diff --git a/DAKOSY_Worker/cZOLL_IMPORT.vb b/DAKOSY_Worker/cZOLL_IMPORT.vb index 64bff29..05eca2a 100644 --- a/DAKOSY_Worker/cZOLL_IMPORT.vb +++ b/DAKOSY_Worker/cZOLL_IMPORT.vb @@ -78,6 +78,7 @@ Public Class cZOLL_IMPORT SPEDBUCH.Abfertigungsdatum = Now.ToShortDateString SPEDBUCH.Sachbearbeiter = "AUTO" + Dim notfound = False Dim art = "" @@ -329,119 +330,120 @@ Public Class cZOLL_IMPORT Public Shared Function EZOLLImport(LRN, art, Optional ByRef SPEDBUCH_TMP = Nothing) As Boolean + Try - Dim firmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" 'Wichtig für Spedbucheintrag - Dim SPEDBUCH As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch - ' Dim cZOLL_IMPORT As New cZOLL_IMPORT + Dim firmaTmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" 'Wichtig für Spedbucheintrag + Dim SPEDBUCH As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch + If True Then + 'Filiale erkennen: + Dim filialeBez = "" + Dim filiale = getFiliale(LRN, filialeBez) + Select Case filiale + Case "5501" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" + Case "4801", "4802" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" ' Return False 'Keine Atoerfassung --> ab 11.02.2025 schon! + Case "5801" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" + Case "5601" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" + End Select + Dim abfertigungsnummer = getAbfertigungsnummer(LRN) - If True Then - 'Filiale erkennen: - Dim filialeBez = "" - Dim filiale = getFiliale(LRN, filialeBez) - Select Case filiale - Case "5501" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" - Case "4801", "4802" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" ' Return False 'Keine Atoerfassung --> ab 11.02.2025 schon! - Case "5801" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" - Case "5601" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" - End Select - Dim abfertigungsnummer = getAbfertigungsnummer(LRN) + If tryFindAviso(LRN, SPEDBUCH.AvisoID, SPEDBUCH.SendungID) Then + SPEDBUCH_TMP = SPEDBUCH + If filiale <> "" And abfertigungsnummer <> "" Then - If tryFindAviso(LRN, SPEDBUCH.AvisoID, SPEDBUCH.SendungID) Then - SPEDBUCH_TMP = SPEDBUCH - If filiale <> "" And abfertigungsnummer <> "" Then + If countSpedbuchEntrys(filiale, LRN, art) = 0 Then 'gibts einen SPED mit BezugsNr -> - If countSpedbuchEntrys(filiale, LRN, art) = 0 Then 'gibts einen SPED mit BezugsNr -> + If countSpedbuchEntrys(filiale, abfertigungsnummer, "") = 0 Then 'gibts einen SPED mit Filiale-AbfertiungsNr - If countSpedbuchEntrys(filiale, abfertigungsnummer, "") = 0 Then 'gibts einen SPED mit Filiale-AbfertiungsNr + SPEDBUCH.FilialenNr = filiale + SPEDBUCH.AbfertigungsNr = abfertigungsnummer + SPEDBUCH.NewUNTER_NR() - SPEDBUCH.FilialenNr = filiale - SPEDBUCH.AbfertigungsNr = abfertigungsnummer - SPEDBUCH.NewUNTER_NR() + SPEDBUCH.Abfertigungsanzahl = 1 + SPEDBUCH.Fakturiert = 0 + ' SPEDBUCH.AtlasBezNrEZA = LRN + SPEDBUCH.Zollsystem = "E" + SPEDBUCH.Sachbearbeiter = "AUTO" - SPEDBUCH.Abfertigungsanzahl = 1 - SPEDBUCH.Fakturiert = 0 - ' SPEDBUCH.AtlasBezNrEZA = LRN - SPEDBUCH.Zollsystem = "E" - SPEDBUCH.Sachbearbeiter = "AUTO" - - Dim ZOLL_IMPORT As New cZOLL_IMPORT - Dim notfound = False - Dim posAnzahl = 0 - - Select Case art - Case "NCTS" : SPEDBUCH.AtlasBezNrNCTS = LRN - Case "AES" : SPEDBUCH.AtlasBezNrAES = LRN - Case Else : SPEDBUCH.AtlasBezNrEZA = LRN - End Select - - SPEDBUCH = ZOLL_IMPORT.IMPORT(SPEDBUCH, SPEDBUCH.AvisoID, SPEDBUCH.SendungID, "VERA", filialeBez, 1, SPEDBUCH.AtlasBezNrEZA, SPEDBUCH.AtlasBezNrNCTS, notfound, True,, SPEDBUCH.AtlasBezNrAES) - - SPEDBUCH_TMP = SPEDBUCH - If notfound Then Return False - ' VERAG_PROG_ALLGEMEIN.cErrorHandler.sendERRORperMail("HEUREKA EZA !!", "" & Me.eza_ObjectName, Now.ToString("yyyy.MM.dd HH:mm"), "al@verag.ag", "") - - ' MsgBox(SPEDBUCH.FilialenNr & " - " & SPEDBUCH.AbfertigungsNr) - VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmaTmp - - If SPEDBUCH.SAVE Then - VERAG_PROG_ALLGEMEIN.cSendungen.SET_SpedbuchEntry(SPEDBUCH.SendungID, True) - Return True - Else - Return False - End If - - - ElseIf art <> "" Then - - Dim SPEDITIONSBUCH_UPDATE As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(filiale, abfertigungsnummer, 0) - - If SPEDITIONSBUCH_UPDATE.hasEntry Then - - If SPEDITIONSBUCH_UPDATE.Zollsystem = "" Then - SPEDITIONSBUCH_UPDATE.Zollsystem = "E" - End If + Dim ZOLL_IMPORT As New cZOLL_IMPORT + Dim notfound = False + Dim posAnzahl = 0 Select Case art - Case "NCTS" - If SPEDITIONSBUCH_UPDATE.AtlasBezNrNCTS = "" Then - SPEDITIONSBUCH_UPDATE.AtlasBezNrNCTS = LRN - - SPEDITIONSBUCH_UPDATE.SAVE() - End If - - Case "AES" - If SPEDITIONSBUCH_UPDATE.AtlasBezNrAES = "" Then - SPEDITIONSBUCH_UPDATE.AtlasBezNrAES = LRN - SPEDITIONSBUCH_UPDATE.SAVE() - End If - - Case "EZA" - If SPEDITIONSBUCH_UPDATE.AtlasBezNrEZA = "" Then - SPEDITIONSBUCH_UPDATE.AtlasBezNrEZA = LRN - SPEDITIONSBUCH_UPDATE.SAVE() - End If - + Case "NCTS" : SPEDBUCH.AtlasBezNrNCTS = LRN + Case "AES" : SPEDBUCH.AtlasBezNrAES = LRN + Case Else : SPEDBUCH.AtlasBezNrEZA = LRN End Select + + SPEDBUCH = ZOLL_IMPORT.IMPORT(SPEDBUCH, SPEDBUCH.AvisoID, SPEDBUCH.SendungID, "VERA", filialeBez, 1, SPEDBUCH.AtlasBezNrEZA, SPEDBUCH.AtlasBezNrNCTS, notfound, True,, SPEDBUCH.AtlasBezNrAES) + + SPEDBUCH_TMP = SPEDBUCH + + If notfound Then + VERAG_PROG_ALLGEMEIN.cErrorHandler.sendERRORperMail("HEUREKA " & art & " !!", LRN, Now.ToString("yyyy.MM.dd HH:mm"), "d.breimaier@verag.ag", "", "", "") + Return False + End If + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmaTmp + + If SPEDBUCH.SAVE Then + VERAG_PROG_ALLGEMEIN.cSendungen.SET_SpedbuchEntry(SPEDBUCH.SendungID, True) + Return True + Else + Return False + End If + + + ElseIf art <> "" Then + + Dim SPEDITIONSBUCH_UPDATE As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(filiale, abfertigungsnummer, 0) + + If SPEDITIONSBUCH_UPDATE.hasEntry Then + + If SPEDITIONSBUCH_UPDATE.Zollsystem = "" Then + SPEDITIONSBUCH_UPDATE.Zollsystem = "E" + End If + + Select Case art + Case "NCTS" + If SPEDITIONSBUCH_UPDATE.AtlasBezNrNCTS = "" Then + SPEDITIONSBUCH_UPDATE.AtlasBezNrNCTS = LRN + SPEDITIONSBUCH_UPDATE.SAVE() + End If + + Case "AES" + If SPEDITIONSBUCH_UPDATE.AtlasBezNrAES = "" Then + SPEDITIONSBUCH_UPDATE.AtlasBezNrAES = LRN + SPEDITIONSBUCH_UPDATE.SAVE() + End If + + Case "EZA" + If SPEDITIONSBUCH_UPDATE.AtlasBezNrEZA = "" Then + SPEDITIONSBUCH_UPDATE.AtlasBezNrEZA = LRN + SPEDITIONSBUCH_UPDATE.SAVE() + End If + + End Select + End If + + End If - End If - - ' MsgBox(SQL.getValueTxtBySql("select count(*) FROM [VERAG].[dbo].[Speditionsbuch] where AbfertigungsNr = 18035380", "FMZOLL")) - End If End If + + Else + + VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmaTmp + Return False 'Ohne Sendungsverweis kein eintrag... End If - - Else - VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmaTmp - Return False 'Ohne Sendungsverweis kein eintrag... - End If - VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = firmaTmp - Return False + Return False + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, ERROR_OP.MAIL) + End Try End Function Public Shared Function tryFindAviso(LRN, ByRef AvisoID, ByRef SendungID) As Boolean @@ -637,7 +639,7 @@ Public Class cZOLL_IMPORT ' SPEDITIONSBUCH.AtlasBezNrEZA = EZA_Nr EZollEZADatenbereitstellung(EZA_Nr, False) ElseIf AES_Nr <> "" Then - EZollEZADatenbereitstellung(AES_Nr, True) ' ???? Warum wird hier nur auf EF geprüft??? AES ist doch -> AF!!!! + EZollEZADatenbereitstellung(AES_Nr, True) ElseIf NCTS_Nr <> "" Then ' SPEDITIONSBUCH.AtlasBezNrNCTS = NCTS_Nr EZollNCTSDatenbereitstellung(NCTS_Nr) diff --git a/UID/ADMIN.vbproj b/UID/ADMIN.vbproj index 9fb8b2d..518199c 100644 --- a/UID/ADMIN.vbproj +++ b/UID/ADMIN.vbproj @@ -426,6 +426,12 @@ UserControl + + usrcntlSessions.vb + + + UserControl + usrCntlZeitenAendern.vb @@ -750,6 +756,9 @@ usrCntlDienstWoche.vb + + usrcntlSessions.vb + usrCntlZeitenAendern.vb diff --git a/UID/Dienstplan/frmDiestAddMa.Designer.vb b/UID/Dienstplan/frmDiestAddMa.Designer.vb index 76d2884..ac971be 100644 --- a/UID/Dienstplan/frmDiestAddMa.Designer.vb +++ b/UID/Dienstplan/frmDiestAddMa.Designer.vb @@ -281,6 +281,7 @@ Partial Class frmDiestAddMa Me.Label58 = New System.Windows.Forms.Label() Me.lblLand = New System.Windows.Forms.Label() Me.cboLand = New System.Windows.Forms.ComboBox() + Me.btnSessions = New System.Windows.Forms.Button() Me.grpTeilzeit.SuspendLayout() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() @@ -2860,12 +2861,24 @@ Partial Class frmDiestAddMa Me.cboLand.Size = New System.Drawing.Size(72, 21) Me.cboLand.TabIndex = 29 ' + 'btnSessions + ' + Me.btnSessions.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSessions.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.btnSessions.Location = New System.Drawing.Point(391, 555) + Me.btnSessions.Name = "btnSessions" + Me.btnSessions.Size = New System.Drawing.Size(86, 37) + Me.btnSessions.TabIndex = 30 + Me.btnSessions.Text = "Sessions" + Me.btnSessions.UseVisualStyleBackColor = True + ' 'frmDiestAddMa ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White Me.ClientSize = New System.Drawing.Size(503, 626) + Me.Controls.Add(Me.btnSessions) Me.Controls.Add(Me.cboLand) Me.Controls.Add(Me.lblLand) Me.Controls.Add(Me.Label58) @@ -3176,4 +3189,5 @@ Partial Class frmDiestAddMa Friend WithEvents Label58 As Label Friend WithEvents lblLand As Label Friend WithEvents cboLand As ComboBox + Friend WithEvents btnSessions As Button End Class diff --git a/UID/Dienstplan/frmDiestAddMa.vb b/UID/Dienstplan/frmDiestAddMa.vb index 575c64b..527908b 100644 --- a/UID/Dienstplan/frmDiestAddMa.vb +++ b/UID/Dienstplan/frmDiestAddMa.vb @@ -1,4 +1,7 @@ Imports System.Text.RegularExpressions +Imports GrapeCity +Imports VERAG_PROG_ALLGEMEIN +Imports VERAG_PROG_ALLGEMEIN.TESTJSON Public Class frmDiestAddMa @@ -60,6 +63,12 @@ Public Class frmDiestAddMa cboLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DE", "DE")) cboLand.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("GB", "GB")) + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("SESSIONS", Me) Then + btnSessions.Visible = True + Else + btnSessions.Visible = False + End If + @@ -759,4 +768,23 @@ Public Class frmDiestAddMa End Try End Sub + + Private Sub Button3_Click(sender As Object, e As EventArgs) Handles btnSessions.Click + Using frm As New Form + + Dim mitarbeiter As New VERAG_PROG_ALLGEMEIN.cMitarbeiter(MA.dstma_mitId) + Dim usrcnlt As New usrcntlSessions(mitarbeiter) + frm.Text = "Sessions von " & mitarbeiter.mit_vname & " " & mitarbeiter.mit_nname + frm.Controls.Add(usrcnlt) + + frm.ClientSize = usrcnlt.Size + + frm.StartPosition = FormStartPosition.CenterScreen + frm.FormBorderStyle = FormBorderStyle.FixedDialog + + frm.ShowDialog() + + End Using + + End Sub End Class \ No newline at end of file diff --git a/UID/Dienstplan/usrcntlSessions.Designer.vb b/UID/Dienstplan/usrcntlSessions.Designer.vb new file mode 100644 index 0000000..c9e1ff8 --- /dev/null +++ b/UID/Dienstplan/usrcntlSessions.Designer.vb @@ -0,0 +1,330 @@ + _ +Partial Class usrcntlSessions + Inherits System.Windows.Forms.UserControl + + 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Me.txtSessDatVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtSessDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.btnAddDay = New System.Windows.Forms.Button() + Me.btnReduceDay = New System.Windows.Forms.Button() + Me.btnToday = New System.Windows.Forms.Button() + Me.Label73 = New System.Windows.Forms.Label() + Me.btnJahr = New System.Windows.Forms.Button() + Me.btnBisJahr = New System.Windows.Forms.Button() + Me.btnVonJahr = New System.Windows.Forms.Button() + Me.btnMonat = New System.Windows.Forms.Button() + Me.btnBisMonat = New System.Windows.Forms.Button() + Me.btnVonMonat = New System.Windows.Forms.Button() + Me.DateTimePicker2 = New System.Windows.Forms.DateTimePicker() + Me.Label74 = New System.Windows.Forms.Label() + Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() + Me.dgvSessions = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + CType(Me.dgvSessions, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'txtSessDatVon + ' + Me.txtSessDatVon._DateTimeOnly = False + Me.txtSessDatVon._numbersOnly = False + Me.txtSessDatVon._numbersOnlyKommastellen = "" + Me.txtSessDatVon._numbersOnlyTrennzeichen = True + Me.txtSessDatVon._Prozent = False + Me.txtSessDatVon._ShortDateNew = True + Me.txtSessDatVon._ShortDateOnly = False + Me.txtSessDatVon._TimeOnly = False + Me.txtSessDatVon._TimeOnly_Seconds = False + Me.txtSessDatVon._value = "" + Me.txtSessDatVon._Waehrung = False + Me.txtSessDatVon._WaehrungZeichen = True + Me.txtSessDatVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSessDatVon.ForeColor = System.Drawing.Color.Black + Me.txtSessDatVon.Location = New System.Drawing.Point(43, 12) + Me.txtSessDatVon.MaxLength = 10 + Me.txtSessDatVon.MaxLineLength = -1 + Me.txtSessDatVon.MaxLines_Warning = "" + Me.txtSessDatVon.MaxLines_Warning_Label = Nothing + Me.txtSessDatVon.Name = "txtSessDatVon" + Me.txtSessDatVon.Size = New System.Drawing.Size(61, 20) + Me.txtSessDatVon.TabIndex = 175 + ' + 'txtSessDatBis + ' + Me.txtSessDatBis._DateTimeOnly = False + Me.txtSessDatBis._numbersOnly = False + Me.txtSessDatBis._numbersOnlyKommastellen = "" + Me.txtSessDatBis._numbersOnlyTrennzeichen = True + Me.txtSessDatBis._Prozent = False + Me.txtSessDatBis._ShortDateNew = True + Me.txtSessDatBis._ShortDateOnly = False + Me.txtSessDatBis._TimeOnly = False + Me.txtSessDatBis._TimeOnly_Seconds = False + Me.txtSessDatBis._value = "" + Me.txtSessDatBis._Waehrung = False + Me.txtSessDatBis._WaehrungZeichen = True + Me.txtSessDatBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSessDatBis.ForeColor = System.Drawing.Color.Black + Me.txtSessDatBis.Location = New System.Drawing.Point(175, 13) + Me.txtSessDatBis.MaxLength = 10 + Me.txtSessDatBis.MaxLineLength = -1 + Me.txtSessDatBis.MaxLines_Warning = "" + Me.txtSessDatBis.MaxLines_Warning_Label = Nothing + Me.txtSessDatBis.Name = "txtSessDatBis" + Me.txtSessDatBis.Size = New System.Drawing.Size(61, 20) + Me.txtSessDatBis.TabIndex = 177 + ' + 'btnAddDay + ' + Me.btnAddDay.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAddDay.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.btnAddDay.ForeColor = System.Drawing.Color.Black + Me.btnAddDay.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnAddDay.Location = New System.Drawing.Point(399, 10) + Me.btnAddDay.Margin = New System.Windows.Forms.Padding(0) + Me.btnAddDay.Name = "btnAddDay" + Me.btnAddDay.Size = New System.Drawing.Size(34, 23) + Me.btnAddDay.TabIndex = 182 + Me.btnAddDay.Text = ">>" + Me.btnAddDay.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnAddDay.UseVisualStyleBackColor = True + ' + 'btnReduceDay + ' + Me.btnReduceDay.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnReduceDay.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.btnReduceDay.ForeColor = System.Drawing.Color.Black + Me.btnReduceDay.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnReduceDay.Location = New System.Drawing.Point(280, 10) + Me.btnReduceDay.Margin = New System.Windows.Forms.Padding(0) + Me.btnReduceDay.Name = "btnReduceDay" + Me.btnReduceDay.Size = New System.Drawing.Size(34, 23) + Me.btnReduceDay.TabIndex = 180 + Me.btnReduceDay.Text = "<<" + Me.btnReduceDay.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnReduceDay.UseVisualStyleBackColor = True + ' + 'btnToday + ' + Me.btnToday.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnToday.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.btnToday.ForeColor = System.Drawing.Color.Black + Me.btnToday.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnToday.Location = New System.Drawing.Point(313, 10) + Me.btnToday.Margin = New System.Windows.Forms.Padding(0) + Me.btnToday.Name = "btnToday" + Me.btnToday.Size = New System.Drawing.Size(87, 23) + Me.btnToday.TabIndex = 181 + Me.btnToday.Text = "Heute" + Me.btnToday.UseVisualStyleBackColor = True + ' + 'Label73 + ' + Me.Label73.AutoSize = True + Me.Label73.Location = New System.Drawing.Point(146, 16) + Me.Label73.Name = "Label73" + Me.Label73.Size = New System.Drawing.Size(23, 13) + Me.Label73.TabIndex = 179 + Me.Label73.Text = "bis:" + ' + 'btnJahr + ' + Me.btnJahr.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.btnJahr.ForeColor = System.Drawing.Color.Black + Me.btnJahr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnJahr.Location = New System.Drawing.Point(625, 10) + Me.btnJahr.Margin = New System.Windows.Forms.Padding(0) + Me.btnJahr.Name = "btnJahr" + Me.btnJahr.Size = New System.Drawing.Size(87, 23) + Me.btnJahr.TabIndex = 188 + Me.btnJahr.Text = "2016" + Me.btnJahr.UseVisualStyleBackColor = True + ' + 'btnBisJahr + ' + Me.btnBisJahr.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnBisJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.btnBisJahr.ForeColor = System.Drawing.Color.Black + Me.btnBisJahr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnBisJahr.Location = New System.Drawing.Point(711, 10) + Me.btnBisJahr.Margin = New System.Windows.Forms.Padding(0) + Me.btnBisJahr.Name = "btnBisJahr" + Me.btnBisJahr.Size = New System.Drawing.Size(34, 23) + Me.btnBisJahr.TabIndex = 189 + Me.btnBisJahr.Text = ">>" + Me.btnBisJahr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnBisJahr.UseVisualStyleBackColor = True + ' + 'btnVonJahr + ' + Me.btnVonJahr.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnVonJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.btnVonJahr.ForeColor = System.Drawing.Color.Black + Me.btnVonJahr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnVonJahr.Location = New System.Drawing.Point(592, 10) + Me.btnVonJahr.Margin = New System.Windows.Forms.Padding(0) + Me.btnVonJahr.Name = "btnVonJahr" + Me.btnVonJahr.Size = New System.Drawing.Size(34, 23) + Me.btnVonJahr.TabIndex = 187 + Me.btnVonJahr.Text = "<<" + Me.btnVonJahr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnVonJahr.UseVisualStyleBackColor = True + ' + 'btnMonat + ' + Me.btnMonat.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnMonat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.btnMonat.ForeColor = System.Drawing.Color.Black + Me.btnMonat.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnMonat.Location = New System.Drawing.Point(469, 10) + Me.btnMonat.Margin = New System.Windows.Forms.Padding(0) + Me.btnMonat.Name = "btnMonat" + Me.btnMonat.Size = New System.Drawing.Size(87, 23) + Me.btnMonat.TabIndex = 185 + Me.btnMonat.Text = "September" + Me.btnMonat.UseVisualStyleBackColor = True + ' + 'btnBisMonat + ' + Me.btnBisMonat.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnBisMonat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.btnBisMonat.ForeColor = System.Drawing.Color.Black + Me.btnBisMonat.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnBisMonat.Location = New System.Drawing.Point(555, 10) + Me.btnBisMonat.Margin = New System.Windows.Forms.Padding(0) + Me.btnBisMonat.Name = "btnBisMonat" + Me.btnBisMonat.Size = New System.Drawing.Size(34, 23) + Me.btnBisMonat.TabIndex = 186 + Me.btnBisMonat.Text = ">>" + Me.btnBisMonat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnBisMonat.UseVisualStyleBackColor = True + ' + 'btnVonMonat + ' + Me.btnVonMonat.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnVonMonat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.btnVonMonat.ForeColor = System.Drawing.Color.Black + Me.btnVonMonat.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnVonMonat.Location = New System.Drawing.Point(436, 10) + Me.btnVonMonat.Margin = New System.Windows.Forms.Padding(0) + Me.btnVonMonat.Name = "btnVonMonat" + Me.btnVonMonat.Size = New System.Drawing.Size(34, 23) + Me.btnVonMonat.TabIndex = 184 + Me.btnVonMonat.Text = "<<" + Me.btnVonMonat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnVonMonat.UseVisualStyleBackColor = True + ' + 'DateTimePicker2 + ' + Me.DateTimePicker2.CustomFormat = "''" + Me.DateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom + Me.DateTimePicker2.Location = New System.Drawing.Point(175, 13) + Me.DateTimePicker2.Margin = New System.Windows.Forms.Padding(0) + Me.DateTimePicker2.Name = "DateTimePicker2" + Me.DateTimePicker2.RightToLeft = System.Windows.Forms.RightToLeft.No + Me.DateTimePicker2.Size = New System.Drawing.Size(95, 20) + Me.DateTimePicker2.TabIndex = 178 + ' + 'Label74 + ' + Me.Label74.AutoSize = True + Me.Label74.Location = New System.Drawing.Point(14, 16) + Me.Label74.Name = "Label74" + Me.Label74.Size = New System.Drawing.Size(28, 13) + Me.Label74.TabIndex = 183 + Me.Label74.Text = "von:" + ' + 'DateTimePicker1 + ' + Me.DateTimePicker1.CustomFormat = "''" + Me.DateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom + Me.DateTimePicker1.Location = New System.Drawing.Point(43, 12) + Me.DateTimePicker1.Margin = New System.Windows.Forms.Padding(0) + Me.DateTimePicker1.Name = "DateTimePicker1" + Me.DateTimePicker1.RightToLeft = System.Windows.Forms.RightToLeft.No + Me.DateTimePicker1.Size = New System.Drawing.Size(95, 20) + Me.DateTimePicker1.TabIndex = 176 + ' + 'dgvSessions + ' + Me.dgvSessions.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvSessions.AllowUserToAddRows = False + Me.dgvSessions.AllowUserToDeleteRows = False + Me.dgvSessions.AllowUserToResizeColumns = False + Me.dgvSessions.AllowUserToResizeRows = False + Me.dgvSessions.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.dgvSessions.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvSessions.Location = New System.Drawing.Point(3, 39) + Me.dgvSessions.Name = "dgvSessions" + Me.dgvSessions.RowHeadersVisible = False + Me.dgvSessions.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvSessions.ShowEditingIcon = False + Me.dgvSessions.Size = New System.Drawing.Size(744, 706) + Me.dgvSessions.TabIndex = 174 + ' + 'usrcntlSessions + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.txtSessDatVon) + Me.Controls.Add(Me.txtSessDatBis) + Me.Controls.Add(Me.btnAddDay) + Me.Controls.Add(Me.btnReduceDay) + Me.Controls.Add(Me.btnToday) + Me.Controls.Add(Me.Label73) + Me.Controls.Add(Me.btnJahr) + Me.Controls.Add(Me.btnBisJahr) + Me.Controls.Add(Me.btnVonJahr) + Me.Controls.Add(Me.btnMonat) + Me.Controls.Add(Me.btnBisMonat) + Me.Controls.Add(Me.btnVonMonat) + Me.Controls.Add(Me.DateTimePicker2) + Me.Controls.Add(Me.Label74) + Me.Controls.Add(Me.DateTimePicker1) + Me.Controls.Add(Me.dgvSessions) + Me.MinimumSize = New System.Drawing.Size(767, 767) + Me.Name = "usrcntlSessions" + Me.Size = New System.Drawing.Size(767, 767) + CType(Me.dgvSessions, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents txtSessDatVon As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtSessDatBis As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents btnAddDay As Button + Friend WithEvents btnReduceDay As Button + Friend WithEvents btnToday As Button + Friend WithEvents Label73 As Label + Friend WithEvents btnJahr As Button + Friend WithEvents btnBisJahr As Button + Friend WithEvents btnVonJahr As Button + Friend WithEvents btnMonat As Button + Friend WithEvents btnBisMonat As Button + Friend WithEvents btnVonMonat As Button + Friend WithEvents DateTimePicker2 As DateTimePicker + Friend WithEvents Label74 As Label + Friend WithEvents DateTimePicker1 As DateTimePicker + Friend WithEvents dgvSessions As VERAG_PROG_ALLGEMEIN.MyDatagridview +End Class diff --git a/UID/Dienstplan/usrcntlSessions.resx b/UID/Dienstplan/usrcntlSessions.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/UID/Dienstplan/usrcntlSessions.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/UID/Dienstplan/usrcntlSessions.vb b/UID/Dienstplan/usrcntlSessions.vb new file mode 100644 index 0000000..4f076c4 --- /dev/null +++ b/UID/Dienstplan/usrcntlSessions.vb @@ -0,0 +1,216 @@ +Public Class usrcntlSessions + + Dim mitarbeiter As VERAG_PROG_ALLGEMEIN.cMitarbeiter + + + Public Sub New() + + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + + End Sub + + Public Sub New(_mitarbeiter As VERAG_PROG_ALLGEMEIN.cMitarbeiter) + + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + Me.mitarbeiter = _mitarbeiter + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + + End Sub + + Private Sub Button6_Click1(sender As Object, e As EventArgs) Handles btnReduceDay.Click + srcTAG = srcTAG.AddDays(-1) + initBtns("Tag") + End Sub + + Private Sub Button7_Click1(sender As Object, e As EventArgs) Handles btnAddDay.Click + srcTAG = srcTAG.AddDays(1) + initBtns("Tag") + End Sub + + Private Sub Button5_Click1(sender As Object, e As EventArgs) Handles btnToday.Click + initBtns("Tag") + End Sub + + Private Sub btnJahr_Click(sender As Object, e As EventArgs) Handles btnJahr.Click + initBtns("Jahr") + End Sub + + Private Sub btnBisMonat_Click(sender As Object, e As EventArgs) Handles btnBisMonat.Click + MONAT = MONAT.AddMonths(1) + initBtns("Monat") + End Sub + + Private Sub btnVonMonat_Click(sender As Object, e As EventArgs) Handles btnVonMonat.Click + MONAT = MONAT.AddMonths(-1) + initBtns("Monat") + End Sub + + Private Sub btnBisJahr_Click(sender As Object, e As EventArgs) Handles btnBisJahr.Click + JAHR = JAHR.AddYears(1) + initBtns("Jahr") + End Sub + + Private Sub btnVonJahr_Click(sender As Object, e As EventArgs) Handles btnVonJahr.Click + JAHR = JAHR.AddYears(-1) + initBtns("Jahr") + End Sub + + Private Sub btnMonat_Click(sender As Object, e As EventArgs) Handles btnMonat.Click + initBtns("Monat") + End Sub + + Dim MONAT As Date = CDate("01." & Now.Month & "." & Now.Year) '.AddMonths(-1) + Dim srcTAG As Date = CDate(Now.ToShortDateString) + + Dim JAHR As Date = CDate("01.01." & Now.Year) + Sub initBtns(MonatJahr) + btnMonat.Text = MONAT.ToString("MMMM") + btnJahr.Text = JAHR.Year + Select Case MonatJahr + Case "Monat" + DateTimePicker1.Value = MONAT + DateTimePicker2.Value = MONAT.AddMonths(1).AddDays(-1) + Case "Jahr" + DateTimePicker1.Value = JAHR + DateTimePicker2.Value = JAHR.AddYears(1).AddDays(-1) + 'End If + Case "Tag" + DateTimePicker1.Value = srcTAG + DateTimePicker2.Value = srcTAG + If srcTAG = Now.ToShortDateString Then + btnToday.Text = "Heute" + ElseIf srcTAG = Now.AddDays(-1).ToShortDateString Then + btnToday.Text = "Gestern" + ElseIf srcTAG = Now.AddDays(-2).ToShortDateString Then + btnToday.Text = "Vorgestern" + Else + btnToday.Text = srcTAG.ToString("dd.MM") + End If + + 'End If + Case "" + DateTimePicker1.Value = ("01." & Now.Month & "." & Now.Year) + DateTimePicker2.Value = Now + End Select + + + txtSessDatVon.Text = DateTimePicker1.Value + txtSessDatBis.Text = DateTimePicker2.Value + + initdgvSessions(CDate(DateTimePicker1.Value).Date, CDate(DateTimePicker2.Value).Date) + + End Sub + + Private Sub initdgvSessions(von As Date, bis As Date) + + Dim SQL_String = "" + + Dim SQL_SESSIONS = "select 'AVISO/SDL' as System,[sess_niederlassung],[sess_ipAddress],[sess_PCName],[sess_PCUserName],[sess_login],[sess_logout] + FROM [ADMIN].[dbo].[tblSessions] + where cast(sess_login as Date) between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' and sess_maId = " & mitarbeiter.mit_id + + + If mitarbeiter.mit_AliasAD_Username IsNot Nothing AndAlso mitarbeiter.mit_AliasAD_Username <> "" AndAlso mitarbeiter.mit_AliasAD_Domain IsNot Nothing AndAlso mitarbeiter.mit_AliasAD_Domain <> "" Then + + Dim whereLogin As String = "([BenutzerAnmeldeName] = '" & mitarbeiter.mit_AliasAD_Domain & "\" & mitarbeiter.mit_AliasAD_Username & "'" + + If mitarbeiter.mit_AliasAD_Username2 IsNot Nothing AndAlso mitarbeiter.mit_AliasAD_Username2 <> "" AndAlso mitarbeiter.mit_AliasAD_Domain2 IsNot Nothing AndAlso mitarbeiter.mit_AliasAD_Domain2 <> "" Then + whereLogin &= " OR [BenutzerAnmeldeName] = '" & mitarbeiter.mit_AliasAD_Domain2 & "\" & mitarbeiter.mit_AliasAD_Username2 & "')" + Else + whereLogin &= ")" + End If + + + Dim SQL_SESSION_TS = "SELECT 'TS/PC','-','-',[TSServer],[BenutzerAnmeldeName],[LogOn_datetime],[LogOff_datetime] + FROM [Doku].[dbo].[TbL_LogOnLogOffLog] + where " & whereLogin & " and cast([LogOn_datetime] as Date) between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "'" + + SQL_String = " select * FROM ( " & SQL_SESSIONS & " UNION ALL " & SQL_SESSION_TS & ") TEMP order by TEMP.sess_login" + Else + SQL_String = " select * FROM ( " & SQL_SESSIONS & ") TEMP order by TEMP.sess_login" + End If + + + dgvSessions.SET_SQL(SQL_String, "ADMIN") + dgvSessions.LOAD() + + With dgvSessions + + .Columns("System").Width = 70 + .Columns("sess_niederlassung").Width = 50 + .Columns("sess_niederlassung").HeaderText = "NL" + .Columns("sess_ipAddress").Width = 100 + .Columns("sess_ipAddress").HeaderText = "IP-Adr" + .Columns("sess_PCName").Width = 70 + .Columns("sess_PCName").HeaderText = "PC" + .Columns("sess_PCUserName").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("sess_PCUserName").HeaderText = "Username" + .Columns("sess_login").Width = 100 + .Columns("sess_login").HeaderText = "Login" + .Columns("sess_logout").Width = 100 + .Columns("sess_logout").HeaderText = "Logout" + + If dgvSessions.Rows.Count > 0 Then + + Dim changeColor As Boolean = True + + For i As Integer = 0 To .Rows.Count - 1 + + .Rows(i).DefaultCellStyle.BackColor = If(changeColor, Color.LightBlue, Color.White) + + If i < .Rows.Count - 1 Then + + Dim currentDate As Date = CDate(.Rows(i).Cells("sess_login").Value).Date + Dim nextDate As Date = CDate(.Rows(i + 1).Cells("sess_login").Value).Date + + If currentDate <> nextDate Then + changeColor = Not changeColor + End If + + End If + + Next + + End If + + + End With + + + End Sub + + Private Sub usrcntlSessions_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If Me.DesignMode Then Exit Sub + initBtns("Tag") + initdgvSessions(CDate(DateTimePicker1.Value).Date, CDate(DateTimePicker2.Value).Date) + End Sub + + Private Sub txtSessDatVon_TextChanged(sender As Object, e As EventArgs) Handles txtSessDatVon.TextChanged + txtSessDatVon.Enabled = sender.text <> "" + If IsDate(txtSessDatVon.Text) AndAlso IsDate(txtSessDatBis.Text) Then + initdgvSessions(CDate(txtSessDatVon.Text).Date, CDate(txtSessDatBis.Text).Date) + End If + End Sub + + Private Sub txtSessDatBis_TextChanged(sender As Object, e As EventArgs) Handles txtSessDatBis.TextChanged + txtSessDatBis.Enabled = sender.text <> "" + If IsDate(txtSessDatVon.Text) AndAlso IsDate(txtSessDatBis.Text) Then + initdgvSessions(CDate(txtSessDatVon.Text).Date, CDate(txtSessDatBis.Text).Date) + End If + End Sub + + Private Sub DateTimePicker1_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker1.ValueChanged + txtSessDatVon._value = CDate(sender.value).ToShortDateString + initdgvSessions(CDate(DateTimePicker1.Value).Date, CDate(DateTimePicker2.Value).Date) + End Sub + + Private Sub DateTimePicker2_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker2.ValueChanged + txtSessDatBis._value = CDate(sender.value).ToShortDateString + initdgvSessions(CDate(DateTimePicker1.Value).Date, CDate(DateTimePicker2.Value).Date) + End Sub +End Class diff --git a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb index 3eb8a13..5cf59d3 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb @@ -244,23 +244,10 @@ Partial Class frmMitarbDetails Me.dgvUberstundenauszahlungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.TabPage6 = New System.Windows.Forms.TabPage() - Me.txtSessDatVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtSessDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.btnAddDay = New System.Windows.Forms.Button() - Me.btnReduceDay = New System.Windows.Forms.Button() - Me.btnToday = New System.Windows.Forms.Button() - Me.Label73 = New System.Windows.Forms.Label() - Me.btnJahr = New System.Windows.Forms.Button() - Me.btnBisJahr = New System.Windows.Forms.Button() - Me.btnVonJahr = New System.Windows.Forms.Button() - Me.btnMonat = New System.Windows.Forms.Button() - Me.btnBisMonat = New System.Windows.Forms.Button() - Me.btnVonMonat = New System.Windows.Forms.Button() - Me.DateTimePicker2 = New System.Windows.Forms.DateTimePicker() - Me.Label74 = New System.Windows.Forms.Label() - Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() - Me.dgvSessions = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.Panel2 = New System.Windows.Forms.Panel() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.txtTimasID = New System.Windows.Forms.TextBox() + Me.Label73 = New System.Windows.Forms.Label() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.TabControl2.SuspendLayout() @@ -288,7 +275,6 @@ Partial Class frmMitarbDetails CType(Me.dgvUberstundenauszahlungen, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvData, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage6.SuspendLayout() - CType(Me.dgvSessions, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'PictureBox1 @@ -2347,6 +2333,8 @@ Partial Class frmMitarbDetails ' 'TabPage8 ' + Me.TabPage8.Controls.Add(Me.Label73) + Me.TabPage8.Controls.Add(Me.txtTimasID) Me.TabPage8.Controls.Add(Me.cbxClientTimas) Me.TabPage8.Controls.Add(Me.cbxTimasMehrereFirmen) Me.TabPage8.Controls.Add(Me.clbTimasMehreFirmen) @@ -2759,22 +2747,7 @@ Partial Class frmMitarbDetails ' 'TabPage6 ' - Me.TabPage6.Controls.Add(Me.txtSessDatVon) - Me.TabPage6.Controls.Add(Me.txtSessDatBis) - Me.TabPage6.Controls.Add(Me.btnAddDay) - Me.TabPage6.Controls.Add(Me.btnReduceDay) - Me.TabPage6.Controls.Add(Me.btnToday) - Me.TabPage6.Controls.Add(Me.Label73) - Me.TabPage6.Controls.Add(Me.btnJahr) - Me.TabPage6.Controls.Add(Me.btnBisJahr) - Me.TabPage6.Controls.Add(Me.btnVonJahr) - Me.TabPage6.Controls.Add(Me.btnMonat) - Me.TabPage6.Controls.Add(Me.btnBisMonat) - Me.TabPage6.Controls.Add(Me.btnVonMonat) - Me.TabPage6.Controls.Add(Me.DateTimePicker2) - Me.TabPage6.Controls.Add(Me.Label74) - Me.TabPage6.Controls.Add(Me.DateTimePicker1) - Me.TabPage6.Controls.Add(Me.dgvSessions) + Me.TabPage6.Controls.Add(Me.Panel2) Me.TabPage6.Location = New System.Drawing.Point(4, 22) Me.TabPage6.Name = "TabPage6" Me.TabPage6.Size = New System.Drawing.Size(750, 747) @@ -2782,245 +2755,36 @@ Partial Class frmMitarbDetails Me.TabPage6.Text = "Sessions" Me.TabPage6.UseVisualStyleBackColor = True ' - 'txtSessDatVon + 'Panel2 ' - Me.txtSessDatVon._DateTimeOnly = False - Me.txtSessDatVon._numbersOnly = False - Me.txtSessDatVon._numbersOnlyKommastellen = "" - Me.txtSessDatVon._numbersOnlyTrennzeichen = True - Me.txtSessDatVon._Prozent = False - Me.txtSessDatVon._ShortDateNew = True - Me.txtSessDatVon._ShortDateOnly = False - Me.txtSessDatVon._TimeOnly = False - Me.txtSessDatVon._TimeOnly_Seconds = False - Me.txtSessDatVon._value = "" - Me.txtSessDatVon._Waehrung = False - Me.txtSessDatVon._WaehrungZeichen = True - Me.txtSessDatVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSessDatVon.ForeColor = System.Drawing.Color.Black - Me.txtSessDatVon.Location = New System.Drawing.Point(43, 11) - Me.txtSessDatVon.MaxLength = 10 - Me.txtSessDatVon.MaxLineLength = -1 - Me.txtSessDatVon.MaxLines_Warning = "" - Me.txtSessDatVon.MaxLines_Warning_Label = Nothing - Me.txtSessDatVon.Name = "txtSessDatVon" - Me.txtSessDatVon.Size = New System.Drawing.Size(61, 20) - Me.txtSessDatVon.TabIndex = 158 - ' - 'txtSessDatBis - ' - Me.txtSessDatBis._DateTimeOnly = False - Me.txtSessDatBis._numbersOnly = False - Me.txtSessDatBis._numbersOnlyKommastellen = "" - Me.txtSessDatBis._numbersOnlyTrennzeichen = True - Me.txtSessDatBis._Prozent = False - Me.txtSessDatBis._ShortDateNew = True - Me.txtSessDatBis._ShortDateOnly = False - Me.txtSessDatBis._TimeOnly = False - Me.txtSessDatBis._TimeOnly_Seconds = False - Me.txtSessDatBis._value = "" - Me.txtSessDatBis._Waehrung = False - Me.txtSessDatBis._WaehrungZeichen = True - Me.txtSessDatBis.Enabled = False - Me.txtSessDatBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSessDatBis.ForeColor = System.Drawing.Color.Black - Me.txtSessDatBis.Location = New System.Drawing.Point(175, 12) - Me.txtSessDatBis.MaxLength = 10 - Me.txtSessDatBis.MaxLineLength = -1 - Me.txtSessDatBis.MaxLines_Warning = "" - Me.txtSessDatBis.MaxLines_Warning_Label = Nothing - Me.txtSessDatBis.Name = "txtSessDatBis" - Me.txtSessDatBis.Size = New System.Drawing.Size(61, 20) - Me.txtSessDatBis.TabIndex = 160 - ' - 'btnAddDay - ' - Me.btnAddDay.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAddDay.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.btnAddDay.ForeColor = System.Drawing.Color.Black - Me.btnAddDay.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnAddDay.Location = New System.Drawing.Point(399, 9) - Me.btnAddDay.Margin = New System.Windows.Forms.Padding(0) - Me.btnAddDay.Name = "btnAddDay" - Me.btnAddDay.Size = New System.Drawing.Size(34, 23) - Me.btnAddDay.TabIndex = 166 - Me.btnAddDay.Text = ">>" - Me.btnAddDay.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnAddDay.UseVisualStyleBackColor = True - ' - 'btnReduceDay - ' - Me.btnReduceDay.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnReduceDay.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.btnReduceDay.ForeColor = System.Drawing.Color.Black - Me.btnReduceDay.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnReduceDay.Location = New System.Drawing.Point(280, 9) - Me.btnReduceDay.Margin = New System.Windows.Forms.Padding(0) - Me.btnReduceDay.Name = "btnReduceDay" - Me.btnReduceDay.Size = New System.Drawing.Size(34, 23) - Me.btnReduceDay.TabIndex = 164 - Me.btnReduceDay.Text = "<<" - Me.btnReduceDay.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnReduceDay.UseVisualStyleBackColor = True - ' - 'btnToday - ' - Me.btnToday.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnToday.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.btnToday.ForeColor = System.Drawing.Color.Black - Me.btnToday.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnToday.Location = New System.Drawing.Point(313, 9) - Me.btnToday.Margin = New System.Windows.Forms.Padding(0) - Me.btnToday.Name = "btnToday" - Me.btnToday.Size = New System.Drawing.Size(87, 23) - Me.btnToday.TabIndex = 165 - Me.btnToday.Text = "Heute" - Me.btnToday.UseVisualStyleBackColor = True - ' - 'Label73 - ' - Me.Label73.AutoSize = True - Me.Label73.Location = New System.Drawing.Point(146, 15) - Me.Label73.Name = "Label73" - Me.Label73.Size = New System.Drawing.Size(23, 13) - Me.Label73.TabIndex = 162 - Me.Label73.Text = "bis:" - ' - 'btnJahr - ' - Me.btnJahr.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.btnJahr.ForeColor = System.Drawing.Color.Black - Me.btnJahr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnJahr.Location = New System.Drawing.Point(625, 9) - Me.btnJahr.Margin = New System.Windows.Forms.Padding(0) - Me.btnJahr.Name = "btnJahr" - Me.btnJahr.Size = New System.Drawing.Size(87, 23) - Me.btnJahr.TabIndex = 172 - Me.btnJahr.Text = "2016" - Me.btnJahr.UseVisualStyleBackColor = True - ' - 'btnBisJahr - ' - Me.btnBisJahr.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnBisJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.btnBisJahr.ForeColor = System.Drawing.Color.Black - Me.btnBisJahr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnBisJahr.Location = New System.Drawing.Point(711, 9) - Me.btnBisJahr.Margin = New System.Windows.Forms.Padding(0) - Me.btnBisJahr.Name = "btnBisJahr" - Me.btnBisJahr.Size = New System.Drawing.Size(34, 23) - Me.btnBisJahr.TabIndex = 173 - Me.btnBisJahr.Text = ">>" - Me.btnBisJahr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnBisJahr.UseVisualStyleBackColor = True - ' - 'btnVonJahr - ' - Me.btnVonJahr.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnVonJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.btnVonJahr.ForeColor = System.Drawing.Color.Black - Me.btnVonJahr.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVonJahr.Location = New System.Drawing.Point(592, 9) - Me.btnVonJahr.Margin = New System.Windows.Forms.Padding(0) - Me.btnVonJahr.Name = "btnVonJahr" - Me.btnVonJahr.Size = New System.Drawing.Size(34, 23) - Me.btnVonJahr.TabIndex = 171 - Me.btnVonJahr.Text = "<<" - Me.btnVonJahr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVonJahr.UseVisualStyleBackColor = True - ' - 'btnMonat - ' - Me.btnMonat.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnMonat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.btnMonat.ForeColor = System.Drawing.Color.Black - Me.btnMonat.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnMonat.Location = New System.Drawing.Point(469, 9) - Me.btnMonat.Margin = New System.Windows.Forms.Padding(0) - Me.btnMonat.Name = "btnMonat" - Me.btnMonat.Size = New System.Drawing.Size(87, 23) - Me.btnMonat.TabIndex = 169 - Me.btnMonat.Text = "September" - Me.btnMonat.UseVisualStyleBackColor = True - ' - 'btnBisMonat - ' - Me.btnBisMonat.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnBisMonat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.btnBisMonat.ForeColor = System.Drawing.Color.Black - Me.btnBisMonat.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnBisMonat.Location = New System.Drawing.Point(555, 9) - Me.btnBisMonat.Margin = New System.Windows.Forms.Padding(0) - Me.btnBisMonat.Name = "btnBisMonat" - Me.btnBisMonat.Size = New System.Drawing.Size(34, 23) - Me.btnBisMonat.TabIndex = 170 - Me.btnBisMonat.Text = ">>" - Me.btnBisMonat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnBisMonat.UseVisualStyleBackColor = True - ' - 'btnVonMonat - ' - Me.btnVonMonat.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnVonMonat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.btnVonMonat.ForeColor = System.Drawing.Color.Black - Me.btnVonMonat.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVonMonat.Location = New System.Drawing.Point(436, 9) - Me.btnVonMonat.Margin = New System.Windows.Forms.Padding(0) - Me.btnVonMonat.Name = "btnVonMonat" - Me.btnVonMonat.Size = New System.Drawing.Size(34, 23) - Me.btnVonMonat.TabIndex = 168 - Me.btnVonMonat.Text = "<<" - Me.btnVonMonat.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVonMonat.UseVisualStyleBackColor = True - ' - 'DateTimePicker2 - ' - Me.DateTimePicker2.CustomFormat = "''" - Me.DateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.DateTimePicker2.Location = New System.Drawing.Point(175, 12) - Me.DateTimePicker2.Margin = New System.Windows.Forms.Padding(0) - Me.DateTimePicker2.Name = "DateTimePicker2" - Me.DateTimePicker2.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.DateTimePicker2.Size = New System.Drawing.Size(95, 20) - Me.DateTimePicker2.TabIndex = 161 - ' - 'Label74 - ' - Me.Label74.AutoSize = True - Me.Label74.Location = New System.Drawing.Point(14, 15) - Me.Label74.Name = "Label74" - Me.Label74.Size = New System.Drawing.Size(28, 13) - Me.Label74.TabIndex = 167 - Me.Label74.Text = "von:" - ' - 'DateTimePicker1 - ' - Me.DateTimePicker1.CustomFormat = "''" - Me.DateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.DateTimePicker1.Location = New System.Drawing.Point(43, 11) - Me.DateTimePicker1.Margin = New System.Windows.Forms.Padding(0) - Me.DateTimePicker1.Name = "DateTimePicker1" - Me.DateTimePicker1.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.DateTimePicker1.Size = New System.Drawing.Size(95, 20) - Me.DateTimePicker1.TabIndex = 159 - ' - 'dgvSessions - ' - Me.dgvSessions.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvSessions.AllowUserToAddRows = False - Me.dgvSessions.AllowUserToDeleteRows = False - Me.dgvSessions.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvSessions.Location = New System.Drawing.Point(3, 38) - Me.dgvSessions.Name = "dgvSessions" - Me.dgvSessions.Size = New System.Drawing.Size(744, 706) - Me.dgvSessions.TabIndex = 156 + Me.Panel2.Location = New System.Drawing.Point(3, 3) + Me.Panel2.Name = "Panel2" + Me.Panel2.Size = New System.Drawing.Size(744, 741) + Me.Panel2.TabIndex = 0 ' 'ContextMenuStrip1 ' Me.ContextMenuStrip1.Name = "ContextMenuStrip1" Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4) ' + 'txtTimasID + ' + Me.txtTimasID.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtTimasID.Location = New System.Drawing.Point(345, 22) + Me.txtTimasID.Name = "txtTimasID" + Me.txtTimasID.Size = New System.Drawing.Size(46, 20) + Me.txtTimasID.TabIndex = 160 + ' + 'Label73 + ' + Me.Label73.AutoSize = True + Me.Label73.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label73.Location = New System.Drawing.Point(269, 25) + Me.Label73.Name = "Label73" + Me.Label73.Size = New System.Drawing.Size(52, 13) + Me.Label73.TabIndex = 161 + Me.Label73.Text = "Timas-ID:" + ' 'frmMitarbDetails ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3072,8 +2836,6 @@ Partial Class frmMitarbDetails CType(Me.dgvUberstundenauszahlungen, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvData, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage6.ResumeLayout(False) - Me.TabPage6.PerformLayout() - CType(Me.dgvSessions, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -3295,23 +3057,10 @@ Partial Class frmMitarbDetails Friend WithEvents Label63 As Label Friend WithEvents cboFunktion As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents TabPage6 As TabPage - Friend WithEvents txtSessDatVon As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents txtSessDatBis As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents btnAddDay As Button - Friend WithEvents btnReduceDay As Button - Friend WithEvents btnToday As Button - Friend WithEvents Label73 As Label - Friend WithEvents btnJahr As Button - Friend WithEvents btnBisJahr As Button - Friend WithEvents btnVonJahr As Button - Friend WithEvents btnMonat As Button - Friend WithEvents btnBisMonat As Button - Friend WithEvents btnVonMonat As Button - Friend WithEvents DateTimePicker2 As DateTimePicker - Friend WithEvents Label74 As Label - Friend WithEvents DateTimePicker1 As DateTimePicker - Friend WithEvents dgvSessions As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents tabBenachrichtigungen As TabPage Friend WithEvents clInterneMailBenachrichtigungen As CheckedListBox Friend WithEvents cbxeigeneFirma As CheckBox + Friend WithEvents Panel2 As Panel + Friend WithEvents Label73 As Label + Friend WithEvents txtTimasID As TextBox End Class diff --git a/UID/Mitarbeiter/frmMitarbDetails.vb b/UID/Mitarbeiter/frmMitarbDetails.vb index 93ca7d6..0c398d9 100644 --- a/UID/Mitarbeiter/frmMitarbDetails.vb +++ b/UID/Mitarbeiter/frmMitarbDetails.vb @@ -1,6 +1,5 @@  Imports System.Text.RegularExpressions -Imports Confluent.Kafka Imports VERAG_PROG_ALLGEMEIN Public Class frmMitarbDetails @@ -1719,12 +1718,8 @@ Public Class frmMitarbDetails End Try ElseIf TabControl2.SelectedIndex = 3 Then - - txtSessDatVon.Text = Now.ToShortDateString - txtSessDatBis.Text = Now.ToShortDateString - - btnMonat.Text = MONAT.ToString("MMMM") - btnJahr.Text = JAHR.Year + Dim usrcnlt = New usrcntlSessions(mitarbeiter) + Panel2.Controls.Add(usrcnlt) End If @@ -1754,142 +1749,135 @@ Public Class frmMitarbDetails End Sub - Private Sub Button6_Click1(sender As Object, e As EventArgs) Handles btnReduceDay.Click - srcTAG = srcTAG.AddDays(-1) - initBtns("Tag") - End Sub + 'Private Sub Button6_Click1(sender As Object, e As EventArgs) + ' srcTAG = srcTAG.AddDays(-1) + ' initBtns("Tag") + 'End Sub - Private Sub Button7_Click1(sender As Object, e As EventArgs) Handles btnAddDay.Click - srcTAG = srcTAG.AddDays(1) - initBtns("Tag") - End Sub + 'Private Sub Button7_Click1(sender As Object, e As EventArgs) + ' srcTAG = srcTAG.AddDays(1) + ' initBtns("Tag") + 'End Sub - Private Sub Button5_Click1(sender As Object, e As EventArgs) Handles btnToday.Click - initBtns("Tag") - End Sub + 'Private Sub Button5_Click1(sender As Object, e As EventArgs) + ' initBtns("Tag") + 'End Sub - Private Sub btnJahr_Click(sender As Object, e As EventArgs) Handles btnJahr.Click - initBtns("Jahr") - End Sub + 'Private Sub btnJahr_Click(sender As Object, e As EventArgs) + ' initBtns("Jahr") + 'End Sub - Private Sub btnBisMonat_Click(sender As Object, e As EventArgs) Handles btnBisMonat.Click - MONAT = MONAT.AddMonths(1) - initBtns("Monat") - End Sub + 'Private Sub btnBisMonat_Click(sender As Object, e As EventArgs) + ' MONAT = MONAT.AddMonths(1) + ' initBtns("Monat") + 'End Sub - Private Sub btnVonMonat_Click(sender As Object, e As EventArgs) Handles btnVonMonat.Click - MONAT = MONAT.AddMonths(-1) - initBtns("Monat") - End Sub + 'Private Sub btnVonMonat_Click(sender As Object, e As EventArgs) + ' MONAT = MONAT.AddMonths(-1) + ' initBtns("Monat") + 'End Sub - Private Sub btnBisJahr_Click(sender As Object, e As EventArgs) Handles btnBisJahr.Click - JAHR = JAHR.AddYears(1) - initBtns("Jahr") - End Sub + 'Private Sub btnBisJahr_Click(sender As Object, e As EventArgs) + ' JAHR = JAHR.AddYears(1) + ' initBtns("Jahr") + 'End Sub - Private Sub btnVonJahr_Click(sender As Object, e As EventArgs) Handles btnVonJahr.Click - JAHR = JAHR.AddYears(-1) - initBtns("Jahr") - End Sub + 'Private Sub btnVonJahr_Click(sender As Object, e As EventArgs) + ' JAHR = JAHR.AddYears(-1) + ' initBtns("Jahr") + 'End Sub - Private Sub btnMonat_Click(sender As Object, e As EventArgs) Handles btnMonat.Click - initBtns("Monat") - End Sub + 'Private Sub btnMonat_Click(sender As Object, e As EventArgs) + ' initBtns("Monat") + 'End Sub - Dim MONAT As Date = CDate("01." & Now.Month & "." & Now.Year) '.AddMonths(-1) - Dim srcTAG As Date = CDate(Now.ToShortDateString) + 'Dim MONAT As Date = CDate("01." & Now.Month & "." & Now.Year) '.AddMonths(-1) + 'Dim srcTAG As Date = CDate(Now.ToShortDateString) - Dim JAHR As Date = CDate("01.01." & Now.Year) - Sub initBtns(MonatJahr) - btnMonat.Text = MONAT.ToString("MMMM") - btnJahr.Text = JAHR.Year - Select Case MonatJahr - Case "Monat" - DateTimePicker1.Value = MONAT - DateTimePicker2.Value = MONAT.AddMonths(1).AddDays(-1) - Case "Jahr" - ' If cbxGeschaftsjahr.Checked Then - 'DateTimePicker1.Value = JAHR.AddMonths(1) - ' DateTimePicker2.Value = JAHR.AddYears(1).AddMonths(1).AddDays(-1) - ' Else - DateTimePicker1.Value = JAHR - DateTimePicker2.Value = JAHR.AddYears(1).AddDays(-1) - 'End If - Case "Tag" - ' If cbxGeschaftsjahr.Checked Then - 'DateTimePicker1.Value = JAHR.AddMonths(1) - ' DateTimePicker2.Value = JAHR.AddYears(1).AddMonths(1).AddDays(-1) - ' Else - DateTimePicker1.Value = srcTAG - DateTimePicker2.Value = srcTAG - If srcTAG = Now.ToShortDateString Then - btnToday.Text = "Heute" - ElseIf srcTAG = Now.AddDays(-1).ToShortDateString Then - btnToday.Text = "Gestern" - ElseIf srcTAG = Now.AddDays(-2).ToShortDateString Then - btnToday.Text = "Vorgestern" - Else - btnToday.Text = srcTAG.ToString("dd.MM") - End If + 'Dim JAHR As Date = CDate("01.01." & Now.Year) + 'Sub initBtns(MonatJahr) + ' btnMonat.Text = MONAT.ToString("MMMM") + ' btnJahr.Text = JAHR.Year + ' Select Case MonatJahr + ' Case "Monat" + ' DateTimePicker1.Value = MONAT + ' DateTimePicker2.Value = MONAT.AddMonths(1).AddDays(-1) + ' Case "Jahr" + ' DateTimePicker1.Value = JAHR + ' DateTimePicker2.Value = JAHR.AddYears(1).AddDays(-1) + ' 'End If + ' Case "Tag" + ' DateTimePicker1.Value = srcTAG + ' DateTimePicker2.Value = srcTAG + ' If srcTAG = Now.ToShortDateString Then + ' btnToday.Text = "Heute" + ' ElseIf srcTAG = Now.AddDays(-1).ToShortDateString Then + ' btnToday.Text = "Gestern" + ' ElseIf srcTAG = Now.AddDays(-2).ToShortDateString Then + ' btnToday.Text = "Vorgestern" + ' Else + ' btnToday.Text = srcTAG.ToString("dd.MM") + ' End If - 'End If - Case "" - DateTimePicker1.Value = ("01." & Now.Month & "." & Now.Year) - DateTimePicker2.Value = Now - End Select + ' 'End If + ' Case "" + ' DateTimePicker1.Value = ("01." & Now.Month & "." & Now.Year) + ' DateTimePicker2.Value = Now + ' End Select - initdgvSessions(CDate(DateTimePicker1.Value).Date, CDate(DateTimePicker2.Value).Date) - 'btnSuche.PerformClick() - End Sub + ' initdgvSessions(CDate(DateTimePicker1.Value).Date, CDate(DateTimePicker2.Value).Date) + ' 'btnSuche.PerformClick() + 'End Sub - Private Sub initdgvSessions(von As Date, bis As Date) + 'Private Sub initdgvSessions(von As Date, bis As Date) - Dim SQL_SESSIONS = "select [sess_niederlassung],[sess_ipAddress],[sess_PCName],[sess_PCUserName],[sess_login],[sess_logout],[sess_lastRm],[sess_lastActivity],[sess_lastBootUpTime] - FROM [ADMIN].[dbo].[tblSessions] - where cast(sess_login as Date) between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' and sess_maId = " & mitarbeiter.mit_id & " - Order by sess_login" + ' Dim SQL_String = "" - dgvSessions.SET_SQL(SQL_SESSIONS, "ADMIN") - dgvSessions.LOAD() - - With dgvSessions - - ''.AutoGenerateColumns = False - ''.Columns("ignoreAuszahlungsdatum").CellTemplate = cell - '.Columns("ignoreAuszahlungsdatum").Width = 70 - '.Columns("ignoreAuszahlungsdatum").HeaderText = "zu spät eingetragen" - '.Columns("ignoreAuszahlungsdatum").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter - '.Columns("Datum").Width = 70 - '.Columns("ÜS100").Width = 70 - '.Columns("ÜS100").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight - '.Columns("ÜS50").Width = 70 - '.Columns("ÜS50").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight - '.Columns("ÜS25").Width = 70 - '.Columns("ÜS25").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight - '.Columns("ÜS50_Saldo").Width = 70 - '.Columns("ÜS50_Saldo").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight - '.Columns("ausbezahlt").Width = 70 - '.Columns("ausbezahlt").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight - - End With + ' Dim SQL_SESSIONS = "select 'AVISO/SDL' as System,[sess_niederlassung],[sess_ipAddress],[sess_PCName],[sess_PCUserName],[sess_login],[sess_logout] + ' FROM [ADMIN].[dbo].[tblSessions] + ' where cast(sess_login as Date) between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' and sess_maId = " & mitarbeiter.mit_id - End Sub + ' If mitarbeiter.mit_AliasAD_Username IsNot Nothing AndAlso mitarbeiter.mit_AliasAD_Username <> "" AndAlso mitarbeiter.mit_AliasAD_Domain IsNot Nothing AndAlso mitarbeiter.mit_AliasAD_Domain <> "" Then - 'Private Sub cbxeigeneFirma_CheckedChanged(sender As Object, e As EventArgs) Handles cbxeigeneFirma.CheckedChanged - ' If Not cbxeigeneFirma.Checked Then + ' Dim SQL_SESSION_TS = "SELECT 'TS/PC','-','-',[TSServer],[BenutzerAnmeldeName],[LogOn_datetime],[LogOff_datetime] + ' FROM [Doku].[dbo].[TbL_LogOnLogOffLog] + ' where [BenutzerAnmeldeName] = '" & mitarbeiter.mit_AliasAD_Domain & "\" & mitarbeiter.mit_AliasAD_Username & "' and cast([LogOn_datetime] as Date) between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "'" - ' If cboFirmaFMZOLL._value <> "" AndAlso IsNumeric(cboFirmaFMZOLL._value) Then - ' loadBenachrichtiungenListe(CInt(cboFirmaFMZOLL._value)) + ' SQL_String = " select * FROM ( " & SQL_SESSIONS & " UNION ALL " & SQL_SESSION_TS & ") TEMP order by TEMP.sess_login" + ' Else + ' SQL_String = " select * FROM ( " & SQL_SESSIONS & ") TEMP order by TEMP.sess_login" + ' End If - ' Else - ' loadBenachrichtiungenListe() + ' dgvSessions.SET_SQL(SQL_String, "ADMIN") + ' dgvSessions.LOAD() + + ' With dgvSessions + + ' If dgvSessions.Rows.Count > 0 Then + + ' '.AutoGenerateColumns = False + ' '.Columns("ignoreAuszahlungsdatum").CellTemplate = cell + ' .Columns("System").Width = 70 + ' .Columns("sess_niederlassung").Width = 50 + ' .Columns("sess_niederlassung").HeaderText = "NL" + ' .Columns("sess_ipAddress").Width = 100 + ' .Columns("sess_ipAddress").HeaderText = "IP-Adr" + ' .Columns("sess_PCName").Width = 70 + ' .Columns("sess_PCName").HeaderText = "PC" + ' .Columns("sess_PCUserName").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + ' .Columns("sess_PCUserName").HeaderText = "Username" + ' .Columns("sess_login").Width = 100 + ' .Columns("sess_login").HeaderText = "Login" + ' .Columns("sess_logout").Width = 100 + ' .Columns("sess_logout").HeaderText = "Logout" ' End If - ' Else - ' loadBenachrichtiungenListe() - ' End If + + + ' End With + 'End Sub diff --git a/UID/Mitarbeiter/frmMitarbTimas.Designer.vb b/UID/Mitarbeiter/frmMitarbTimas.Designer.vb index 14d933c..e91d01f 100644 --- a/UID/Mitarbeiter/frmMitarbTimas.Designer.vb +++ b/UID/Mitarbeiter/frmMitarbTimas.Designer.vb @@ -33,6 +33,8 @@ Partial Class frmMitarbTimas Me.btnOK = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.Label8 = New System.Windows.Forms.Label() + Me.CheckedListBox1 = New System.Windows.Forms.CheckedListBox() Me.txtMandantenNr = New System.Windows.Forms.TextBox() Me.Label4 = New System.Windows.Forms.Label() Me.Button1 = New System.Windows.Forms.Button() @@ -81,8 +83,8 @@ Partial Class frmMitarbTimas Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.TabControl1 = New System.Windows.Forms.TabControl() - Me.CheckedListBox1 = New System.Windows.Forms.CheckedListBox() - Me.Label8 = New System.Windows.Forms.Label() + Me.txtTimasID = New System.Windows.Forms.TextBox() + Me.Label9 = New System.Windows.Forms.Label() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.GroupBox2.SuspendLayout() @@ -178,6 +180,8 @@ Partial Class frmMitarbTimas ' 'GroupBox2 ' + Me.GroupBox2.Controls.Add(Me.Label9) + Me.GroupBox2.Controls.Add(Me.txtTimasID) Me.GroupBox2.Controls.Add(Me.Label8) Me.GroupBox2.Controls.Add(Me.CheckedListBox1) Me.GroupBox2.Controls.Add(Me.txtMandantenNr) @@ -214,6 +218,26 @@ Partial Class frmMitarbTimas Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "Timas - User" ' + 'Label8 + ' + Me.Label8.AutoSize = True + Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label8.Location = New System.Drawing.Point(339, 51) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(196, 13) + Me.Label8.TabIndex = 132 + Me.Label8.Text = "Einstellungen (werden in Timas gesetzt):" + ' + 'CheckedListBox1 + ' + Me.CheckedListBox1.Enabled = False + Me.CheckedListBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.CheckedListBox1.FormattingEnabled = True + Me.CheckedListBox1.Location = New System.Drawing.Point(342, 67) + Me.CheckedListBox1.Name = "CheckedListBox1" + Me.CheckedListBox1.Size = New System.Drawing.Size(210, 94) + Me.CheckedListBox1.TabIndex = 131 + ' 'txtMandantenNr ' Me.txtMandantenNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -692,25 +716,23 @@ Partial Class frmMitarbTimas Me.TabControl1.Size = New System.Drawing.Size(546, 242) Me.TabControl1.TabIndex = 123 ' - 'CheckedListBox1 + 'txtTimasID ' - Me.CheckedListBox1.Enabled = False - Me.CheckedListBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CheckedListBox1.FormattingEnabled = True - Me.CheckedListBox1.Location = New System.Drawing.Point(342, 67) - Me.CheckedListBox1.Name = "CheckedListBox1" - Me.CheckedListBox1.Size = New System.Drawing.Size(210, 94) - Me.CheckedListBox1.TabIndex = 131 + Me.txtTimasID.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtTimasID.Location = New System.Drawing.Point(226, 15) + Me.txtTimasID.Name = "txtTimasID" + Me.txtTimasID.Size = New System.Drawing.Size(91, 20) + Me.txtTimasID.TabIndex = 133 ' - 'Label8 + 'Label9 ' - Me.Label8.AutoSize = True - Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label8.Location = New System.Drawing.Point(339, 51) - Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(196, 13) - Me.Label8.TabIndex = 132 - Me.Label8.Text = "Einstellungen (werden in Timas gesetzt):" + Me.Label9.AutoSize = True + Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label9.Location = New System.Drawing.Point(164, 19) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(52, 13) + Me.Label9.TabIndex = 134 + Me.Label9.Text = "Timas-ID:" ' 'frmMitarbTimas ' @@ -799,4 +821,6 @@ Partial Class frmMitarbTimas Friend WithEvents Label4 As Label Friend WithEvents CheckedListBox1 As CheckedListBox Friend WithEvents Label8 As Label + Friend WithEvents Label9 As Label + Friend WithEvents txtTimasID As TextBox End Class diff --git a/UID/Mitarbeiter/frmMitarbTimas.resx b/UID/Mitarbeiter/frmMitarbTimas.resx index db78be9..104cac6 100644 --- a/UID/Mitarbeiter/frmMitarbTimas.resx +++ b/UID/Mitarbeiter/frmMitarbTimas.resx @@ -121,226 +121,227 @@ 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 - B3v2d44WCwAAAAAASUVORK5CYII= + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAADNiSURBVHhe7d13/DxJWeDxApacXDIirrCAYgJuoQCF + BREVlSigSDxZJBySwUNBLREEEfSIAsIJAoskj7QkwdsFJC7JRUCSsHhkOFZyEl8P28POVj0zU093z1To + zx/vf+r3+848XV3VU/V0dbX77ne/6wAAAAAAwLIkBQAAAAAAoH9JAQAAAAAA6F9SAAAAAAAA+pcUAAAA + AACA/iUFAAAAAACgf0kBAAAAAADoX1IAAAAAAAD6lxQAAAAAAID+JQUAAAAAAKB/SQEAAAAAAOhfUgAA + AAAAAPqXFAAAAAAAgP4lBQAAAAAAoH9JAQAAAAAA6F9SAAAAAAAA+pcUAAAAAACA/iUFAAAAAACgf0kB + AAAAAADoX1IAAAAAAAD6lxRYOR8AAAAALMPZnQ+XdT5cz/lwR+fD7zsfHuV8eJrz4e+dDyc5H05xPnzU + +fBp58MXB99wPny3Qav4xeeG43qP8+FtzocTnQ8vdT48bzj+P3M+PMD5cFvnww2cD1d1PlzK+XBWpR5H + i+djwBRJgVXcQAEAAAA077zOh2OdD3d3PjxpmPzKZPjbyqQZ233T+fAh58MrnQ9/4Xy4g/Phx8cmCuL5 + GDBFUrCL8+EWSiMvSTrYZeKOgtF+xPnwdaWeS7mTEmNN/rsSM/rxA8o5b9X/Uo4P+yG/S6u7SZ91PnzQ + +fBW58Orh7tIT3E+PNz5cFfnw686H37K+XBB5ZxhOR6ktKNaPUOJH3246DDOl8n/u50P31HOP+YlvxMv + GpIul1bOiSqenwFTJAW7OB/O4nw4WWnQJT097igY7Xilfkt5v/PhCCXGmpAQ6BsJARySDAxf73x4vPPh + zs6HqzsfzqOcS/TlIs6H05T2UKv/HJJY8XGgTUc7H37P+fDG4dzG5xuH9aYhWXwB5Vx9Xzw/A6ZICnI4 + H35RacAlyQVMlt0kHQYmV1PqtqSbKzHWhoRA30gIoDRZsfV/nQ8Pdj5cs4EkKeweq5z32skz0/FxoB2S + aDxumHzG5xZ1+A/nw6OdD5dUzl8yNwOmSApyDQOUuPGW9MK4s8BM7kzF9VqKLK+V1ShxjLUhIdA3EgKo + zReGjauu28g1EttdbnjEJD7PLbi2cjyom6xGedhwHYnPJ+r0ZefDHzofzrl+LuN5GTBFUpDL+XANpdGW + doxy8UOemyn1WZLsXBvHWCMSAn0jIYCa/evw3Om5lfONNjxfOa+t+CfleFAnuUbIpFIml/F5RBve53y4 + yuqcxvMyYIqkwGLYBCNusCXJzp3xRRC7yetjPqDUZymvUmKsFQmBvpEQQAs+6Xy4G48TNMcr57I1N1GO + C3X5ueHNAPG5Q3vktY23k/Maz8mAKZICi+G5/do2IJFllPHFENvdQ6nHkr6fAW0ACYG+kRBAS97ufLiS + cu5Rp9cp57A173U+nE05NpQnCUJ5vV18ztC+B8ZzMmCKpMBq2OE/bqglvUG5KGIzmfB8TqnHUp6jxFgz + EgJ9IyGA1sgmhL+tnH/U5UbKuWvVHZXjQ1nyGtOTlHOFftw3npMBYyUFVs6HoyrcEOdXlIsjdI9U6q+U + bw0bLMUx1oyEQN9ICKBVD1XaAOogd27lznp8zlp1KvtYVOWizod3K+cJ/blZPC8DxkgKrIaLz2OURlrS + O9l9OctlhrtJcf2V8kQlxtqREOgbCQG0jKRAnWQFR3yuWnd/5ThxeLIyQB4dis8P+nSa3EiL52aAVVJg + NVyALl7hzqW/rlwocWZ/p9RbKV/Z9K7VypEQ6BsJAbTu9kpbQDnnHTaBjM9T6z7f2fWyRWd1PrxMOTfo + m7wy/Kzx/AywSAqs1i5Ef6I00pLez47LW11dqbOS5L24cYwtICHQt54GuCQElumrzocfU9oDyvgD5Rz1 + 4k+V48Xh9Ny2sN1x8fwMsEgKrNYuRLVtTid+S7lg4nSy+WJcX6W0fGeBhEDfWm2XGhICy/WW4e5h3CZw + WBdzPnxJOT+9+FqjK/16cFXnw7eVc4JlkFVH543naECupMAquiDJM2RxIy1JNro5h3LhXLqbK3VVUsvP + HpIQ6BsJAfTiOKVN4LAer5yX3jxFOW7sl7z28V3KucCy3CueowG5kgKr6KIku8z+u9JIS7qncvFcMkmQ + fFCpp1I+3vjuxCQE+kZCAL1o/VrbuisMb9KJz0tv5C61HGt8/Nif/6GcByzPR9lLAGMlBVbKham23XNl + Gc35lDiX6l5KHZXU+l0rEgJ9IyGAntxVaRc4jBcq56NXL1COH/shSb4eN6nEOL8cz9OAHEmBlXJxko38 + PqA00pIeqMS5RDK5kef14/op5X0dbPxIQqBvJATQE7nm8krew/sZ5Vz07mpKPWB+91DqHsv1zHieBuRI + CqyUi5OQV/7FjbSkL3Y2sB/rUUrdlPRrSoytISHQt56uGyQEIGRyGrcN7FdNm/geyj8q9YB5yUahNT0C + ivJOk0eD47kasEtSYKVcoITcgXin0lBLavW1dnO5jPPhG0q9lCK7Xvdwp4qEQN9ICKA3T1TaBvbnpso5 + WIpfUuoD85H6jescuE48VwN2SQqslAvUyg2URlrSl50PF1fiXIq/U+qkpJ9TYmwRCYG+kRBAb2Tj3x6S + sS2QR+Ler5yDpZAbQ7zucn+OV+oceEg8VwN2SQqslAvUuhOVhlqSDIjjGJfg6kpdlPQqJcZWkRDoGwkB + 9OjKSvvA/O6m1P3S3FqpF0wnmwl+Valv4NXxXA3YJSmwUi5S666pNNSSZMn8Dytx9kzuBNX2/OJVlDhb + RUKgbyQE0KN7K+0D85K3G31Kqful+fDwuuO4fjDNTZS6BsQX47kasEtSYKVcpGIvVhprSU9TYuzZLZQ6 + KOk5SowtIyHQNxIC6NHzlfaBeQWl3pdKdsKP6wfTPEWpZ2Dlh+P5GrBNUmClXKRiP+l8+E+lsZbybefD + 5ZU4eyRZecnOx3VQyrecD5dT4mwZCYG+kRBAj/5VaR+YzyWGfYviel+qTw8rJuJ6wngfUuoZWPmFeL4G + bJMUWCkXKc3fKo21JNlgL46xR/dRjr2kHne3JiHQNxIC6NF3nA/nUdoI5vFXSp0v3R8p9YRxLqXUL7Du + uHi+BmyTFFgpFyqNvPLum0qDLUVWLPT0HLvmSOfDF5RjL0XullxSibN1JAT6RkIAvbqq0kYw3Y8OKxHj + +l66LzkfLqrUF+x+TanfFnzd+fBu58PznA+Pcj7c3/nwm3I3e9j8+sedD0cNv7uHIuPSHxk2Wr2G8+FX + nA+3cz7c1/nwF86HFzgf3t7gBo4PjudrwDZJgZVyodrk8UqDLellSow9ebRyzCU9VImxB7UkBB6h/NBh + up5ez0ZCAOtur7QRTPcipa5LeY1SVtJjlPqC3cOUuq3RZ5wPT5e71UOirOVXUJ7N+XCFYcz3jMpuuGn+ + Kp6vAdskBVZKp9lEsnC1PVMnb0GI4+zBZStbkfG5YXIVx9mDWhICsoFVHBuwrpaEwA2VxEsPLjLc4bqx + 8+GPnQ9vVo69Jg9U2gimuZZSz6V8zPlwTufD25R/K0XGJbJiNK432MgNrbhuayErcCUp9vPDJDqOvRfS + t37d+fBepQ5q8JJ4vgZskxRYKZ1km9qymicqMfZAlmPFx1rS/ZQYe0FCAK2oJSFwXSW2XkmCQJacxnVQ + A2kPcbwYT1YTvVGp51LuMMQl/S3+t5KepdQdbD6i1GsN/mnYSDyOt2dHVLgiV5wYz9eAbZICK6VzbCN3 + UWpbZvOLSpwtk1UP8TGWdKrz4dxKnL0gIYBWkBAo57aVrdoSz1XixHg3V+q4lPdEy7NruqMsd5CvpNQf + 8sidadkUNK7X0p49TI7jeJfiT5Q6Keld8XwN2CYpsFI6xS6/qzTckmQ5XS/PCctxSIY2PsaS7qjE2RMS + AmgFCYGyZPOsuC5Ker0SI8aRidAHlDou5UZRfHLXtqZJ5MuVOkQeeXVzXJ+lvbbzxwNyyPhb6iGum1JI + CMAkKbBSOsUucrf4E0rjLemmSpwtuoVybCXJs1W9Z4xJCKAVJATKk1fexvVRyruU+DDO7yj1W8oblPjE + 05T/W9J1lBix2/WUuixJ9gaTXfrjOJdIHhGTFTBxHZXw0Xi+BmyTFFgpHSLHXZTGW5JMXFve/VScw/nw + YeXYSrqZEmdvSAigFSQEypO7e7UMGN+nxAe78w+7qcf1W4psbBjHKH6wslenvaWj1ZmHdBulLkt6uBLj + kp2g1FEJJARgkhRYKZ0hh9w1/pDSgEtq/RVM91GOqSTZYXsJP/YkBNAKEgJ1OEmpkxI+qsQGu5qeHX6p + Et86ef1v/Dcl/ZoSI7araaz3jeENYnGMSyZzibieSvhYPF8DtkkKrJTOkOtWSgMuSRIUcpc9jrMFF6pw + s8alDPpJCKAVJATq8AClTkr4f0pssJHJ0FeUui1BVp78lBLjugs4Hz6r/G0p71/AY4Vz+1OlHkuRu+Fx + fEt3lFJPJbBCACZJgZXSGXLJEv13Ko24pLsqcbbgL5VjKekVSoy9IiGAVpAQqMOxSp2U8EUlNtj8tVKv + pfytEp/mHsrflnQnJUZsVst1XBynxAcfPq/U1aGREIBJUmCldASLX1EacUmfbPAVeUdX9joruUtxFSXO + XpEQQCtqGUguPSFwMaVOSiAhMM0VnQ/fVuq1BBkD5G7sJisha3pkU1aqtDbuKukpSh2WktvmluZkpa4O + jYQATJICK6UjWL1OacglyXLOOMaavUA5hpKOV2LsGQkBtIKEQB1kb5UaJpKSAI9jQz55Xj+u01Ieo8S3 + zS2VzyhJXkcdxwjd05X6K+FTSmw4XQ0bC/5rPF8DtkkKrJSOYPWzSkMu6XPDc3ZxnDWqre7kLoXsoh3H + 2TMSAmgFCYF6yN35uF4OjU0Fx6vlsQ8hr327qBLjNpKUeqvyWaVIfzhSiROpWl5dyv4Bm71Iqa9De2c8 + XwO2SQqslI4wRk2ZdtHC5Ep+0N+kxF7SE5Q4e0dCAK0gIVCPGhICH1Tiwm61TabHXvtrSmqIRyoxIlXD + ZFNYV6UsyTHOh5sWdq14vgZskxRYKR1hjJ+u6N3M4kvOh4socdbk15W4S5K7FEt8/QwJAbSChEA9/kOp + l0N7mxIXdqtpub28MeB8Soy5aroZ8zXnww8pMeLMakkIyOaUcWw4oHg+BkyRFFjFDXSCZykXnJIepcRY + C9kU6CNKzCXJ+43jOJeAhABaQUKgHnGdlPAaJS5sV9uGfPdSYrT4iUr2s1h5qhIjzqyWhMDNldhwQPF8 + DJgiKbCKG+gE8ux5TbvlS7b6B5U4a3A/Jd6SZN+FH1DiXAISAmgFCYE6yB3duE5KeJ4SG7ar6ZV9sgeE + JCjiGK1kEh5/dimSnJC3N8Qx4gy1JATkkZM4NhxQPB8DpkgKrOIGOtETlYtOSU9SYiztQs6H/6/EWpIk + KOI4l4KEAFpBQqAOsiw6rpMS/lKJDZtdcEh+x/VYyu2VGMeQGx9fVT6/lL9XYsQZakkIyOqSODYcUDwf + A6ZICqziBjqRPINe0w/TtyrcNV8GcXGcJZ268HcI15IQwHS9v1OZhEAdrqXUSQlLTuSO8TClDkv5Z+fD + WZUYx5JH/uLvKOmaSow4XS0Jgd5/L6sXz8eAKZICq7iBzuDhyoWnpGcqMZZydGWPVYjfUuJcEhIC/eh9 + gENCoA53UeqkhFsosUF3qeExwrgOS7mhEuMU8qpl2aAw/p5STlJixOlqSQhcWokNBxTPx4ApkgKruIHO + QJ5Fr+GVTCvy9oNalka9QImvpPc6H86mxLkkJAT6QULgMJaeEKjlme1aftda8DSl/kp5vRLfHGraH0H8 + qhIj6kkIlNw3Sn6r43iQ+mg8ZwM2SQqslI46hwcqDbskuQDHMR5aLctM18m7TuM4l4aEQD9ICBzGkhMC + 8g57ecwqrpNDk8fhzq7Eh9RPOh++o9RhKT+rxDiH2t6g8O6ZH4voBQkBEgK5SAggW1JgpXTUOcgz6Z9U + GndJV1fiPBQZRL5FiamkNylxLhEJgX6QEDiMJScErqPURwnvUGKD7mVK/ZXyEiW+Od1S+c6SbqfEuHQk + BEgI5CIhgGxJgZXSUedyN6Vxl/QPSoyHcislntJkYBvHuUQkBPpBQuAwlpwQeKVSHyU8TokNqespdVeK + PL4oqxXiGOckNx/eqnx3KXO9WrEnJARICOQiIYBsSYGV0lHnIssZa1q+JkoMZM/pfPg3JZaSXq7EuVQk + BPpBQuAwSlxHa3BbpS5K+Q0lPpyZTI5PVuqulGcoMe6DvF8+/u6S7qXEuGQkBEgI5CIhgGxJgZXSUed0 + G6WBl/RmJcZ9u78SR0lyl+LKSpxLRUKgHyQEDmOJCYGbV/SGGNk/4IJKjDiz31TqrhRpO0cpMe7LS5UY + Svmc8+H8SoxLRUKAhEAuEgLIlhRYKR11TrKhjGwsEzfykm6kxLkvF67sjQvi2UqcS0ZCoB8kBA5jSQkB + aVP/W6mDkl6txIkzk2XqH1HqrhTpu3GM+yRvoPi2EkcpD1FiXCoSAiQEcpEQQLakwErpqHOT9+3Gjbyk + dx1w59vHKN9fktylOFqJc8lICPSDhMBh9JgQkPe4SwL3isPr0h7kfDhxWFEVH39p8uhCHD/O7N5KvZXy + JefDRZQY962W12OKLzsfLq7EuEQkBEgI5CIhgGxJgZXSUffhDUpDL0k2+YtjnNvlK1piuvJ4Jc6lIyHQ + DxIC6J0sv5Z9aeK2gTPIROfzSt2V8kdKjIdwSefDV5R4SmH8cToSAiQEcpEQQLakwErpqPtwbaWhlySb + HR6hxDmnFyrfW5Jk6C+hxLl0JAT6QUIAvft9pV3gzP5MqbdSPuN8OJ8S46H8iRJTKXKD5HJKjEtDQoCE + QC4SAsiWFFgpHXVfTlAae0l3UmKcy7WU7ytNBgZxnCAh0BMSAujZJ5wP51XaBc5waefD15S6K+WeSoyH + JJv5SVIijquU45UYl4aEAAmBXCQEkC0psFI66r7IzvY1PY95qvPhXEqcU8mrjt6ifF9JssyUXal1JAT6 + QUIAPbup0iZwZk9X6q0Ued2wbG4Yx3hov6PEVtJVlBiXhIQACYFcJASQLSmwUjrqPj1HafAlycZDcYxT + yf4E8feUdl8lTpyOhEA/SAigV09R2gPO7Kcru+lQy+aPZ3c+fFCJr5SlvyWDhAAJgVwkBJAtKbBSOuo+ + yfNjNb0KZ+7n+2TFgdwViL+npH2thOgFCYF+kBBAj15byZ3m2r1CqbtS5HXLh3qbUY5bKDGWdD0lxqUg + IUBCIBcJAWRLCqyUjrpvT1IafUkPVmIc63eVzy/tt5Q4cQYSAv0gIYDevGbmpHWvrq/UXUny6so4xpLk + UcY3K3GW8rYhpjjOJSAhQEIgFwkBZEsKrJSOum/yKpyaNv35ovPhSCVOK3nPsHxW/Pklvdf5cDYlVpyB + hEA/SAigJ09jZUAWuRP/DqX+SnmdEmMNanvb0y2VGJeAhAAJgVwkBJAtKbBSOuoh1PRaIPEIJUarxymf + WxqbUO1GQqAfJATQA9kE9jbK+YdOntWP67Ckn1FirMVLlHhL+cABXv9cIxICJARykRBAtqTASumohyB3 + 5Gu6m/6VYeVCHGeuKzgfvqV8bklvUuJEioRAP0gIoGVfHxLLF1LOPXTnlEGzUpelvFiJsSZXrGwfp7so + MfauloTApZTYDoWEQB4SAsiWFFgpHfVQfl9p/CXJQCyOMdf/UT6vtGOVOJEiIdAPEgJo0SedDw+fmJRe + qvsp9VmKvOHgJ5QYa/PXSuylSNs/jxJjz2pJCJT8vSQhkIeEALIlBVZKRz2U8w4/BnEHKOWbzocfVuLc + pbbn8sQJSpzQkRDoR8kBziGQEOjHR5wPT3Q+/BL7vIwmS56/oNQt2vIg5dz2rJaEwJWU2A6FhEAeEgLI + lhRYKR31kO6udICSnq7EuI3skiu75cafU5LcpSh5oW9NLQkB2cdCBrgYr6bXfO0DCYF+yIavj3U+/DwJ + gdEepdQr2iOPj15YOb+9qiUhcAMltkMhIZCHhACyJQVWSkc9JNlBWe6UxJ2gFHm2Tp6xi+Pc5NbKZ5T2 + LCVObFZLQiAosQHrSAj06TPOhz93PhytnHPojhr2XIjrEm16tHKOe1VLQuCOSmyHQkIgDwkBZEsKrJSO + emi3UzpBSc9XYtScq7LNjIQ89nBZJVZsRkIArSAh0DdZ3fVMEgNZpJ7i+kO75FXUYx7ZbFEtCYFHKrEd + iqzmi1f41eRkpb5KICGAbEmBldJRD00uDKcoHaGkqyhxxn5X+bvSpmyMuFQkBNAKEgLL8A3nw0OGFXRx + G4APVx6SJ3G9oW1/o5zrHtWSEHilEhtOV8vrOUkIIFtSYKV0hBJurHSEkl6hxLjuIpW9NlF82flwcSVW + bEdCAK0gIbAsb3c+XEZpB0v3D0pdoX3faeQtDVPVkhD4/AL23RnryUp9lUBCANmSAiulI5TyRqUzlCRv + D4hjXJE78fH/L03uKMVxYjcSAmgFCYHl+azz4WpKW1iqX1TqCP2QO7PxOe9NLQkBwbVFJ49TxHVVAgkB + ZEsKrJSOUMp1lM5Q0uuUGMWPDpsPxv+/pM85Hy6gxIrdSAigFSQElum0YZl83B6WRu5mvlupH/TlZ5Vz + 35OaEgIPU+KDD09Q6qoEEgLIlhRYKR2hJFmqH3eIkrTXsrxY+X+l3UeJE3lICKAVJASW61POh0sobWJJ + bq/UC/rzBuXc9+TZyjGX8gnnwxFKjEsn+yvEdVUCCQFkSwqslI5QkmzmF3eIkt7hfDjLWny1rWIQpzof + zqnUJfKQEEArSAgsmzw7v/57tCTnHn7r4jpBn26ktIFePEk53pJuq8S4ZGcbVt3G9VQCCQFkSwqslM5Q + 2nOVTlHSLYa4ZCBWy6tI1smENq5D5CMhgFaQEIC8pjduF0vwAKUu0K/3dLzh3Z8rx1vSx4aEWxznUv2S + UkelkBBAtqTASukMpV2+smf03ztkDCWLGv9baf/S8Y/moZAQQCtICEDuki/tdYQXqvCtPti/OyhtoQc1 + vrJadtWP41yqk5T6KYWEALIlBVZKZ6jBU5SOUdLdhixqXF7aTZS6gw0JAbSChADEHZW20bNHK3WA/kny + 61xKe2idrPKJj7UGd1diXZo7K/VSEgkBZEsKrJQOUYNLOR++pnSOUr6llJUmr2mM6w12JATQChICEJve + gNOjyzgfvqnUAZbhvkqbaN31leOsxYMWvOr0phVea0gIIFtSYKV0ilrU9pxVbY5V6gx2JATQChICWLmk + 0j56VNOO7Dg82dztB5R20bLLKsdZk9cPG3zHcfdK9k94qPPhP5W6KI2EALIlBVZK56jFhXlucKMTlPrC + OCQE0AoSAliRV/DF7aM3xyjHjeWRyVrcNlomr/mraZ+sTV46vO2h1z1LJNF0L5l0K8deCxICyJYUWCmd + pCYPVjrI0kkW80pKXWEcEgJoRS0JgRsOg6keXML58CPOh58aXisrm8c+ZEi6fkE59lo8QWkfvXmtctxY + nq90uCJG3qIQH2et5Dr4HOfDXZ0PVxw22Y6PpwWyEuBnnA/3dz682vnwDeVYa0NCANmSAiul09TkfM6H + TymdZMmepdQTxiMhgFbUkhC4rhJbj2TgK8/7vlipg9JkWW8cb09+WTlmLNdfKW2kZccrx9iKrzsf3jUc + w585H+4xvJ7755wP/835cPSQaF0lXS+oHP8UMi+Qz73IkMwVP+l8uLLz4drDXgDHDfshPMn58Arnw0cq + fSRgl/fEczZgk6TASulstbmn0kmWSjY8kefP4jrCeLUkBLA/co7j894iEgLlyKqI05S6KOXjSoy9kE3N + TlGOGcslS+zlldRxW2nVfZRjBGJviedswCZJgZVyoaqNPL9U8zM+h/RYpX4wDQmB/pEQmNcSEwJC7oB9 + R6mPEuTNN3F8vZDXKsbHCzxPaSut8srxAbHXxnM2YJOkwEq5UNXoDkpHWZovOx8uptQNpiEh0D8SAvNa + akJAyLP7cX2U0uNmX/Kc778rxwqIqyptpkWysSCbZmOXF8ZzNmCTpMBKuVDVSJYQ/ovSWZbkj5V6wXQk + BPpHQmBeS04IyCNbtTyLKs/RxvG17veU4wRWXqO0mVbJiof4+IB1j4nnbMAmSYGVcpGqlWwUEneWpZB3 + 8Z5fqRNMR0KgfyQE5rXkhIB4q1InJfSWEJBNwrhril1+QWk7LbqNcmzAunvEczZgk6TASrlI1ezNSodZ + gnsrdYF5kBDoHwmBeS09IfBopU5K6C0hUEv7Rt3e4Xw4i9J+WiO75cujoPHxASvHxnM2YJOkwEq5SNVM + BqJxh+ndxzp9VrQWJAT6R0JgXktPCMgrreI6KaGnhIC8qkzeohMfI6C5ldKGWvQ3yrEBQq6H54nnbMAm + SYGVcoGq3auUjtMz2VAxrgPMh4RA/0gIzGvpCYEbKHVSQk8Jgecqxwds8iHnw9mVdtSaKyvHBojXx/M1 + YJukwEq5QNXuGKXj9Oo9w4aKcR1gPiQE+kdCYF5LTwhcW6mTEnpJCFxNObbSZN+eSw91vHQ/4Xz4ulJH + pd1daUsteqVybMAD4vkasE1SYKVcnFrwfKXz9OjGyrFjXiQE+kdCYF5LTwjUcldPJmtxbC06UTm20u6s + xLlkD1XqqLRPDs/hx7G25hrKsWHZ5E02R8XzNWCbpMBKuTi14EedD99WOlFP/kk5bsyPhED/SAjMi4RA + Wicl9JAQuKFyXKW9nZV5ifM4Hz6u1FVpf6DE2qJnK8eG5XpZPFcDdkkKrJQLUyueqnSinsiy1PiYMT8S + Av0jITAvEgJpnZTQekLgiOGxuPi4SrumEit8+A2lrkr7j+F1lXGsrbkkr9zEmmvHczVgl6TASrkwtUKe + 7/ua0pF68DLleLEfJAT6R0JgXiQE0jopofWEwJ2UYyrtGUqcOMNJSp2V9pdKnC36TeXYsDwnxPM0IEdS + YKVclFpSy/ug5yTPDv20cqzYDxIC/SMhMC8SAmmdlNByQkCWoH9COaaS5G7zxZVYcQYZm9T2uKa8nu0o + JdYWPV05PizHV50Pl4/naUCOpMBKuSC1RJaKnaZ0qpY9UzlO7A8Jgf6REJgXCYG0TkpoOSHwYOV4Sruv + EidSj1fqrrS/VeJs0bmcD29Tjg/LcI94jgbkSgqslAtSa/5Q6VStkkz3ZZRjxP6QEOgfCYF5kRBI66SE + VhMCFx3uxsfHU9J7O3mv/SFcaHgtY1yHJfW0slL6xweVY0Tfjo/nZ4BFUmClXIxaI6+d+azSuVr0WOX4 + sF8kBPpHQmBeJATSOimh1YTA45RjKe0XlDix2V2VOiytp72Xfsj58CHlGNGn1zofzhHPzwCLpMBKuRC1 + 6N5KB2vNl50PF1OODftFQqB/JATmRUIgrZMSWkwIXH5YCRcfS0kvVOLEdmdzPrxTqcvSjlVibZUkBWTl + SnyM6MsJsqdKPDcDrJICK+Ui1KJzOB9OVTpaS/5YOS7sHwmB/pEQmBcJgbROSmgxIfAC5ThKkjcV9bIh + 3aFdS6nP0t6oxNmyCzofXqUcJ/ogv+lHxPMyYIykwEq5ALWq5YmdPI93fuWYsH8ttxvkISEwLxICaZ2U + 0FpC4BrKMZT2R0qcyHe8Uqel3VSJs2WyGkNuGH1HOVa06dPOhxvH8zFgiqTASrn4tEoumq0ur5JHHuLj + wWGQEOgfCYF5kRBI66SE1hICr1eOoaR/cz6cW4kT+S41PO4Y121JMg48Qom1dZJQ+xfleNEOeVxK9lA5 + Us5pPB8DpkgKrJSLTstupnTA2n10eOQhPhYcBgmB/pEQmBcJgbROSmgpIXBjJf7SZLwQxwm7Byp1W9px + Spw9kLHifZwPX1COGfWSR5Oe7Hy47Pr5jOdjwBRJgZVywWnZWZwPb1E6Y81urxwHDoeEQP9ICMyLhEBa + JyW0khCQu7XvU+IvSZ7LjuPEOOescEf8j3e++kP2FpBEjCw9j48d9fjnIYFzYeUcJvMxYIqkwCpuoB24 + ntIpa3WK8+GsyjHgcEgI9I+EwLxICKR1UkIrCYG7KLGXJMt2f0yJE+PdUKnn0h6gxNkbWTFwa+fDq9lj + oApfH14h+Hs515h4PgZMkRRYxQ20E69ROmqNbqTEjsMiIdA/EgLzIiGQ1kkJLSQEzud8+KQSe0l/rsSJ + 6V6u1HVJsqy+hT4yl0s6H37b+fAS58NpSn1gfp8dVhs93PlwfeuqlHg+BkyRFFjFDbQTV1M6bm3eoMSN + wyMh0D8SAvMiIZDWSQktTHb+UIm7JElOXECJE9NdYVh9Edd5SY9Q4lwC2WT7GOfDnZ0PT3I+vI7HC0aT + lRey19c/Oh+eOjyqITfzZEPNuN5N4vkYMEVSYBU30I7IM1YyYKrVuZSYcXiy5C4+N+hLL5t2yt2H+NhK + 6HEHbwsZbMd1UoLsmRPHVhtZIRDHXdJ5lBgxH3l9clznJfE65zOT9i+Jm2OdD7dyPtzX+fBI58PTnA/P + dT6c4Hw4yfnwLufDh4ckwhfXtPpYgqyYWB3DqcOeJic7H050PrzI+fBs58MTnA8PHh5xkg1Hr+l8OHqf + 44d4PgZMkRQAAAAAAID+JQUAAAAAAKB/SQEAAAAAAOhfUgAAAAAAAPqXFAAAAAAAgP4lBQAAAAAAoH9J + AQAAAAAA6F9SAAAAAAAA+pcUAAAAAACA/iUFAAAAAACgf0kBAAAAAADoX1IAAAAAAAD6lxQAAAAAAID+ + JQUAAAAAAKB/SQEAAAAAAOhfUgAAQAtOcQ4AWnTnU5z7n6c49+RTnPvuDh8e/q+4rPJZh9Zy7DU5Zq1u + vqDUXWy9Lo+Jfw+BKZICAABaoAywrE5WBl27PE/5nLnIZ8ffN5YM1leDxyOV79qHMfW5TgbF8WfmmPq9 + QiY58efmsJyzf1D+Ppfle1YsEzCZnMR/r5H2FP/tIc1xrqeYcvy3HHkeY6uJYfz5+9RS7I9QvneTKX1y + DLkW5yYAcnwv0RL/NgJWSQEAAC1QBlsWlkHjurGT1hxzDRI18tn7Tg7MEb9MTOPP3UaOKf6MMazfuyIT + nPizNpkyERpTt5IUij9nk9x6HFtPc5C2G8dzaGOO//p7TGSMTWTlajF2S7xT+qSVHG/8/XN5cvz7CFgk + BQAAtEAZcOXKvRu6yZhJwS5yNzf+nn3ZxyB4ap2uWCYJc33n2CSPdYIqd1njz8gx5ThlQhd/nibn7u/Y + epqL1F8c0yGNOf6cZfVTyV3ufST6Woz9UH3SQmKS44y/e26SnORRAoySFAAA0AJl4JXLcldXs48J9aEn + O3IXzbKkfJfcO8y7yMqN+LM3sdwJ3GbsYyDWczZ24mP9nnW5S6JzViCMrae5jF3VMxfL8cu5nqt95pBr + 2lz9ueXYrX1lbJ/Mdei6lH5MUgBmSQEAAC1QBl855phUWCatueaIy2rOgXjOHeYcMniOP1szVwJCjE3w + WM5Z7nFpLN+j2XUXNHcFwth6msvURN5UuatXxk4CV4/1iDH9Sb5z6gS35diFpa9M6ZO5xtSF/M2qLsec + C+knR8a/l8A2SQEAAC1QBl+75E58dtnHQNIy8JNB72rAOGXgKL43eFTiscq5w5wjZ1n2XOdxZewjIJY6 + n5JEsnyPRs5x/JnrcpMrY+tpLnGb38SSOJC6jf9+k9x+Yj1fsopjU91aJrhiSjsTLccuLPHP8X3byOM6 + 8Xdusy0ea12ypwBMkgIAAFqgDJp2sUwUdsmdHOSwPPe6a8IsExfr5NyyFFpz6Am6ZdC/y6763MRyzsSu + u/SbWL9nE2kX8Wev5DwrPraeSrC0/231MoZ14rZtErhiXQY/dtVPy7ELa18Z2ydzWVYH5LRDa4KBRweQ + LSkAAKAFyoBpG+tgd5c5B5OWQXPO5F0GxtZNrKYcjwxm48+bYtvS7Lm/K/cZ+5jlnImxCSTr92wik+RN + MeQkWHLaXQ2syaldyScL67nKmVCv5CRtVixvl1hpOfYV6zFs6g9zsSSgc2PZdv1bf9Ws4HWEyJYUAADQ + AmWwtEnuJMFyZ9EyIN7FkqzIuZMkZIBpGZBOeQwi905Ybv1uqtvc82ix6bt2sZyzKXVr+Z5dtGPNvaua + 2+5Ks7zabc5VD9b+tusxjpil7VuPq+XY11n6ypQ+mSv+zm1yV0bIuWLSj9klBQAAtEAZLGlyB7syELUs + yZxzQJlzh3bFckfTMjmyfva6nPjl/+QmDjbVbc73WO5GirErI3JiWdEm4rks35Mjnnjk3lUdW0+HZpkU + jl0dotl251azbRXMJrkJNWHpyy3Hvs7SV6b0yVzxd24jscd9c6v49xCYIikAAKAF8QBpg9wJwmqQaxm4 + 5i7z3Cb3Dq2w3j2zfLYYcxc49zvkPOROPLTjzPlbmeDl/L91Y85h7jGvjJ1MW78nR7z0P7d/jKmnEkpN + CnOSjivWO+wrlmOztLmWY19nuXaP/Q4LyzGvrN4wIMnp+PPOJP49BKZICgAAaEE8QFLk3vFfv1NoGcTN + MajMvUMr4slcDsvxjJkg5cYv/8+ydHj9LmHO38lkQO6w5a5CEJtWIuySe8wrYyfTud9jOWaxPtnIaR9j + 6+nQrAmUOfqvyL3OrIxJvAnLviC5d/Fbjn1dzjVi3dg+aWFNTm4i/W/1iMD3445/D4EpkgIAAFqgDMDW + 5T4qINaXaubeMRVjJtAxy/eNGYxbBuJjEg658a8GsnH5JuuTgpxJ66puLHcJx54/y0B/7B1VYalby3le + JcByJ9Bj6+nQchMoK3NNCnPP09Tvzb2eidxrRcuxrztUn7SQurJcjyy+t4Fg/JsIjJUUAADQAmUAti53 + oBsPPi2TijnunFru7o55tnbMRNEiZ7K+PgDP+f9iNQnNGeiv4rbeJRx7h9hyzsYkWVZy6mrVBq13eiXh + ktvWx9bToeX2eTFH313JOU9zfK9lcpl7l73l2Ncdqk9aWfvlGNLuj4x/HwGLpAAAgBYogy/rIEy7U2Sd + VI69Y7aSO1DWnqvPYRnwWwfKuXeY1z83d9Imceeci9WjAvLZOcmDdWMSLCL3nIk44WSR8z3rdWvZUFHa + fm59TW3jh2Jp63Ouesg5T1O/N7evreROqluOfZ3lOKb0yTHk98gS3xjy+dePfyOBXEkBAAAtUAZewvKo + wKaNmyyDt7GTSpEz4V0Ze3cu/pxtrO8Az73DvD4Az/0bOQc5E7z1z7ZMiMcmWCznTIxtH7nfs378khix + tN0cY9vdoVknnXOterB+79jJaG6/Wdl0bVvXcuzrcvvKytg+OVVuMnQKkgIYJSkAAKAFyoDLMujaNvm1 + LD8dO0gWuXdoxZi7c9aBuPVYcut6fQAuk9b438eKH3HISSCsWFdDrFjO2dikg+V74slN7t/lsrQ7y+Mp + Gmv7W2edFM616sHanq2T3ZXcvraSc3wtx77O0uan9Mm5SLzWOsklx8fjAzBLCgAAaIEy0MqdAH9v0KT8 + /YplsDZ2YiksiYcxdzQtd8xFPLncJSd+bQA+x11s+Yz1zSAPdbcz55hX9t02tLq1rJDJYWl3U8+rtf2t + KzUpPNSk2lK3uas6Wo59XU5fWZnSJ/dF2u6cSQI2G4RZUgAAQAuiQdXcE6FcUyYXloHytgSGRv6/5fO1 + /RR2yfl8bQBuGcBvEk/oc5NBK2MnnznHvBLHaJHzPVrdCnkGO/6/Y+W2O+sdek3ud2ksbWpTvY1hTUSt + J7Fy5e6JspLb7lqOfV1OX5ny+SVIf5JYLaueVk6OfyuBXZICAABaEA2grHfD5zRmcmmZQI25a2atD+tA + OTd+7XMtd3M18aMCwnJ3bWwSJ/eYV8a0C8v3aHW7MmYiEbO0u6nn1PJdmpKTQst3j7nLbkl2CMvEveXY + RW5fWRnbJ0uyJlU+HP9WArskBQAAtGBtwGS9Ozy3MRMMywTK8hy3sA6SZVJgvTubG782ALcOcNdJrNqk + wTIBHnuHOPeYxdikg+V7tLpdmVLHK5Z2Z534xSzfFbO29231Noal7VmvFdZl/dv2RtG0HLuwXPun9Mld + 5FilfjTxyrUx1x9LwvO78W8lsEtSAABAC4aBUqlHBdaNGeBZJlCW57hlsmO56yfGvOYrN/7474R1qfI6 + bVJi/byxk8/cYxZj2oT1e3YlcayrRGKWdidtKJ4IWUyZpMvfx7Fvso9JoeX7tdUt21g3atSSZdu0HLuw + TJSn9MldrEkp67FazhMrBGCWFAAA0IJhoDR10jOHMZMMy6R918RvxTI4Xhk7SM6Jf9sycMudyZVNExLr + 3XDLRHedJfEkA/j473NNrdsV6x3aWG67Ky03gSLGtvdtrPWcu/Te2p/HtLmWYxeW68jY78hluT7k9N91 + luTK8+LfSmCXpAAAgBYYl4vKADW+K7mNNdFgucNpGYRvGzjK4FxitUyI4s8eM+nLvRu27U68dcKw6VEB + IXUQ//9txhyzdRXC2KTDHHW7zlo3K9vaXW0sE7F9TQot1wtpy7sm1tY+PSXR0Wrsh+qTuax9TSb5m65p + 6yznR9w5/q0EdkkKAAConfFRgTEDTutg0zLRsCQy9mVsMkDkDny3DcCtdbDtsQbLBGTsRNcab8m6XSdx + 5Kw4iOUmHEqz9tNdk9mxLNejFZnorZ9HSQbJ+beeryl9ueXYrX1yqm3XoBVrPQqpy/j3Y7UngfXzeMMA + RkkKAAConWESuO3O8i6W5aiWpIP17vjcLLFqcuPfNtDPvRMudsVrmYSMnejmHrMYm3SwfM+2uo2NeQ1h + bsKhNOuk0FJvVmP275hqyoS69dhz+8pcclaBWa5rc5Pzd0z8WwnkSAoAAKiZcRIQ33mxsCzVtEwCLYmG + Ocndpjkmejnx59RHzgRkV0LHOgAfe/w5x7wyNumQ+z05dRvL+dx1UyZqh2SZFI6pN6tDTqxlyfmc56m1 + 2K1tegpL25FVKIeqxxWSAZgkKQAAoFbGJdAyAY4Haxa5y7dXcga41iXOc5D6mpIYWZcbf86kOGeVx65l + uvs4R7HcY14Zm3TI/Z6cuo1ZNl60TH5Ks0wKx9TbGJLAsmwCN8aufjFWK7Hn9pW5WNvOIepx5Xt7EcS/ + lYBFUgAAQK2Mg6ypzwtb7z7nDHTHLN8eY5UEGDs53SQ3/pzv3TWZ3/WogMhJKqxIncR/n8OyIkWMSTqI + OetWk1tX1slPKdZJ4dh6G0u+z5KwyCF9Zmz7sqg9dmufnGps25G/s/xmWcj5uWX8GwmMkRQAAFCrYVCZ + I2dyniP+3G1yEhCrNwPsS/x9c8uNP2fgv9qIbJNtjwqsyHmO/26TsW1iV5yx+O9zzVm3mtVGZbvkPCtd + A6mHOPZtxtbbVKvzGk/ockmCZmzbnarW2K19cqqpbWfVVnOTcptIEkA+h8cDMKukAACAFiiDLgCoXU7i + Z+wd6X1rOfbaSD3FdbdJ/LfJ7yEwRVIAAAAAAAD6lxQAAAAAAID+JQUAAAAAAKB/SQEAAAAAAOhfUgAA + AAAAAPqXFAAAAAAAgP4lBQAAAAAAoH9JAQAAAAAA6F9SAAAAAAAA+pcUAAAAAACA/iUFAAAAAACgf0kB + AAAAAADoX1IAAAAAAAD6lxQAAAAAAID+JQUAAAAAAKB/SQEAAAAAAOjffwEHe/Z3Cz7sxAAAAABJRU5E + rkJggg== diff --git a/UID/Mitarbeiter/frmMitarbTimas.vb b/UID/Mitarbeiter/frmMitarbTimas.vb index 91b2ddc..2fdd227 100644 --- a/UID/Mitarbeiter/frmMitarbTimas.vb +++ b/UID/Mitarbeiter/frmMitarbTimas.vb @@ -79,6 +79,17 @@ Public Class frmMitarbTimas txtEmail.Text = emp.email txtMobiltel.Text = emp.phone2 txtMandantenNr.Text = emp.clientNumber + txtTimasID.Text = emp.ID + + txtTimasID.ReadOnly = True + + If emp.ID = avisoEmp.mit_timasId Then + txtTimasID.BackColor = Color.LightGreen + Else + txtTimasID.BackColor = Color.IndianRed + End If + + 'txtPersonalNr.Text = emp.pnr1 diff --git a/UID/My Project/AssemblyInfo.vb b/UID/My Project/AssemblyInfo.vb index 9e7d614..60ee7ac 100644 --- a/UID/My Project/AssemblyInfo.vb +++ b/UID/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/UID/cSqlDb.vb b/UID/cSqlDb.vb index 77e2bbf..5ad2bbe 100644 --- a/UID/cSqlDb.vb +++ b/UID/cSqlDb.vb @@ -1566,8 +1566,8 @@ Public Class cMitarbeiter 'Änderung Dim sql = "INSERT INTO tblMitarbeiter " & - "(mit_username,mit_abweichenderAnzeigename, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_DpUserStandardFirma2,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_AliasAD_Domain2,mit_AliasAD_Username2,mit_teamId,mit_ChatBenutzer,mit_FirmaHaupt,mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname,mit_foto_DocId,mit_MAVerzeichnis_Motto,mit_sprache,mit_fakturierungsgruppe, mit_CSuser, mit_CSpwd, mit_PersonalNr, mit_telefonnr,mit_ATGRNAccessCode_AT51FP7,mit_ATGRNAccessCode_AT52VA6 , mit_Sprachkentnisse,mit_EZOLL_SB_UNISPED, mit_homeoffice,mit_timasNichtStempeln,mit_emailprivat, mit_timasMehrereFirmen, mit_timasFirmen, mit_Funktion,mit_terminalTimasId, mit_EMailbenachrichtigungen) OUTPUT INSERTED.mit_id VALUES " & - "(@mit_username,@mit_abweichenderAnzeigename,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_DpUserStandardFirma2,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_AliasAD_Domain2,@mit_AliasAD_Username2,@mit_teamId,@mit_ChatBenutzer,@mit_FirmaHaupt,@mit_ChatEasteregg,@mit_MAVerzeichnis_SettingsTstmp,@mit_MAVerzeichnis_allowGebDat,@mit_MAVerzeichnis_allowWohnadresse,@mit_MAVerzeichnis_allowGebDatOhneJahr,@mit_MAVerzeichnis_Spitzname,@mit_foto_DocId,@mit_MAVerzeichnis_Motto ,@mit_sprache,@mit_fakturierungsgruppe, @mit_CSuser, @mit_CSpwd, @mit_PersonalNr, @mit_telefonnr,@mit_ATGRNAccessCode_AT51FP7 ,@mit_ATGRNAccessCode_AT52VA6, @mit_Sprachkentnisse,@mit_EZOLL_SB_UNISPED, @mit_homeoffice,@mit_timasNichtStempeln, @mit_emailprivat, @mit_timasMehrereFirmen, @mit_timasFirmen,@mit_Funktion,@mit_terminalTimasId, @mit_EMailbenachrichtigungen )" + "(mit_username,mit_abweichenderAnzeigename, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_DpUserStandardFirma2,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_AliasAD_Domain2,mit_AliasAD_Username2,mit_teamId,mit_ChatBenutzer,mit_FirmaHaupt,mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname,mit_foto_DocId,mit_MAVerzeichnis_Motto,mit_sprache,mit_fakturierungsgruppe, mit_CSuser, mit_CSpwd, mit_PersonalNr, mit_telefonnr,mit_ATGRNAccessCode_AT51FP7,mit_ATGRNAccessCode_AT52VA6 , mit_Sprachkentnisse,mit_EZOLL_SB_UNISPED, mit_homeoffice,mit_timasNichtStempeln,mit_emailprivat, mit_timasMehrereFirmen, mit_timasFirmen, mit_Funktion, mit_EMailbenachrichtigungen) OUTPUT INSERTED.mit_id VALUES " & + "(@mit_username,@mit_abweichenderAnzeigename,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_DpUserStandardFirma2,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_AliasAD_Domain2,@mit_AliasAD_Username2,@mit_teamId,@mit_ChatBenutzer,@mit_FirmaHaupt,@mit_ChatEasteregg,@mit_MAVerzeichnis_SettingsTstmp,@mit_MAVerzeichnis_allowGebDat,@mit_MAVerzeichnis_allowWohnadresse,@mit_MAVerzeichnis_allowGebDatOhneJahr,@mit_MAVerzeichnis_Spitzname,@mit_foto_DocId,@mit_MAVerzeichnis_Motto ,@mit_sprache,@mit_fakturierungsgruppe, @mit_CSuser, @mit_CSpwd, @mit_PersonalNr, @mit_telefonnr,@mit_ATGRNAccessCode_AT51FP7 ,@mit_ATGRNAccessCode_AT52VA6, @mit_Sprachkentnisse,@mit_EZOLL_SB_UNISPED, @mit_homeoffice,@mit_timasNichtStempeln, @mit_emailprivat, @mit_timasMehrereFirmen, @mit_timasFirmen,@mit_Funktion, @mit_EMailbenachrichtigungen )" @@ -1653,7 +1653,7 @@ Public Class cMitarbeiter cmd.Parameters.AddWithValue("@mit_timasMehrereFirmen", m.mit_timasMehrereFirmen) cmd.Parameters.AddWithValue("@mit_timasFirmen", If(m.mit_timasFirmen, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_Funktion", If(m.mit_Funktion, DBNull.Value)) - cmd.Parameters.AddWithValue("@mit_terminalTimasId", If(m.mit_terminalTimasId, DBNull.Value)) + 'cmd.Parameters.AddWithValue("@mit_terminalTimasId", If(m.mit_terminalTimasId, DBNull.Value)) cmd.Parameters.AddWithValue("@mit_EMailbenachrichtigungen", If(m.mit_EMailbenachrichtigungen, DBNull.Value)) Try diff --git a/UID/usrCntlAPI.Designer.vb b/UID/usrCntlAPI.Designer.vb index a54536d..4f906bc 100644 --- a/UID/usrCntlAPI.Designer.vb +++ b/UID/usrCntlAPI.Designer.vb @@ -86,6 +86,8 @@ Partial Class usrCntlAPI Me.Panel3 = New System.Windows.Forms.Panel() Me.Button10 = New System.Windows.Forms.Button() Me.Button11 = New System.Windows.Forms.Button() + Me.btnExcel = New System.Windows.Forms.Button() + Me.cbxOhneAnhang = New System.Windows.Forms.CheckBox() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.Panel2.SuspendLayout() @@ -141,6 +143,8 @@ Partial Class usrCntlAPI ' 'SplitContainer1.Panel1 ' + Me.SplitContainer1.Panel1.Controls.Add(Me.cbxOhneAnhang) + Me.SplitContainer1.Panel1.Controls.Add(Me.btnExcel) Me.SplitContainer1.Panel1.Controls.Add(Me.txtSuche) Me.SplitContainer1.Panel1.Controls.Add(Me.Label15) Me.SplitContainer1.Panel1.Controls.Add(Me.cboProgram) @@ -1040,6 +1044,30 @@ Partial Class usrCntlAPI Me.Button11.TabIndex = 4 Me.Button11.UseVisualStyleBackColor = True ' + 'btnExcel + ' + Me.btnExcel.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnExcel.BackgroundImage = Global.ADMIN.My.Resources.Resources.Excel_2013_logo_155x110 + Me.btnExcel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.btnExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnExcel.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnExcel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnExcel.Location = New System.Drawing.Point(943, 64) + Me.btnExcel.Name = "btnExcel" + Me.btnExcel.Size = New System.Drawing.Size(69, 52) + Me.btnExcel.TabIndex = 59 + Me.btnExcel.UseVisualStyleBackColor = True + ' + 'cbxOhneAnhang + ' + Me.cbxOhneAnhang.AutoSize = True + Me.cbxOhneAnhang.Location = New System.Drawing.Point(742, 123) + Me.cbxOhneAnhang.Name = "cbxOhneAnhang" + Me.cbxOhneAnhang.Size = New System.Drawing.Size(90, 17) + Me.cbxOhneAnhang.TabIndex = 60 + Me.cbxOhneAnhang.Text = "ohne Anhang" + Me.cbxOhneAnhang.UseVisualStyleBackColor = True + ' 'usrCntlAPI ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1128,4 +1156,6 @@ Partial Class usrCntlAPI Friend WithEvents Label14 As Label Friend WithEvents txtSuche As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label15 As Label + Friend WithEvents btnExcel As Button + Friend WithEvents cbxOhneAnhang As CheckBox End Class diff --git a/UID/usrCntlAPI.vb b/UID/usrCntlAPI.vb index 083c468..059204c 100644 --- a/UID/usrCntlAPI.vb +++ b/UID/usrCntlAPI.vb @@ -224,6 +224,9 @@ Public Class usrCntlAPI End If End If + + If cbxOhneAnhang.Checked Then sqlstr &= " AND isnull([api_EMailAttCnt],-1) = 0 " + If cboFiliale._value <> "" Then sqlstr &= " AND [api_FilialenNr] LIKE @FilialenNr " If cboPartnersystem._value <> "" Then sqlstr &= " AND [api_Partnersystem] = @Partnersystem " @@ -327,4 +330,22 @@ Public Class usrCntlAPI Me.Cursor = Cursors.Default End Sub + Private Sub btnExcel_Click(sender As Object, e As EventArgs) Handles btnExcel.Click + If DataGridView.Rows.Count > 0 Then + Dim dtNew As New DataTable + dtNew = TryCast(DataGridView.DataSource, DataTable) + + If dtNew.Rows.Count > 0 Then + + For Each col As DataColumn In dtNew.Columns + + Dim colName = col.ColumnName.Replace("api_", "") + + If Not col.ColumnName = (colName) Then col.ColumnName = col.ColumnName.Replace("api_", "") + Next + + cProgramFunctions.genExcelFromDT_NEW(dtNew) + End If + End If + End Sub End Class diff --git a/UID/usrctlProcedures.vb b/UID/usrctlProcedures.vb index 8a455c4..81d5b94 100644 --- a/UID/usrctlProcedures.vb +++ b/UID/usrctlProcedures.vb @@ -4362,6 +4362,7 @@ OPTION (MAXRECURSION 1000);", "AVISO") ' Case "Bosnien und Herzegowina" : ISO2SetCountry = "BA" Case "Mauretanien" : ISO2SetCountry = "MR" Case "Vereinigtes Königreich (Nordirland)" : ISO2SetCountry = "GB" + Case "Oman" : ISO2SetCountry = "OM" End Select diff --git a/initATLASAufschubkonten/cWorker_Verwahrung.vb b/initATLASAufschubkonten/cWorker_Verwahrung.vb index 445e924..baffd5b 100644 --- a/initATLASAufschubkonten/cWorker_Verwahrung.vb +++ b/initATLASAufschubkonten/cWorker_Verwahrung.vb @@ -596,15 +596,15 @@ Anzeige: Select Case filiale Case "4803", "4809" - Standort = "VERAG AG" + Standort = Sicherheiten_Standort.VERAG_AG Case "5601" - Standort = "Unisped GmbH" + Standort = Sicherheiten_Standort.UNISPED Case "5701" - Standort = "AMBAR GmbH" + Standort = Sicherheiten_Standort.AMBAR Case "4810", "5103", "5901" - Standort = "VERAG GmbH" + Standort = Sicherheiten_Standort.VERAG_GMBH Case "5501" - Standort = "IMEX" + Standort = Sicherheiten_Standort.IMEX Case Else Return False End Select @@ -617,6 +617,11 @@ Anzeige: If SND IsNot Nothing AndAlso SND.tblSnd_Abfertigungsart_ID = 44 Then + If isZollern(SND) Then + Standort = Sicherheiten_Standort.ZOLLERN + End If + + Dim existingEntries As DataTable existingEntries = (New SQL).loadDgvBySql("Select gs_gsnr, gs_gsId, gs_posNr,gs_DK_laufnr, gs_freitext,gs_systemuser,gs_VeralteteWeitereRegistriernummer,gs_MRNNr, gs_ATBNr, gs_dakoyimport from [tblGesamtsicherheit] where [gs_ATBNr] = '" & Vorpapiernummer & "' order by gs_datum desc", "AVISO") If existingEntries.Rows.Count = 0 Then @@ -1210,9 +1215,9 @@ Anzeige: TextHTMLtable &= "" - End If + End If - TextHTMLtable &= "" + TextHTMLtable &= "" TextHTMLtable &= vbNewLine & vbNewLine & vbNewLine & "*Automatic generated e-mail*" Return TextHTMLtable @@ -1245,5 +1250,22 @@ Anzeige: End Select + End Function + + Private Shared Function isZollern(SND As cSendungen) + + Dim zollernKdnr = {772383, 712203} + + If zollernKdnr.Contains(SND.tblSnd_AbsenderKdNr) OrElse + zollernKdnr.Contains(SND.tblSnd_AuftraggeberKdNr) OrElse + (SND.tblSnd_AvisiererKdNr IsNot Nothing AndAlso zollernKdnr.Contains(SND.tblSnd_AvisiererKdNr)) OrElse + zollernKdnr.Contains(SND.tblSnd_EmpfaengerKdNr) OrElse + (SND.tblSnd_FrachtfuehrerKdNr IsNot Nothing AndAlso zollernKdnr.Contains(SND.tblSnd_FrachtfuehrerKdNr)) Then + Return True + Else + Return False + End If + + End Function End Class diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 5d26189..4596caa 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -1094,14 +1094,14 @@ Public Class frmStartOptions '========================================== sql.doSQL("Update Speditionsbuch SET [DokumentId_Steuerbeleg]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND [DokumentId_Steuerbeleg] is null", "FMZOLL") - If sendMail Then doMailZollbeleg(destFull, "STB", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN) + If sendMail AndAlso SPEDBUCH_TMP IsNot Nothing AndAlso SPEDBUCH_TMP.SendungID IsNot Nothing Then doMailZollbeleg(destFull, "STB", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN) Case "TR109", "CC029C" If DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "NCTS", SPEDBUCH_TMP) And Not sendMail Then addTODatatable(dtSPEDEintrageAusEinarbeitung_HISTORY, cDHF_Anhaenge, SPEDBUCH_TMP, datum) End If 'Versucht den SpedBucheintrag, falls noch nicht vorhanden sql.doSQL("Update Speditionsbuch SET [DokumentId_VBD]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrNCTS='" & cDHF_Anhaenge.LRN & "' AND [DokumentId_VBD] is null", "FMZOLL") ' BEREITSTELLUNG DER DATEN AN FREMDSYSTEME - If sendMail Then + If sendMail AndAlso SPEDBUCH_TMP IsNot Nothing AndAlso SPEDBUCH_TMP.SendungID IsNot Nothing Then cVERAG_out_ncts.copyFileFTP_VERAGncts_EZOLL(cDHF_Anhaenge.AnmID) doMailZollbeleg(destFull, "VBD", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN) End If @@ -1117,7 +1117,7 @@ Public Class frmStartOptions 'Zeitspanne ? 3 Tage , älter nicht senden.. If destFull <> "" AndAlso SPEDBUCH_TMP IsNot Nothing AndAlso SPEDBUCH_TMP.SendungID IsNot Nothing Then - If sendMail Then doMailZollbeleg(destFull, "ABD", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN) + If sendMail AndAlso SPEDBUCH_TMP IsNot Nothing AndAlso SPEDBUCH_TMP.SendungID IsNot Nothing Then doMailZollbeleg(destFull, "ABD", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN) End If Case Else '' --> EINFUHR --> 'Ergänzung STB - Mitteilung @@ -1125,7 +1125,7 @@ Public Class frmStartOptions addTODatatable(dtSPEDEintrageAusEinarbeitung_HISTORY, cDHF_Anhaenge, SPEDBUCH_TMP, datum) End If 'Versucht den SpedBucheintrag, falls noch nicht vorhanden sql.doSQL("Update Speditionsbuch SET DokumentId_Mitteilung='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND DokumentId_Mitteilung is null", "FMZOLL") - If sendMail Then doMailZollbeleg(destFull, "STB", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN) + If sendMail AndAlso SPEDBUCH_TMP IsNot Nothing AndAlso SPEDBUCH_TMP.SendungID IsNot Nothing Then doMailZollbeleg(destFull, "STB", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN) End Select @@ -1144,7 +1144,7 @@ Public Class frmStartOptions sql.doSQL("Update Speditionsbuch SET [DokumentId_AVM]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrAES='" & cDHF_Anhaenge.LRN & "' AND DokumentId_AVM is null", "FMZOLL") If destFull <> "" AndAlso SPEDBUCH_TMP IsNot Nothing AndAlso SPEDBUCH_TMP.SendungID IsNot Nothing Then - If sendMail Then doMailZollbeleg(destFull, "AVM", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN) + If sendMail AndAlso SPEDBUCH_TMP IsNot Nothing AndAlso SPEDBUCH_TMP.SendungID IsNot Nothing Then doMailZollbeleg(destFull, "AVM", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN) End If End Select