Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

VERAG_PROG_ALLGEMEIN/AuditFlow/frmAuditFlow_Pruefungsojekt.Designer.vb

@@ -24,6 +24,7 @@ Partial Class frmAuditFlow_Pruefungsojekt
     Private Sub InitializeComponent()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAuditFlow_Pruefungsojekt))
         Me.pnlTop = New System.Windows.Forms.Panel()
+        Me.Label4 = New System.Windows.Forms.Label()
         Me.cboKategorie = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.Label7 = New System.Windows.Forms.Label()
@@ -58,7 +59,8 @@ Partial Class frmAuditFlow_Pruefungsojekt
         Me.Button2 = New System.Windows.Forms.Button()
         Me.Button1 = New System.Windows.Forms.Button()
         Me.CheckBox1 = New System.Windows.Forms.CheckBox()
-        Me.Label4 = New System.Windows.Forms.Label()
+        Me.Label16 = New System.Windows.Forms.Label()
+        Me.rtbWeitereInfo = New System.Windows.Forms.RichTextBox()
         Me.pnlTop.SuspendLayout()
         Me.Panel1.SuspendLayout()
         Me.Panel2.SuspendLayout()
@@ -74,6 +76,17 @@ Partial Class frmAuditFlow_Pruefungsojekt
         Me.pnlTop.Size = New System.Drawing.Size(566, 48)
         Me.pnlTop.TabIndex = 10
         '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 16.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label4.ForeColor = System.Drawing.Color.White
+        Me.Label4.Location = New System.Drawing.Point(10, 13)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(117, 26)
+        Me.Label4.TabIndex = 0
+        Me.Label4.Text = "AuditFlow"
+        '
         'cboKategorie
         '
         Me.cboKategorie._allowedValuesFreiText = Nothing
@@ -529,7 +542,7 @@ Partial Class frmAuditFlow_Pruefungsojekt
         Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
         Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button2.Location = New System.Drawing.Point(403, 548)
+        Me.Button2.Location = New System.Drawing.Point(403, 693)
         Me.Button2.Margin = New System.Windows.Forms.Padding(0)
         Me.Button2.Name = "Button2"
         Me.Button2.Padding = New System.Windows.Forms.Padding(0, 0, 10, 0)
@@ -544,7 +557,7 @@ Partial Class frmAuditFlow_Pruefungsojekt
         Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
         Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button1.Location = New System.Drawing.Point(18, 548)
+        Me.Button1.Location = New System.Drawing.Point(18, 693)
         Me.Button1.Margin = New System.Windows.Forms.Padding(0)
         Me.Button1.Name = "Button1"
         Me.Button1.Padding = New System.Windows.Forms.Padding(0, 0, 10, 0)
@@ -566,23 +579,32 @@ Partial Class frmAuditFlow_Pruefungsojekt
         Me.CheckBox1.Text = "AKTIV"
         Me.CheckBox1.UseVisualStyleBackColor = True
         '
-        'Label4
+        'Label16
         '
-        Me.Label4.AutoSize = True
-        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 16.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label4.ForeColor = System.Drawing.Color.White
-        Me.Label4.Location = New System.Drawing.Point(10, 13)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(117, 26)
-        Me.Label4.TabIndex = 0
-        Me.Label4.Text = "AuditFlow"
+        Me.Label16.AutoSize = True
+        Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label16.Location = New System.Drawing.Point(12, 544)
+        Me.Label16.Name = "Label16"
+        Me.Label16.Size = New System.Drawing.Size(96, 65)
+        Me.Label16.TabIndex = 72
+        Me.Label16.Text = "Beschreibung/ " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Weitere Info:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(Kontakt,Prüfstelle," & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Inhalt, ...)" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10)
+        '
+        'rtbWeitereInfo
+        '
+        Me.rtbWeitereInfo.Location = New System.Drawing.Point(110, 544)
+        Me.rtbWeitereInfo.Name = "rtbWeitereInfo"
+        Me.rtbWeitereInfo.Size = New System.Drawing.Size(436, 136)
+        Me.rtbWeitereInfo.TabIndex = 71
+        Me.rtbWeitereInfo.Text = ""
         '
         'frmAuditFlow_Pruefungsojekt
         '
         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(566, 607)
+        Me.ClientSize = New System.Drawing.Size(566, 752)
+        Me.Controls.Add(Me.Label16)
+        Me.Controls.Add(Me.rtbWeitereInfo)
         Me.Controls.Add(Me.CheckBox1)
         Me.Controls.Add(Me.Button1)
         Me.Controls.Add(Me.Button2)
@@ -654,4 +676,6 @@ Partial Class frmAuditFlow_Pruefungsojekt
     Friend WithEvents CheckBox1 As Windows.Forms.CheckBox
     Friend WithEvents CheckBox2 As Windows.Forms.CheckBox
     Friend WithEvents Label4 As Windows.Forms.Label
