Anpassungen 20210526

2021-05-26 09:31:17 +02:00
parent 97ef665fd1
commit 762f2c0032
24 changed files with 42 additions and 38 deletions
--- a/_AllgMainObjekte/Diverse_Formulare/frmBeziehungEdit.Designer.vb
+++ b/_AllgMainObjekte/Diverse_Formulare/frmBeziehungEdit.Designer.vb
@@ -36,6 +36,7 @@ Partial Class frmBeziehungEdit
        Me.lblBeziehungstyp = New System.Windows.Forms.Label()
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.Panel2 = New System.Windows.Forms.Panel()
+        Me.cbboxKontaktFB = New DevComponents.DotNetBar.Controls.ComboBoxEx()
        Me.Label5 = New System.Windows.Forms.Label()
        Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker()
        Me.Label4 = New System.Windows.Forms.Label()
@@ -49,7 +50,6 @@ Partial Class frmBeziehungEdit
        Me.Panel3 = New System.Windows.Forms.Panel()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.tsmnuSecurityObjekte = New System.Windows.Forms.ToolStripMenuItem()
-        Me.cbboxKontaktFB = New DevComponents.DotNetBar.Controls.ComboBoxEx()
        CType(Me.txtSeqeunz, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.Panel2.SuspendLayout()
@@ -180,6 +180,18 @@ Partial Class frmBeziehungEdit
        Me.Panel2.Size = New System.Drawing.Size(336, 227)
        Me.Panel2.TabIndex = 36
        '
+        'cbboxKontaktFB
+        '
+        Me.cbboxKontaktFB.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
+        Me.cbboxKontaktFB.DisplayMember = "Text"
+        Me.cbboxKontaktFB.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
+        Me.cbboxKontaktFB.FormattingEnabled = True
+        Me.cbboxKontaktFB.ItemHeight = 14
+        Me.cbboxKontaktFB.Location = New System.Drawing.Point(85, 156)
+        Me.cbboxKontaktFB.Name = "cbboxKontaktFB"
+        Me.cbboxKontaktFB.Size = New System.Drawing.Size(230, 20)
+        Me.cbboxKontaktFB.TabIndex = 49
+        '
        'Label5
        '
        Me.Label5.AutoSize = True
@@ -286,23 +298,11 @@ Partial Class frmBeziehungEdit
        Me.tsmnuSecurityObjekte.Size = New System.Drawing.Size(160, 22)
        Me.tsmnuSecurityObjekte.Text = "Security Objekte"
        '
-        'cbboxKontaktFB
-        '
-        Me.cbboxKontaktFB.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.cbboxKontaktFB.DisplayMember = "Text"
-        Me.cbboxKontaktFB.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
-        Me.cbboxKontaktFB.FormattingEnabled = True
-        Me.cbboxKontaktFB.ItemHeight = 14
-        Me.cbboxKontaktFB.Location = New System.Drawing.Point(85, 156)
-        Me.cbboxKontaktFB.Name = "cbboxKontaktFB"
-        Me.cbboxKontaktFB.Size = New System.Drawing.Size(230, 20)
-        Me.cbboxKontaktFB.TabIndex = 49
-        '
        'frmBeziehungEdit
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(336, 463)
+        Me.ClientSize = New System.Drawing.Size(336, 454)
        Me.ContextMenuStrip = Me.ContextMenuStrip1
        Me.Controls.Add(Me.Panel3)
        Me.Controls.Add(Me.Panel2)
--- a/_AllgMainObjekte/Diverse_Formulare/frmBeziehungEdit.vb
+++ b/_AllgMainObjekte/Diverse_Formulare/frmBeziehungEdit.vb
@@ -16,11 +16,14 @@
    End Sub

    Private Sub frmBeziehungEdit_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        kontaktfb = Datenklasse.Get_Stammdaten("Personal", "Bezeichznung")
-        Me.cbboxKontaktFB.DataSource = kontaktfb
-        Me.cbboxKontaktFB.DisplayMember = "Bezeichnung"
-        Me.cbboxKontaktFB.ValueMember = "Keyvalue"
-        Me.cbboxKontaktFB.SelectedValue = Me.Kontaktid
+        If Me.Panel2.Height = 227 Then
+            kontaktfb = Datenklasse.Get_Stammdaten("Personal", "Bezeichznung")
+            Me.cbboxKontaktFB.DataSource = kontaktfb
+            Me.cbboxKontaktFB.DisplayMember = "Bezeichnung"
+            Me.cbboxKontaktFB.ValueMember = "Keyvalue"
+            Me.cbboxKontaktFB.SelectedValue = Me.Kontaktid
+        End If
+
        sec.Set_Form_Security(Me)
    End Sub

--- a/_AllgMainObjekte/Diverse_Formulare/frmNeueBeziehung.Designer.vb
+++ b/_AllgMainObjekte/Diverse_Formulare/frmNeueBeziehung.Designer.vb
@@ -39,6 +39,7 @@ Partial Class frmNeueBeziehung
        Me.cbTemporaer = New System.Windows.Forms.CheckBox()
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.Panel2 = New System.Windows.Forms.Panel()
+        Me.cbboxKontaktFB = New DevComponents.DotNetBar.Controls.ComboBoxEx()
        Me.Label5 = New System.Windows.Forms.Label()
        Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker()
        Me.Label4 = New System.Windows.Forms.Label()
@@ -52,7 +53,6 @@ Partial Class frmNeueBeziehung
        Me.Panel3 = New System.Windows.Forms.Panel()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.SecurityObjekte = New System.Windows.Forms.ToolStripMenuItem()
-        Me.cbboxKontaktFB = New DevComponents.DotNetBar.Controls.ComboBoxEx()
        CType(Me.txtSeqeunz, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.Panel2.SuspendLayout()
@@ -211,6 +211,18 @@ Partial Class frmNeueBeziehung
        Me.Panel2.Size = New System.Drawing.Size(337, 227)
        Me.Panel2.TabIndex = 14
        '
+        'cbboxKontaktFB
+        '
+        Me.cbboxKontaktFB.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
+        Me.cbboxKontaktFB.DisplayMember = "Text"
+        Me.cbboxKontaktFB.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
+        Me.cbboxKontaktFB.FormattingEnabled = True
+        Me.cbboxKontaktFB.ItemHeight = 14
+        Me.cbboxKontaktFB.Location = New System.Drawing.Point(85, 156)
+        Me.cbboxKontaktFB.Name = "cbboxKontaktFB"
+        Me.cbboxKontaktFB.Size = New System.Drawing.Size(230, 20)
+        Me.cbboxKontaktFB.TabIndex = 48
+        '
        'Label5
        '
        Me.Label5.AutoSize = True
@@ -316,23 +328,11 @@ Partial Class frmNeueBeziehung
        Me.SecurityObjekte.Size = New System.Drawing.Size(162, 22)
        Me.SecurityObjekte.Text = "Secuirty-Objekte"
        '
-        'cbboxKontaktFB
-        '
-        Me.cbboxKontaktFB.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
-        Me.cbboxKontaktFB.DisplayMember = "Text"
-        Me.cbboxKontaktFB.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
-        Me.cbboxKontaktFB.FormattingEnabled = True
-        Me.cbboxKontaktFB.ItemHeight = 14
-        Me.cbboxKontaktFB.Location = New System.Drawing.Point(85, 156)
-        Me.cbboxKontaktFB.Name = "cbboxKontaktFB"
-        Me.cbboxKontaktFB.Size = New System.Drawing.Size(230, 20)
-        Me.cbboxKontaktFB.TabIndex = 48
-        '
        'frmNeueBeziehung
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(337, 502)
+        Me.ClientSize = New System.Drawing.Size(337, 263)
        Me.ContextMenuStrip = Me.ContextMenuStrip1
        Me.Controls.Add(Me.Panel3)
        Me.Controls.Add(Me.Panel2)
--- a/_AllgMainObjekte/Diverse_Formulare/frmNeueBeziehung.vb
+++ b/_AllgMainObjekte/Diverse_Formulare/frmNeueBeziehung.vb
@@ -16,11 +16,6 @@

    Private Sub frmNeueBeziehung_Load(sender As Object, e As EventArgs) Handles MyBase.Load
        Me.Panel2.Height = 1
-
-        kontaktfb = Datenklasse.Get_Stammdaten("Personal", "Bezeichznung")
-        Me.cbboxKontaktFB.DataSource = kontaktfb
-        Me.cbboxKontaktFB.DisplayMember = "Bezeichnung"
-        Me.cbboxKontaktFB.ValueMember = "Keyvalue"
        sec.Set_Form_Security(Me)
    End Sub

@@ -54,8 +49,14 @@

    Private Sub cbTemporaer_CheckedChanged(sender As Object, e As EventArgs) Handles cbTemporaer.CheckedChanged
        If Me.cbTemporaer.Checked = True Then
+            Cursor = Cursors.WaitCursor
            Me.Panel2.Height = 227
            Me.Height = Me.Height + 227
+            kontaktfb = Datenklasse.Get_Stammdaten("Personal", "Bezeichznung")
+            Me.cbboxKontaktFB.DataSource = kontaktfb
+            Me.cbboxKontaktFB.DisplayMember = "Bezeichnung"
+            Me.cbboxKontaktFB.ValueMember = "Keyvalue"
+            Cursor = Cursors.Default
        Else
            Me.Panel2.Height = 1
            Me.Height = Me.Height - 227