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

2023-02-02 13:07:15 +01:00
parent f77a8b16d7 ba2a6591d3
commit f8a354348b
4 changed files with 83 additions and 49 deletions
--- a/Aviso/frmEssensbestellungenAdministration.vb
+++ b/Aviso/frmEssensbestellungenAdministration.vb
@@ -16,8 +16,8 @@ Public Class frmEssensbestellungenAdministration
        btnJahr.Text = JAHR.Year

        txtMitarbeiter.Text = ""
-        cboGebaeude.changeItem("")
-        cboAbteilung.changeItem("")
+        'cboGebaeude.changeItem("")
+        'cboAbteilung.changeItem("")
        cbxStornos.Checked = False
        cbxAbgerechnet.Checked = False

@@ -29,12 +29,11 @@ Public Class frmEssensbestellungenAdministration

        cbKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen] ORDER BY eb_kw desc", False, "AVISO", True)

-
-        cbxMailKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen]", False, "AVISO", True)
+        cbxMailKW.Items.AddRange(cbKW.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
        cbxMailKW.changeItem("")

        cbxMailGebäude.changeItem("")
-        cbxMailGebäude.fillWithSQL("SELECT DISTINCT(eb_gebaeude) FROM [tblEssensbestellungen]", False, "AVISO", True)
+        cbxMailGebäude.Items.AddRange(cboGebaeude.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())

        loadBestellungen()

@@ -232,7 +231,7 @@ Public Class frmEssensbestellungenAdministration
        cbxStornos.Checked = False
        cbxAbgerechnet.Checked = False
        txtBestellDat.Text = Date.Parse("01.01.2001")
-        txtBestellDatBis.Text = Now.ToShortDateString
+        txtBestellDatBis.Text = Now.AddDays(7).ToShortDateString 'Um die aktuellen EB für nächste Woche zu sehen
        Me.btnSuche.PerformClick()

    End Sub
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
@@ -60,6 +60,7 @@ Public Class frmGesamtsicherheitenNEU
            cbxRundPosanzeigen.Visible = False
        End If

+
        currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort)
        SaldoNew = Decimal.Parse(currentGesSichRef.CalcSaldo())
        lblSaldo.Text = "Saldo: €" & SaldoNew.ToString("N")
@@ -85,7 +86,7 @@ Public Class frmGesamtsicherheitenNEU
            txtlkwIdSearch.initSearchBox(Me.FindForm, "  LKW_Nr, AvisoID, CAST(Datum as Date) as Datum FROM [Aviso]", {"LKW_Nr", "AvisoID", "Datum"}, "", "Datum desc", "LKW_Nr", "AvisoID", "AVISO",, 250, 200)

        Else
-            LoadDGVSicherheiten()
+            LoadDGVSicherheiten(True)
        End If
        LoadStandort()
        cboSicherheitATR.Enabled = currentGesSichRef.brgakto_gs_ATR
@@ -94,6 +95,7 @@ Public Class frmGesamtsicherheitenNEU
        initPrevNextButtons()
        changeLabel()

+
        Me.Text = "Gesamtsicherheit " & Standort
        frmHauptfenster.EnableDoubleBuffered(dgvSicherheitsPos)

@@ -182,6 +184,8 @@ Public Class frmGesamtsicherheitenNEU

    Public Sub LoadDataTableSicherheitenForExport(list As List(Of Integer), datumVon As String, datumBis As String)

+        Me.Cursor = Cursors.WaitCursor
+
        Dim gsnr As String
        Dim counter = 0
        For Each n In list
@@ -239,6 +243,7 @@ Public Class frmGesamtsicherheitenNEU

        dtSicherheiten.Columns.Remove("Saldo")

+        Me.Cursor = Cursors.Default

    End Sub

@@ -1168,7 +1173,7 @@ Public Class frmGesamtsicherheitenNEU
    End Sub


-    Private Function setPrevAndNextGesIDAllOpen()
+    Private Sub setPrevAndNextGesIDAllOpen()

        Dim isInList As Boolean = False

@@ -1211,10 +1216,10 @@ Public Class frmGesamtsicherheitenNEU

        End If

-    End Function
+    End Sub


