From 18417119ed3993f74373bb6d37ca2b937b407f81 Mon Sep 17 00:00:00 2001
From: Daniel Covington <danielc@kentcommunications.com>
Date: Fri, 31 May 2024 11:46:46 -0400
Subject: [PATCH] Changed reports to reflect data and made the labels print on
 8.5 x 11

---
 Data/Label_Report.rep | 12 +++++++-----
 Data/Proofs.rep       | 31 ++++++++++++++++---------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/Data/Label_Report.rep b/Data/Label_Report.rep
index cd7d899..008105d 100644
--- a/Data/Label_Report.rep
+++ b/Data/Label_Report.rep
@@ -1,11 +1,13 @@
 object TRpReport
-  PageHeight = 8120
-  PageWidth = 5742
+  Pagesize = rpPageSizeCustom
+  PagesizeQt = 2
+  PageHeight = 7639
+  PageWidth = 5903
   PageBackColor = 16777215
-  LeftMargin = 270
+  LeftMargin = 360
   TopMargin = 360
-  RightMargin = 270
-  BottomMargin = 360
+  RightMargin = 0
+  BottomMargin = 0
   SubReports = <
     item
       SubReport = TRpSubReport0
diff --git a/Data/Proofs.rep b/Data/Proofs.rep
index 0c3b56e..bf924e1 100644
--- a/Data/Proofs.rep
+++ b/Data/Proofs.rep
@@ -31,21 +31,22 @@ object TRpReport
         'SS5, InkjetRecords.APPSENT, InkjetRecords.APPRETURNED, InkjetRec' +
         '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, 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 '
+        'S,'#13#10#9#9#9' InkjetRecords.PHONENUMBER, Cint(InkjetRecords.BALLOT_NUM' +
+        'BER) As  BALLOT_NUMBER, InkjetRecords.CassADDRESS1, IIF(InkjetRe' +
+        'cords.CassADDRESS3 ="",InkjetRecords.CassADDRESS4,InkjetRecords.' +
+        'CassADDRESS3)as CassADDRESS2,'#13#10#9#9#9'IIF(InkjetRecords.CassADDRESS3' +
+        ' ="",InkjetRecords.CassADDRESS5,InkjetRecords.CassADDRESS4)as Ca' +
+        'ssADDRESS3,IIF(InkjetRecords.CassADDRESS3 ="","",InkjetRecords.C' +
+        'assADDRESS5)as CassADDRESS4,IIF(InkjetRecords.CassADDRESS3 ="","' +
+        '","")as CassADDRESS5, InkjetRecords.KitLabelID,'#13#10#9#9#9' KitLabels.I' +
+        'D, KitLabels.KitID, KitLabels.OutboundSerial, KitLabels.InBoundS' +
+        'erial, KitLabels.OutboundIMB,'#13#10#9#9#9' KitLabels.InBoundIMB, KitLabe' +
+        'ls.OutboundIMBDigits, KitLabels.InBoundIMBDigits, KitLabels.Outb' +
+        'oundIMBPNG,'#13#10#9#9#9' KitLabels.INBOUNDIMBPNG, KitLabels.SetNumber'#13#10#9 +
+        #9#9' FROM InkjetRecords'#13#10#9#9#9' LEFT JOIN [KitLabels] ON InkjetRecord' +
+        's.KitLabelID = KitLabels.ID'#13#10#9#9#9' WHERE InkjetRecords.KitID = PBK' +
+        'ITID AND InkjetRecords.ID >= PBMIN and InkjetRecords.ID <= PBMAX' +
+        ' Order by PRECINCT & Clng(BALLOT_NUMBER) ASC'
     end
     item
       Alias = 'JURISDICTION'