Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO

Aviso/Aviso.vbproj

@@ -108,7 +108,7 @@
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>Aviso_TemporaryKey.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>LME.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />

Aviso/frmEssensbestellungenAdministration.Designer.vb

@@ -79,6 +79,7 @@ Partial Class frmEssensbestellungenAdministration
         Me.lblWarning = New System.Windows.Forms.Label()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.Label9 = New System.Windows.Forms.Label()
+        Me.cbxAlleAnzeigen = New System.Windows.Forms.CheckBox()
         Me.pnlTop.SuspendLayout()
         Me.Panel1.SuspendLayout()
         Me.ContextMenuStrip1.SuspendLayout()
@@ -119,6 +120,7 @@ Partial Class frmEssensbestellungenAdministration
         '
         'Panel1
         '
+        Me.Panel1.Controls.Add(Me.cbxAlleAnzeigen)
         Me.Panel1.Controls.Add(Me.lblBestellungBis)
         Me.Panel1.Controls.Add(Me.btnBestelllimit)
         Me.Panel1.Controls.Add(Me.lblDaysToOrder)
@@ -796,6 +798,16 @@ Partial Class frmEssensbestellungenAdministration
         Me.Label9.Text = "Gesamtbetrag"
         Me.Label9.TextAlign = System.Drawing.ContentAlignment.TopRight
         '
+        'cbxAlleAnzeigen
+        '
+        Me.cbxAlleAnzeigen.AutoSize = True
+        Me.cbxAlleAnzeigen.Location = New System.Drawing.Point(668, 79)
+        Me.cbxAlleAnzeigen.Name = "cbxAlleAnzeigen"
+        Me.cbxAlleAnzeigen.Size = New System.Drawing.Size(42, 17)
+        Me.cbxAlleAnzeigen.TabIndex = 72
+        Me.cbxAlleAnzeigen.Text = "alle"
+        Me.cbxAlleAnzeigen.UseVisualStyleBackColor = True
+        '
         'frmEssensbestellungenAdministration
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -886,4 +898,5 @@ Partial Class frmEssensbestellungenAdministration
     Friend WithEvents txtBestelllimit As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents btnBestelllimit As Button
     Friend WithEvents lblBestellungBis As Label
+    Friend WithEvents cbxAlleAnzeigen As CheckBox
 End Class

Aviso/frmEssensbestellungenAdministration.vb

@@ -126,6 +126,9 @@ Public Class frmEssensbestellungenAdministration
         If cboGebaeude._value IsNot "" Then SQLwhere &= " AND [eb_gebaeude] = '" & cboGebaeude._value.ToString & "'"
         If cboAbteilung._value IsNot "" Then SQLwhere &= " AND [eb_abteilung] = '" & cboAbteilung._value.ToString & "'"
         If txtMitarbeiter.Text <> "" Then SQLwhere &= " AND [eb_mitname] like '%" & txtMitarbeiter.Text & "%'"
+
+        If cbxAlleAnzeigen.Checked = False Then
+
             If cbxStornos.Checked Then
                 SQLwhere &= " AND [eb_storniert] = '1'"
             Else
@@ -144,6 +147,10 @@ Public Class frmEssensbestellungenAdministration
                 'SQLwhere &= " AND [eb_gesendet] = '1'"
             End If
 
+        End If
+
+
+
         If txtBestellDat._value <> Nothing AndAlso txtBestellDatBis._value <> Nothing Then
             SQLwhere &= " AND [eb_datum] BETWEEN '" & txtBestellDat._value & "' AND '" & txtBestellDatBis._value & "'"
         End If
@@ -219,7 +226,15 @@ Public Class frmEssensbestellungenAdministration
         End If
     End Sub
 
-    Private Sub btnSuche_Click(sender As Object, e As EventArgs) Handles btnSuche.Click, cbxAbgerechnet.CheckedChanged, cbxStornos.CheckedChanged, cbxNichtAbgeschickt.CheckedChanged
+    Private Sub btnSuche_Click(sender As Object, e As EventArgs) Handles btnSuche.Click, cbxAbgerechnet.CheckedChanged, cbxStornos.CheckedChanged, cbxNichtAbgeschickt.CheckedChanged, cbxAlleAnzeigen.CheckedChanged
+
+        If cbxAlleAnzeigen.Checked Then
+            cbxAbgerechnet.Checked = Not cbxAlleAnzeigen.Checked
+            cbxNichtAbgeschickt.Checked = Not cbxAlleAnzeigen.Checked
+            cbxStornos.Checked = Not cbxAlleAnzeigen.Checked
+        End If
+
+
         loadBestellungen()
     End Sub
 

