Explorar el Código

update inkjet sort

master
Daniel Covington hace 1 día
padre
commit
1b93164990
Se han modificado 5 ficheros con 21 adiciones y 2 borrados
  1. +7
    -1
      App/Controllers/Kit/KitController.asp
  2. +1
    -1
      App/DomainModels/KitRepository.asp
  3. +13
    -0
      App/Views/Kit/SwitchBoardPurpleEnvelopeEdit.asp
  4. BIN
      ImportService/TrackingDataImport.vbs
  5. BIN
      Tests/TrackingDataImport_TestHarness.vbs

+ 7
- 1
App/Controllers/Kit/KitController.asp Ver fichero

@@ -35,13 +35,19 @@ Class KitController
%> <!--#include file="../../Views/Kit/SwitchBoardPurpleEnvelopeIndex.asp"--> <%
End Sub

Public Sub SwitchBoardPurpleEnvelopeEditPost
Public Sub SwitchBoardPurpleEnvelopeEditPost
MVC.RequirePost
HTMLSecurity.OnInvalidAntiCsrfTokenRedirectToActionExt "KitEditForm", Request.Form("nonce"), "Edit", Array("Id", Request.Form("Id"))
dim ID : ID = Request.Form("Id")
dim model : set model = KitRepository.FindByID(ID)
set model = Automapper.AutoMap(Request.Form, model)
dim inkjetSortDirection : inkjetSortDirection = UCase(Trim(Request.Form("InkjetSortDirection") & ""))
model.InboundSTID = Null
If inkjetSortDirection = "ASC" Then
model.JobType = "Purple Envelopes-Ascending"
Else
model.JobType = "Purple Envelopes"
End If


model.Status = "Ready to Assign Labels"


+ 1
- 1
App/DomainModels/KitRepository.asp Ver fichero

@@ -67,7 +67,7 @@ Class KitRepository_Class
dim sql : sql = "SELECT Kit.ID,Kit.JobNumber as [JobNumber],Kit.JCode, " &_
"Jurisdiction.Name As Jurisdiction," &_
"(SELECT COUNT(*) From InkjetRecords Where KitId = Kit.ID)" &_
" As [LabelCount],[CreatedOn],[LabelsPrinted],[ExportedToSnailWorks],[InkJetJob],[JobType],[Filename],[Cass],[Status],[OutboundSTID],[InboundSTID],[OfficeCopiesAmount] FROM Kit INNER JOIN Jurisdiction ON Kit.Jcode = Jurisdiction.JCode Where Kit.JobType = 'Purple Envelopes' Order By [ID];"
" As [LabelCount],[CreatedOn],[LabelsPrinted],[ExportedToSnailWorks],[InkJetJob],[JobType],[Filename],[Cass],[Status],[OutboundSTID],[InboundSTID],[OfficeCopiesAmount] FROM Kit INNER JOIN Jurisdiction ON Kit.Jcode = Jurisdiction.JCode Where Kit.JobType IN ('Purple Envelopes', 'Purple Envelopes-Ascending') Order By [ID];"

dim list : set list = new LinkedList_Class
dim rs : set rs = DAL.PagedQuery(sql, empty, per_page, page_num)


+ 13
- 0
App/Views/Kit/SwitchBoardPurpleEnvelopeEdit.asp Ver fichero

@@ -97,9 +97,22 @@
<p><strong>Exported to SnailWorks On:</strong> <%= Model.Kit.ExportedToSnailWorks %></p>
<% IF Model.Kit.Status = "Ready To Assign STIDS" THEN %>
<%= HTML.FormTag("Kit","SwitchBoardPurpleEnvelopeEditPost",empty,empty) %>
<%
dim isAscendingInkjetSort : isAscendingInkjetSort = (UCase(Trim(Model.Kit.JobType & "")) = "PURPLE ENVELOPES-ASCENDING")
%>
<p><strong>Amount of Office Copies:</strong></p>
<%= HTML.TextBox("OfficeCopiesAmount","0") %>
<p></p>
<p><strong>Inkjet Sort Order:</strong></p>
<div class="form-check">
<input class="form-check-input" type="radio" name="InkjetSortDirection" id="InkjetSortDirectionDesc" value="DESC" <% If Not isAscendingInkjetSort Then Response.Write("checked") %>>
<label class="form-check-label" for="InkjetSortDirectionDesc">Descending</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" name="InkjetSortDirection" id="InkjetSortDirectionAsc" value="ASC" <% If isAscendingInkjetSort Then Response.Write("checked") %>>
<label class="form-check-label" for="InkjetSortDirectionAsc">Ascending</label>
</div>
<p></p>
<p><strong>Select Outbound STID:</strong></p>
<%= HTML.Hidden("nonce", HTMLSecurity.GetAntiCSRFToken("KitEditForm")) %>
<%= HTML.Hidden("Id", Model.Kit.ID) %>


BIN
ImportService/TrackingDataImport.vbs Ver fichero


BIN
Tests/TrackingDataImport_TestHarness.vbs Ver fichero


Cargando…
Cancelar
Guardar

Powered by TurnKey Linux.