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

Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO

Browse Source
This commit is contained in:
Andreas Luxbauer
2023-10-04 10:11:35 +02:00
parent 1bd5e88e14 0afe3f9d15
commit b046fe7346
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Aviso/frmHauptfenster.vb
View File

@@ -597,19 +597,19 @@ Public Class frmHauptfenster
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
Dim timas As New cTimasAPI Dim timas As New cTimasAPI
Dim infoMessage As New DataTable Dim infoMessage As New DataTable
Dim timeEntryExisting As Boolean = False Dim timeEntryExisting As Boolean = False
timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, infoMessage, timeEntryExisting) timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, infoMessage, timeEntryExisting)
If Not timeEntryExisting Then If Not timeEntryExisting Then
Dim a As MsgBoxResult = MsgBox("Für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " wurde heute noch keine Zeit erfasst" & vbNewLine & Now.ToString() & "als Startzeit erfassen?", vbYesNo) Dim a As MsgBoxResult = MsgBox("Für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " wurde heute noch keine Zeit erfasst" & vbNewLine & Now.ToString() & "als Startzeit erfassen?", vbYesNo)
If a = vbYes Then If a = vbYes Then
Dim info Dim info
timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "in") timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "in")
MsgBox(info) MsgBox(info)
Else Else
End If End If
End If End If
End If End If
@@ -1264,12 +1264,12 @@ Public Class frmHauptfenster
" when [Status] =5 then 4 " & " when [Status] =5 then 4 " &
" when [Status] =0 then 5 " & " when [Status] =0 then 5 " &
" END, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID") " END, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID")
Else Else
'---------------------------------------------------------------------------------------------------------------------------------- '----------------------------------------------------------------------------------------------------------------------------------
'--- Sendung --- '--- Sendung ---
'---------------------------------------------------------------------------------------------------------------------------------- '----------------------------------------------------------------------------------------------------------------------------------
Dim inBearbeitungSQL = " tblSendungen.LetzterMitarbeiterId=@maId " ' 1<>1 " 'DEFAULT = "Benutzer" Dim inBearbeitungSQL = " tblSendungen.LetzterMitarbeiterId=@maId " ' 1<>1 " 'DEFAULT = "Benutzer"
If cboMyAvisoAnzeige._value <> "" Then If cboMyAvisoAnzeige._value <> "" Then
If cboMyAvisoAnzeige._value = "ALLE" Then If cboMyAvisoAnzeige._value = "ALLE" Then
' inBearbeitungSQL = " 1=1 " 'ALLE ' inBearbeitungSQL = " 1=1 " 'ALLE
@@ -3098,7 +3098,7 @@ Public Class frmHauptfenster
Dim path = SDL.cFinanzOnlineWebService.genUID_Formular("ATU74813856") Dim path = SDL.cFinanzOnlineWebService.genUID_Formular("ATU74813856")
If path <> "" Then If path <> "" Then
Process.Start(path) process.Start(path)
End If End If
'If SDL.cFinanzOnlineWebService.Call_Web_Service_MethodUID_Abfrage_NEU2020(firma, "ATU74813856") = 0 Then 'If SDL.cFinanzOnlineWebService.Call_Web_Service_MethodUID_Abfrage_NEU2020(firma, "ATU74813856") = 0 Then
' MsgBox("HURRA2" & vbNewLine & firma) ' MsgBox("HURRA2" & vbNewLine & firma)