-    Private Function setPrevAndNextGesIDAllOpenIfNotInList(ByRef isInList As Boolean)
+    Private Sub setPrevAndNextGesIDAllOpenIfNotInList(ByRef isInList As Boolean)

        For i As Integer = 0 To dataTable.Rows.Count - 1
            If dataTable.Rows(i).Item("gs_gsnr") = Me.gessicherheitID Then
@@ -1251,10 +1256,10 @@ Public Class frmGesamtsicherheitenNEU

        Next

-    End Function
+    End Sub


-    Private Function setPrevAndNextGesAll()
+    Private Function setPrevAndNextGesAll() As Integer

        For i As Integer = 0 To dataTable.Rows.Count - 1
            If dataTable.Rows(i).Item("gs_gsnr") = Me.gessicherheitID Then
@@ -1279,6 +1284,8 @@ Public Class frmGesamtsicherheitenNEU

    Private Sub btnPrev_Click(sender As Object, e As EventArgs) Handles btnPrev.Click

+        If dataTable.Rows.Count < 2 Then Exit Sub
+
        If (cbx_offene.Checked) Then
            setPrevAndNextGesIDAllOpen()
        Else
@@ -1296,6 +1303,8 @@ Public Class frmGesamtsicherheitenNEU

    Private Sub btnNext_Click(sender As Object, e As EventArgs) Handles btnNext.Click

+        If dataTable.Rows.Count < 2 Then Exit Sub
+
        If (cbx_offene.Checked) Then
            setPrevAndNextGesIDAllOpen()
        Else
--- a/Aviso/frmWarenorte.Designer.vb
+++ b/Aviso/frmWarenorte.Designer.vb
@@ -75,7 +75,7 @@ Partial Class frmWarenorte
        Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top
        Me.pnlTop.Location = New System.Drawing.Point(0, 0)
        Me.pnlTop.Name = "pnlTop"
-        Me.pnlTop.Size = New System.Drawing.Size(690, 48)
+        Me.pnlTop.Size = New System.Drawing.Size(726, 48)
        Me.pnlTop.TabIndex = 2
        '
        'lblWarning
@@ -103,7 +103,7 @@ Partial Class frmWarenorte
        '
        Me.Label3.AutoSize = True
        Me.Label3.ForeColor = System.Drawing.Color.White
-        Me.Label3.Location = New System.Drawing.Point(555, 8)
+        Me.Label3.Location = New System.Drawing.Point(592, 8)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(32, 13)
        Me.Label3.TabIndex = 5
@@ -116,7 +116,7 @@ Partial Class frmWarenorte
        Me.cbxFirma._value = ""
        Me.cbxFirma.DropDownWidth = 150
        Me.cbxFirma.FormattingEnabled = True
-        Me.cbxFirma.Location = New System.Drawing.Point(558, 24)
+        Me.cbxFirma.Location = New System.Drawing.Point(595, 24)
        Me.cbxFirma.Name = "cbxFirma"
        Me.cbxFirma.Size = New System.Drawing.Size(128, 21)
        Me.cbxFirma.TabIndex = 13
@@ -147,7 +147,7 @@ Partial Class frmWarenorte
        '
        Me.txtWarenort.Location = New System.Drawing.Point(12, 25)
        Me.txtWarenort.Name = "txtWarenort"
-        Me.txtWarenort.Size = New System.Drawing.Size(100, 20)
+        Me.txtWarenort.Size = New System.Drawing.Size(126, 20)
        Me.txtWarenort.TabIndex = 0
        '
        'Label1
@@ -162,7 +162,7 @@ Partial Class frmWarenorte
        'Label2
        '
        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(126, 9)
+        Me.Label2.Location = New System.Drawing.Point(152, 9)
        Me.Label2.Name = "Label2"
        Me.Label2.Size = New System.Drawing.Size(69, 13)
        Me.Label2.TabIndex = 3
@@ -170,15 +170,15 @@ Partial Class frmWarenorte
        '
        'txtBezeichnung
        '
-        Me.txtBezeichnung.Location = New System.Drawing.Point(129, 25)
+        Me.txtBezeichnung.Location = New System.Drawing.Point(155, 25)
        Me.txtBezeichnung.Name = "txtBezeichnung"
