From 1047f6ef373bf15337f354446e0ec8c9af552bf4 Mon Sep 17 00:00:00 2001
From: Daniel Covington <danielc@kentcommunications.com>
Date: Fri, 14 Mar 2025 10:47:02 -0400
Subject: [PATCH] this should take care of the sorting issues

---
 Data/Proofs.rep                      |  49 ++++++++++++++-------------
 ImportService/TrackingDataImport.vbs | Bin 87962 -> 88244 bytes
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/Data/Proofs.rep b/Data/Proofs.rep
index 5241d10..b2effd4 100644
--- a/Data/Proofs.rep
+++ b/Data/Proofs.rep
@@ -23,28 +23,31 @@ object TRpReport
       Alias = 'KITLABELS'
       DatabaseAlias = 'WEBDATA'
       SQL = 
-        'SELECT * FROM ('#13#10'SELECT IIf(Len([PRECINCT]) = 1, '#39'0'#39' & [PRECINCT' +
-        '] & Right([BALLOT_NUMBER],4), [PRECINCT] & Right([BALLOT_NUMBER]' +
-        ',4)) AS SORT_ORDER,InkjetRecords.ID, InkjetRecords.KitID, Inkjet' +
-        'Records.VOTERID, InkjetRecords.LASTNAME,'#13#10#9#9#9' InkjetRecords.FIRS' +
-        'TNAME, InkjetRecords.MIDDLENAME, InkjetRecords.SUFFIX, InkjetRec' +
-        'ords.PRECINCT,'#13#10#9#9#9' InkjetRecords.ADDRESS1, InkjetRecords.ADDRES' +
-        'S2, InkjetRecords.ADDRESS3, InkjetRecords.ADDRESS4,'#13#10#9#9#9' InkjetR' +
-        'ecords.ADDRESS5, InkjetRecords.APPSENT, InkjetRecords.APPRETURNE' +
-        'D, InkjetRecords.BALSENT,'#13#10#9#9#9' InkjetRecords.BALRETURNED, Inkjet' +
-        'Records.CountingBoard, InkjetRecords.UOCAVASTATUS, InkjetRecords' +
-        '.EMAILADDRESS,'#13#10#9#9#9' InkjetRecords.PHONENUMBER, BALLOT_NUMBER, In' +
-        'kjetRecords.CassADDRESS1,InkjetRecords.CassADDRESS2,InkjetRecord' +
-        's.CassADDRESS3,InkjetRecords.CassADDRESS4,InkjetRecords.CassADDR' +
-        'ESS5, InkjetRecords.KitLabelID,'#13#10#9#9#9' KitLabels.ID, KitLabels.Kit' +
-        'ID, KitLabels.OutboundSerial, KitLabels.InBoundSerial, KitLabels' +
-        '.OutboundIMB,'#13#10#9#9#9' KitLabels.InBoundIMB, KitLabels.OutboundIMBDi' +
-        'gits, KitLabels.InBoundIMBDigits, KitLabels.OutboundIMBPNG,'#13#10#9#9#9 +
-        ' KitLabels.INBOUNDIMBPNG, KitLabels.SetNumber'#13#10#9#9#9' FROM InkjetRe' +
-        'cords'#13#10#9#9#9' LEFT JOIN [KitLabels] ON InkjetRecords.KitLabelID = K' +
-        'itLabels.ID'#13#10#9#9#9' WHERE InkjetRecords.KitID = PBKITID AND InkjetR' +
-        'ecords.ID >= PBMIN and InkjetRecords.ID <= PBMAX) As [data] Orde' +
-        'r By Clng(SORT_ORDER)'
+        'SELECT * FROM ('#13#10'    SELECT '#13#10'        IIf(Len([PRECINCT]) = 1, '#39 +
+        '0'#39' & [PRECINCT] & Right([BALLOT_NUMBER],4), [PRECINCT] & Right([' +
+        'BALLOT_NUMBER],4)) AS SORT_ORDER,'#13#10'        InkjetRecords.ID, Ink' +
+        'jetRecords.KitID, InkjetRecords.VOTERID, InkjetRecords.LASTNAME,' +
+        #13#10'        InkjetRecords.FIRSTNAME, InkjetRecords.MIDDLENAME, Ink' +
+        'jetRecords.SUFFIX, InkjetRecords.PRECINCT,'#13#10'        InkjetRecord' +
+        's.ADDRESS1, InkjetRecords.ADDRESS2, InkjetRecords.ADDRESS3, Inkj' +
+        'etRecords.ADDRESS4,'#13#10'        InkjetRecords.ADDRESS5, InkjetRecor' +
+        'ds.APPSENT, InkjetRecords.APPRETURNED, InkjetRecords.BALSENT,'#13#10' ' +
+        '       InkjetRecords.BALRETURNED, InkjetRecords.CountingBoard, I' +
+        'nkjetRecords.UOCAVASTATUS, InkjetRecords.EMAILADDRESS,'#13#10'        ' +
+        'InkjetRecords.PHONENUMBER, BALLOT_NUMBER, InkjetRecords.CassADDR' +
+        'ESS1, InkjetRecords.CassADDRESS2,'#13#10'        InkjetRecords.CassADD' +
+        'RESS3, InkjetRecords.CassADDRESS4, InkjetRecords.CassADDRESS5, I' +
+        'nkjetRecords.KitLabelID,'#13#10'        KitLabels.ID AS KitLabelID, Ki' +
+        'tLabels.KitID, KitLabels.OutboundSerial, KitLabels.InBoundSerial' +
+        ','#13#10'        KitLabels.OutboundIMB, KitLabels.InBoundIMB, KitLabel' +
+        's.OutboundIMBDigits, KitLabels.InBoundIMBDigits,'#13#10'        KitLab' +
+        'els.OutboundIMBPNG, KitLabels.INBOUNDIMBPNG, KitLabels.SetNumber' +
+        #13#10'    FROM InkjetRecords'#13#10'    LEFT JOIN KitLabels ON InkjetRecor' +
+        'ds.KitLabelID = KitLabels.ID'#13#10'    WHERE InkjetRecords.KitID = PB' +
+        'KITID '#13#10'      AND InkjetRecords.ID >= PBMIN '#13#10'      AND InkjetRe' +
+        'cords.ID <= PBMAX'#13#10') AS data '#13#10'ORDER BY '#13#10'    Val(PRECINCT), PRE' +
+        'CINCT, '#13#10'    Val(Right(BALLOT_NUMBER, 4)), Right(BALLOT_NUMBER, ' +
+        '4);'
     end
     item
       Alias = 'JURISDICTION'
