diff --git a/App/Controllers/Kit/KitController.asp b/App/Controllers/Kit/KitController.asp index 8e2d13d..0b176ff 100644 --- a/App/Controllers/Kit/KitController.asp +++ b/App/Controllers/Kit/KitController.asp @@ -35,13 +35,19 @@ Class KitController %> <% 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" diff --git a/App/DomainModels/KitRepository.asp b/App/DomainModels/KitRepository.asp index e60e53e..c2e1448 100644 --- a/App/DomainModels/KitRepository.asp +++ b/App/DomainModels/KitRepository.asp @@ -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) diff --git a/App/Views/Kit/SwitchBoardPurpleEnvelopeEdit.asp b/App/Views/Kit/SwitchBoardPurpleEnvelopeEdit.asp index 3c60c34..750bc48 100644 --- a/App/Views/Kit/SwitchBoardPurpleEnvelopeEdit.asp +++ b/App/Views/Kit/SwitchBoardPurpleEnvelopeEdit.asp @@ -97,9 +97,22 @@
Exported to SnailWorks On: <%= Model.Kit.ExportedToSnailWorks %>
<% 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") + %>Amount of Office Copies:
<%= HTML.TextBox("OfficeCopiesAmount","0") %> +Inkjet Sort Order:
+Select Outbound STID:
<%= HTML.Hidden("nonce", HTMLSecurity.GetAntiCSRFToken("KitEditForm")) %> <%= HTML.Hidden("Id", Model.Kit.ID) %> diff --git a/ImportService/TrackingDataImport.vbs b/ImportService/TrackingDataImport.vbs index 7299180..59aec44 100644 Binary files a/ImportService/TrackingDataImport.vbs and b/ImportService/TrackingDataImport.vbs differ diff --git a/Tests/TrackingDataImport_TestHarness.vbs b/Tests/TrackingDataImport_TestHarness.vbs index 2115188..2e4db50 100644 Binary files a/Tests/TrackingDataImport_TestHarness.vbs and b/Tests/TrackingDataImport_TestHarness.vbs differ