diff --git a/Data/Proofs.rep b/Data/Proofs.rep index bf924e1..57c6e2e 100644 --- a/Data/Proofs.rep +++ b/Data/Proofs.rep @@ -31,7 +31,7 @@ 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, Cint(InkjetRecords.BALLOT_NUM' + + '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' + @@ -78,7 +78,7 @@ object TRpReport item Name = 'PBKITID' AllowNulls = False - Value = 157 + Value = 192 ParamType = rpParamInteger Datasets.Strings = ( 'KIT' @@ -95,7 +95,7 @@ object TRpReport item Name = 'PBJCODE' AllowNulls = False - Value = '34000' + Value = '01840' Datasets.Strings = ( 'JURISDICTION' 'CONTACTS') @@ -108,7 +108,7 @@ object TRpReport item Name = 'PBMIN' AllowNulls = False - Value = 139075 + Value = 291893 ParamType = rpParamInteger Datasets.Strings = ( 'KITLABELS') @@ -121,7 +121,7 @@ object TRpReport item Name = 'PBMAX' AllowNulls = False - Value = 140314 + Value = 291894 ParamType = rpParamInteger Datasets.Strings = ( 'KITLABELS') @@ -178,6 +178,7 @@ object TRpReport StreamFormat = rpStreamText BackStyle = baPrint DrawStyle = rpDrawStretch + CachedImage = rpCachedFixed PrintCondition = '' DoBeforePrint = '' DoAfterPrint = '' @@ -1900,6 +1901,7 @@ object TRpReport StreamFormat = rpStreamText BackStyle = baPrint DrawStyle = rpDrawStretch + CachedImage = rpCachedFixed PrintCondition = '' DoBeforePrint = '' DoAfterPrint = '' @@ -4398,7 +4400,7 @@ object TRpReport PosY = 6315 Type1Font = poHelvetica FontSize = 8 - DataType = rpParamDate + DataType = rpParamString AutoExpand = False AutoContract = False ExportPosition = 0 @@ -4409,7 +4411,7 @@ object TRpReport DoAfterPrint = '' WFontName = 'Arial' LFontName = 'Helvetica' - Expression = 'KITLABELS.PRECINCT + '#13#10'KITLABELS.BALLOT_NUMBER' + Expression = 'STR([KITLABELS.PRECINCT]) + STR([KITLABELS.BALLOT_NUMBER])' DisplayFormat = '' ExportDisplayFormat = '' AgIniValue = '0' diff --git a/ImportService/TrackingDataImport.vbs b/ImportService/TrackingDataImport.vbs index 154d5ab..77a882c 100644 --- a/ImportService/TrackingDataImport.vbs +++ b/ImportService/TrackingDataImport.vbs @@ -104,14 +104,14 @@ Dim row:row = 0 objInkjetCSV.SetCellByName row,"Address 2",AddressArray(2) objInkjetCSV.SetCellByName row,"Address 3",AddressArray(3) objInkjetCSV.SetCellByName row,"Address 4",AddressArray(4) - objInkJetCSV.SetCellByName row,"IM barcode Characters","*" & KitLabelsRs("OutboundIMBDigits").Value & "*" + 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 & TrimLeadingZeros(KitLabelsRs("BALLOT_NUMBER").Value) - objInkjetCSV.SetCellByName row,"Title",ContactRs("Title").Value + objInkjetCSV.SetCellByName row,"Title",CleanNull(ContactRs("Title").Value) objInkJetCSV.SetCellByName row,"G2 Full Name",JurisdictionRs("Name").Value objInkJetCSV.SetCellByName row,"G2 Company",JurisdictionRs("Mailing_Address").Value objInkJetCSV.SetCellByName row,"G2 Alternate 1 Address",JurisdictionRs("CSZ").Value @@ -586,8 +586,8 @@ Function PadString(inputString, size) End Function Function CleanNull(StringToClean) - If IsNull(StringToClean) Then:CleanNull = "":End If -End Function + If IsNull(StringToClean) Then:CleanNull = "":Else CleanNull = StringToClean:End If +End Function Public Sub Assign(ByRef var, ByVal val) If IsObject(val) Then