From 27568d8e0dcd2090c7bdf9b9585e0d61d585cc1d Mon Sep 17 00:00:00 2001 From: Daniel Covington Date: Thu, 9 May 2024 11:00:40 -0400 Subject: [PATCH] Getting this to work --- App/DomainModels/InkjetRecordsRepository.asp | 12 ++++++------ App/Views/InkjetRecords/index.asp | 2 ++ App/Views/Kit/SwitchBoardPurpleEnvelopeEdit.asp | 2 ++ ImportService/TrackingDataImport.vbs | 16 ++++++++-------- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/App/DomainModels/InkjetRecordsRepository.asp b/App/DomainModels/InkjetRecordsRepository.asp index 9556ae1..a6bfe19 100644 --- a/App/DomainModels/InkjetRecordsRepository.asp +++ b/App/DomainModels/InkjetRecordsRepository.asp @@ -34,10 +34,10 @@ Class InkjetRecordsModel_Class Public CassADDRESS3 '106 Public CassADDRESS4 '106 Public CassADDRESS5 '106 - + Public KitLabelID Private Sub Class_Initialize 'ValidateExitsts Me, "","" - Class_Get_Properties = Array("ID, KitID, VOTERID, LASTNAME, FIRSTNAME, MIDDLENAME, SUFFIX, PRECINCT, ADDRESS1, ADDRESS2, ADDRESS3, ADDRESS4, ADDRESS5, APPSENT, APPRETURNED, BALSENT, BALRETURNED, CountingBoard, UOCAVASTATUS, EMAILADDRESS, PHONENUMBER, BALLOT_NUMBER, CassADDRESS1, CassADDRESS2, CassADDRESS3, CassADDRESS4, CassADDRESS5") + Class_Get_Properties = Array("ID, KitID, VOTERID, LASTNAME, FIRSTNAME, MIDDLENAME, SUFFIX, PRECINCT, ADDRESS1, ADDRESS2, ADDRESS3, ADDRESS4, ADDRESS5, APPSENT, APPRETURNED, BALSENT, BALRETURNED, CountingBoard, UOCAVASTATUS, EMAILADDRESS, PHONENUMBER, BALLOT_NUMBER, CassADDRESS1, CassADDRESS2, CassADDRESS3, CassADDRESS4, CassADDRESS5,KitLabelID") End Sub End CLass @@ -49,7 +49,7 @@ End CLass Class InkjetRecordsRepository_Class Public Function FindByID(ID) - dim sql : sql = "Select [ID], [KitID], [VOTERID], [LASTNAME], [FIRSTNAME], [MIDDLENAME], [SUFFIX], [PRECINCT], [ADDRESS1], [ADDRESS2], [ADDRESS3], [ADDRESS4], [ADDRESS5], [APPSENT], [APPRETURNED], [BALSENT], [BALRETURNED], [CountingBoard], [UOCAVASTATUS], [EMAILADDRESS], [PHONENUMBER], [BALLOT_NUMBER], [CassADDRESS1], [CassADDRESS2], [CassADDRESS3], [CassADDRESS4], [CassADDRESS5] FROM [InkjetRecords] WHERE ID = ?" + dim sql : sql = "Select [ID], [KitID], [VOTERID], [LASTNAME], [FIRSTNAME], [MIDDLENAME], [SUFFIX], [PRECINCT], [ADDRESS1], [ADDRESS2], [ADDRESS3], [ADDRESS4], [ADDRESS5], [APPSENT], [APPRETURNED], [BALSENT], [BALRETURNED], [CountingBoard], [UOCAVASTATUS], [EMAILADDRESS], [PHONENUMBER], [BALLOT_NUMBER], [CassADDRESS1], [CassADDRESS2], [CassADDRESS3], [CassADDRESS4], [CassADDRESS5], [KitLabelID] FROM [InkjetRecords] WHERE ID = ?" dim rs : set rs = DAL.Query(sql,ID) If rs.EOF then Err.Raise 1, "InkjetRecordsRepository_Class", InkjetRecordsNotFoundException("ID", ID) @@ -63,7 +63,7 @@ Class InkjetRecordsRepository_Class End Function Public Function Find(where_kvarray, order_string_or_array) - dim sql : sql = "Select [ID], [KitID], [VOTERID], [LASTNAME], [FIRSTNAME], [MIDDLENAME], [SUFFIX], [PRECINCT], [ADDRESS1], [ADDRESS2], [ADDRESS3], [ADDRESS4], [ADDRESS5], [APPSENT], [APPRETURNED], [BALSENT], [BALRETURNED], [CountingBoard], [UOCAVASTATUS], [EMAILADDRESS], [PHONENUMBER], [BALLOT_NUMBER], [CassADDRESS1], [CassADDRESS2], [CassADDRESS3], [CassADDRESS4], [CassADDRESS5] FROM [InkjetRecords]" + dim sql : sql = "Select [ID], [KitID], [VOTERID], [LASTNAME], [FIRSTNAME], [MIDDLENAME], [SUFFIX], [PRECINCT], [ADDRESS1], [ADDRESS2], [ADDRESS3], [ADDRESS4], [ADDRESS5], [APPSENT], [APPRETURNED], [BALSENT], [BALRETURNED], [CountingBoard], [UOCAVASTATUS], [EMAILADDRESS], [PHONENUMBER], [BALLOT_NUMBER], [CassADDRESS1], [CassADDRESS2], [CassADDRESS3], [CassADDRESS4], [CassADDRESS5], [KitLabelID] FROM [InkjetRecords]" If Not IsEmpty(where_kvarray) then sql = sql & " WHERE " @@ -96,7 +96,7 @@ Class InkjetRecordsRepository_Class End Function Public Function FindPaged(where_kvarray, order_string_or_array, per_page, page_num, ByRef page_count, ByRef record_count) - dim sql : sql = "Select [ID], [KitID], [VOTERID], [LASTNAME], [FIRSTNAME], [MIDDLENAME], [SUFFIX], [PRECINCT], [ADDRESS1], [ADDRESS2], [ADDRESS3], [ADDRESS4], [ADDRESS5], [APPSENT], [APPRETURNED], [BALSENT], [BALRETURNED], [CountingBoard], [UOCAVASTATUS], [EMAILADDRESS], [PHONENUMBER], [BALLOT_NUMBER], [CassADDRESS1], [CassADDRESS2], [CassADDRESS3], [CassADDRESS4], [CassADDRESS5] FROM [InkjetRecords]" + dim sql : sql = "Select [ID], [KitID], [VOTERID], [LASTNAME], [FIRSTNAME], [MIDDLENAME], [SUFFIX], [PRECINCT], [ADDRESS1], [ADDRESS2], [ADDRESS3], [ADDRESS4], [ADDRESS5], [APPSENT], [APPRETURNED], [BALSENT], [BALRETURNED], [CountingBoard], [UOCAVASTATUS], [EMAILADDRESS], [PHONENUMBER], [BALLOT_NUMBER], [CassADDRESS1], [CassADDRESS2], [CassADDRESS3], [CassADDRESS4], [CassADDRESS5],[KitLabelID] FROM [InkjetRecords]" If Not IsEmpty(where_kvarray) then sql = sql & " WHERE " @@ -138,7 +138,7 @@ Class InkjetRecordsRepository_Class End Function Public Function SearchTablePaged(where_kvarray, order_string_or_array, per_page, page_num, ByRef page_count, ByRef record_count) - dim sql : sql = "Select [ID], [KitID], [VOTERID], [LASTNAME], [FIRSTNAME], [MIDDLENAME], [SUFFIX], [PRECINCT], [ADDRESS1], [ADDRESS2], [ADDRESS3], [ADDRESS4], [ADDRESS5], [APPSENT], [APPRETURNED], [BALSENT], [BALRETURNED], [CountingBoard], [UOCAVASTATUS], [EMAILADDRESS], [PHONENUMBER], [BALLOT_NUMBER], [CassADDRESS1], [CassADDRESS2], [CassADDRESS3], [CassADDRESS4], [CassADDRESS5] FROM [InkjetRecords]" + dim sql : sql = "Select [ID], [KitID], [VOTERID], [LASTNAME], [FIRSTNAME], [MIDDLENAME], [SUFFIX], [PRECINCT], [ADDRESS1], [ADDRESS2], [ADDRESS3], [ADDRESS4], [ADDRESS5], [APPSENT], [APPRETURNED], [BALSENT], [BALRETURNED], [CountingBoard], [UOCAVASTATUS], [EMAILADDRESS], [PHONENUMBER], [BALLOT_NUMBER], [CassADDRESS1], [CassADDRESS2], [CassADDRESS3], [CassADDRESS4], [CassADDRESS5], [KitLabelID] FROM [InkjetRecords]" If Not IsEmpty(where_kvarray) then sql = sql & " WHERE " diff --git a/App/Views/InkjetRecords/index.asp b/App/Views/InkjetRecords/index.asp index 80a7822..61af2de 100644 --- a/App/Views/InkjetRecords/index.asp +++ b/App/Views/InkjetRecords/index.asp @@ -26,6 +26,7 @@ ID KitID + KitLabelID VOTERID LASTNAME FIRSTNAME @@ -65,6 +66,7 @@ <% = H(InkjetRecords.ID) %> <% = H(InkjetRecords.KitID) %> + <% = H(InkjetRecords.KitLabelID) %> <% = H(InkjetRecords.VOTERID) %> <% = H(InkjetRecords.LASTNAME) %> <% = H(InkjetRecords.FIRSTNAME) %> diff --git a/App/Views/Kit/SwitchBoardPurpleEnvelopeEdit.asp b/App/Views/Kit/SwitchBoardPurpleEnvelopeEdit.asp index 8d16d8e..beff653 100644 --- a/App/Views/Kit/SwitchBoardPurpleEnvelopeEdit.asp +++ b/App/Views/Kit/SwitchBoardPurpleEnvelopeEdit.asp @@ -33,6 +33,7 @@ ID KitID + KitLabelID VOTERID LASTNAME FIRSTNAME @@ -72,6 +73,7 @@ <% = H(KitLabels.ID) %> <% = H(KitLabels.KitId) %> + <% = H(KitLabels.KitLabelID) %> <% = H(KitLabels.VOTERID) %> <% = H(KitLabels.LASTNAME) %> <% = H(KitLabels.FIRSTNAME) %> diff --git a/ImportService/TrackingDataImport.vbs b/ImportService/TrackingDataImport.vbs index fcacdc6..44e2c00 100644 --- a/ImportService/TrackingDataImport.vbs +++ b/ImportService/TrackingDataImport.vbs @@ -30,14 +30,14 @@ Dim WorkingDirectory:WorkingDirectory = Replace(WScript.ScriptFullName,WScript.S Dim KitID -' CheckForFiles -' KitID = CheckForJobsToCass() -' If KitID > 0 Then -' ExportMMCsv(KitID) -' RunMailManager -' ImportCass -' End If -oConn.Open(ConnectionString) + CheckForFiles + KitID = CheckForJobsToCass() + If KitID > 0 Then + ExportMMCsv(KitID) + RunMailManager + ImportCass + End If +'oConn.Open(ConnectionString) KitID = CheckForReadyToLabel() If KitID > 0 Then createTrackingInfoForKit(KitID)