edv/ADMIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ADMIN' of https://dev.azure.com/VeragAG/_git/ADMIN into ADMIN

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-10-02 16:42:57 +02:00
parent e912482f67 eb603ccabb
commit 9ff3652a61
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UID/Mitarbeiter/frmMitarbDetails.Designer.vb generated
View File

@@ -2306,7 +2306,7 @@ Partial Class frmMitarbDetails
'cbxClientTimas
'
Me.cbxClientTimas.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cbxClientTimas.DropDownWidth = 100
Me.cbxClientTimas.DropDownWidth = 200
Me.cbxClientTimas.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxClientTimas.FormattingEnabled = True
Me.cbxClientTimas.Items.AddRange(New Object() {"", "1", "2", "3", "4", "5"})

2
UID/Mitarbeiter/frmMitarbDetails.vb
View File

@@ -156,6 +156,8 @@ Public Class frmMitarbDetails
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG AG", "VERAG AG"))
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG GMBH", "VERAG GMBH"))
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG UNISPED Ltd", "VERAG UNISPED LIMITED"))
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG CUSTOMS LOGISTICS Ltd", "VERAG CL LIMITED"))
cbxClientTimas.SelectedIndex = 0

35
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -4075,17 +4075,17 @@ Public Class frmStartOptions
End If
SDL.Sachbearbeiter = "ASFINAG"
Dim Validto = SQL.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
Dim Validto = SQl.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
SDL.KartenNr = SQL.checkNullStr(oRDR.GetValue("CardNumber"))
SDL.KartenNr = SQl.checkNullStr(oRDR.GetValue("CardNumber"))
If Validto <> "" Then
SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(oRDR.GetValue("CardNumber"), 1, 2), Mid(Validto, 3, 2), 1)))
End If
SDL.OBUID = SQL.checkNullStr(oRDR.GetValue("OBUID"))
SDL.Vertragsabschlussdatum = SQL.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
SDL.Kategorie = SQL.checkNullStr(oRDR.GetValue("Kategorie"))
SDL.Schadstoffklasse = SQL.checkNullStr(oRDR.GetValue("Schadstoffklasse"))
SDL.Status = SQL.checkNullStr(oRDR.GetValue("Status"))
SDL.OBUID = SQl.checkNullStr(oRDR.GetValue("OBUID"))
SDL.Vertragsabschlussdatum = SQl.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
SDL.Kategorie = SQl.checkNullStr(oRDR.GetValue("Kategorie"))
SDL.Schadstoffklasse = SQl.checkNullStr(oRDR.GetValue("Schadstoffklasse"))
SDL.Status = SQl.checkNullStr(oRDR.GetValue("Status"))
SDL.SAVE()
End If
@@ -4131,21 +4131,21 @@ Public Class frmStartOptions
End If
SDL.Sachbearbeiter = "ASFINAG" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "_TEST", "")
Dim Validto = SQL.checkNullStr(row.Item("contractDate"))
Dim Validto = SQl.checkNullStr(row.Item("contractDate"))
SDL.KartenNr = SQL.checkNullStr(row.Item("cardNumber"))
SDL.KartenNr = SQl.checkNullStr(row.Item("cardNumber"))
If Validto <> "" Then
'MsgBox(Mid(row.Item("ValidTo"), 1, 2) & " " & Mid(row.Item("ValidTo"), 3, 2))
SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(row.Item("ValidTo"), 1, 2), Mid(row.Item("ValidTo"), 3, 2), 1))) 'noch im DETAIL checken!
End If
SDL.OBUID = SQL.checkNullStr(row.Item("OBUID"))
SDL.Vertragsabschlussdatum = SQL.checkNullStr(row.Item("contractDate"))
SDL.Kategorie = SQL.checkNullStr(row.Item("vehicleCategory"))
SDL.Schadstoffklasse = SQL.checkNullStr(row.Item("emissionCategory"))
SDL.Status = SQL.checkNullStr(row.Item("status"))
SDL.Nationalitaet = SQL.checkNullStr(row.Item("nationality"))
SDL.CO2Kategorie = SQL.checkNullStr(row.Item("CO2EmissionsClass"))
SDL.OBUID = SQl.checkNullStr(row.Item("OBUID"))
SDL.Vertragsabschlussdatum = SQl.checkNullStr(row.Item("contractDate"))
SDL.Kategorie = SQl.checkNullStr(row.Item("vehicleCategory"))
SDL.Schadstoffklasse = SQl.checkNullStr(row.Item("emissionCategory"))
SDL.Status = SQl.checkNullStr(row.Item("status"))
SDL.Nationalitaet = SQl.checkNullStr(row.Item("nationality"))
SDL.CO2Kategorie = SQl.checkNullStr(row.Item("CO2EmissionsClass"))
SDL.SAVE()
End If
@@ -6478,7 +6478,7 @@ repeatRequestDaily:
If APIText.Contains("Invalid token") Then
If Not cs.authenticate() = 200 Then
API_Start_Daily.UPDTAE_ERR("ERROR", APIText, "importCreditsafeEvents")
API_Start_Daily.UPDTAE_ERR("ERROR", APIText, "dailyImportCreditsafeEvents")
Exit Sub
Else
Thread.Sleep(4000)
@@ -6504,6 +6504,7 @@ repeatRequestDailyPages:
End If
API_Start_Daily.UPDTAE_OK(,, "dailyImportCreditsafeEvents" & " Seiten:" & totalPages & "/" & page)
Exit Sub