Aviso/frmGesamtsicherheitenMenuNEU.vb

@@ -15,10 +15,10 @@ Public Class frmGesamtsicherheitenMenuNEU
 
 
         Select Case Standort
-            Case "Verag GmbH" : firmaId = 2
+            Case "Verag GmbH" : firmaId = 2 : chkOffen.Checked = True
-            Case "VERAG AG" : firmaId = 1
+            Case "VERAG AG" : firmaId = 1 : chkOffen.Checked = False
-            Case "IMEX" : firmaId = 20
+            Case "IMEX" : firmaId = 20 : chkOffen.Checked = False
-            Case "Verag CS" : firmaId = 11
+            Case "Verag CS" : firmaId = 11 : chkOffen.Checked = False
         End Select
 
 
@@ -39,7 +39,6 @@ Public Class frmGesamtsicherheitenMenuNEU
 
         txtDatVon.Text = Date.Parse("01.01.2001")
         txtDatBis.Text = Now.ToShortDateString
-        chkOffen.Checked = True
 
         btnMonat.Text = MONAT.ToString("MMMM")
         btnJahr.Text = JAHR.Year

Aviso/frmGesamtsicherheitenNEU.Designer.vb

@@ -33,12 +33,12 @@ Partial Class frmGesamtsicherheitenNEU
         Me.ATBNraendernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.Panel2 = New System.Windows.Forms.Panel()
         Me.pnlChangeATCNr = New System.Windows.Forms.Panel()
+        Me.txtDatumaendern = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtSicherheitsbetragContext = New System.Windows.Forms.TextBox()
         Me.Label30 = New System.Windows.Forms.Label()
         Me.txtWarenwertContext = New System.Windows.Forms.TextBox()
         Me.lblWarenwertContext = New System.Windows.Forms.Label()
         Me.txtUhrzeitaendern = New System.Windows.Forms.TextBox()
-        Me.txtDatumaendern = New System.Windows.Forms.TextBox()
         Me.Label26 = New System.Windows.Forms.Label()
         Me.lblATCwarning = New System.Windows.Forms.Label()
         Me.FlatButton3 = New VERAG_PROG_ALLGEMEIN.FlatButton()
@@ -110,6 +110,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Label20 = New System.Windows.Forms.Label()
         Me.txtPosNr = New System.Windows.Forms.TextBox()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.cbxRundPosanzeigen = New System.Windows.Forms.CheckBox()
         Me.btnRundungsdifAusgl = New System.Windows.Forms.Button()
         Me.btnNew = New System.Windows.Forms.Button()
         Me.cbx_offene = New System.Windows.Forms.CheckBox()
@@ -145,7 +146,6 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtSicherheitFreitext = New System.Windows.Forms.TextBox()
         Me.btnAddPos = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.btnAddSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.cbxRundPosanzeigen = New System.Windows.Forms.CheckBox()
         Me.ContextMenuStripGesSicherh.SuspendLayout()
         Me.Panel2.SuspendLayout()
         Me.pnlChangeATCNr.SuspendLayout()
@@ -189,12 +189,12 @@ Partial Class frmGesamtsicherheitenNEU
         'pnlChangeATCNr
         '
         Me.pnlChangeATCNr.BackColor = System.Drawing.SystemColors.ButtonHighlight
+        Me.pnlChangeATCNr.Controls.Add(Me.txtDatumaendern)
         Me.pnlChangeATCNr.Controls.Add(Me.txtSicherheitsbetragContext)
         Me.pnlChangeATCNr.Controls.Add(Me.Label30)
         Me.pnlChangeATCNr.Controls.Add(Me.txtWarenwertContext)
         Me.pnlChangeATCNr.Controls.Add(Me.lblWarenwertContext)
         Me.pnlChangeATCNr.Controls.Add(Me.txtUhrzeitaendern)
-        Me.pnlChangeATCNr.Controls.Add(Me.txtDatumaendern)
         Me.pnlChangeATCNr.Controls.Add(Me.Label26)
         Me.pnlChangeATCNr.Controls.Add(Me.lblATCwarning)
         Me.pnlChangeATCNr.Controls.Add(Me.FlatButton3)
@@ -207,6 +207,32 @@ Partial Class frmGesamtsicherheitenNEU
         Me.pnlChangeATCNr.TabIndex = 13
         Me.pnlChangeATCNr.Visible = False
         '
