From 631af729abcab3bbc15f83e1ed744dbc43fbb46b Mon Sep 17 00:00:00 2001
From: Daniel Covington <danielc@kentcommunications.com>
Date: Mon, 20 May 2024 12:46:27 -0400
Subject: [PATCH] More cleanup

---
 Data/Proofs.rep                      | 31 +++++++++++++++++++++++++---
 ImportService/TrackingDataImport.vbs | 23 ++++++++++-----------
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/Data/Proofs.rep b/Data/Proofs.rep
index d00be83..046e904 100644
--- a/Data/Proofs.rep
+++ b/Data/Proofs.rep
@@ -1880,6 +1880,9 @@ object TRpReport
       end
       item
         Component = TRpExpression10
+      end
+      item
+        Component = TRpExpression18
       end>
     ExternalTable = 'REPMAN_REPORTS'
     ExternalField = 'REPORT'
@@ -4453,7 +4456,7 @@ object TRpReport
     Width = 4800
     Height = 264
     PosX = 8050
-    PosY = 7015
+    PosY = 7245
     Type1Font = poHelvetica
     AutoExpand = False
     AutoContract = False
@@ -4475,7 +4478,7 @@ object TRpReport
     Width = 4800
     Height = 264
     PosX = 8050
-    PosY = 7265
+    PosY = 7495
     Type1Font = poHelvetica
     AutoExpand = False
     AutoContract = False
@@ -4497,7 +4500,7 @@ object TRpReport
     Width = 4800
     Height = 264
     PosX = 8050
-    PosY = 7465
+    PosY = 7695
     Type1Font = poHelvetica
     AutoExpand = False
     AutoContract = False
@@ -4515,4 +4518,26 @@ object TRpReport
     AgIniValue = '0'
     ExportExpression = ''
   end
+  object TRpExpression18: TRpExpression
+    Width = 4200
+    Height = 264
+    PosX = 8055
+    PosY = 7020
+    Type1Font = poHelvetica
+    AutoExpand = False
+    AutoContract = False
+    ExportPosition = 0
+    ExportSize = 1
+    ExportDoNewLine = False
+    PrintCondition = ''
+    DoBeforePrint = ''
+    DoAfterPrint = ''
+    WFontName = 'Arial'
+    LFontName = 'Helvetica'
+    Expression = 'KITLABELS.CassADDRESS2'
+    DisplayFormat = ''
+    ExportDisplayFormat = ''
+    AgIniValue = '0'
+    ExportExpression = ''
+  end
 end
diff --git a/ImportService/TrackingDataImport.vbs b/ImportService/TrackingDataImport.vbs
index d9d2cc7..9cb7203 100644
--- a/ImportService/TrackingDataImport.vbs
+++ b/ImportService/TrackingDataImport.vbs
@@ -85,15 +85,14 @@ Function ExportInkjetFile(KitID)
 	objInkjetCSV.SetColumnName 9,"Jurisdiction code"
 	objInkjetCSV.SetColumnName 10,"Election Date"
 	objInkJetCSV.SetColumnName 11,"Combined  Pct_Ballot Num"
-	objInkJetCSV.SetColumnName 12,"Voter ID"
-	objInkJetCSV.SetColumnName 13,"2D Matrix Barcode"
-	objInkJetCSV.SetColumnName 14,"G2 Full Name"
-	objInkJetCSV.SetColumnName 15,"G2 Company"
-	objInkJetCSV.SetColumnName 16,"G2 Alternate 1 Address"
-	objInkJetCSV.SetColumnName 17,"G2 Delivery Address"
-	objInkJetCSV.SetColumnName 18,"G2 City St ZIP+4"
-	objInkJetCSV.SetColumnName 19,"G2 IM barcode Characters"
-	objInkJetCSV.SetColumnName 20,"NEW Ballot No f"
+	objInkJetCSV.SetColumnName 12,"2D Matrix Barcode"
+	objInkJetCSV.SetColumnName 13,"G2 Full Name"
+	objInkJetCSV.SetColumnName 14,"G2 Company"
+	objInkJetCSV.SetColumnName 15,"G2 Alternate 1 Address"
+	objInkJetCSV.SetColumnName 16,"G2 Delivery Address"
+	objInkJetCSV.SetColumnName 17,"G2 City St ZIP+4"
+	objInkJetCSV.SetColumnName 18,"G2 IM barcode Characters"
+	objInkJetCSV.SetColumnName 19,"Matching Code"
 
 Dim AddressArray 
 Dim row:row = 0	
@@ -106,11 +105,11 @@ Dim row:row = 0
 			objInkjetCSV.SetCellByName row,"City St ZIP+4",AddressArray(4)
 			objInkJetCSV.SetCellByName row,"IM barcode Characters",KitLabelsRs("OutboundIMBDigits").Value
 			objInkJetCSV.SetCellByName row,"Precinct",KitLabelsRs("PRECINCT").Value
-			objInkJetCSV.SetCellByName row,"Ballot ID",KitLabelsRs("VOTERID").Value
+			objInkJetCSV.SetCellByName row,"Ballot ID",KitLabelsRs("VOTERID").Value 
+			objInkJetCSV.SetCellByName row,"Ballot Number",TrimLeadingZeros(KitLabelsRs("BALLOT_NUMBER").Value)
 			objInkJetCSV.SetCellByName row,"Jurisdiction code",KitRs("Jcode").Value
 			objInkJetCSV.SetCellByName row,"Election Date",ElectionDate
 			objInkJetCSV.SetCellByName row,"Combined  Pct_Ballot Num",KitLabelsRs("PRECINCT").Value & KitLabelsRs("BALLOT_NUMBER").Value
-			objInkJetCSV.SetCellByName row,"Voter ID",KitLabelsRs("VOTERID").Value
 			objInkJetCSV.SetCellByName row,"2D Matrix Barcode",KitRs("Jcode").Value & KitLabelsRs("BALLOT_NUMBER").Value
 			objInkJetCSV.SetCellByName row,"G2 Full Name",JurisdictionRs("Name").Value
 			objInkJetCSV.SetCellByName row,"G2 Company",JurisdictionRs("Mailing_Address").Value
@@ -118,7 +117,7 @@ Dim row:row = 0
 			objInkJetCSV.SetCellByName row,"G2 Delivery Address",""
 			objInkJetCSV.SetCellByName row,"G2 City St ZIP+4",""
 			objInkJetCSV.SetCellByName row,"G2 IM barcode Characters",JurisdictionRs("IMB_Digits").Value
-			objInkJetCSV.SetCellByName row,"NEW Ballot No f",TrimLeadingZeros(KitLabelsRs("PRECINCT").Value) & TrimLeadingZeros(KitLabelsRs("BALLOT_NUMBER").Value)
+			objInkJetCSV.SetCellByName row,"Matching Code",KitRs("Jcode").Value & TrimLeadingZeros(KitLabelsRs("PRECINCT").Value) & TrimLeadingZeros(KitLabelsRs("BALLOT_NUMBER").Value)
 			'Where do we put the roundtrip IMB
 			row = row + 1
 			KitLabelsRs.MoveNext