From 71625abc51112f9438050b2015da889314c268d3 Mon Sep 17 00:00:00 2001
From: Daniel Covington <danielc@kentcommunications.com>
Date: Wed, 29 May 2024 14:23:47 -0400
Subject: [PATCH] more cleanup

---
 Data/Label_Report.rep                |  2 +-
 Data/Proofs.rep                      | 29 ++++++++++++++++++++++++++++
 ImportService/TrackingDataImport.vbs |  2 +-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/Data/Label_Report.rep b/Data/Label_Report.rep
index fb1857b..cd7d899 100644
--- a/Data/Label_Report.rep
+++ b/Data/Label_Report.rep
@@ -1347,7 +1347,7 @@ object TRpReport
     WFontName = 'Arial'
     LFontName = 'Helvetica'
     Expression = 
-      #39'Code Expires on 5/7/2024 '#39' +'#13#10#39'Destroy Unused Lables '#39' +'#13#10#39'afte' +
+      #39'Code Expires on 8/5/2024 '#39' +'#13#10#39'Destroy Unused Lables '#39' +'#13#10#39'afte' +
       'r election'#39
     DisplayFormat = ''
     ExportDisplayFormat = ''
diff --git a/Data/Proofs.rep b/Data/Proofs.rep
index 3122941..0c3b56e 100644
--- a/Data/Proofs.rep
+++ b/Data/Proofs.rep
@@ -1889,6 +1889,9 @@ object TRpReport
       end
       item
         Component = TRpExpression18
+      end
+      item
+        Component = TRpExpression7
       end>
     ExternalTable = 'REPMAN_REPORTS'
     ExternalField = 'REPORT'
@@ -4545,4 +4548,30 @@ object TRpReport
     AgIniValue = '0'
     ExportExpression = ''
   end
+  object TRpExpression7: TRpExpression
+    Width = 4935
+    Height = 345
+    PosX = 8055
+    PosY = 7710
+    Type1Font = poLinked
+    FontSize = 16
+    FontStyle = 1
+    AutoExpand = False
+    AutoContract = False
+    ExportPosition = 0
+    ExportSize = 1
+    ExportDoNewLine = False
+    PrintCondition = ''
+    DoBeforePrint = ''
+    DoAfterPrint = ''
+    WFontName = 'USPSIMBStandard'
+    LFontName = 'Helvetica'
+    Expression = 
+      #39'DTATTTFDTFFAFATTDTAFTFATTFDDTDDDAFFAADTFDTAADFAATFAADFAFTDTFAFT' +
+      'TA'#39
+    DisplayFormat = ''
+    ExportDisplayFormat = ''
+    AgIniValue = '0'
+    ExportExpression = ''
+  end
 end
diff --git a/ImportService/TrackingDataImport.vbs b/ImportService/TrackingDataImport.vbs
index afaa545..154d5ab 100644
--- a/ImportService/TrackingDataImport.vbs
+++ b/ImportService/TrackingDataImport.vbs
@@ -62,7 +62,7 @@ Function ExportInkjetFile(KitID)
 			" KitLabels.INBOUNDIMBPNG, KitLabels.SetNumber" &_
 			" FROM InkjetRecords" &_
 			" LEFT JOIN [KitLabels] ON InkjetRecords.KitLabelID = KitLabels.ID" & _
-			" WHERE InkjetRecords.KitID =" & KitID & " ;")
+			" WHERE InkjetRecords.KitID =" & KitID & " Order by PRECINCT & Clng(BALLOT_NUMBER) Desc;")
 	Dim JurisdictionRs:Set JurisdictionRs = oConn.Execute("SELECT * FROM Jurisdiction WHERE JCode ='" & KitRs("Jcode").Value & "';")
 	Dim ContactRs:Set ContactRs = oConn.Execute("SELECT * FROM Contacts WHERE [JURISCODE] ='" & KitRs("Jcode").Value & "';")
 	Dim ExportFileName:ExportFileName = objFSO.GetBaseName(KitRs("Filename")) & ".csv"