feature_Gesamtsicherheiten: GUI verbessert

Aviso/frmGesamtsicherheitenMenuNEU.vb

@@ -73,7 +73,7 @@ Public Class frmGesamtsicherheitenMenuNEU
             ) as tb1 left join [tblGesamtsicherheit] as tb2 on tb1.ding = tb2.gs_gsnr) as meh group by gs_gsnr) as meh2
             Where gs_standort = '" & Standort & "' " & sqladdon & "
             AND gs_datum > '" & Date.Parse(txtDatVon.Text) & "'
-            AND gs_datum < '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "'"
+            AND gs_datum < '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "' ORDER BY gs_gsnr"
 
         dgvListe.SET_SQL(sqlstring, "AVISO")
         dgvListe.LOAD()

Aviso/frmGesamtsicherheitenNEU.Designer.vb

@@ -33,7 +33,6 @@ Partial Class frmGesamtsicherheitenNEU
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ClosedErzeugenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.Panel2 = New System.Windows.Forms.Panel()
-        Me.pnlSummeGesPos = New System.Windows.Forms.Panel()
         Me.txtPosSicherheitsbGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtPosWarenwertGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtPosAnzalPosGes = New System.Windows.Forms.TextBox()
@@ -89,7 +88,6 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.cbx_offene = New System.Windows.Forms.CheckBox()
         Me.btnSuche = New System.Windows.Forms.Button()
-        Me.Label23 = New System.Windows.Forms.Label()
         Me.cbx_Suche_Warenort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label19 = New System.Windows.Forms.Label()
         Me.txt_Suche = New System.Windows.Forms.TextBox()