-        Me.txtBezeichnung.Size = New System.Drawing.Size(100, 20)
+        Me.txtBezeichnung.Size = New System.Drawing.Size(121, 20)
        Me.txtBezeichnung.TabIndex = 2
        '
        'Label5
        '
        Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(126, 59)
+        Me.Label5.Location = New System.Drawing.Point(152, 59)
        Me.Label5.Name = "Label5"
        Me.Label5.Size = New System.Drawing.Size(21, 13)
        Me.Label5.TabIndex = 7
@@ -186,15 +186,15 @@ Partial Class frmWarenorte
        '
        'txtOrt
        '
-        Me.txtOrt.Location = New System.Drawing.Point(129, 75)
+        Me.txtOrt.Location = New System.Drawing.Point(155, 75)
        Me.txtOrt.Name = "txtOrt"
-        Me.txtOrt.Size = New System.Drawing.Size(100, 20)
+        Me.txtOrt.Size = New System.Drawing.Size(121, 20)
        Me.txtOrt.TabIndex = 5
        '
        'Label6
        '
        Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(246, 114)
+        Me.Label6.Location = New System.Drawing.Point(292, 114)
        Me.Label6.Name = "Label6"
        Me.Label6.Size = New System.Drawing.Size(65, 13)
        Me.Label6.TabIndex = 9
@@ -203,7 +203,7 @@ Partial Class frmWarenorte
        'Label7
        '
        Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(126, 114)
+        Me.Label7.Location = New System.Drawing.Point(152, 114)
        Me.Label7.Name = "Label7"
        Me.Label7.Size = New System.Drawing.Size(46, 13)
        Me.Label7.TabIndex = 11
@@ -211,15 +211,15 @@ Partial Class frmWarenorte
        '
        'txtKennr
        '
-        Me.txtKennr.Location = New System.Drawing.Point(129, 130)
+        Me.txtKennr.Location = New System.Drawing.Point(155, 130)
        Me.txtKennr.Name = "txtKennr"
-        Me.txtKennr.Size = New System.Drawing.Size(100, 20)
+        Me.txtKennr.Size = New System.Drawing.Size(121, 20)
        Me.txtKennr.TabIndex = 8
        '
        'cbxAktiv
        '
        Me.cbxAktiv.AutoSize = True
-        Me.cbxAktiv.Location = New System.Drawing.Point(252, 9)
+        Me.cbxAktiv.Location = New System.Drawing.Point(298, 9)
        Me.cbxAktiv.Name = "cbxAktiv"
        Me.cbxAktiv.Size = New System.Drawing.Size(50, 17)
        Me.cbxAktiv.TabIndex = 3
@@ -229,7 +229,7 @@ Partial Class frmWarenorte
        'Label8
        '
        Me.Label8.AutoSize = True
-        Me.Label8.Location = New System.Drawing.Point(249, 59)
+        Me.Label8.Location = New System.Drawing.Point(295, 59)
        Me.Label8.Name = "Label8"
        Me.Label8.Size = New System.Drawing.Size(39, 13)
        Me.Label8.TabIndex = 16
@@ -237,13 +237,16 @@ Partial Class frmWarenorte
        '
        'txtCluster
        '
-        Me.txtCluster.Location = New System.Drawing.Point(252, 75)
+        Me.txtCluster.Location = New System.Drawing.Point(298, 75)
        Me.txtCluster.Name = "txtCluster"
        Me.txtCluster.Size = New System.Drawing.Size(100, 20)
        Me.txtCluster.TabIndex = 6
        '
        'mainPanel
        '
+        Me.mainPanel.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.mainPanel.Controls.Add(Me.GroupBoxFK)
        Me.mainPanel.Controls.Add(Me.txtStrasse)
        Me.mainPanel.Controls.Add(Me.Label10)
@@ -267,7 +270,7 @@ Partial Class frmWarenorte
        Me.mainPanel.Controls.Add(Me.Label6)
        Me.mainPanel.Location = New System.Drawing.Point(320, 55)
        Me.mainPanel.Name = "mainPanel"
-        Me.mainPanel.Size = New System.Drawing.Size(366, 241)
+        Me.mainPanel.Size = New System.Drawing.Size(406, 241)
        Me.mainPanel.TabIndex = 17
        '
        'GroupBoxFK