@@ -4335,7 +4338,7 @@ object TRpReport
     PosX = 8050
     PosY = 5745
     Modul = 17
-    Ratio = 3.000000000000000000
+    Ratio = 3.00000000000000000
     Typ = bcCode39
     NumColumns = 1
     NumRows = 1
diff --git a/ImportService/TrackingDataImport.vbs b/ImportService/TrackingDataImport.vbs
index c65e287aeb514d1e48bb83a4d9fe84e14037cb71..1e66437d53397c6d909ba1bd718e26687860fbc9 100644
GIT binary patch
delta 742
zcmbQWo^{Jc)(w|@C)-3xNoz1DFem}B8W6`b@G@`#X$Vx>{MMJ1Q4**0<VJtl$t?@|
z2&iydxCD<1#zp(_%4$!(5TZ1BPhbfiRUmgL1hGxd2--tHRao#LJSrXr8&6IMS%F7I
z;Y!KLW}!Rqst}*t5GFKv-g5lrh))W4!eh+Y6{>h-Cx$oTk=2YapKQ}9F*#rkOT8vA
zE*%+yfn+p;3qvA92@uBuc{pO6!Ji=rsLmBgDlj-PL;}e$ppF~{4Tb=qm@9)bgC~O@
zkPKk}nG8}H4CLtm+350MSrfQ4E(>AC2Qg$aq%&jy9jGxm(N9_#WTXku5_D_O)UiX=
YO|Lg+6rY^q%Q2Z})xXUTB6s}-0C0kM4*&oF

delta 226
zcmdn8k#*L3)(w|@rx)lm@=W%6#mA_znca_-aWczdp~;5=<R;HsxL~rxVui^Gi?#vj
zD?qF_S!T%!u-JiMw#jdnoCCA(ECtCaO!iqOHrX#w2}~<2Z<@Sh`7<DvntUKkXmU>2
zipdEpg(jD*%$xjVrPXAGRWl~<S``wk$)LcH$WRO<qZwR)tP&uO1@inEiWpKDQh}rb
zgA+p~kaTA7VaQ`hXV72>2FeC8gfPT|X%_}pAP;1Y3s8MAL-OQ!U(wBfB6s`)0O%4=
A8vp<R