+    Friend WithEvents Label16 As Windows.Forms.Label
+    Friend WithEvents rtbWeitereInfo As Windows.Forms.RichTextBox
 End Class

VERAG_PROG_ALLGEMEIN/AuditFlow/frmAuditFlow_Pruefungsojekt.vb

@@ -69,9 +69,9 @@ Public Class frmAuditFlow_Pruefungsojekt
         If txtIntervallWert.Text = "" Then MsgBox("Intervall-Wert angeben!") : Return False
         If datVon._value = "" Then MsgBox("Startdatum angeben!") : Return False
         If txtBezeichnung.Text = "" Then MsgBox("Bezeichnung angeben!") : Return False
-        If txtZustaendigIntern_Mail.Text = "" Then MsgBox("Email angeben!") : Return False
+        If CheckBox2.Checked AndAlso txtZustaendigIntern_Mail.Text = "" Then MsgBox("Email angeben!") : Return False
         Return True
-    End Function
+        End Function
     Sub getValues()
         Try
 
@@ -81,14 +81,21 @@ Public Class frmAuditFlow_Pruefungsojekt
         AF_PO.wartPO_Kategorie = cboKategorie._value
 
         AF_PO.wartPO_Bezeichnung = txtBezeichnung.Text
-        AF_PO.wartPO_Kennung = txtKennung.Text
-        AF_PO.wartPO_zustaendigIntern_Mail = txtZustaendigIntern_Mail.Text
-        AF_PO.wartPO_IntervallWert = txtIntervallWert.Text
+            AF_PO.wartPO_Kennung = txtKennung.Text
+
+            If CheckBox2.Checked Then
+                AF_PO.wartPO_zustaendigIntern_Mail = txtZustaendigIntern_Mail.Text
+            Else
+                AF_PO.wartPO_zustaendigIntern_Mail = ""
+            End If
+
+            AF_PO.wartPO_IntervallWert = txtIntervallWert.Text
         AF_PO.wartPO_IntervallTyp = cboIntervall._value
         AF_PO.wartPO_zustaendigIntern_MaId = cboMA._value
-        AF_PO.wartPO_zustaendigIntern_Name = cboMA.Text
+            AF_PO.wartPO_zustaendigIntern_Name = cboMA.Text
+            AF_PO.wartPO_Beschreibung = rtbWeitereInfo.Text
 
-        AF_PO.wartPO_startdatum = datVon._value
+            AF_PO.wartPO_startdatum = datVon._value
             If datBis._value <> "" Then
                 AF_PO.wartPO_enddatum = datBis._value
             Else
@@ -96,13 +103,13 @@ Public Class frmAuditFlow_Pruefungsojekt
             End If
 
             AF_PO.wartPO_Erinnerung_VorlaufInTagen = txtErinnerungVorlaubInTagen.Text
-        AF_PO.wartPO_Aktiv = CheckBox1.Checked
+            AF_PO.wartPO_Aktiv = CheckBox1.Checked
 
-        If cboMA._value <> "" Then
-            Dim MA As New cMitarbeiter(cboMA._value)
-            AF_PO.wartPO_zustaendigIntern_Tel = MA.mit_telefonnr
-            'AF_PO= MA.mit_telefonnr
-        End If
+            If cboMA._value <> "" Then
+                Dim MA As New cMitarbeiter(cboMA._value)
+                AF_PO.wartPO_zustaendigIntern_Tel = MA.mit_telefonnr
+                'AF_PO= MA.mit_telefonnr
+            End If
 
 
         Catch ex As Exception
@@ -128,6 +135,7 @@ Public Class frmAuditFlow_Pruefungsojekt
         cboMA.changeItem(AF_PO.wartPO_zustaendigIntern_MaId)
         'cboMA.Text = AF_PO.wartPO_zustaendigIntern_Name
         txtErinnerungVorlaubInTagen.Text = AF_PO.wartPO_Erinnerung_VorlaufInTagen
+        rtbWeitereInfo.Text = If(AF_PO.wartPO_Beschreibung, "")
         CheckBox1.Checked = AF_PO.wartPO_Aktiv
 
         txtZustaendigIntern_Mail.Text = AF_PO.wartPO_zustaendigIntern_Mail 'zuletzt, sonst bei MA Wechsel überschrieben 

VERAG_PROG_ALLGEMEIN/Classes/cAvisoBenachrichtigungen.vb

@@ -1,4 +1,4 @@
-Imports System.Data.SqlClient
+Imports System.Data.SqlClient
 Imports System.Reflection
 
 Public Class cAvisoBenachrichtigungen
@@ -311,5 +311,6 @@ Public Class cAvisoBenachrichtigungenCodes
     Public Shared AES_NachfrageVerbleib As Integer = 11
     Public Shared Verwahrung_Foto As Integer = 20
     Public Shared Essensgeld As Integer = 21
+    Public Shared AVISO_ERSTELLT As Integer = 22
 
 End Class