Просмотр исходного кода

Getting this to work

pull/8/head
Daniel Covington 6 месяцев назад
Родитель
Сommit
27568d8e0d
4 измененных файлов: 18 добавлений и 14 удалений
  1. +6
    -6
      App/DomainModels/InkjetRecordsRepository.asp
  2. +2
    -0
      App/Views/InkjetRecords/index.asp
  3. +2
    -0
      App/Views/Kit/SwitchBoardPurpleEnvelopeEdit.asp
  4. +8
    -8
      ImportService/TrackingDataImport.vbs

+ 6
- 6
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 "


+ 2
- 0
App/Views/InkjetRecords/index.asp Просмотреть файл

@@ -26,6 +26,7 @@
<th></th>
<th style="text-align: left">ID</th>
<th style="text-align: left">KitID</th>
<th style="text-align: left">KitLabelID</th>
<th style="text-align: left">VOTERID</th>
<th style="text-align: left">LASTNAME</th>
<th style="text-align: left">FIRSTNAME</th>
@@ -65,6 +66,7 @@
</td>
<td><% = H(InkjetRecords.ID) %></td>
<td><% = H(InkjetRecords.KitID) %></td>
<td><% = H(InkjetRecords.KitLabelID) %></td>
<td><% = H(InkjetRecords.VOTERID) %></td>
<td><% = H(InkjetRecords.LASTNAME) %></td>
<td><% = H(InkjetRecords.FIRSTNAME) %></td>


+ 2
- 0
App/Views/Kit/SwitchBoardPurpleEnvelopeEdit.asp Просмотреть файл

@@ -33,6 +33,7 @@
<th></th>
<th style="text-align: left">ID</th>
<th style="text-align: left">KitID</th>
<th style="text-align: left">KitLabelID</th>
<th style="text-align: left">VOTERID</th>
<th style="text-align: left">LASTNAME</th>
<th style="text-align: left">FIRSTNAME</th>
@@ -72,6 +73,7 @@
</td>
<td><% = H(KitLabels.ID) %></td>
<td><% = H(KitLabels.KitId) %></td>
<td><% = H(KitLabels.KitLabelID) %></td>
<td><% = H(KitLabels.VOTERID) %></td>
<td><% = H(KitLabels.LASTNAME) %></td>
<td><% = H(KitLabels.FIRSTNAME) %></td>


+ 8
- 8
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)


Загрузка…
Отмена
Сохранить

Powered by TurnKey Linux.