From d50683f387347222e31fa65d7360846667733117 Mon Sep 17 00:00:00 2001
From: Daniel Covington <danielc@kentcommunications.com>
Date: Mon, 20 May 2024 10:55:44 -0400
Subject: [PATCH] Cleanup

---
 Data/Proofs.rep                      | 40 +++++++++++++++-------------
 ImportService/TrackingDataImport.vbs |  1 -
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/Data/Proofs.rep b/Data/Proofs.rep
index a975024..d00be83 100644
--- a/Data/Proofs.rep
+++ b/Data/Proofs.rep
@@ -32,16 +32,20 @@ object TRpReport
         'ords.BALSENT,'#13#10#9#9#9' InkjetRecords.BALRETURNED, InkjetRecords.Coun' +
         'tingBoard, InkjetRecords.UOCAVASTATUS, InkjetRecords.EMAILADDRES' +
         'S,'#13#10#9#9#9' InkjetRecords.PHONENUMBER, InkjetRecords.BALLOT_NUMBER, ' +
-        'InkjetRecords.CassADDRESS1, InkjetRecords.CassADDRESS2,'#13#10#9#9#9' Ink' +
-        'jetRecords.CassADDRESS3, InkjetRecords.CassADDRESS4, InkjetRecor' +
-        'ds.CassADDRESS5, InkjetRecords.KitLabelID,'#13#10#9#9#9' KitLabels.ID, Ki' +
-        'tLabels.KitID, KitLabels.OutboundSerial, KitLabels.InBoundSerial' +
-        ', KitLabels.OutboundIMB,'#13#10#9#9#9' KitLabels.InBoundIMB, KitLabels.Ou' +
-        'tboundIMBDigits, KitLabels.InBoundIMBDigits, KitLabels.OutboundI' +
-        'MBPNG,'#13#10#9#9#9' KitLabels.INBOUNDIMBPNG, KitLabels.SetNumber'#13#10#9#9#9' FR' +
-        'OM InkjetRecords'#13#10#9#9#9' LEFT JOIN [KitLabels] ON InkjetRecords.Kit' +
-        'LabelID = KitLabels.ID'#13#10#9#9#9' WHERE InkjetRecords.KitID = PBKITID ' +
-        'AND InkjetRecords.ID >= PBMIN and InkjetRecords.ID <= PBMAX '
+        'InkjetRecords.CassADDRESS1, IIF(InkjetRecords.CassADDRESS3 ="",I' +
+        'nkjetRecords.CassADDRESS4,InkjetRecords.CassADDRESS3)as CassADDR' +
+        'ESS2,'#13#10#9#9#9'IIF(InkjetRecords.CassADDRESS3 ="",InkjetRecords.CassA' +
+        'DDRESS5,InkjetRecords.CassADDRESS4)as CassADDRESS3,IIF(InkjetRec' +
+        'ords.CassADDRESS3 ="","",InkjetRecords.CassADDRESS5)as CassADDRE' +
+        'SS4,IIF(InkjetRecords.CassADDRESS3 ="","","")as CassADDRESS5, In' +
+        'kjetRecords.KitLabelID,'#13#10#9#9#9' KitLabels.ID, KitLabels.KitID, KitL' +
+        'abels.OutboundSerial, KitLabels.InBoundSerial, KitLabels.Outboun' +
+        'dIMB,'#13#10#9#9#9' KitLabels.InBoundIMB, KitLabels.OutboundIMBDigits, Ki' +
+        'tLabels.InBoundIMBDigits, KitLabels.OutboundIMBPNG,'#13#10#9#9#9' KitLabe' +
+        'ls.INBOUNDIMBPNG, KitLabels.SetNumber'#13#10#9#9#9' FROM InkjetRecords'#13#10#9 +
+        #9#9' LEFT JOIN [KitLabels] ON InkjetRecords.KitLabelID = KitLabels' +
+        '.ID'#13#10#9#9#9' WHERE InkjetRecords.KitID = PBKITID AND InkjetRecords.I' +
+        'D >= PBMIN and InkjetRecords.ID <= PBMAX '
     end
     item
       Alias = 'JURISDICTION'
@@ -4084,7 +4088,7 @@ object TRpReport
   object TRpExpression0: TRpExpression
     Width = 4200
     Height = 264
-    PosX = 8055
+    PosX = 8050
     PosY = 6775
     Type1Font = poHelvetica
     AutoExpand = False
@@ -4196,7 +4200,7 @@ object TRpReport
   object TRpExpression9: TRpExpression
     Width = 5745
     Height = 345
-    PosX = 8160
+    PosX = 8045
     PosY = 8505
     Type1Font = poEmbedded
     FontSize = 16
@@ -4336,7 +4340,7 @@ object TRpReport
   object TRpBarcode0: TRpBarcode
     Width = 4830
     Height = 465
-    PosX = 8390
+    PosX = 8050
     PosY = 5745
     Modul = 17
     Ratio = 3.000000000000000000
@@ -4352,7 +4356,7 @@ object TRpReport
   object TRpExpression15: TRpExpression
     Width = 1035
     Height = 240
-    PosX = 8400
+    PosX = 8050
     PosY = 6315
     Type1Font = poHelvetica
     FontSize = 8
@@ -4376,7 +4380,7 @@ object TRpReport
   object TRpExpression16: TRpExpression
     Width = 1035
     Height = 240
-    PosX = 9550
+    PosX = 9320
     PosY = 6315
     Type1Font = poHelvetica
     FontSize = 8
@@ -4400,7 +4404,7 @@ object TRpReport
   object TRpExpression17: TRpExpression
     Width = 1035
     Height = 240
-    PosX = 11850
+    PosX = 11620
     PosY = 6315
     Type1Font = poHelvetica
     FontSize = 8
@@ -4424,7 +4428,7 @@ object TRpReport
   object TRpExpression4: TRpExpression
     Width = 1035
     Height = 240
-    PosX = 10700
+    PosX = 10470
     PosY = 6315
     Type1Font = poHelvetica
     FontSize = 8
@@ -4492,7 +4496,7 @@ object TRpReport
   object TRpExpression10: TRpExpression
     Width = 4800
     Height = 264
-    PosX = 8055
+    PosX = 8050
     PosY = 7465
     Type1Font = poHelvetica
     AutoExpand = False
diff --git a/ImportService/TrackingDataImport.vbs b/ImportService/TrackingDataImport.vbs
index 0e28ef0..d9d2cc7 100644
--- a/ImportService/TrackingDataImport.vbs
+++ b/ImportService/TrackingDataImport.vbs
@@ -128,7 +128,6 @@ Dim row:row = 0
 	
 	
 	
-	objExportFile.Close
 	oConn.Execute("UPDATE KIT SET [Status] ='Done',[InkJetJob]=1  WHERE [ID] =" & KitID & ";")
 	If KitRs.State = 1 Then:KitRs.Close:End If
 	If KitLabelsRs.State = 1 Then:KitLabelsRs.Close: End If