Compare commits

..

4 Commits

12 changed files with 311 additions and 96 deletions

View File

@@ -1113,6 +1113,7 @@
<None Include="Resources\ok.png" />
<None Include="Resources\fragezeichen.png" />
<None Include="Resources\sdl_ico2.ico" />
<None Include="Resources\email_big1.png" />
<Content Include="uid.ico" />
</ItemGroup>
<ItemGroup>

View File

@@ -85,6 +85,7 @@ Partial Class frmMitarbDetails
Me.clInterneMailBenachrichtigungen = New System.Windows.Forms.CheckedListBox()
Me.Label4 = New System.Windows.Forms.Label()
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
Me.PictureBox9 = New System.Windows.Forms.PictureBox()
Me.cboFunktion = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label63 = New System.Windows.Forms.Label()
Me.txtTelNr = New System.Windows.Forms.TextBox()
@@ -248,6 +249,7 @@ Partial Class frmMitarbDetails
Me.TabPage6 = New System.Windows.Forms.TabPage()
Me.Panel2 = New System.Windows.Forms.Panel()
Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.Label74 = New System.Windows.Forms.Label()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
Me.TabControl2.SuspendLayout()
@@ -261,6 +263,7 @@ Partial Class frmMitarbDetails
CType(Me.dgvUserParameter, System.ComponentModel.ISupportInitialize).BeginInit()
Me.tabBenachrichtigungen.SuspendLayout()
Me.GroupBox2.SuspendLayout()
CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit()
Me.GroupBox1.SuspendLayout()
CType(Me.picFoto, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPage3.SuspendLayout()
@@ -964,6 +967,8 @@ Partial Class frmMitarbDetails
'
'GroupBox2
'
Me.GroupBox2.Controls.Add(Me.Label74)
Me.GroupBox2.Controls.Add(Me.PictureBox9)
Me.GroupBox2.Controls.Add(Me.cboFunktion)
Me.GroupBox2.Controls.Add(Me.Label63)
Me.GroupBox2.Controls.Add(Me.txtTelNr)
@@ -1018,6 +1023,16 @@ Partial Class frmMitarbDetails
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Firmendaten"
'
'PictureBox9
'
Me.PictureBox9.BackgroundImage = Global.ADMIN.My.Resources.Resources.email_big1
Me.PictureBox9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.PictureBox9.Location = New System.Drawing.Point(660, 250)
Me.PictureBox9.Name = "PictureBox9"
Me.PictureBox9.Size = New System.Drawing.Size(43, 29)
Me.PictureBox9.TabIndex = 116
Me.PictureBox9.TabStop = False
'
'cboFunktion
'
Me.cboFunktion._allowedValuesFreiText = Nothing
@@ -2785,6 +2800,16 @@ Partial Class frmMitarbDetails
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
'
'Label74
'
Me.Label74.AutoSize = True
Me.Label74.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label74.Location = New System.Drawing.Point(575, 250)
Me.Label74.Name = "Label74"
Me.Label74.Size = New System.Drawing.Size(79, 13)
Me.Label74.TabIndex = 117
Me.Label74.Text = "Zugangsdaten:"
'
'frmMitarbDetails
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2819,6 +2844,7 @@ Partial Class frmMitarbDetails
Me.tabBenachrichtigungen.PerformLayout()
Me.GroupBox2.ResumeLayout(False)
Me.GroupBox2.PerformLayout()
CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit()
Me.GroupBox1.ResumeLayout(False)
Me.GroupBox1.PerformLayout()
CType(Me.picFoto, System.ComponentModel.ISupportInitialize).EndInit()
@@ -3063,4 +3089,6 @@ Partial Class frmMitarbDetails
Friend WithEvents Panel2 As Panel
Friend WithEvents Label73 As Label
Friend WithEvents txtTimasID As TextBox
Friend WithEvents PictureBox9 As PictureBox
Friend WithEvents Label74 As Label
End Class

View File

@@ -1,5 +1,6 @@

Imports System.Text.RegularExpressions
Imports System.Windows.Forms.VisualStyles.VisualStyleElement
Imports VERAG_PROG_ALLGEMEIN
Public Class frmMitarbDetails
@@ -954,7 +955,34 @@ Public Class frmMitarbDetails
End Sub
Private Sub cbxGekuendigt_CheckedChanged(sender As Object, e As EventArgs) Handles cbxGekuendigt.CheckedChanged
datGekuendigtAm.Enabled = cbxGekuendigt.Checked
If cbxGekuendigt.Checked AndAlso Not mitarbeiter.mit_gekuendigt Then
If vbYes = MsgBox("Möchten Sie den Mitarbeiter deaktivieren? " & vbNewLine & "Es wird automatisch ein Ticket zu Deaktivierung des Accounts erstellt.", vbYesNo) Then
Dim f As New frmDatumsabfrage("Austrittsdatum ", False)
f.ShowDialog()
If f.DialogResult = DialogResult.OK Then
datGekuendigtAm.Value = f.dtp_date.Value
Dim Mailtext As String = "Folgender Mitarbeiter verlässt mit " & datGekuendigtAm.Value.ToShortDateString & " das Unternehmen " & mitarbeiter.mit_firma & ": " & mitarbeiter.mit_vname & " " & mitarbeiter.mit_nname & vbNewLine & "Bitte alle zugehörigen Accounts deaktivieren!"
Dim empfaenger = VERAG_PROG_ALLGEMEIN.cMitarbeiter.GetEMailRecipientForEmailNotification("Mitarbeiter-Austritt")
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("support@verag.ag", "Austritt Mitarbeiter " & mitarbeiter.mit_vname & " " & mitarbeiter.mit_nname & " (" & mitarbeiter.mit_firma & ")", Mailtext,, True,, empfaenger)
'datGekuendigtAm.Enabled = cbxGekuendigt.Checked
btnOK.PerformClick()
End If
End If
Else
'datGekuendigtAm.Enabled = cbxGekuendigt.Checked
End If
End Sub
@@ -1627,19 +1655,21 @@ Public Class frmMitarbDetails
' Sicherheitsprüfungen
If tageProWoche <= 0 Then Return 0
If urlaubInStunden AndAlso wochenstunden <= 0 Then Return 0
Dim anspruch As Double = 0
Dim anspruch As Double
If Not urlaubInStunden Then
' Urlaub in Tagen
' 5 Wochen Urlaub in Tagen
anspruch = 5 * tageProWoche
Else
' Urlaub in Stunden: durchschnittliche Tagesarbeitszeit * 5
anspruch = (wochenstunden / tageProWoche) * 5
If wochenstunden <= 0 Then Return 0
' 5 Wochen Urlaub in Stunden
anspruch = wochenstunden * 5
End If
Return Math.Round(anspruch, 2, MidpointRounding.AwayFromZero)
End Function
Private Sub TabControl2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl2.SelectedIndexChanged
@@ -1908,6 +1938,93 @@ Public Class frmMitarbDetails
Next
End Sub
Private Sub PictureBox9_Click(sender As Object, e As EventArgs) Handles PictureBox9.Click
If Not cbxGekuendigt.Checked AndAlso Not mitarbeiter.mit_gekuendigt Then
' Dim empfaenger = VERAG_PROG_ALLGEMEIN.cMitarbeiter.GetEMailRecipientForEmailNotification("Mitarbeiter-Eintritt")
Dim betreff As String = "Start Mitarbeiter " & mitarbeiter.mit_vname & " " & mitarbeiter.mit_nname & " (" & mitarbeiter.mit_firma.ToString.Replace("ALL", "VERAG") & ")"
Dim TextHTMLtable As String = ""
TextHTMLtable &= "Hallo " & mitarbeiter.mit_vname & "!" & "<br><br>Herzlich Willkommen bei " & mitarbeiter.mit_firma.ToString.Replace("ALL", "VERAG") & ".<br><br>"
TextHTMLtable &= "Um dir den Start so einfach wie möglich zu machen, findest du alle relevanten Informationen zum Unternehmen hier: <a href=""https://wiki.verag.ag"">WIKI</a>"
TextHTMLtable &= "<br><br>Die Zugangsdaten für deine benötigten Programme/Systeme lauten wie folgt:<br><br>"
TextHTMLtable &= "<table border=1>"
TextHTMLtable &= "<tr><td>Programm</td><td>Info</td><td>User</td><td>Passwort</td></tr>"
If mitarbeiter.mit_AliasAD_Username IsNot Nothing AndAlso mitarbeiter.mit_AliasAD_Username <> "" Then
TextHTMLtable &= "<tr>"
TextHTMLtable &= "<td><b>" & "Windows" & "</b></td>"
TextHTMLtable &= "<td><b>" & "PC-Zugangsdaten" & "</b></td>"
TextHTMLtable &= "<td><b>" & mitarbeiter.mit_AliasAD_Username & "</b></td>"
TextHTMLtable &= "<td><b>" & mitarbeiter.mit_pwd & "</b></td>"
TextHTMLtable &= "</tr>"
End If
If mitarbeiter.mit_username <> "" AndAlso mitarbeiter.mit_pwd <> "" Then
TextHTMLtable &= "<tr>"
TextHTMLtable &= "<td><b>" & "AVISO/SDL" & "</b></td>"
TextHTMLtable &= "<td><b>" & "ERP-System" & "</b></td>"
TextHTMLtable &= "<td><b>" & mitarbeiter.mit_username & "</b></td>"
TextHTMLtable &= "<td><b>" & mitarbeiter.mit_pwd & "</b></td>"
TextHTMLtable &= "</tr>"
End If
If mitarbeiter.mit_timasId IsNot Nothing AndAlso IsNumeric(mitarbeiter.mit_timasId) Then
TextHTMLtable &= "<tr>"
TextHTMLtable &= "<td><b>" & "TIMAS" & "</b></td>"
TextHTMLtable &= "<td><b>" & "Zeiterfassung" & "</b></td>"
TextHTMLtable &= "<td><b>" & mitarbeiter.mit_username & "</b></td>"
TextHTMLtable &= "<td><b>" & mitarbeiter.mit_pwd & "</b></td>"
TextHTMLtable &= "</tr>"
End If
If mitarbeiter.mit_DAKOSY_SB IsNot Nothing AndAlso mitarbeiter.mit_DAKOSY_SB <> "" Then
TextHTMLtable &= "<tr>"
TextHTMLtable &= "<td><b>" & "DAKOSY" & "</b></td>"
TextHTMLtable &= "<td><b>" & "ZOLL-DE" & "</b></td>"
TextHTMLtable &= "<td><b>" & mitarbeiter.mit_DAKOSY_SB & "</b></td>"
TextHTMLtable &= "<td><b>" & mitarbeiter.mit_pwd & "</b></td>"
TextHTMLtable &= "</tr>"
End If
If mitarbeiter.mit_EZOLL_SB IsNot Nothing AndAlso mitarbeiter.mit_EZOLL_SB > 0 Then
TextHTMLtable &= "<tr>"
TextHTMLtable &= "<td><b>" & "EZOLL" & "</b></td>"
TextHTMLtable &= "<td><b>" & "ZOLL-AT" & "</b></td>"
TextHTMLtable &= "<td><b>" & mitarbeiter.mit_EZOLL_SB & "</b></td>"
TextHTMLtable &= "<td><b>" & mitarbeiter.mit_pwd & "</b></td>"
TextHTMLtable &= "</tr>"
End If
If mitarbeiter.mit_CSuser IsNot Nothing AndAlso mitarbeiter.mit_CSuser <> "" Then
TextHTMLtable &= "<tr>"
TextHTMLtable &= "<td><b>" & "Creditsafe" & "</b></td>"
TextHTMLtable &= "<td><b>" & "Bonitätsprüfungstool" & "</b></td>"
TextHTMLtable &= "<td><b>" & mitarbeiter.mit_CSuser & "</b></td>"
TextHTMLtable &= "<td><b>" & mitarbeiter.mit_CSpwd & "</b></td>"
TextHTMLtable &= "</tr>"
End If
TextHTMLtable &= "</table>"
VERAG_PROG_ALLGEMEIN.cProgramFunctions.createMail("", betreff, TextHTMLtable)
End If
End Sub
End Class

View File

@@ -48,6 +48,7 @@ Partial Class usrCntlMitarbeiter
Me.TabPage9 = New System.Windows.Forms.TabPage()
Me.dgvDURMAZ = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.TabPage8 = New System.Windows.Forms.TabPage()
Me.lbl_Mitarbeiter_export = New System.Windows.Forms.Label()
Me.pbMitarbeiter_export = New System.Windows.Forms.ProgressBar()
Me.cbxTimasAktiv = New System.Windows.Forms.CheckBox()
Me.lblTimasMandant = New System.Windows.Forms.Label()
@@ -67,7 +68,6 @@ Partial Class usrCntlMitarbeiter
Me.UserKopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.BerechtigungenSetzenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.lbl_Mitarbeiter_export = New System.Windows.Forms.Label()
Me.Panel2.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPage1.SuspendLayout()
@@ -371,6 +371,15 @@ Partial Class usrCntlMitarbeiter
Me.TabPage8.Text = "Zeiterfassung"
Me.TabPage8.UseVisualStyleBackColor = True
'
'lbl_Mitarbeiter_export
'
Me.lbl_Mitarbeiter_export.AutoSize = True
Me.lbl_Mitarbeiter_export.Location = New System.Drawing.Point(679, 8)
Me.lbl_Mitarbeiter_export.Name = "lbl_Mitarbeiter_export"
Me.lbl_Mitarbeiter_export.Size = New System.Drawing.Size(30, 13)
Me.lbl_Mitarbeiter_export.TabIndex = 54
Me.lbl_Mitarbeiter_export.Text = "0 / 0"
'
'pbMitarbeiter_export
'
Me.pbMitarbeiter_export.Location = New System.Drawing.Point(556, 3)
@@ -532,7 +541,7 @@ Partial Class usrCntlMitarbeiter
'
Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.UserKopierenToolStripMenuItem, Me.BerechtigungenSetzenToolStripMenuItem})
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
Me.ContextMenuStrip1.Size = New System.Drawing.Size(195, 48)
Me.ContextMenuStrip1.Size = New System.Drawing.Size(195, 70)
'
'UserKopierenToolStripMenuItem
'
@@ -551,15 +560,6 @@ Partial Class usrCntlMitarbeiter
Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
'
'lbl_Mitarbeiter_export
'
Me.lbl_Mitarbeiter_export.AutoSize = True
Me.lbl_Mitarbeiter_export.Location = New System.Drawing.Point(679, 8)
Me.lbl_Mitarbeiter_export.Name = "lbl_Mitarbeiter_export"
Me.lbl_Mitarbeiter_export.Size = New System.Drawing.Size(30, 13)
Me.lbl_Mitarbeiter_export.TabIndex = 54
Me.lbl_Mitarbeiter_export.Text = "0 / 0"
'
'usrCntlMitarbeiter
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

