neu

2020-09-23 07:22:38 +02:00
parent 41b13fe4b0
commit f5248e4a51
31 changed files with 2776 additions and 141 deletions
--- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
@@ -1149,6 +1149,7 @@ Partial Class frmMitarbDetails
        '
        'picFoto
        '
+        Me.picFoto.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.picFoto.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
        Me.picFoto.Cursor = System.Windows.Forms.Cursors.Hand
        Me.picFoto.Location = New System.Drawing.Point(523, 12)
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -57,6 +57,7 @@
        cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
        cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))
        cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FRONTOFFICE"))
+        cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERIMEX", "VERIMEX"))
        cboDPFirma2.Items.Clear()
        cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
        cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "ALLE"))
@@ -66,6 +67,7 @@
        cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
        cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))
        cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FRONTOFFICE"))
+        cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERIMEX", "VERIMEX"))


        cboALIASDomain.Items.Clear()
@@ -95,6 +97,7 @@
        cboFirma.Items.Add("UNISPED")
        cboFirma.Items.Add("AMBAR")
        cboFirma.Items.Add("FRONTOFFICE")
+        cboFirma.Items.Add("VERIMEX")
        cboFirma.Items.Add("ALLE")


@@ -105,6 +108,7 @@
        cboFirmaHaupt.Items.Add("UNISPED")
        cboFirmaHaupt.Items.Add("AMBAR")
        cboFirmaHaupt.Items.Add("FRONTOFFICE")
+        cboFirmaHaupt.Items.Add("VERIMEX")


        ZOLLDATENBEARB = False
@@ -283,10 +287,15 @@
        Else
            cbxEinsteigsDat.Checked = True : datEinstiegsdatum.Text = mitarbeiter.mit_einstiegsdatum
        End If
-        If mitarbeiter.mit_kuendigungsdatum = "" Then
-            cbxGekuendigt.Checked = False
+
+
+        If mitarbeiter.mit_gekuendigt Then
+            cbxGekuendigt.Checked = True
+            If mitarbeiter.mit_kuendigungsdatum <> "" Then
+                datGekuendigtAm.Text = mitarbeiter.mit_kuendigungsdatum
+            End If
        Else
-            cbxGekuendigt.Checked = True : datGekuendigtAm.Text = mitarbeiter.mit_kuendigungsdatum
+            cbxGekuendigt.Checked = False
        End If

        If mitarbeiter.mit_FMZollPersID > 0 Then
@@ -313,10 +322,23 @@

        cbxTestaccount.Checked = If(mitarbeiter.mit_TESTonly, False)

-        picFoto.ImageLocation = mitarbeiter.mit_foto
+        initFoto()
+        ' picFoto.ImageLocation = mitarbeiter.mit_foto
    End Sub

-
+    Sub initFoto()
+        If mitarbeiter.mit_foto_DocId IsNot Nothing Then
+            Try
+                picFoto.BackgroundImage = Image.FromFile(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(mitarbeiter.mit_foto_DocId))
+            Catch ex As Exception
+                picFoto.BackgroundImage = My.Resources.personGray_m
+            End Try
+        ElseIf mitarbeiter.mit_geschlecht = "w" Then
+            picFoto.BackgroundImage = My.Resources.personGray_w
+        Else
+            picFoto.BackgroundImage = My.Resources.personGray_m
+        End If
+    End Sub
    Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click
        Me.Close()
    End Sub
@@ -560,7 +582,8 @@
        If cbxEinsteigsDat.Checked Then mitarbeiter.mit_einstiegsdatum = datEinstiegsdatum.Text Else mitarbeiter.mit_einstiegsdatum = ""
        mitarbeiter.mit_gekuendigt = cbxGekuendigt.Checked
        If cbxGekuendigt.Checked Then mitarbeiter.mit_kuendigungsdatum = datGekuendigtAm.Text Else mitarbeiter.mit_kuendigungsdatum = ""
-        If picFoto.ImageLocation <> "" Then mitarbeiter.mit_foto = picFoto.ImageLocation
+        'If picFoto.ImageLocation <> "" Then mitarbeiter.mit_foto = picFoto.ImageLocation
+        initFoto()
        mitarbeiter.mit_TESTonly = cbxTestaccount.Checked

    End Sub
@@ -570,6 +593,31 @@
    End Sub

    Private Sub PictureBox2_Click(sender As Object, e As EventArgs) Handles picFoto.Click