+        'txtDatumaendern
+        '
+        Me.txtDatumaendern._DateTimeOnly = False
+        Me.txtDatumaendern._numbersOnly = False
+        Me.txtDatumaendern._numbersOnlyKommastellen = ""
+        Me.txtDatumaendern._numbersOnlyTrennzeichen = True
+        Me.txtDatumaendern._Prozent = False
+        Me.txtDatumaendern._ShortDateNew = False
+        Me.txtDatumaendern._ShortDateOnly = True
+        Me.txtDatumaendern._TimeOnly = False
+        Me.txtDatumaendern._TimeOnly_Seconds = False
+        Me.txtDatumaendern._value = ""
+        Me.txtDatumaendern._Waehrung = False
+        Me.txtDatumaendern._WaehrungZeichen = True
+        Me.txtDatumaendern.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtDatumaendern.ForeColor = System.Drawing.Color.Black
+        Me.txtDatumaendern.Location = New System.Drawing.Point(95, 72)
+        Me.txtDatumaendern.MaxLength = 10
+        Me.txtDatumaendern.MaxLineLength = -1
+        Me.txtDatumaendern.MaxLines_Warning = ""
+        Me.txtDatumaendern.MaxLines_Warning_Label = Nothing
+        Me.txtDatumaendern.Multiline = True
+        Me.txtDatumaendern.Name = "txtDatumaendern"
+        Me.txtDatumaendern.Size = New System.Drawing.Size(112, 24)
+        Me.txtDatumaendern.TabIndex = 61
+        '
         'txtSicherheitsbetragContext
         '
         Me.txtSicherheitsbetragContext.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -215,7 +241,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtSicherheitsbetragContext.Name = "txtSicherheitsbetragContext"
         Me.txtSicherheitsbetragContext.ReadOnly = True
         Me.txtSicherheitsbetragContext.Size = New System.Drawing.Size(134, 24)
-        Me.txtSicherheitsbetragContext.TabIndex = 14
+        Me.txtSicherheitsbetragContext.TabIndex = 64
         Me.txtSicherheitsbetragContext.TabStop = False
         '
         'Label30
@@ -235,7 +261,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtWarenwertContext.Margin = New System.Windows.Forms.Padding(0)
         Me.txtWarenwertContext.Name = "txtWarenwertContext"
         Me.txtWarenwertContext.Size = New System.Drawing.Size(186, 24)
-        Me.txtWarenwertContext.TabIndex = 9
+        Me.txtWarenwertContext.TabIndex = 63
         '
         'lblWarenwertContext
         '
@@ -254,16 +280,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtUhrzeitaendern.Margin = New System.Windows.Forms.Padding(0)
         Me.txtUhrzeitaendern.Name = "txtUhrzeitaendern"
         Me.txtUhrzeitaendern.Size = New System.Drawing.Size(71, 24)
-        Me.txtUhrzeitaendern.TabIndex = 8
+        Me.txtUhrzeitaendern.TabIndex = 62
-        '
-        'txtDatumaendern
-        '
-        Me.txtDatumaendern.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtDatumaendern.Location = New System.Drawing.Point(95, 72)
-        Me.txtDatumaendern.Margin = New System.Windows.Forms.Padding(0)
-        Me.txtDatumaendern.Name = "txtDatumaendern"
-        Me.txtDatumaendern.Size = New System.Drawing.Size(112, 24)
-        Me.txtDatumaendern.TabIndex = 7
         '
         'Label26
         '
@@ -306,7 +323,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtATCaendern.Margin = New System.Windows.Forms.Padding(0)
         Me.txtATCaendern.Name = "txtATCaendern"
         Me.txtATCaendern.Size = New System.Drawing.Size(186, 24)
-        Me.txtATCaendern.TabIndex = 6
+        Me.txtATCaendern.TabIndex = 60
         '
         'Label34
         '
@@ -1153,6 +1170,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnSaveDatetime.TabIndex = 11
         Me.btnSaveDatetime.Text = "speichern"
         Me.btnSaveDatetime.UseVisualStyleBackColor = False
+        Me.btnSaveDatetime.Visible = False
         '
         'lblId
         '
@@ -1277,6 +1295,16 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Panel1.Size = New System.Drawing.Size(1384, 61)
         Me.Panel1.TabIndex = 2
         '
