neu

2022-07-08 08:11:33 +02:00
parent a4ad6cc8c8
commit 505b2800c5
96 changed files with 4969 additions and 8465 deletions
--- a/Aviso/Benachrichtigung/frmAvisoBenachrichtigungReminderBestaetigen.Designer.vb
+++ b/Aviso/Benachrichtigung/frmAvisoBenachrichtigungReminderBestaetigen.Designer.vb
@@ -23,6 +23,7 @@ Partial Class frmAvisoBenachrichtigungReminderBestaetigen
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.pnl = New System.Windows.Forms.Panel()
+        Me.Button2 = New System.Windows.Forms.Button()
        Me.Label2 = New System.Windows.Forms.Label()
        Me.Button1 = New System.Windows.Forms.Button()
        Me.lblDatUhrzeit = New System.Windows.Forms.Label()
@@ -32,7 +33,6 @@ Partial Class frmAvisoBenachrichtigungReminderBestaetigen
        Me.btn = New System.Windows.Forms.Button()
        Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.Button2 = New System.Windows.Forms.Button()
        Me.pnl.SuspendLayout()
        Me.SuspendLayout()
        '
@@ -50,16 +50,32 @@ Partial Class frmAvisoBenachrichtigungReminderBestaetigen
        Me.pnl.Controls.Add(Me.btn)
        Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnl.Location = New System.Drawing.Point(0, 0)
+        Me.pnl.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(460, 159)
+        Me.pnl.Size = New System.Drawing.Size(690, 245)
        Me.pnl.TabIndex = 0
        '
+        'Button2
+        '
+        Me.Button2.BackColor = System.Drawing.Color.Red
+        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Button2.ForeColor = System.Drawing.Color.White
+        Me.Button2.Location = New System.Drawing.Point(630, -2)
+        Me.Button2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(58, 48)
+        Me.Button2.TabIndex = 10
+        Me.Button2.Text = "X"
+        Me.Button2.UseVisualStyleBackColor = False
+        '
        'Label2
        '
        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(193, 10)
+        Me.Label2.Location = New System.Drawing.Point(290, 15)
+        Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(79, 13)
+        Me.Label2.Size = New System.Drawing.Size(116, 20)
        Me.Label2.TabIndex = 4
        Me.Label2.Text = "Datum/Uhrzeit:"
        '
@@ -68,9 +84,10 @@ Partial Class frmAvisoBenachrichtigungReminderBestaetigen
        Me.Button1.BackColor = System.Drawing.Color.SteelBlue
        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.Button1.ForeColor = System.Drawing.Color.White
-        Me.Button1.Location = New System.Drawing.Point(11, 92)
+        Me.Button1.Location = New System.Drawing.Point(16, 142)
+        Me.Button1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(236, 56)
+        Me.Button1.Size = New System.Drawing.Size(354, 86)
        Me.Button1.TabIndex = 9
        Me.Button1.Text = "OK & Vermerk bestätigen" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(Vorauskasse / Angeforderte Doks erhalten)"
        Me.Button1.UseVisualStyleBackColor = False
@@ -78,9 +95,10 @@ Partial Class frmAvisoBenachrichtigungReminderBestaetigen
        'lblDatUhrzeit
        '
        Me.lblDatUhrzeit.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblDatUhrzeit.Location = New System.Drawing.Point(213, 10)
+        Me.lblDatUhrzeit.Location = New System.Drawing.Point(320, 15)
+        Me.lblDatUhrzeit.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
        Me.lblDatUhrzeit.Name = "lblDatUhrzeit"
-        Me.lblDatUhrzeit.Size = New System.Drawing.Size(177, 13)
+        Me.lblDatUhrzeit.Size = New System.Drawing.Size(266, 20)
        Me.lblDatUhrzeit.TabIndex = 8
        Me.lblDatUhrzeit.Text = "01.01.2020 10:00"
        Me.lblDatUhrzeit.TextAlign = System.Drawing.ContentAlignment.TopRight
@@ -89,18 +107,20 @@ Partial Class frmAvisoBenachrichtigungReminderBestaetigen
        '
        Me.lblArt.AutoSize = True
        Me.lblArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold)
-        Me.lblArt.Location = New System.Drawing.Point(11, 8)
+        Me.lblArt.Location = New System.Drawing.Point(16, 12)
+        Me.lblArt.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
        Me.lblArt.Name = "lblArt"
-        Me.lblArt.Size = New System.Drawing.Size(167, 17)
+        Me.lblArt.Size = New System.Drawing.Size(232, 25)
        Me.lblArt.TabIndex = 5
        Me.lblArt.Text = "VERMERK REMINDER"
        '
        'lbl
        '
        Me.lbl.AutoSize = True
