From 1b931649906dee2ebc46e76eea3457133da279ab Mon Sep 17 00:00:00 2001 From: Daniel Covington Date: Wed, 18 Mar 2026 16:53:55 -0400 Subject: [PATCH] update inkjet sort --- App/Controllers/Kit/KitController.asp | 8 +++++++- App/DomainModels/KitRepository.asp | 2 +- .../Kit/SwitchBoardPurpleEnvelopeEdit.asp | 13 +++++++++++++ ImportService/TrackingDataImport.vbs | Bin 91684 -> 95374 bytes Tests/TrackingDataImport_TestHarness.vbs | Bin 45984 -> 51142 bytes 5 files changed, 21 insertions(+), 2 deletions(-) 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 72991801f16bad44e1f493274745cceb9269ac86..59aec44b9d2987027a5049c357df1882c7e9a0fd 100644 GIT binary patch delta 2379 zcmb7GOKcle6uqy+C{7c{PL$ZG8!|Hj5|{K@X~ z9QrN9Z!Cu7RRT}nd~)&m@4x!wPF93vcvytw@fFc(o+29p6ft}V&;?zA zA^&8a`l=_OgYxg=aoeH<4o}xKokH4annRroobz-V*Ew3iyA-HAO;fnq`pYybHcvBT z$xB%=pi|&q``Q|--R)P~a?p4$5_K5dUKcITZtCo3=?pTML+1G^CJk#D@z9^dT)2c1 zJn+CLQSNJI<_v%Spq=j-M=Eb#ly_c+N9WD)%Bv5Y zyRxuuCA$mI^gLa_wFqP7DC?}lxWoJyJX7=gaPDp$3f^adPs(i)53_O>i`=scaJK}yI@TTJkAtDXPA%*@V@Km7xjz}Ol9 delta 204 zcmeBs$-3kW>xLMn%{Q3B#HKeDGKy_Zll;asIfsvD@;OD3$;%>yCZCcL*c_!aiDmK^ zwJIRCnVzS|$ToS;H?GNt)O9BNMR832qh>SNO2cMzoyH-9$-91rOrGP&Gx>w8)?|kz z8k0}$%-XylE{a#xg~62}n8BGrhe3fMfFTITb7t^l@B@+|KoO|yWXB}g$t!ZK*kOG6 vT+``Afs7)X=jGbyOn>Lk$TfM@JfY2Hb21nwKbUJWy(*B=YV(45@2&y>PRU7Q diff --git a/Tests/TrackingDataImport_TestHarness.vbs b/Tests/TrackingDataImport_TestHarness.vbs index 2115188b5d202a44bfa7d977dc3e316632df2fce..2e4db50f8f7b0c52d4c80063e1acb999d9166670 100644 GIT binary patch delta 4015 zcmbVPYfO`86n?89T`i?h3N5gfegmNsiq*LZ6AcA6af%3Du>u7OEthg>i=a-a(ZyuZ zsn3>~B}>qRdC62J%d#zQV}E9{%*7u|mYDtV*OFz)wq)B6w`@D_*HYTAt?^r$ewXvU z=bY!9_uRgjAD4ag#`3vG>D3L)%Z6DoYhpe&$Of331z01SWTR|^jni{m$-AT`8?jz7l71?UUPF$L%D` z!yXXdVy)IE)Aksfja*JLo;Zus!+OH@sZ=cGrYFgxKyP&cc`QKzbhd(6S6*d9_o zM9=jiut*Uv~8n^cwuE8F?&1hSrTU4>a0(oWptTox4o+j z4{R0BNI2qZWY{e+Dip3-+z#c!>2iqoJFb?nD7rRvug9|U0$S__eBEs;;}wnLlqy*C zQg~HB$es^%&qg@j+W<#q4(2{cL$jqgiTBKugt^r+%Q+#4#2V@{btJt2YtQFJtWe>H zp56op-Rjh1pf?Xfh|su|xZ_dbW^YO4eFc8+UB#c%{j87tU)fiPE_Ve^^a}Xcy^-z( ziasc=6=G9g2`--%aJH`ltw8~Xev^3b?k|RrU4Ut=TD17vex)uNs}x0UYEuD{tniFj z`8hwCA4fc8bP8F6dVK21&4}qjrEQYP4|}ACPG+gAiLsZ==Z#Cq{%?j-o+C7G#+z3R z(6$>g!u_;-u?p#>RY*jJzow0_&1%I?wQ1IXnhq6mFKQD`EBmS$xdS;!^9FF*+W=pk z20wX+pz@gLuEx264KloVcVIoPLIcy_8tSTtWpI8!SOtx53p$2cWN_UWsuj5$!yXx2 z*M@f!*NhB~8@@(S&(@Jq8C;)?92B{HqwO-d?vB0;)7WJh9AAuaj;-h#m*cxzPWhW~@zo+MOud9TXAV9*V8Tg?vF5|8ux76T)7eUF*{iK=p&71`Dt!}WV?Emy z>3(%o{kO3l^xjGI-E2Gc&PLXX9s8}=<*Zpwxr*O5mmU{rPb*D!v_`q>VEgGB?y%)F zMaE0E(%KVdxQIf^pM<+8GHgl;t;oIza1ll9TfaR0BK9NrS4Li$p)#YO67!^(A-x<9WYkoRd zAtCB$$Yi!iO!9&B;hEK3r#`7cT&u!CX5=Ga70_Ci)0kRQ>L8Nnq=DI`HA6E|66Xd7 z)=gANC|vX5i3S;Y{@KJ4s@{hDZRCYMF}UNM|L>tAvZPt?&ZLt|d^%Q+^d!XZj4TNi zwVrkIbQO*!gejjG`PbYyE)|(M4s$Gy#8VTIWGB$&W6AH13Gwjcx`cx=Et5x>jVj>? x%@S_h>$l?EF)gpD%V`BwCymfjjy`BF!JH)zKkrdu&(yOxam6(M&GdI`{{stgig^G4 delta 907 zcmY*XOGsNm6n&{_c!Z~Yq^~hVNgp9d2tiXRZ7D@u1PP&pP(&<-qS0y;t1%xF%*VfA z&?fbSuG0FntGbX#HeIwTBE^M^v~=O3h`WLmap9trQaYJDLtV_BbIv_;nYnj9r>mqN z*Ydxw7aph%I^nNVKD9H?nPIX*WQk0W>^+o=%qSBk%ul1pcuBsWXaVZ$rLJMdO3s8B zAJIk#D&=}<>|sLKx?PKB17^gxIq+E)(x4f;153!g5pXpk(WhAn>u}K}z^`Xv3EzV#m2n_!h2?!2=fg_$tqO4G zSY*c4D3V<1jC+}fcHCaU-c^I_F;T5_o2gX|PR84D_{oHm8!S2^2KYacu59Zle;pC& z75!Txie+()mo=@q>dAN@w<4EH$s`P(T=rFThX0x;V984a|c{WHx81ID*W-J566@3 z6+SW5i9b_znSX$B#v@}V4rV&xoNc2#GrJDY+$DD6=bRh;^DVO1isHNn9Se?f56BG8 z7acTLdRt3sf#T9^4pUl+OEWl4l|4jPc+vE-mc*{59=WCthBQZ%`{^bUgXu2(N>5zY zQM|yHrCJ(qf?al3&ZIJGqON6P#4V!#mFLPd#BDWp`5K(R<8W55!$#JEQ!fum