diff --git a/.vs/BEA/v16/.suo b/.vs/BEA/v16/.suo index 559e851..385a3f2 100644 Binary files a/.vs/BEA/v16/.suo and b/.vs/BEA/v16/.suo differ diff --git a/BEA/bin/Debug/20210525_bea.zip b/BEA/bin/Debug/20210525_bea.zip index 3388b3a..a4ba2e2 100644 Binary files a/BEA/bin/Debug/20210525_bea.zip and b/BEA/bin/Debug/20210525_bea.zip differ diff --git a/BEA/bin/Debug/20210526_bea.zip b/BEA/bin/Debug/20210526_bea.zip new file mode 100644 index 0000000..0f441c1 Binary files /dev/null and b/BEA/bin/Debug/20210526_bea.zip differ diff --git a/BEA/bin/Debug/BEA.exe b/BEA/bin/Debug/BEA.exe index 27cf36b..5b44784 100644 Binary files a/BEA/bin/Debug/BEA.exe and b/BEA/bin/Debug/BEA.exe differ diff --git a/BEA/bin/Debug/BEA.pdb b/BEA/bin/Debug/BEA.pdb index 31d6f6b..22b501e 100644 Binary files a/BEA/bin/Debug/BEA.pdb and b/BEA/bin/Debug/BEA.pdb differ diff --git a/BEA/bin/Debug/_AllgMainObjekte.dll b/BEA/bin/Debug/_AllgMainObjekte.dll index 1ec02cb..4d19a67 100644 Binary files a/BEA/bin/Debug/_AllgMainObjekte.dll and b/BEA/bin/Debug/_AllgMainObjekte.dll differ diff --git a/BEA/bin/Debug/_AllgMainObjekte.pdb b/BEA/bin/Debug/_AllgMainObjekte.pdb index 800fa8f..19e1706 100644 Binary files a/BEA/bin/Debug/_AllgMainObjekte.pdb and b/BEA/bin/Debug/_AllgMainObjekte.pdb differ diff --git a/BEA/obj/Debug/BEA.exe b/BEA/obj/Debug/BEA.exe index 27cf36b..5b44784 100644 Binary files a/BEA/obj/Debug/BEA.exe and b/BEA/obj/Debug/BEA.exe differ diff --git a/BEA/obj/Debug/BEA.pdb b/BEA/obj/Debug/BEA.pdb index 31d6f6b..22b501e 100644 Binary files a/BEA/obj/Debug/BEA.pdb and b/BEA/obj/Debug/BEA.pdb differ diff --git a/BEA/obj/Debug/BEA.vbproj.ResolveComReference.cache b/BEA/obj/Debug/BEA.vbproj.ResolveComReference.cache index 04622a5..5f354be 100644 Binary files a/BEA/obj/Debug/BEA.vbproj.ResolveComReference.cache and b/BEA/obj/Debug/BEA.vbproj.ResolveComReference.cache differ diff --git a/BEA/obj/Debug/BEA.vbprojAssemblyReference.cache b/BEA/obj/Debug/BEA.vbprojAssemblyReference.cache index c6ec39d..7d409ba 100644 Binary files a/BEA/obj/Debug/BEA.vbprojAssemblyReference.cache and b/BEA/obj/Debug/BEA.vbprojAssemblyReference.cache differ diff --git a/BEA/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/BEA/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 4ea459d..4515a0b 100644 Binary files a/BEA/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/BEA/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/BEA/obj/Debug/bea.exe.licenses b/BEA/obj/Debug/bea.exe.licenses index 99a89a2..6116cad 100644 Binary files a/BEA/obj/Debug/bea.exe.licenses and b/BEA/obj/Debug/bea.exe.licenses differ diff --git a/_AllgMainObjekte/Diverse_Formulare/frmBeziehungEdit.Designer.vb b/_AllgMainObjekte/Diverse_Formulare/frmBeziehungEdit.Designer.vb index 31ab82e..7c809bd 100644 --- 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) diff --git a/_AllgMainObjekte/Diverse_Formulare/frmBeziehungEdit.vb b/_AllgMainObjekte/Diverse_Formulare/frmBeziehungEdit.vb index 94b45d8..06e7cb0 100644 --- 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 diff --git a/_AllgMainObjekte/Diverse_Formulare/frmNeueBeziehung.Designer.vb b/_AllgMainObjekte/Diverse_Formulare/frmNeueBeziehung.Designer.vb index 7bb8803..6e726da 100644 --- 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) diff --git a/_AllgMainObjekte/Diverse_Formulare/frmNeueBeziehung.vb b/_AllgMainObjekte/Diverse_Formulare/frmNeueBeziehung.vb index ad51379..e37c667 100644 --- 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 diff --git a/_AllgMainObjekte/bin/Debug/_AllgMainObjekte.dll b/_AllgMainObjekte/bin/Debug/_AllgMainObjekte.dll index 1ec02cb..4d19a67 100644 Binary files a/_AllgMainObjekte/bin/Debug/_AllgMainObjekte.dll and b/_AllgMainObjekte/bin/Debug/_AllgMainObjekte.dll differ diff --git a/_AllgMainObjekte/bin/Debug/_AllgMainObjekte.pdb b/_AllgMainObjekte/bin/Debug/_AllgMainObjekte.pdb index 800fa8f..19e1706 100644 Binary files a/_AllgMainObjekte/bin/Debug/_AllgMainObjekte.pdb and b/_AllgMainObjekte/bin/Debug/_AllgMainObjekte.pdb differ diff --git a/_AllgMainObjekte/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/_AllgMainObjekte/obj/Debug/DesignTimeResolveAssemblyReferences.cache index e024f46..80aa450 100644 Binary files a/_AllgMainObjekte/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/_AllgMainObjekte/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.dll b/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.dll index 1ec02cb..4d19a67 100644 Binary files a/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.dll and b/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.dll differ diff --git a/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.pdb b/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.pdb index 800fa8f..19e1706 100644 Binary files a/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.pdb and b/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.pdb differ diff --git a/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.vbproj.GenerateResource.cache b/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.vbproj.GenerateResource.cache index 3857d9f..6ef76ab 100644 Binary files a/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.vbproj.GenerateResource.cache and b/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.vbproj.GenerateResource.cache differ diff --git a/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.vbprojAssemblyReference.cache b/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.vbprojAssemblyReference.cache index 16d9856..601b9c7 100644 Binary files a/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.vbprojAssemblyReference.cache and b/_AllgMainObjekte/obj/Debug/_AllgMainObjekte.vbprojAssemblyReference.cache differ