@@ -121,7 +119,6 @@ Partial Class frmGesamtsicherheitenNEU
         CType(Me.dgvGesamtsicherheit, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.ContextMenuStrip1.SuspendLayout()
         Me.Panel2.SuspendLayout()
-        Me.pnlSummeGesPos.SuspendLayout()
         Me.panOverlay.SuspendLayout()
         CType(Me.dgvSicherheitsPos, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.pnlSummeGes.SuspendLayout()
@@ -165,7 +162,7 @@ Partial Class frmGesamtsicherheitenNEU
         DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
         Me.dgvGesamtsicherheit.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
         Me.dgvGesamtsicherheit.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvGesamtsicherheit.Size = New System.Drawing.Size(742, 486)
+        Me.dgvGesamtsicherheit.Size = New System.Drawing.Size(742, 454)
         Me.dgvGesamtsicherheit.TabIndex = 0
         '
         'ContextMenuStrip1
@@ -182,31 +179,16 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'Panel2
         '
-        Me.Panel2.Controls.Add(Me.pnlSummeGesPos)
         Me.Panel2.Controls.Add(Me.panOverlay)
+        Me.Panel2.Controls.Add(Me.dgvGesamtsicherheit)
         Me.Panel2.Controls.Add(Me.dgvSicherheitsPos)
         Me.Panel2.Controls.Add(Me.pnlSummeGes)
-        Me.Panel2.Controls.Add(Me.dgvGesamtsicherheit)
         Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill
         Me.Panel2.Location = New System.Drawing.Point(0, 290)
         Me.Panel2.Name = "Panel2"
         Me.Panel2.Size = New System.Drawing.Size(1384, 486)
         Me.Panel2.TabIndex = 1
         '
-        'pnlSummeGesPos
-        '
-        Me.pnlSummeGesPos.BackColor = System.Drawing.SystemColors.ButtonHighlight
-        Me.pnlSummeGesPos.Controls.Add(Me.txtPosSicherheitsbGes)
-        Me.pnlSummeGesPos.Controls.Add(Me.txtPosWarenwertGes)
-        Me.pnlSummeGesPos.Controls.Add(Me.txtPosAnzalPosGes)
-        Me.pnlSummeGesPos.Controls.Add(Me.Label29)
-        Me.pnlSummeGesPos.Controls.Add(Me.Label28)
-        Me.pnlSummeGesPos.Controls.Add(Me.Label22)
-        Me.pnlSummeGesPos.Location = New System.Drawing.Point(748, 451)
-        Me.pnlSummeGesPos.Name = "pnlSummeGesPos"
-        Me.pnlSummeGesPos.Size = New System.Drawing.Size(636, 35)
-        Me.pnlSummeGesPos.TabIndex = 4
-        '
         'txtPosSicherheitsbGes
         '
         Me.txtPosSicherheitsbGes._DateTimeOnly = False
@@ -222,7 +204,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtPosSicherheitsbGes._Waehrung = True
         Me.txtPosSicherheitsbGes._WaehrungZeichen = True
         Me.txtPosSicherheitsbGes.ForeColor = System.Drawing.Color.Black
-        Me.txtPosSicherheitsbGes.Location = New System.Drawing.Point(533, 10)
+        Me.txtPosSicherheitsbGes.Location = New System.Drawing.Point(1272, 6)
         Me.txtPosSicherheitsbGes.MaxLineLength = -1
         Me.txtPosSicherheitsbGes.MaxLines_Warning = ""
         Me.txtPosSicherheitsbGes.MaxLines_Warning_Label = Nothing
@@ -246,7 +228,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtPosWarenwertGes._Waehrung = True
         Me.txtPosWarenwertGes._WaehrungZeichen = True
         Me.txtPosWarenwertGes.ForeColor = System.Drawing.Color.Black
-        Me.txtPosWarenwertGes.Location = New System.Drawing.Point(261, 10)
+        Me.txtPosWarenwertGes.Location = New System.Drawing.Point(1018, 6)
         Me.txtPosWarenwertGes.MaxLineLength = -1
         Me.txtPosWarenwertGes.MaxLines_Warning = ""
         Me.txtPosWarenwertGes.MaxLines_Warning_Label = Nothing
@@ -257,7 +239,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'txtPosAnzalPosGes
         '
-        Me.txtPosAnzalPosGes.Location = New System.Drawing.Point(84, 10)
+        Me.txtPosAnzalPosGes.Location = New System.Drawing.Point(830, 6)
         Me.txtPosAnzalPosGes.Name = "txtPosAnzalPosGes"
         Me.txtPosAnzalPosGes.ReadOnly = True
         Me.txtPosAnzalPosGes.Size = New System.Drawing.Size(53, 20)
@@ -267,7 +249,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label29.AutoSize = True
         Me.Label29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label29.Location = New System.Drawing.Point(155, 13)
+        Me.Label29.Location = New System.Drawing.Point(909, 9)
         Me.Label29.Name = "Label29"
         Me.Label29.Size = New System.Drawing.Size(103, 13)
         Me.Label29.TabIndex = 2
@@ -277,7 +259,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label28.AutoSize = True
         Me.Label28.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label28.Location = New System.Drawing.Point(397, 13)
+        Me.Label28.Location = New System.Drawing.Point(1128, 9)
         Me.Label28.Name = "Label28"
         Me.Label28.Size = New System.Drawing.Size(130, 13)
         Me.Label28.TabIndex = 4
@@ -287,7 +269,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label22.AutoSize = True
         Me.Label22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label22.Location = New System.Drawing.Point(3, 13)
+        Me.Label22.Location = New System.Drawing.Point(759, 9)
         Me.Label22.Name = "Label22"
         Me.Label22.Size = New System.Drawing.Size(63, 13)
         Me.Label22.TabIndex = 0
@@ -455,21 +437,28 @@ Partial Class frmGesamtsicherheitenNEU
         Me.dgvSicherheitsPos.Name = "dgvSicherheitsPos"
         Me.dgvSicherheitsPos.ReadOnly = True
         Me.dgvSicherheitsPos.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvSicherheitsPos.Size = New System.Drawing.Size(636, 486)
+        Me.dgvSicherheitsPos.Size = New System.Drawing.Size(636, 454)
         Me.dgvSicherheitsPos.TabIndex = 1
         '
         'pnlSummeGes
         '
         Me.pnlSummeGes.BackColor = System.Drawing.SystemColors.ButtonHighlight
+        Me.pnlSummeGes.Controls.Add(Me.txtPosSicherheitsbGes)
         Me.pnlSummeGes.Controls.Add(Me.txtSicherheitsbGes)
+        Me.pnlSummeGes.Controls.Add(Me.Label28)
+        Me.pnlSummeGes.Controls.Add(Me.txtPosWarenwertGes)
+        Me.pnlSummeGes.Controls.Add(Me.Label29)
         Me.pnlSummeGes.Controls.Add(Me.txtWarenwertGes)
+        Me.pnlSummeGes.Controls.Add(Me.txtPosAnzalPosGes)
         Me.pnlSummeGes.Controls.Add(Me.txtAnzalPosGes)
         Me.pnlSummeGes.Controls.Add(Me.Label27)
+        Me.pnlSummeGes.Controls.Add(Me.Label22)
         Me.pnlSummeGes.Controls.Add(Me.Label24)
         Me.pnlSummeGes.Controls.Add(Me.Label25)
-        Me.pnlSummeGes.Location = New System.Drawing.Point(0, 451)
+        Me.pnlSummeGes.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.pnlSummeGes.Location = New System.Drawing.Point(0, 454)
         Me.pnlSummeGes.Name = "pnlSummeGes"
-        Me.pnlSummeGes.Size = New System.Drawing.Size(742, 35)
+        Me.pnlSummeGes.Size = New System.Drawing.Size(1384, 32)
         Me.pnlSummeGes.TabIndex = 3
         '
         'txtSicherheitsbGes
@@ -487,7 +476,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtSicherheitsbGes._Waehrung = True
         Me.txtSicherheitsbGes._WaehrungZeichen = True
         Me.txtSicherheitsbGes.ForeColor = System.Drawing.Color.Black
-        Me.txtSicherheitsbGes.Location = New System.Drawing.Point(638, 10)
+        Me.txtSicherheitsbGes.Location = New System.Drawing.Point(615, 5)
         Me.txtSicherheitsbGes.MaxLineLength = -1
         Me.txtSicherheitsbGes.MaxLines_Warning = ""
         Me.txtSicherheitsbGes.MaxLines_Warning_Label = Nothing
@@ -511,7 +500,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtWarenwertGes._Waehrung = True
         Me.txtWarenwertGes._WaehrungZeichen = True
         Me.txtWarenwertGes.ForeColor = System.Drawing.Color.Black
-        Me.txtWarenwertGes.Location = New System.Drawing.Point(315, 10)
+        Me.txtWarenwertGes.Location = New System.Drawing.Point(326, 6)
         Me.txtWarenwertGes.MaxLineLength = -1
         Me.txtWarenwertGes.MaxLines_Warning = ""
         Me.txtWarenwertGes.MaxLines_Warning_Label = Nothing
@@ -522,7 +511,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         'txtAnzalPosGes
         '
-        Me.txtAnzalPosGes.Location = New System.Drawing.Point(89, 10)
+        Me.txtAnzalPosGes.Location = New System.Drawing.Point(93, 5)
         Me.txtAnzalPosGes.Name = "txtAnzalPosGes"
         Me.txtAnzalPosGes.ReadOnly = True
         Me.txtAnzalPosGes.Size = New System.Drawing.Size(53, 20)
@@ -532,7 +521,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label27.AutoSize = True
         Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label27.Location = New System.Drawing.Point(479, 13)
+        Me.Label27.Location = New System.Drawing.Point(479, 9)
         Me.Label27.Name = "Label27"
         Me.Label27.Size = New System.Drawing.Size(130, 13)
         Me.Label27.TabIndex = 4
@@ -542,7 +531,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label24.AutoSize = True
         Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label24.Location = New System.Drawing.Point(9, 13)
+        Me.Label24.Location = New System.Drawing.Point(9, 8)
         Me.Label24.Name = "Label24"
         Me.Label24.Size = New System.Drawing.Size(63, 13)
         Me.Label24.TabIndex = 0
@@ -552,7 +541,7 @@ Partial Class frmGesamtsicherheitenNEU
         '
         Me.Label25.AutoSize = True
         Me.Label25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label25.Location = New System.Drawing.Point(194, 13)
+        Me.Label25.Location = New System.Drawing.Point(194, 8)
         Me.Label25.Name = "Label25"
         Me.Label25.Size = New System.Drawing.Size(103, 13)
         Me.Label25.TabIndex = 2
@@ -930,13 +919,12 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight
         Me.Panel1.Controls.Add(Me.cbx_offene)
         Me.Panel1.Controls.Add(Me.btnSuche)
-        Me.Panel1.Controls.Add(Me.Label23)
         Me.Panel1.Controls.Add(Me.cbx_Suche_Warenort)
         Me.Panel1.Controls.Add(Me.Label19)
         Me.Panel1.Controls.Add(Me.txt_Suche)
         Me.Panel1.Controls.Add(Me.Label21)
         Me.Panel1.Controls.Add(Me.btn_resetSearch)
-        Me.Panel1.Location = New System.Drawing.Point(0, 44)
+        Me.Panel1.Location = New System.Drawing.Point(3, 41)
         Me.Panel1.Name = "Panel1"
         Me.Panel1.Size = New System.Drawing.Size(1384, 61)
         Me.Panel1.TabIndex = 2
@@ -963,18 +951,6 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnSuche.Text = "Suche starten"
         Me.btnSuche.UseVisualStyleBackColor = True
         '
-        'Label23
-        '
-        Me.Label23.Anchor = System.Windows.Forms.AnchorStyles.Right
-        Me.Label23.AutoSize = True
-        Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
-        Me.Label23.ForeColor = System.Drawing.Color.Honeydew
-        Me.Label23.Location = New System.Drawing.Point(207, -13)
-        Me.Label23.Name = "Label23"
-        Me.Label23.Size = New System.Drawing.Size(24, 15)
-        Me.Label23.TabIndex = 0
-        Me.Label23.Text = "Bis"
-        '
         'cbx_Suche_Warenort
         '
         Me.cbx_Suche_Warenort._allowedValuesFreiText = Nothing
@@ -1298,8 +1274,6 @@ Partial Class frmGesamtsicherheitenNEU
         CType(Me.dgvGesamtsicherheit, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ContextMenuStrip1.ResumeLayout(False)
         Me.Panel2.ResumeLayout(False)
-        Me.pnlSummeGesPos.ResumeLayout(False)
-        Me.pnlSummeGesPos.PerformLayout()
         Me.panOverlay.ResumeLayout(False)
         Me.panOverlay.PerformLayout()
         CType(Me.dgvSicherheitsPos, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1376,7 +1350,6 @@ Partial Class frmGesamtsicherheitenNEU
     Friend WithEvents Label19 As Label
     Friend WithEvents txt_Suche As TextBox
     Friend WithEvents Label21 As Label
-    Friend WithEvents Label23 As Label
     Friend WithEvents btnSuche As Button
     Friend WithEvents Label20 As Label
     Friend WithEvents txtPosNr As TextBox
@@ -1397,7 +1370,6 @@ Partial Class frmGesamtsicherheitenNEU
     Friend WithEvents Label24 As Label
     Friend WithEvents txtPosAnzalPosGes As TextBox
     Friend WithEvents txtAnzalPosGes As TextBox
-    Private WithEvents pnlSummeGesPos As Panel
     Friend WithEvents txtWarenwertGes As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents txtSicherheitsbGes As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents txtPosWarenwertGes As VERAG_PROG_ALLGEMEIN.MyTextBox

Aviso/frmGesamtsicherheitenNEU.vb

@@ -14,8 +14,8 @@ Public Class frmGesamtsicherheitenNEU
     Property currentSPos As cGesamtsicherheitsPositionen
     Property currentGesSichRef As cGesamtsicherheitsReferenz
     Public Property gessicherheitID As Integer
-    Public Property prevGessicherheitID As Integer = 0
+    Public Property prevGessicherheitID As Integer
-    Public Property nextGessicherheitID As Integer = 0
+    Public Property nextGessicherheitID As Integer
     Public Property datum As DateTime = Nothing
     Property Standort As String = ""
 
@@ -98,8 +98,6 @@ Public Class frmGesamtsicherheitenNEU
             If cbx_Suche_Warenort._value <> "" Then sqlSearchSting &= "AND gs_warenort like '%" & cbx_Suche_Warenort._value & "%'"
         End If
 
-        'Dim addtosqlstring As String = ""
-
         Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_posNr], [gs_ATBNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'" & sqlSearchSting & "order by [gs_gsId]"
 
         dgvGesamtsicherheit.SET_SQL(SQLStringSicherheit, "AVISO", ,)
@@ -160,7 +158,6 @@ Public Class frmGesamtsicherheitenNEU
             loadTitle()
             setSaldo()
 
-
             If dgvGesamtsicherheit.Enabled = False Then Exit Sub
 
         Else
@@ -368,8 +365,6 @@ Public Class frmGesamtsicherheitenNEU
                 End With
 
 
-
-
                 If Neu = True AndAlso count <= 1 Then OPEN.gs_gsNr = AddNewGesamtSichNr()
 
                 Select Case checkIfExist(OPEN.gs_ATBNr, gessicherheitID)
@@ -1092,7 +1087,8 @@ Public Class frmGesamtsicherheitenNEU
 
     End Sub
 
+    Private Sub pnlSummeGes_Paint(sender As Object, e As PaintEventArgs) Handles pnlSummeGes.Paint
 
-
+    End Sub
 End Class