From 0055056145432e093918af8a25e01e4ac0ecd7bf Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 7 Nov 2025 15:10:06 +0100 Subject: [PATCH] cDatenserver, StartOpt, Mitarbeiter, etc. --- UID/Mitarbeiter/usrCntlMitarbeiter.vb | 287 +++++++++++---------- initATLASAufschubkonten/frmStartOptions.vb | 1 + 2 files changed, 153 insertions(+), 135 deletions(-) diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.vb b/UID/Mitarbeiter/usrCntlMitarbeiter.vb index 35678ff..df369f1 100644 --- a/UID/Mitarbeiter/usrCntlMitarbeiter.vb +++ b/UID/Mitarbeiter/usrCntlMitarbeiter.vb @@ -39,152 +39,168 @@ Public Class usrCntlMitarbeiter End Sub Public Sub Tabelle_anzeigen() - Dim startIndex As Integer = TabControl1.SelectedIndex - Dim firmaGefunden As Boolean = False - Dim tabCount As Integer = TabControl1.TabCount - If TabControl1.SelectedIndex <> 7 Then - For offset As Integer = 0 To tabCount - 1 - Dim i As Integer = (startIndex + offset) Mod tabCount - Dim firma As String = "" - - Select Case i - Case 0 - firma = "VERAG" - Case 1 - firma = "ATILLA" - Case 2 - firma = "IMEX" - Case 3 - firma = "UNISPED" - Case 4 - firma = "AMBAR" - Case 5 - firma = "FRONTOFFICE" - Case 6 - firma = "VERIMEX" - End Select - - - If firma <> "" Then - If showVERAGATILLA(firma) Then - ' Wechsel zum Tab der gefundenen Firma - TabControl1.SelectedIndex = i - firmaGefunden = True - Exit For - End If - End If - - Next - End If - - If TabControl1.SelectedIndex = 7 Then + If TabControl1.SelectedIndex = 0 Then + showVERAGATILLA("VERAG") + ElseIf TabControl1.SelectedIndex = 1 Then + showVERAGATILLA("ATILLA") + ElseIf TabControl1.SelectedIndex = 2 Then + showVERAGATILLA("IMEX") + ElseIf TabControl1.SelectedIndex = 3 Then + showVERAGATILLA("UNISPED") + ElseIf TabControl1.SelectedIndex = 4 Then + showVERAGATILLA("AMBAR") + ElseIf TabControl1.SelectedIndex = 5 Then + showVERAGATILLA("FRONTOFFICE") + ElseIf TabControl1.SelectedIndex = 6 Then + showVERAGATILLA("VERIMEX") + ElseIf TabControl1.SelectedIndex = 7 Then If dgvTimasNew IsNot Nothing Then showTIMAS(False) End If End If - If txtSuche.Text <> "" AndAlso TabControl1.SelectedIndex <> 7 Then - If Not firmaGefunden Then - MsgBox("Keine Daten für die ausgewählten Kriterien gefunden.", MsgBoxStyle.Information) + End Sub + + Public Sub showVERAGATILLA(firma) + 'Paint wieder reaktivieren + locZeilen = -1 + If Not Grid_aktiv Then Exit Sub + + + + Dim sql As String = "SELECT mit_id,mit_username,mit_vname, mit_nname ,mit_niederlassung,mit_abteilung,mit_email,cast (case when mit_timasId is null then 0 else 1 end as bit) mit_ze, cast (case when isnull([mit_DAKOSY_SB],'')<> '' and isnull([mit_DAKOSY_SBFull],'')<>'' then 1 else 0 end as bit) mit_DAKOSY, mit_durchwahl,mit_gekuendigt, isnull(mit_foto_DocId,'') as mit_foto_DocId FROM tblMitarbeiter WHERE (mit_firma='" & firma & "' OR (mit_firma='ALL' AND mit_FirmaHaupt='" & firma & "' )) " + + If txtSuche.Text <> "" Then + sql &= " AND (mit_username LIKE '%" & txtSuche.Text & "%' OR mit_nname LIKE '%" & txtSuche.Text & "%' OR mit_vname LIKE '%" & txtSuche.Text & "%') " + End If + + If cbx.CheckState <> CheckState.Indeterminate Then + sql &= " AND mit_gekuendigt=" & IIf(cbx.Checked, 1, 0) + End If + + If cbxZE.CheckState <> CheckState.Indeterminate Then + sql &= IIf(cbxZE.Checked, " AND mit_timasId is not null", " AND mit_timasId is null") + End If + + If cbxDakosy.CheckState <> CheckState.Indeterminate Then + sql &= IIf(cbxDakosy.Checked, " AND (isnull([mit_DAKOSY_SB],'')<> '' AND isnull([mit_DAKOSY_SBFull],'')<>'')", " AND ((isnull([mit_DAKOSY_SB],'')= '' OR isnull([mit_DAKOSY_SBFull],'')=''))") + End If + + If firma = "VERAG" Then + + ' dgvVERAG.DataSource = UID.AnzeigeTabelleFirma(sql) + + c.SET_SQL(sql, "ADMIN") + c.LOAD() + 'Tabelle Kommt/Geht bereinigen + If c.RowCount = 0 Then + c.DataSource = Nothing + Else + sortDGV(c) + 'Eintraege_festlegen() + 'AL: Sortierung nach Ausfahrt (Zeit) + c.Sort(c.Columns(3), ListSortDirection.Ascending) + End If + ElseIf firma = "ATILLA" Then + ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql) + + dgvATILLA.SET_SQL(sql, "ADMIN") + dgvATILLA.LOAD() + + 'Tabelle Kommt/Geht bereinigen + If dgvATILLA.RowCount = 0 Then + dgvATILLA.DataSource = Nothing + Else + sortDGV(dgvATILLA) + 'Eintraege_festlegen() + 'AL: Sortierung nach Ausfahrt (Zeit) + dgvATILLA.Sort(dgvATILLA.Columns(3), ListSortDirection.Ascending) + End If + ElseIf firma = "IMEX" Then + ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql) + + dgvIMEX.SET_SQL(sql, "ADMIN") + dgvIMEX.LOAD() + + 'Tabelle Kommt/Geht bereinigen + If dgvIMEX.RowCount = 0 Then + dgvIMEX.DataSource = Nothing + Else + sortDGV(dgvIMEX) + 'Eintraege_festlegen() + 'AL: Sortierung nach Ausfahrt (Zeit) + dgvIMEX.Sort(dgvIMEX.Columns(3), ListSortDirection.Ascending) + End If + ElseIf firma = "UNISPED" Then + ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql) + + dgvUNISPED.SET_SQL(sql, "ADMIN") + dgvUNISPED.LOAD() + + 'Tabelle Kommt/Geht bereinigen + If dgvUNISPED.RowCount = 0 Then + dgvUNISPED.DataSource = Nothing + Else + sortDGV(dgvUNISPED) + 'Eintraege_festlegen() + 'AL: Sortierung nach Ausfahrt (Zeit) + dgvUNISPED.Sort(dgvUNISPED.Columns(3), ListSortDirection.Ascending) + End If + ElseIf firma = "AMBAR" Then + ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql) + + dgvAMBAR.SET_SQL(sql, "ADMIN") + dgvAMBAR.LOAD() + + 'Tabelle Kommt/Geht bereinigen + If dgvAMBAR.RowCount = 0 Then + dgvAMBAR.DataSource = Nothing + Else + sortDGV(dgvAMBAR) + 'Eintraege_festlegen() + 'AL: Sortierung nach Ausfahrt (Zeit) + dgvAMBAR.Sort(dgvAMBAR.Columns(3), ListSortDirection.Ascending) + End If + + ElseIf firma = "FRONTOFFICE" Then + ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql) + + dgvFRONTOFFICE.SET_SQL(sql, "ADMIN") + dgvFRONTOFFICE.LOAD() + + 'Tabelle Kommt/Geht bereinigen + If dgvFRONTOFFICE.RowCount = 0 Then + dgvFRONTOFFICE.DataSource = Nothing + Else + sortDGV(dgvFRONTOFFICE) + 'Eintraege_festlegen() + 'AL: Sortierung nach Ausfahrt (Zeit) + dgvFRONTOFFICE.Sort(dgvFRONTOFFICE.Columns(3), ListSortDirection.Ascending) + + End If + + + ElseIf firma = "VERIMEX" Then + ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql) + + dgvVERIMEX.SET_SQL(sql, "ADMIN") + dgvVERIMEX.LOAD() + + 'Tabelle Kommt/Geht bereinigen + If dgvVERIMEX.RowCount = 0 Then + dgvVERIMEX.DataSource = Nothing + Else + sortDGV(dgvVERIMEX) + 'Eintraege_festlegen() + 'AL: Sortierung nach Ausfahrt (Zeit) + dgvVERIMEX.Sort(dgvVERIMEX.Columns(3), ListSortDirection.Ascending) + End If End If End Sub - Public Function showVERAGATILLA(firma As String) As Boolean - ' Paint wieder reaktivieren - locZeilen = -1 - If Not Grid_aktiv Then Return False - - ' SQL-Abfrage erstellen - Dim sql As String = "SELECT mit_id, mit_username, mit_vname, mit_nname, mit_niederlassung, mit_abteilung, mit_email, " & - "CAST(CASE WHEN mit_timasId IS NULL THEN 0 ELSE 1 END AS BIT) mit_ze, " & - "CAST(CASE WHEN ISNULL([mit_DAKOSY_SB],'')<> '' AND ISNULL([mit_DAKOSY_SBFull],'')<>'' THEN 1 ELSE 0 END AS BIT) mit_DAKOSY, " & - "mit_durchwahl, mit_gekuendigt, ISNULL(mit_foto_DocId,'') AS mit_foto_DocId " & - "FROM tblMitarbeiter WHERE (mit_firma='" & firma & "' OR (mit_firma='ALL' AND mit_FirmaHaupt='" & firma & "'))" - - ' Filter hinzufügen - If txtSuche.Text <> "" Then - sql &= " AND (mit_username LIKE '%" & txtSuche.Text & "%' OR mit_nname LIKE '%" & txtSuche.Text & "%' OR mit_vname LIKE '%" & txtSuche.Text & "%')" - End If - - If cbx.CheckState <> CheckState.Indeterminate Then - sql &= " AND mit_gekuendigt=" & If(cbx.Checked, 1, 0) - End If - - If cbxZE.CheckState <> CheckState.Indeterminate Then - sql &= If(cbxZE.Checked, " AND mit_timasId IS NOT NULL", " AND mit_timasId IS NULL") - End If - - If cbxDakosy.CheckState <> CheckState.Indeterminate Then - sql &= If(cbxDakosy.Checked, " AND (ISNULL([mit_DAKOSY_SB],'')<> '' AND ISNULL([mit_DAKOSY_SBFull],'')<>'')", " AND (ISNULL([mit_DAKOSY_SB],'')= '' OR ISNULL([mit_DAKOSY_SBFull],'')='')") - End If - - ' Daten laden und prüfen - Select Case firma - Case "VERAG" - c.SET_SQL(sql, "ADMIN") - c.LOAD() - If c.RowCount > 0 Then - sortDGV(c) - c.Sort(c.Columns(3), ListSortDirection.Ascending) - Return True - End If - Case "ATILLA" - dgvATILLA.SET_SQL(sql, "ADMIN") - dgvATILLA.LOAD() - If dgvATILLA.RowCount > 0 Then - sortDGV(dgvATILLA) - dgvATILLA.Sort(dgvATILLA.Columns(3), ListSortDirection.Ascending) - Return True - End If - Case "IMEX" - dgvIMEX.SET_SQL(sql, "ADMIN") - dgvIMEX.LOAD() - If dgvIMEX.RowCount > 0 Then - sortDGV(dgvIMEX) - dgvIMEX.Sort(dgvIMEX.Columns(3), ListSortDirection.Ascending) - Return True - End If - Case "UNISPED" - dgvUNISPED.SET_SQL(sql, "ADMIN") - dgvUNISPED.LOAD() - If dgvUNISPED.RowCount > 0 Then - sortDGV(dgvUNISPED) - dgvUNISPED.Sort(dgvUNISPED.Columns(3), ListSortDirection.Ascending) - Return True - End If - Case "AMBAR" - dgvAMBAR.SET_SQL(sql, "ADMIN") - dgvAMBAR.LOAD() - If dgvAMBAR.RowCount > 0 Then - sortDGV(dgvAMBAR) - dgvAMBAR.Sort(dgvAMBAR.Columns(3), ListSortDirection.Ascending) - Return True - End If - Case "FRONTOFFICE" - dgvFRONTOFFICE.SET_SQL(sql, "ADMIN") - dgvFRONTOFFICE.LOAD() - If dgvFRONTOFFICE.RowCount > 0 Then - sortDGV(dgvFRONTOFFICE) - dgvFRONTOFFICE.Sort(dgvFRONTOFFICE.Columns(3), ListSortDirection.Ascending) - Return True - End If - Case "VERIMEX" - dgvVERIMEX.SET_SQL(sql, "ADMIN") - dgvVERIMEX.LOAD() - If dgvVERIMEX.RowCount > 0 Then - sortDGV(dgvVERIMEX) - dgvVERIMEX.Sort(dgvVERIMEX.Columns(3), ListSortDirection.Ascending) - Return True - End If - End Select - - Return False - End Function - - Public Sub showTIMAS(refresh As Boolean) locZeilen = -1 @@ -836,6 +852,7 @@ Public Class usrCntlMitarbeiter Return rest.ResponseStatusCode & " " & rest.ResponseStatusText Else Debug.WriteLine("File uploaded") + MsgBox("Bilder wurden hochgeladen") End If rest.ClearAllHeaders() diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 2a9f8dc..c2baa3b 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -3349,6 +3349,7 @@ Public Class frmStartOptions ' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "UID Prüfung", Body,,, False, ,, list) End If + If setKundenvermerk Then For Each r As DataRow In dt.Rows