-        Me.lbl.Location = New System.Drawing.Point(8, 34)
+        Me.lbl.Location = New System.Drawing.Point(12, 52)
+        Me.lbl.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
        Me.lbl.Name = "lbl"
-        Me.lbl.Size = New System.Drawing.Size(49, 13)
+        Me.lbl.Size = New System.Drawing.Size(73, 20)
        Me.lbl.TabIndex = 2
        Me.lbl.Text = "Vermerk:"
        '
@@ -108,21 +128,24 @@ Partial Class frmAvisoBenachrichtigungReminderBestaetigen
        '
        Me.rtbVermerk.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.rtbVermerk.Location = New System.Drawing.Point(11, 50)
+        Me.rtbVermerk.Location = New System.Drawing.Point(16, 77)
+        Me.rtbVermerk.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.rtbVermerk.Name = "rtbVermerk"
        Me.rtbVermerk.ReadOnly = True
-        Me.rtbVermerk.Size = New System.Drawing.Size(436, 36)
+        Me.rtbVermerk.Size = New System.Drawing.Size(653, 53)
        Me.rtbVermerk.TabIndex = 1
        Me.rtbVermerk.Text = ""
        '
        'btn
        '
        Me.btn.BackColor = System.Drawing.Color.SteelBlue
+        Me.btn.DialogResult = System.Windows.Forms.DialogResult.Yes
        Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btn.ForeColor = System.Drawing.Color.White
-        Me.btn.Location = New System.Drawing.Point(253, 92)
+        Me.btn.Location = New System.Drawing.Point(380, 142)
+        Me.btn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.btn.Name = "btn"
-        Me.btn.Size = New System.Drawing.Size(194, 56)
+        Me.btn.Size = New System.Drawing.Size(291, 86)
        Me.btn.TabIndex = 0
        Me.btn.Text = "OK" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(Benachrichtigung akzeptieren)"
        Me.btn.UseVisualStyleBackColor = False
@@ -130,34 +153,26 @@ Partial Class frmAvisoBenachrichtigungReminderBestaetigen
        'DataGridViewTextBoxColumn1
        '
        Me.DataGridViewTextBoxColumn1.HeaderText = "Column1"
+        Me.DataGridViewTextBoxColumn1.MinimumWidth = 8
        Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1"
        Me.DataGridViewTextBoxColumn1.Visible = False
+        Me.DataGridViewTextBoxColumn1.Width = 150
        '
        'DataGridViewTextBoxColumn2
        '
        Me.DataGridViewTextBoxColumn2.HeaderText = "Datei"
+        Me.DataGridViewTextBoxColumn2.MinimumWidth = 8
        Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
-        '
-        'Button2
-        '
-        Me.Button2.BackColor = System.Drawing.Color.Red
-        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Button2.ForeColor = System.Drawing.Color.White
-        Me.Button2.Location = New System.Drawing.Point(420, -1)
-        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(39, 31)
-        Me.Button2.TabIndex = 10
-        Me.Button2.Text = "X"
-        Me.Button2.UseVisualStyleBackColor = False
+        Me.DataGridViewTextBoxColumn2.Width = 150
        '
        'frmAvisoBenachrichtigungReminderBestaetigen
        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(460, 159)
+        Me.ClientSize = New System.Drawing.Size(690, 245)
        Me.Controls.Add(Me.pnl)
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
+        Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.Name = "frmAvisoBenachrichtigungReminderBestaetigen"
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
        Me.Text = "Bestätigen"
--- a/Aviso/Benachrichtigung/frmAvisoBenachrichtigungReminderBestaetigen.vb
+++ b/Aviso/Benachrichtigung/frmAvisoBenachrichtigungReminderBestaetigen.vb
@@ -39,7 +39,8 @@


    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
-        Me.DialogResult = DialogResult.None
+
+        Me.DialogResult = DialogResult.Yes
        Me.Close()
    End Sub

--- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb
+++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb
@@ -218,10 +218,12 @@
                            frmHauptfenster.avisoAktualisierenAktiveIdBehalten(AB.ab_AvisoID, True)
                            initDgvAvisoBenachrichtigungen(True, Me.Font)
                        Case DialogResult.Cancel
-                            'NIX
-                        Case Else
+                            'NIX 
+                        Case DialogResult.Yes
                            AB.BESTAETIGEN_BENACHRICHTIGUNG()
                            initDgvAvisoBenachrichtigungen(True, Me.Font)
+                        Case Else
+                            'NIX soll eig nicht vorkommen
                    End Select