+        Dim fd2 As Windows.Forms.OpenFileDialog = New Windows.Forms.OpenFileDialog()
+
+        fd2.Title = "Bild auswählen"
+        '   fd.InitialDirectory = "F:\PROGRAMME\ADMIN_DATA\Fotos_Mitarbeiter\"
+        fd2.Filter = "Image Files(*.BMP;*.JPG;*.GIF;*.PNG)|*.BMP;*.JPG;*.GIF;*.PNG"
+        fd2.FilterIndex = 2
+        fd2.RestoreDirectory = True
+
+        If fd2.ShowDialog() = DialogResult.OK AndAlso fd2.FileName <> "" Then
+
+            Dim Extension = New IO.FileInfo(fd2.FileName).Extension
+            Dim docId = -1
+            If saveToDS(Extension, fd2.FileName, docId) Then
+
+                mitarbeiter.mit_foto_DocId = docId
+                Try
+                    picFoto.BackgroundImage = Image.FromFile(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(mitarbeiter.mit_foto_DocId))
+                Catch ex As Exception
+                    MsgBox(ex.Message & ex.StackTrace)
+                End Try
+            End If
+        End If
+        Exit Sub
+
+
        Dim fd As OpenFileDialog = New OpenFileDialog()
        Dim strFileName As String

@@ -600,6 +648,24 @@
        End If
    End Sub

