more changes

Data/Proofs.rep

@@ -23,30 +23,32 @@ object TRpReport
       Alias = 'KITLABELS'
       DatabaseAlias = 'WEBDATA'
       SQL = 
-        'SELECT InkjetRecords.ID, InkjetRecords.KitID, InkjetRecords.VOTE' +
-        'RID, InkjetRecords.LASTNAME,'#13#10#9#9#9' InkjetRecords.FIRSTNAME, Inkje' +
-        'tRecords.MIDDLENAME, InkjetRecords.SUFFIX, InkjetRecords.PRECINC' +
-        'T,'#13#10#9#9#9' InkjetRecords.ADDRESS1, InkjetRecords.ADDRESS2, InkjetRe' +
-        'cords.ADDRESS3, InkjetRecords.ADDRESS4,'#13#10#9#9#9' InkjetRecords.ADDRE' +
-        '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, Clng(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 ASC ,Clng(BALLOT_NUMBER) ASC'
+        '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, IIF(InkjetRecords.CassADDRESS3 ="",Ink' +
+        'jetRecords.CassADDRESS4,InkjetRecords.CassADDRESS3)as CassADDRES' +
+        'S2,'#13#10#9#9#9'IIF(InkjetRecords.CassADDRESS3 ="",InkjetRecords.CassADD' +
+        'RESS5,InkjetRecords.CassADDRESS4)as CassADDRESS3,IIF(InkjetRecor' +
+        'ds.CassADDRESS3 ="","",InkjetRecords.CassADDRESS5)as CassADDRESS' +
+        '4,IIF(InkjetRecords.CassADDRESS3 ="","","")as CassADDRESS5, Inkj' +
+        'etRecords.KitLabelID,'#13#10#9#9#9' KitLabels.ID, KitLabels.KitID, KitLab' +
+        'els.OutboundSerial, KitLabels.InBoundSerial, KitLabels.OutboundI' +
+        'MB,'#13#10#9#9#9' KitLabels.InBoundIMB, KitLabels.OutboundIMBDigits, KitL' +
+        'abels.InBoundIMBDigits, KitLabels.OutboundIMBPNG,'#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 InkjetRecords.KitLabelID = KitLabels.I' +
+        'D'#13#10#9#9#9' WHERE InkjetRecords.KitID = PBKITID AND InkjetRecords.ID ' +
+        '>= PBMIN and InkjetRecords.ID <= PBMAX) As [data] Order By SORT_' +
+        'ORDER'
     end
     item
       Alias = 'JURISDICTION'
@@ -126,7 +128,7 @@ object TRpReport
     item
       Name = 'PBMAX'
       AllowNulls = False
-      Value = 291894
+      Value = 295000
       ParamType = rpParamInteger
       Datasets.Strings = (
         'KITLABELS')
@@ -1879,9 +1881,6 @@ object TRpReport
       item
         Component = TRpExpression16
       end
-      item
-        Component = TRpExpression17
-      end
       item
         Component = TRpExpression4
       end
@@ -4398,30 +4397,6 @@ object TRpReport
     AgIniValue = '0'
     ExportExpression = ''
   end
-  object TRpExpression17: TRpExpression
-    Width = 1035
-    Height = 240
-    PosX = 11620
-    PosY = 6315
-    Type1Font = poHelvetica
-    FontSize = 8
-    DataType = rpParamString
-    AutoExpand = False
-    AutoContract = False
-    ExportPosition = 0
-    ExportSize = 1
-    ExportDoNewLine = False
-    PrintCondition = ''
-    DoBeforePrint = ''
-    DoAfterPrint = ''
-    WFontName = 'Arial'
-    LFontName = 'Helvetica'
-    Expression = 'STR([KITLABELS.PRECINCT])  + STR([KITLABELS.BALLOT_NUMBER])'
-    DisplayFormat = ''
-    ExportDisplayFormat = ''
-    AgIniValue = '0'
-    ExportExpression = ''
-  end
   object TRpExpression4: TRpExpression
     Width = 1035
     Height = 240