+        'cbxRundPosanzeigen
+        '
+        Me.cbxRundPosanzeigen.AutoSize = True
+        Me.cbxRundPosanzeigen.Location = New System.Drawing.Point(12, 38)
+        Me.cbxRundPosanzeigen.Name = "cbxRundPosanzeigen"
+        Me.cbxRundPosanzeigen.Size = New System.Drawing.Size(169, 17)
+        Me.cbxRundPosanzeigen.TabIndex = 52
+        Me.cbxRundPosanzeigen.Text = "Rundungspositionen anzeigen"
+        Me.cbxRundPosanzeigen.UseVisualStyleBackColor = True
+        '
         'btnRundungsdifAusgl
         '
         Me.btnRundungsdifAusgl.Location = New System.Drawing.Point(1133, 7)
@@ -1668,16 +1696,6 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnAddSicherheit.TabIndex = 36
         Me.btnAddSicherheit.UseVisualStyleBackColor = False
         '
-        'cbxRundPosanzeigen
-        '
-        Me.cbxRundPosanzeigen.AutoSize = True
-        Me.cbxRundPosanzeigen.Location = New System.Drawing.Point(12, 38)
-        Me.cbxRundPosanzeigen.Name = "cbxRundPosanzeigen"
-        Me.cbxRundPosanzeigen.Size = New System.Drawing.Size(169, 17)
-        Me.cbxRundPosanzeigen.TabIndex = 52
-        Me.cbxRundPosanzeigen.Text = "Rundungspositionen anzeigen"
-        Me.cbxRundPosanzeigen.UseVisualStyleBackColor = True
-        '
         'frmGesamtsicherheitenNEU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1815,7 +1833,6 @@ Partial Class frmGesamtsicherheitenNEU
     Friend WithEvents FlatButton4 As VERAG_PROG_ALLGEMEIN.FlatButton
     Friend WithEvents btnNew As Button
     Friend WithEvents txtGestellInfo As TextBox
-    Friend WithEvents txtDatumaendern As TextBox
     Friend WithEvents Label26 As Label
     Friend WithEvents txtUhrzeitaendern As TextBox
     Friend WithEvents lbloffenerWarenwert As Label
@@ -1829,4 +1846,5 @@ Partial Class frmGesamtsicherheitenNEU
     Friend WithEvents Label30 As Label
     Friend WithEvents btnRundungsdifAusgl As Button
     Friend WithEvents cbxRundPosanzeigen As CheckBox
+    Friend WithEvents txtDatumaendern As VERAG_PROG_ALLGEMEIN.MyTextBox
 End Class

Aviso/frmGesamtsicherheitenNEU.vb

@@ -1,4 +1,5 @@
 
+Imports System.Web.UI.WebControls.Expressions
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmGesamtsicherheitenNEU
@@ -468,7 +469,7 @@ Public Class frmGesamtsicherheitenNEU
 
     Private Sub Date_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosDat.KeyPress, txtSicherheitDat.KeyPress, txtDatumaendern.KeyPress
         Select Case Asc(e.KeyChar)
-            Case 48 To 57, 8, 46, 58
+            Case 48 To 57, 8, 44, 46, 58, 47
                 ' Zahlen, Backspace, . und : zulassen
 
             Case Else
@@ -479,7 +480,8 @@ Public Class frmGesamtsicherheitenNEU
 
     Private Sub DateTime_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosTime.KeyPress, txtSicherheitTime.KeyPress, txtUhrzeitaendern.KeyPress
         Select Case Asc(e.KeyChar)
-            Case 48 To 57, 8, 46, 58
+            Case 48 To 57, 8, 44, 46, 58
+                'Case 48 To 57, 8, 44, 46, 58, 160, 188, 110, 111, 190, 226
                 ' Zahlen, Backspace, . und : zulassen
 
             Case Else
@@ -1175,12 +1177,22 @@ Public Class frmGesamtsicherheitenNEU
 
     Private Sub setPrevAndNextGesIDAllOpen()
 
+
         Dim isInList As Boolean = False
 
         Dim onlyOpenDT As DataTable
         dataTable.DefaultView.Sort = "gs_gsnr ASC"
         dataTable = dataTable.DefaultView.ToTable
+        If dataTable.Select("gs_isOpen = True").Any Then
             onlyOpenDT = dataTable.Select("gs_isOpen = True").CopyToDataTable
+        Else
+            prevGessicherheitID = -1
+            nextGessicherheitID = -1
+            MsgBox("keine offenen Gesamtsicherheiten gefunden!")
+            Exit Sub
+
+        End If
+
 
 
         For i As Integer = 0 To onlyOpenDT.Rows.Count - 1