+    Public Function saveToDS(Extension, sourcePath, Optional ByRef da_id = -1) As Boolean
+
+        Dim DS As VERAG_PROG_ALLGEMEIN.cDATENSERVER = Nothing
+        If da_id > 0 Then
+            DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER(da_id)
+        Else
+            DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MITARBEITER", "PERSONAL_FOTOS", "", "", mitarbeiter.mit_nname & "_" & mitarbeiter.mit_id & Extension, -1, False)
+        End If
+
+        ' Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MITARBEITER", "PERSONAL_FOTOS", "", "", MA.mit_nname & "_" & MA.mit_id, -1, False)
+        '   MsgBox(DS.da_id)
+        If Not DS.uploadDataToDATENSERVER(sourcePath,,, False,, False) Then MsgBox("Fehler beim Speichern: Datenserver!") : Return False
+        If DS.da_id <= 0 Then MsgBox("Keine DocId!") : Return False
+        da_id = DS.da_id
+        ' destPath = DS.GET_TOP1_PATH
+        Return True
+    End Function
+
    Private Function cut_file(ByVal file As String) As String ' Funktion zum Entfernen der Backslashs / Ordner While file.Contains("\") file = file.Remove(0, 1) End While Return file End Function 
        While file.Contains("\")
            file = file.Remove(0, 1)
--- a/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb
+++ b/UID/Mitarbeiter/usrCntlMitarbeiter.Designer.vb
@@ -39,6 +39,8 @@ Partial Class usrCntlMitarbeiter
        Me.dgvUNISPED = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.TabPage5 = New System.Windows.Forms.TabPage()
        Me.dgvAMBAR = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.TabPage6 = New System.Windows.Forms.TabPage()
+        Me.dgvFRONTOFFICE = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.cbx = New System.Windows.Forms.CheckBox()
        Me.txtSuche = New System.Windows.Forms.TextBox()
@@ -46,8 +48,8 @@ Partial Class usrCntlMitarbeiter
        Me.Button2 = New System.Windows.Forms.Button()
        Me.Label1 = New System.Windows.Forms.Label()
        Me.Panel3 = New System.Windows.Forms.Panel()
-        Me.TabPage6 = New System.Windows.Forms.TabPage()
-        Me.dgvFRONTOFFICE = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.TabPage7 = New System.Windows.Forms.TabPage()
+        Me.dgvVERIMEX = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Panel2.SuspendLayout()
        Me.TabControl1.SuspendLayout()
        Me.TabPage1.SuspendLayout()
@@ -60,10 +62,12 @@ Partial Class usrCntlMitarbeiter
        CType(Me.dgvUNISPED, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.TabPage5.SuspendLayout()
        CType(Me.dgvAMBAR, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.Panel1.SuspendLayout()
-        Me.Panel3.SuspendLayout()
        Me.TabPage6.SuspendLayout()
        CType(Me.dgvFRONTOFFICE, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Panel1.SuspendLayout()
+        Me.Panel3.SuspendLayout()
+        Me.TabPage7.SuspendLayout()
+        CType(Me.dgvVERIMEX, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'Button6
@@ -131,6 +135,7 @@ Partial Class usrCntlMitarbeiter
        Me.TabControl1.Controls.Add(Me.TabPage4)
        Me.TabControl1.Controls.Add(Me.TabPage5)
        Me.TabControl1.Controls.Add(Me.TabPage6)
+        Me.TabControl1.Controls.Add(Me.TabPage7)
        Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.TabControl1.Location = New System.Drawing.Point(0, 0)
        Me.TabControl1.Name = "TabControl1"
@@ -243,6 +248,27 @@ Partial Class usrCntlMitarbeiter
        Me.dgvAMBAR.Size = New System.Drawing.Size(875, 616)
        Me.dgvAMBAR.TabIndex = 25
        '
+        'TabPage6
+        '
+        Me.TabPage6.Controls.Add(Me.dgvFRONTOFFICE)
+        Me.TabPage6.Location = New System.Drawing.Point(4, 22)
+        Me.TabPage6.Name = "TabPage6"
+        Me.TabPage6.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabPage6.Size = New System.Drawing.Size(881, 622)
+        Me.TabPage6.TabIndex = 5
+        Me.TabPage6.Text = "FRONT-OFFICE"
+        Me.TabPage6.UseVisualStyleBackColor = True
+        '
+        'dgvFRONTOFFICE
+        '
+        Me.dgvFRONTOFFICE.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvFRONTOFFICE.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvFRONTOFFICE.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.dgvFRONTOFFICE.Location = New System.Drawing.Point(3, 3)
+        Me.dgvFRONTOFFICE.Name = "dgvFRONTOFFICE"
+        Me.dgvFRONTOFFICE.Size = New System.Drawing.Size(875, 616)
+        Me.dgvFRONTOFFICE.TabIndex = 26
+        '
        'Panel1
        '
        Me.Panel1.Controls.Add(Me.cbx)
@@ -310,26 +336,26 @@ Partial Class usrCntlMitarbeiter
        Me.Panel3.Size = New System.Drawing.Size(889, 648)
        Me.Panel3.TabIndex = 27
        '
-        'TabPage6
+        'TabPage7
        '
-        Me.TabPage6.Controls.Add(Me.dgvFRONTOFFICE)
-        Me.TabPage6.Location = New System.Drawing.Point(4, 22)
-        Me.TabPage6.Name = "TabPage6"
-        Me.TabPage6.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage6.Size = New System.Drawing.Size(881, 622)
-        Me.TabPage6.TabIndex = 5
-        Me.TabPage6.Text = "FRONT-OFFICE"
-        Me.TabPage6.UseVisualStyleBackColor = True
+        Me.TabPage7.Controls.Add(Me.dgvVERIMEX)
+        Me.TabPage7.Location = New System.Drawing.Point(4, 22)
+        Me.TabPage7.Name = "TabPage7"
+        Me.TabPage7.Padding = New System.Windows.Forms.Padding(3)
+        Me.TabPage7.Size = New System.Drawing.Size(881, 622)
+        Me.TabPage7.TabIndex = 6
+        Me.TabPage7.Text = "VERIMEX"
+        Me.TabPage7.UseVisualStyleBackColor = True
        '
-        'dgvFRONTOFFICE
+        'dgvVERIMEX
        '
-        Me.dgvFRONTOFFICE.AKTUALISIERUNGS_INTERVALL = -1
-        Me.dgvFRONTOFFICE.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvFRONTOFFICE.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.dgvFRONTOFFICE.Location = New System.Drawing.Point(3, 3)
-        Me.dgvFRONTOFFICE.Name = "dgvFRONTOFFICE"
-        Me.dgvFRONTOFFICE.Size = New System.Drawing.Size(875, 616)
-        Me.dgvFRONTOFFICE.TabIndex = 26
+        Me.dgvVERIMEX.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvVERIMEX.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvVERIMEX.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.dgvVERIMEX.Location = New System.Drawing.Point(3, 3)
+        Me.dgvVERIMEX.Name = "dgvVERIMEX"
+        Me.dgvVERIMEX.Size = New System.Drawing.Size(875, 616)
+        Me.dgvVERIMEX.TabIndex = 27
        '
        'usrCntlMitarbeiter
        '
@@ -353,11 +379,13 @@ Partial Class usrCntlMitarbeiter
        CType(Me.dgvUNISPED, System.ComponentModel.ISupportInitialize).EndInit()
        Me.TabPage5.ResumeLayout(False)
        CType(Me.dgvAMBAR, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.TabPage6.ResumeLayout(False)
+        CType(Me.dgvFRONTOFFICE, System.ComponentModel.ISupportInitialize).EndInit()
        Me.Panel1.ResumeLayout(False)
        Me.Panel1.PerformLayout()
        Me.Panel3.ResumeLayout(False)
-        Me.TabPage6.ResumeLayout(False)
-        CType(Me.dgvFRONTOFFICE, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.TabPage7.ResumeLayout(False)
+        CType(Me.dgvVERIMEX, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)

    End Sub
@@ -386,4 +414,6 @@ Partial Class usrCntlMitarbeiter
    Friend WithEvents dgvAMBAR As VERAG_PROG_ALLGEMEIN.MyDatagridview
    Friend WithEvents TabPage6 As TabPage
    Friend WithEvents dgvFRONTOFFICE As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents TabPage7 As TabPage
+    Friend WithEvents dgvVERIMEX As VERAG_PROG_ALLGEMEIN.MyDatagridview
 End Class
--- a/UID/Mitarbeiter/usrCntlMitarbeiter.vb
+++ b/UID/Mitarbeiter/usrCntlMitarbeiter.vb
@@ -39,6 +39,8 @@ Public Class usrCntlMitarbeiter
            showVERAGATILLA("AMBAR")
        ElseIf TabControl1.SelectedIndex = 5 Then
            showVERAGATILLA("FRONTOFFICE")
+        ElseIf TabControl1.SelectedIndex = 6 Then
+            showVERAGATILLA("VERIMEX")
        End If
    End Sub

@@ -147,14 +149,31 @@ Public Class usrCntlMitarbeiter
                dgvFRONTOFFICE.DataSource = Nothing
            Else
                sortDGV(dgvFRONTOFFICE)
-            'Eintraege_festlegen()
-            'AL: Sortierung nach Ausfahrt (Zeit)
-            dgvFRONTOFFICE.Sort(dgvFRONTOFFICE.Columns(3), ListSortDirection.Ascending)
+                'Eintraege_festlegen()
+                'AL: Sortierung nach Ausfahrt (Zeit)
+                dgvFRONTOFFICE.Sort(dgvFRONTOFFICE.Columns(3), ListSortDirection.Ascending)
+
+            End If
+
+
+        ElseIf firma = "VERIMEX" Then
+            ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql)
+
+            dgvVERIMEX.SET_SQL(sql, "ADMIN")
+            dgvVERIMEX.LOAD()
+
+            'Tabelle Kommt/Geht bereinigen
+            If dgvVERIMEX.RowCount = 0 Then
+                dgvVERIMEX.DataSource = Nothing
+            Else
+                sortDGV(dgvVERIMEX)
+                'Eintraege_festlegen()
+                'AL: Sortierung nach Ausfahrt (Zeit)
+                dgvVERIMEX.Sort(dgvVERIMEX.Columns(3), ListSortDirection.Ascending)

            End If
        End If

-
    End Sub


@@ -213,6 +232,7 @@ Public Class usrCntlMitarbeiter
            Case 3 : Firma = "UNISPED"
            Case 4 : Firma = "AMBAR"
            Case 5 : Firma = "FRONTOFFICE"
+            Case 6 : Firma = "VERIMEX"
        End Select
        Dim frmMitarbDetails As New frmMitarbDetails(Firma)
        frmMitarbDetails.Show()
@@ -275,6 +295,14 @@ Public Class usrCntlMitarbeiter
                    Tabelle_anzeigen()
                Case vbNo

+            End Select
+        ElseIf TabControl1.SelectedIndex = 5 Then
+            Select Case MsgBox("Soll der Mitarbeiter '" & dgvVERIMEX.CurrentRow.Cells(1).Value & "' wirklich gelöscht werden?", vbQuestion Or vbYesNo Or vbDefaultButton2, "Löschen?")
+                Case vbYes
+                    UID.delData(Convert.ToInt32(dgvVERIMEX.CurrentRow.Cells(0).Value))
+                    Tabelle_anzeigen()
+                Case vbNo
+
            End Select
        End If

@@ -295,7 +323,7 @@ Public Class usrCntlMitarbeiter



-    Private Sub dgvIMEX_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvIMEX.CellDoubleClick, dgvUNISPED.CellDoubleClick, dgvAMBAR.CellDoubleClick, dgvVERAG.CellDoubleClick, dgvATILLA.CellDoubleClick, dgvFRONTOFFICE.CellDoubleClick
+    Private Sub dgvIMEX_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvIMEX.CellDoubleClick, dgvUNISPED.CellDoubleClick, dgvAMBAR.CellDoubleClick, dgvVERAG.CellDoubleClick, dgvATILLA.CellDoubleClick, dgvFRONTOFFICE.CellDoubleClick, dgvVERIMEX.CellDoubleClick
        Me.Cursor = Cursors.WaitCursor
        Dim frmMitarbDetails As New frmMitarbDetails
        frmMitarbDetails.mid = sender.CurrentRow.Cells(0).Value
@@ -324,6 +352,7 @@ Public Class usrCntlMitarbeiter
            Case 3 : dgv = dgvUNISPED
            Case 4 : dgv = dgvAMBAR
            Case 5 : dgv = dgvFRONTOFFICE
+            Case 6 : dgv = dgvVERIMEX
        End Select

        If e.KeyCode = Keys.Return Then