View File

@@ -1435,5 +1435,7 @@ Public Class usrCntlMitarbeiter
End Sub
Private Sub MailMitZugangsdatenToolStripMenuItem_Click(sender As Object, e As EventArgs)
End Sub
End Class

View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.2.6.5")>
<Assembly: AssemblyFileVersion("1.2.6.5")>
<Assembly: AssemblyVersion("1.2.6.7")>
<Assembly: AssemblyFileVersion("1.2.6.7")>

View File

@@ -343,6 +343,16 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property email_big1() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("email_big1", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>

View File

@@ -145,6 +145,9 @@
<data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="UpdaterVersion" xml:space="preserve">
<value>4.0</value>
</data>
<data name="refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -157,30 +160,39 @@
<data name="dispo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dispo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="reise" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\reise.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="refresh1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\refresh1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="admin_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\admin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="refresh1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\refresh1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="uhr_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\uhr_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="MDM_IT_Verguetung" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\MDM_IT_Verguetung.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="personGray_m" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\personGray_m.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="dispo_ico" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dispo_ico1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="connStringFMZOLL_NEW" xml:space="preserve">
<value>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</value>
</data>
<data name="MDM_AI_Verguetung" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\MDM_AI_Verguetung.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="cmr_logo_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cmr-logo_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Verag_Academy_blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Verag-Academy_blue.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="kalender" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\kalender.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="fd" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fd.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -196,8 +208,11 @@
<data name="admin1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\admin1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="kalender" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\kalender.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="sdl_ico1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sdl_ico2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="reise" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\reise.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -271,8 +286,8 @@
<data name="gear1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\gear1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="UpdaterVersion" xml:space="preserve">
<value>4.0</value>
<data name="chain" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\chain.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="printer" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\printer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -286,9 +301,6 @@
<data name="connStringAdmin" xml:space="preserve">
<value>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</value>
</data>
<data name="chain" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\chain.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="uid" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\uid.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -313,16 +325,7 @@
<data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sdl_ico1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sdl_ico2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="MDM_AI_Verguetung" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\MDM_AI_Verguetung.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="MDM_IT_Verguetung" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\MDM_IT_Verguetung.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="connStringFMZOLL_NEW" xml:space="preserve">
<value>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=VERAG;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</value>
<data name="email_big1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

Binary file not shown.

After

Width:  |  Height:  |  Size: 239 KiB

View File

@@ -33,6 +33,7 @@ Partial Class frmMain
Me.TableAdapterManager1 = New ADMIN.DataSetBerechtigungenTableAdapters.TableAdapterManager()
Me.pnlMain = New System.Windows.Forms.Panel()
Me.Panel3 = New System.Windows.Forms.Panel()
Me.btnFirm = New System.Windows.Forms.Button()
Me.btnInterneBenachrichtigungen = New System.Windows.Forms.Button()
Me.lblVersion = New System.Windows.Forms.Label()
Me.btnAuditFlow = New System.Windows.Forms.Button()
@@ -52,7 +53,6 @@ Partial Class frmMain
Me.btnMitarbeiter = New System.Windows.Forms.Button()
Me.Panel2 = New System.Windows.Forms.Panel()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.btnFirm = New System.Windows.Forms.Button()
Me.Panel3.SuspendLayout()
Me.Panel2.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -137,6 +137,18 @@ Partial Class frmMain
Me.Panel3.Size = New System.Drawing.Size(137, 801)
Me.Panel3.TabIndex = 32
'
'btnFirm
'
Me.btnFirm.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnFirm.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnFirm.Location = New System.Drawing.Point(12, 76)
Me.btnFirm.Name = "btnFirm"
Me.btnFirm.Size = New System.Drawing.Size(94, 33)
Me.btnFirm.TabIndex = 47
Me.btnFirm.Text = "Firmen"
Me.btnFirm.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnFirm.UseVisualStyleBackColor = True
'
'btnInterneBenachrichtigungen
'
Me.btnInterneBenachrichtigungen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -265,6 +277,7 @@ Partial Class frmMain
Me.btnUpdate.Size = New System.Drawing.Size(94, 34)
Me.btnUpdate.TabIndex = 37
Me.btnUpdate.Text = "Update"
Me.btnUpdate.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnUpdate.UseVisualStyleBackColor = True
'
'btnSchulungen
@@ -358,18 +371,6 @@ Partial Class frmMain
Me.PictureBox1.TabIndex = 31
Me.PictureBox1.TabStop = False
'
'btnFirm
'
Me.btnFirm.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnFirm.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnFirm.Location = New System.Drawing.Point(12, 76)
Me.btnFirm.Name = "btnFirm"
Me.btnFirm.Size = New System.Drawing.Size(94, 33)
Me.btnFirm.TabIndex = 47
Me.btnFirm.Text = "Firmen"
Me.btnFirm.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnFirm.UseVisualStyleBackColor = True
'
'frmMain
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

View File

@@ -26,6 +26,8 @@ Partial Class usrCntlDatenarchiv
Me.SplitContainer = New System.Windows.Forms.SplitContainer()
Me.pnlSearch = New System.Windows.Forms.Panel()
Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
Me.lblfehlendeDokumente = New System.Windows.Forms.Label()
Me.Button1 = New System.Windows.Forms.Button()
Me.cbxTestsystem = New System.Windows.Forms.CheckBox()
Me.cboPartnersystem = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label8 = New System.Windows.Forms.Label()
@@ -35,12 +37,12 @@ Partial Class usrCntlDatenarchiv
Me.pnlAnzeige = New System.Windows.Forms.Panel()
Me.DataGridView = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Panel1 = New System.Windows.Forms.Panel()
Me.btnSave = New System.Windows.Forms.Button()
Me.lblErgebnis = New System.Windows.Forms.Label()
Me.Label4 = New System.Windows.Forms.Label()
Me.txtMaxSrch = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Button10 = New System.Windows.Forms.Button()
Me.Button11 = New System.Windows.Forms.Button()
Me.btnSave = New System.Windows.Forms.Button()
CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainer.Panel1.SuspendLayout()
Me.SplitContainer.Panel2.SuspendLayout()
@@ -96,6 +98,8 @@ Partial Class usrCntlDatenarchiv
'
'SplitContainer1.Panel1
'
Me.SplitContainer1.Panel1.Controls.Add(Me.lblfehlendeDokumente)
Me.SplitContainer1.Panel1.Controls.Add(Me.Button1)
Me.SplitContainer1.Panel1.Controls.Add(Me.cbxTestsystem)
Me.SplitContainer1.Panel1.Controls.Add(Me.cboPartnersystem)
Me.SplitContainer1.Panel1.Controls.Add(Me.Label8)
@@ -107,6 +111,24 @@ Partial Class usrCntlDatenarchiv
Me.SplitContainer1.SplitterDistance = 55
Me.SplitContainer1.TabIndex = 0
'
'lblfehlendeDokumente
'
Me.lblfehlendeDokumente.AutoSize = True
Me.lblfehlendeDokumente.ForeColor = System.Drawing.Color.Red
Me.lblfehlendeDokumente.Location = New System.Drawing.Point(617, 15)
Me.lblfehlendeDokumente.Name = "lblfehlendeDokumente"
Me.lblfehlendeDokumente.Size = New System.Drawing.Size(0, 13)
Me.lblfehlendeDokumente.TabIndex = 57
'
'Button1
'
Me.Button1.Location = New System.Drawing.Point(443, 10)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(159, 23)
Me.Button1.TabIndex = 56
Me.Button1.Text = "Prüfe Datenarchiv-DOK"
Me.Button1.UseVisualStyleBackColor = True
'
'cbxTestsystem
'
Me.cbxTestsystem.AutoSize = True
@@ -142,6 +164,7 @@ Partial Class usrCntlDatenarchiv
'
'btnSuche
'
Me.btnSuche.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnSuche.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btnSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -218,6 +241,19 @@ Partial Class usrCntlDatenarchiv
Me.Panel1.Size = New System.Drawing.Size(1020, 44)
Me.Panel1.TabIndex = 1
'
'btnSave
'
Me.btnSave.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnSave.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btnSave.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnSave.Location = New System.Drawing.Point(789, 5)
Me.btnSave.Name = "btnSave"
Me.btnSave.Size = New System.Drawing.Size(118, 26)
Me.btnSave.TabIndex = 56
Me.btnSave.Text = "speichern"
Me.btnSave.UseVisualStyleBackColor = True
'
'lblErgebnis
'
Me.lblErgebnis.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -230,6 +266,7 @@ Partial Class usrCntlDatenarchiv
'
'Label4
'
Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Label4.AutoSize = True
Me.Label4.Location = New System.Drawing.Point(930, 5)
Me.Label4.Name = "Label4"
@@ -251,6 +288,7 @@ Partial Class usrCntlDatenarchiv
Me.txtMaxSrch._value = ""
Me.txtMaxSrch._Waehrung = False
Me.txtMaxSrch._WaehrungZeichen = True
Me.txtMaxSrch.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.txtMaxSrch.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtMaxSrch.ForeColor = System.Drawing.Color.Black
Me.txtMaxSrch.Location = New System.Drawing.Point(966, 2)
@@ -288,18 +326,6 @@ Partial Class usrCntlDatenarchiv
Me.Button11.TabIndex = 4
Me.Button11.UseVisualStyleBackColor = True
'
'btnSave
'
Me.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnSave.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btnSave.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnSave.Location = New System.Drawing.Point(789, 5)
Me.btnSave.Name = "btnSave"
Me.btnSave.Size = New System.Drawing.Size(118, 26)
Me.btnSave.TabIndex = 56
Me.btnSave.Text = "speichern"
Me.btnSave.UseVisualStyleBackColor = True
'
'usrCntlDatenarchiv
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -343,4 +369,6 @@ Partial Class usrCntlDatenarchiv
Friend WithEvents Label12 As Label
Friend WithEvents cbxTestsystem As CheckBox
Friend WithEvents btnSave As Button
Friend WithEvents Button1 As Button
Friend WithEvents lblfehlendeDokumente As Label
End Class

View File

@@ -1,6 +1,4 @@
Imports System.ComponentModel
Imports System.IO
Imports System.Windows.Documents
Imports System.Windows.Documents
Imports VERAG_PROG_ALLGEMEIN
Public Class usrCntlDatenarchiv
@@ -24,6 +22,7 @@ Public Class usrCntlDatenarchiv
'cboPartnersystem.Items.Clear()
Dim distinctDT As DataTable = DatenarchivBind.bindingdataTable.DefaultView.ToTable(True, "Param_system")
cboPartnersystem.Items.Add(New MyListItem("", ""))
For Each d As DataRow In distinctDT.Rows
If Not cboPartnersystem.Items.Contains(d.Item(0)) Then cboPartnersystem.Items.Add(d.Item(0))
Next
@@ -72,31 +71,6 @@ Public Class usrCntlDatenarchiv
Me.Cursor = Cursors.Default
End Sub
Private Sub cbxProduktivsystem_CheckedChanged(sender As Object, e As EventArgs) Handles cbxTestsystem.CheckedChanged
'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
DatenarchivBind = New cEasyBinding(BIND_DB)
Dim sqlstr As String = ""
Dim TopMax = If(IsNumeric(txtMaxSrch.Text), " TOP " & txtMaxSrch.Text, "")
DatenarchivBind.initBinding("SELECT " & TopMax & " [Param_name],[Param_value], [Param_system] FROM " & table & " WHERE 1 = 1 " & getDatenarchivwhere(), table)
DataGridView.DataSource = DatenarchivBind.bindingdataTable
Dim distinctDT As DataTable = DatenarchivBind.bindingdataTable.DefaultView.ToTable(True, "Param_system")
For Each d As DataRow In distinctDT.Rows
If Not cboPartnersystem.Items.Contains(d.Item(0)) Then cboPartnersystem.Items.Add(d.Item(0))
Next
Me.usrCntlDatenarchiv_Load(sender, e)
End Sub
Private Sub cboPartnersystem_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboPartnersystem.SelectedIndexChanged
btnSuche_Click(sender, e)
End Sub
@@ -202,4 +176,55 @@ Public Class usrCntlDatenarchiv
End If
End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
Dim jahr As Integer = 2026
Dim zupruefendeDokumente As String = " select top(100000) * from [tblDatenarchiv_Collection] where Year(coll_date) = " & jahr & " and coll_archiv = 0 and isnull(coll_pfad,'') <> '' order by coll_date desc "
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim Datenarchiv_DOKS As DataTable = SQL.loadDgvBySql(zupruefendeDokumente, "FMZOLL")
Dim dtFehlendeDOKS = Datenarchiv_DOKS.Clone()
If Datenarchiv_DOKS.Rows.Count > 0 Then
For Each r As DataRow In Datenarchiv_DOKS.Rows
If r.Item("coll_pfad") <> "" Then
If Not System.IO.File.Exists(r.Item("coll_pfad")) Then
dtFehlendeDOKS.ImportRow(r)
lblfehlendeDokumente.Text = "fehlende Doks.: " & dtFehlendeDOKS.Rows.Count
Me.Refresh()
If dtFehlendeDOKS.Rows.Count >= 10000 Then Exit For
End If
End If
Next
If dtFehlendeDOKS.Rows.Count > 0 Then
MsgBox("Es existieren " & dtFehlendeDOKS.Rows.Count & " Datenarchiv-Datensätze, die kein zugeordnetes Dokument besitzen!")
VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtFehlendeDOKS,,,,, True,,, True)
If vbYes = MsgBox("Sollen diese Datenarchiveinträge gelöscht werden?", vbYesNo) Then
End If
Else
MsgBox("Es wurden keine fehlenden Dokumente gefunden!")
End If
End If
End Sub
End Class