@@ -278,7 +281,7 @@ Partial Class frmWarenorte
        Me.GroupBoxFK.Controls.Add(Me.cxZV)
        Me.GroupBoxFK.Location = New System.Drawing.Point(12, 159)
        Me.GroupBoxFK.Name = "GroupBoxFK"
-        Me.GroupBoxFK.Size = New System.Drawing.Size(183, 74)
+        Me.GroupBoxFK.Size = New System.Drawing.Size(264, 74)
        Me.GroupBoxFK.TabIndex = 25
        Me.GroupBoxFK.TabStop = False
        Me.GroupBoxFK.Text = "Förmlichkeiten"
@@ -286,7 +289,7 @@ Partial Class frmWarenorte
        'cxIM
        '
        Me.cxIM.AutoSize = True
-        Me.cxIM.Location = New System.Drawing.Point(117, 41)
+        Me.cxIM.Location = New System.Drawing.Point(143, 43)
        Me.cxIM.Name = "cxIM"
        Me.cxIM.Size = New System.Drawing.Size(55, 17)
        Me.cxIM.TabIndex = 7
@@ -296,7 +299,7 @@ Partial Class frmWarenorte
        'cxEX
        '
        Me.cxEX.AutoSize = True
-        Me.cxEX.Location = New System.Drawing.Point(117, 16)
+        Me.cxEX.Location = New System.Drawing.Point(143, 18)
        Me.cxEX.Name = "cxEX"
        Me.cxEX.Size = New System.Drawing.Size(56, 17)
        Me.cxEX.TabIndex = 6
@@ -327,7 +330,7 @@ Partial Class frmWarenorte
        '
        Me.txtStrasse.Location = New System.Drawing.Point(12, 75)
        Me.txtStrasse.Name = "txtStrasse"
-        Me.txtStrasse.Size = New System.Drawing.Size(100, 20)
+        Me.txtStrasse.Size = New System.Drawing.Size(126, 20)
        Me.txtStrasse.TabIndex = 4
        '
        'Label10
@@ -347,7 +350,7 @@ Partial Class frmWarenorte
        Me.cbxFirmaChange.DropDownWidth = 120
        Me.cbxFirmaChange.Enabled = False
        Me.cbxFirmaChange.FormattingEnabled = True
-        Me.cbxFirmaChange.Location = New System.Drawing.Point(252, 175)
+        Me.cbxFirmaChange.Location = New System.Drawing.Point(298, 175)
        Me.cbxFirmaChange.Name = "cbxFirmaChange"
        Me.cbxFirmaChange.Size = New System.Drawing.Size(100, 21)
        Me.cbxFirmaChange.TabIndex = 21
@@ -356,7 +359,7 @@ Partial Class frmWarenorte
        'Label
        '
        Me.Label.AutoSize = True
-        Me.Label.Location = New System.Drawing.Point(249, 159)
+        Me.Label.Location = New System.Drawing.Point(295, 159)
        Me.Label.Name = "Label"
        Me.Label.Size = New System.Drawing.Size(32, 13)
        Me.Label.TabIndex = 20
@@ -376,12 +379,12 @@ Partial Class frmWarenorte
        '
        Me.txtReihenfolge.Location = New System.Drawing.Point(12, 130)
        Me.txtReihenfolge.Name = "txtReihenfolge"
-        Me.txtReihenfolge.Size = New System.Drawing.Size(100, 20)
+        Me.txtReihenfolge.Size = New System.Drawing.Size(126, 20)
        Me.txtReihenfolge.TabIndex = 7
        '
        'btnSave
        '
-        Me.btnSave.Location = New System.Drawing.Point(277, 210)
+        Me.btnSave.Location = New System.Drawing.Point(323, 210)
        Me.btnSave.Name = "btnSave"
        Me.btnSave.Size = New System.Drawing.Size(75, 23)
        Me.btnSave.TabIndex = 10
@@ -395,7 +398,7 @@ Partial Class frmWarenorte
        Me.cbxGrenzstelle._value = ""
        Me.cbxGrenzstelle.DropDownWidth = 120
        Me.cbxGrenzstelle.FormattingEnabled = True