@@ -1264,13 +1276,17 @@ Public Class frmGesamtsicherheitenNEU
         For i As Integer = 0 To dataTable.Rows.Count - 1
             If dataTable.Rows(i).Item("gs_gsnr") = Me.gessicherheitID Then
 
-                prevGessicherheitID = dataTable.Rows(i).Item("gs_gsnr") - 1
+                If i = 0 Then
+                    prevGessicherheitID = -1 ' no prev Sicherheit
+                Else
+                    prevGessicherheitID = dataTable.Rows(i - 1).Item("gs_gsnr")
+                End If
 
-                nextGessicherheitID = dataTable.Rows(i).Item("gs_gsnr") + 1
+                If i = dataTable.Rows.Count - 1 Then
-
+                    nextGessicherheitID = -1 ' ' no next Sicherheit
-
+                Else
-                If i = 0 Then prevGessicherheitID = -1 ' no prev Sicherheit
+                    nextGessicherheitID = dataTable.Rows(i + 1).Item("gs_gsnr")
-                If i = dataTable.Rows.Count - 1 Then nextGessicherheitID = -1 ' ' no next Sicherheit
+                End If
 
                 'MsgBox("prevGessicherheitID " & prevGessicherheitID)
                 'MsgBox("nextGessicherheitID " & nextGessicherheitID)
@@ -1295,8 +1311,10 @@ Public Class frmGesamtsicherheitenNEU
         If Me.prevGessicherheitID = -1 Then
             initPrevNextButtons()
             Exit Sub
-        End If
+        ElseIf Me.prevGessicherheitID > 0 Then
             Me.gessicherheitID = Me.prevGessicherheitID
+        End If
+
 
         LoadDGVSicherheiten()
     End Sub
@@ -1311,13 +1329,12 @@ Public Class frmGesamtsicherheitenNEU
             setPrevAndNextGesAll()
         End If
 
-
-
         If Me.nextGessicherheitID = -1 Then
             initPrevNextButtons()
             Exit Sub
-        End If
+        ElseIf Me.nextGessicherheitID > 0 Then
             Me.gessicherheitID = Me.nextGessicherheitID
+        End If
 
         LoadDGVSicherheiten()
     End Sub
@@ -1646,19 +1663,39 @@ Public Class frmGesamtsicherheitenNEU
 
         If txtPosTime.Text <> "" Then
             txtPosTime.Text = Replace(txtPosTime.Text, ".", ":")
+            txtPosTime.Text = Replace(txtPosTime.Text, ",", ":")
         End If
 
         If txtSicherheitTime.Text <> "" Then
             txtSicherheitTime.Text = Replace(txtSicherheitTime.Text, ".", ":")
+            txtSicherheitTime.Text = Replace(txtSicherheitTime.Text, ",", ":")
         End If
 
         If txtUhrzeitaendern.Text <> "" Then
             txtUhrzeitaendern.Text = Replace(txtUhrzeitaendern.Text, ".", ":")
+            txtUhrzeitaendern.Text = Replace(txtUhrzeitaendern.Text, ",", ":")
         End If
 
 
     End Sub
 
+    Private Sub txtPosDat_Leave(sender As Object, e As EventArgs) Handles txtPosDat.Leave, txtSicherheitDat.Leave, txtDatumaendern.Leave, txtUhrzeitaendern.Leave
+        If txtPosDat.Text <> "" Then
+            txtPosDat.Text = Replace(txtPosDat.Text, "/", ".")
+            txtPosDat.Text = Replace(txtPosDat.Text, ",", ".")
+        End If
+
+        If txtSicherheitDat.Text <> "" Then
+            txtSicherheitDat.Text = Replace(txtSicherheitDat.Text, "/", ".")
+            txtSicherheitDat.Text = Replace(txtSicherheitDat.Text, ",", ".")
+        End If
+
+        If txtDatumaendern.Text <> "" Then
+            txtDatumaendern.Text = Replace(txtDatumaendern.Text, "/", ".")
+            txtDatumaendern.Text = Replace(txtDatumaendern.Text, ",", ".")
+        End If
+    End Sub
+
     Private Sub changeLabel(Optional isATR As Boolean = True)
 
         If Standort = "Verag GmbH" Then
@@ -1757,4 +1794,5 @@ Public Class frmGesamtsicherheitenNEU
     Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles cbxRundPosanzeigen.CheckedChanged
         LoadDGVSicherheiten(True)
     End Sub
+
 End Class