-        Me.cbxGrenzstelle.Location = New System.Drawing.Point(249, 130)
+        Me.cbxGrenzstelle.Location = New System.Drawing.Point(295, 130)
        Me.cbxGrenzstelle.Name = "cbxGrenzstelle"
        Me.cbxGrenzstelle.Size = New System.Drawing.Size(100, 21)
        Me.cbxGrenzstelle.TabIndex = 9
@@ -425,17 +428,17 @@ Partial Class frmWarenorte
        Me.UsrcntlPDFScanList1.BackColor = System.Drawing.Color.White
        Me.UsrcntlPDFScanList1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
        Me.UsrcntlPDFScanList1.Cursor = System.Windows.Forms.Cursors.Default
-        Me.UsrcntlPDFScanList1.Location = New System.Drawing.Point(320, 299)
+        Me.UsrcntlPDFScanList1.Location = New System.Drawing.Point(335, 299)
        Me.UsrcntlPDFScanList1.Margin = New System.Windows.Forms.Padding(0)
        Me.UsrcntlPDFScanList1.Name = "UsrcntlPDFScanList1"
-        Me.UsrcntlPDFScanList1.Size = New System.Drawing.Size(366, 81)
+        Me.UsrcntlPDFScanList1.Size = New System.Drawing.Size(367, 81)
        Me.UsrcntlPDFScanList1.TabIndex = 99
        '
        'frmWarenorte
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(690, 382)
+        Me.ClientSize = New System.Drawing.Size(726, 382)
        Me.Controls.Add(Me.UsrcntlPDFScanList1)
        Me.Controls.Add(Me.mainPanel)
        Me.Controls.Add(Me.btnAdd)
--- a/Aviso/frmWarenorte.vb
+++ b/Aviso/frmWarenorte.vb
@@ -192,12 +192,7 @@ Public Class frmWarenorte

        Dim WarenortNew As New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_id").Value)

-        If txtWarenort.TextLength > 50 Then
-            lblWarning.Text = "Warenort darf max 50 Zeichen besitzen!"
-            Exit Sub
-        Else
-            lblWarning.Text = ""
-        End If
+        If checkFields() = False Then Exit Sub

        WarenortNew.wo_warenort = txtWarenort.Text
        WarenortNew.wo_bezeichnung = txtBezeichnung.Text
@@ -217,12 +212,15 @@ Public Class frmWarenorte


        WarenortNew.SAVE()
+
        dgvWarenorteNew.GetOrder()
        initDGVWarenort(cbxFirma._value)
        dgvWarenorteNew.SetOrder()



+
+
    End Sub

    Private Sub cbxFirma_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxFirma.SelectedValueChanged
@@ -238,7 +236,7 @@ Public Class frmWarenorte


        If cbxFirma._value = "" Then
-            If ((dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is DBNull.Value Or dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is Nothing Or dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value = "") And initialSave = False) Then
+            If ((dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is DBNull.Value Or dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is Nothing Or dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value = "") Or initialSave = True) Then 'And initialSave = False ???

                If setWarning Then
                    lblWarning.Text = "Bitte Firma auswählen!"
@@ -263,4 +261,29 @@ Public Class frmWarenorte

    End Function

+    Private Function checkFields() As Boolean
+
+        If txtWarenort.TextLength > 50 Then
+            lblWarning.Text = "Warenort darf max 50 Zeichen besitzen!"
+            Return False
+        ElseIf txtBezeichnung.TextLength > 50 Then
+            lblWarning.Text = "Bezeichnung darf max 50 Zeichen besitzen!"
+            Return False
+        ElseIf txtStrasse.TextLength > 60 Then
+            lblWarning.Text = "Strasse darf max 60 Zeichen besitzen!"
+            Return False
+        ElseIf txtOrt.TextLength > 50 Then
+            lblWarning.Text = "Ort darf max 50 Zeichen besitzen!"
+            Return False
+        ElseIf txtKennr.TextLength > 20 Then
+            lblWarning.Text = "Kennnummer darf max 20 Zeichen besitzen!"
+            Return False
+        End If
+
+        lblWarning.Text = ""
+        Return True
+
+
+    End Function
+
 End Class