Warenorte, etc.

2023-01-18 17:11:03 +01:00
parent 8b6ca3762f
commit 40fbf9a51c
4 changed files with 70 additions and 15 deletions
--- a/Aviso/UsrCntlEssensbestellungen.vb
+++ b/Aviso/UsrCntlEssensbestellungen.vb
@@ -208,12 +208,12 @@ Public Class UsrCntlessensbestellungen
            If TypeOf gb Is GroupBox Then
                For Each c As Control In gb.Controls

-                    If c.Text.ToLower.StartsWith(menu.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton Then
+                    If c.Text.ToLower.StartsWith(menu.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then
                        Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c
                        If rb.Checked Then countMenus = countMenus + 1
                    End If

-                    If c.Text.ToLower.StartsWith(alacarte.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton Then
+                    If c.Text.ToLower.StartsWith(alacarte.ToLower) AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then
                        Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c
                        If rb.Checked Then countlaCarte = countlaCarte + 1
                    End If
--- a/Aviso/frmEssensbestellungenAdministration.Designer.vb
+++ b/Aviso/frmEssensbestellungenAdministration.Designer.vb
@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmEssensbestellungenAdministration
    Inherits System.Windows.Forms.Form

    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
        Try
            If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class frmEssensbestellungenAdministration
    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmEssensbestellungenAdministration))
@@ -73,6 +73,8 @@ 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.Label11 = New System.Windows.Forms.Label()
+        Me.txtMarkierteDS = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.pnlTop.SuspendLayout()
        Me.Panel1.SuspendLayout()
        Me.ContextMenuStrip1.SuspendLayout()
@@ -113,6 +115,8 @@ Partial Class frmEssensbestellungenAdministration
        '
        'Panel1
        '
+        Me.Panel1.Controls.Add(Me.txtMarkierteDS)
+        Me.Panel1.Controls.Add(Me.Label11)
        Me.Panel1.Controls.Add(Me.btnNew)
        Me.Panel1.Controls.Add(Me.cbKW)
        Me.Panel1.Controls.Add(Me.Label6)
@@ -540,7 +544,7 @@ Partial Class frmEssensbestellungenAdministration
        '
        'txtAnzahlDS
        '
-        Me.txtAnzahlDS.Location = New System.Drawing.Point(1020, 744)
+        Me.txtAnzahlDS.Location = New System.Drawing.Point(1032, 745)
        Me.txtAnzahlDS.Name = "txtAnzahlDS"
        Me.txtAnzahlDS.ReadOnly = True
        Me.txtAnzahlDS.Size = New System.Drawing.Size(42, 20)
@@ -561,7 +565,7 @@ Partial Class frmEssensbestellungenAdministration
        '
        Me.Label5.AutoSize = True
        Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label5.Location = New System.Drawing.Point(913, 747)
+        Me.Label5.Location = New System.Drawing.Point(925, 748)
        Me.Label5.Name = "Label5"
        Me.Label5.Size = New System.Drawing.Size(99, 13)
        Me.Label5.TabIndex = 44
@@ -696,6 +700,42 @@ Partial Class frmEssensbestellungenAdministration
        Me.Label9.Text = "Gesamtbetrag"
        Me.Label9.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
+        'Label11
+        '
+        Me.Label11.AutoSize = True
+        Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label11.Location = New System.Drawing.Point(1032, 46)
+        Me.Label11.Name = "Label11"
+        Me.Label11.Size = New System.Drawing.Size(125, 13)
+        Me.Label11.TabIndex = 66
+        Me.Label11.Text = "Betrag markierte DS:"
+        Me.Label11.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
+        'txtMarkierteDS
+        '
+        Me.txtMarkierteDS._DateTimeOnly = False
+        Me.txtMarkierteDS._numbersOnly = False
+        Me.txtMarkierteDS._numbersOnlyKommastellen = ""
+        Me.txtMarkierteDS._numbersOnlyTrennzeichen = False
+        Me.txtMarkierteDS._Prozent = False
+        Me.txtMarkierteDS._ShortDateNew = False
+        Me.txtMarkierteDS._ShortDateOnly = False
+        Me.txtMarkierteDS._TimeOnly = False
+        Me.txtMarkierteDS._TimeOnly_Seconds = False
+        Me.txtMarkierteDS._value = ""
+        Me.txtMarkierteDS._Waehrung = True
+        Me.txtMarkierteDS._WaehrungZeichen = True
+        Me.txtMarkierteDS.ForeColor = System.Drawing.Color.Black
+        Me.txtMarkierteDS.Location = New System.Drawing.Point(1035, 62)
+        Me.txtMarkierteDS.MaxLineLength = -1
+        Me.txtMarkierteDS.MaxLines_Warning = ""
+        Me.txtMarkierteDS.MaxLines_Warning_Label = Nothing
+        Me.txtMarkierteDS.Name = "txtMarkierteDS"
+        Me.txtMarkierteDS.ReadOnly = True
+        Me.txtMarkierteDS.Size = New System.Drawing.Size(68, 20)
+        Me.txtMarkierteDS.TabIndex = 65
+        Me.txtMarkierteDS.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
        'frmEssensbestellungenAdministration
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -780,4 +820,6 @@ Partial Class frmEssensbestellungenAdministration
    Friend WithEvents Button2 As Button
    Friend WithEvents Label9 As Label
    Friend WithEvents btnNew As Button
+    Friend WithEvents Label11 As Label
+    Friend WithEvents txtMarkierteDS As VERAG_PROG_ALLGEMEIN.MyTextBox
 End Class
--- a/Aviso/frmEssensbestellungenAdministration.vb
+++ b/Aviso/frmEssensbestellungenAdministration.vb
@@ -271,7 +271,7 @@ Public Class frmEssensbestellungenAdministration
        If dgvBestellungen.SelectedRows.Count = 0 Then Exit Sub

        Select Case sender.Text
-            Case "abgerechnet"
+            Case "abgerechnen"
                Select Case dgvBestellungen.SelectedRows.Count
                    Case 1
                        If vbYes = MsgBox("Möchten Sie die Essensbestellung '" & dgvBestellungen.SelectedRows(0).Cells("eb_kw").Value & " von Mitarbeiter " & dgvBestellungen.SelectedRows(0).Cells("eb_mitname").Value & " abrechnen", vbYesNoCancel) Then
@@ -706,5 +706,18 @@ Public Class frmEssensbestellungenAdministration

    Private Sub dgvBestellungen_SelectionChanged(sender As Object, e As EventArgs) Handles dgvBestellungen.SelectionChanged
        lblWarning.Text = ""
+
+        Dim countSumme As Double = 0
+
+        If dgvBestellungen.SelectedRows.Count > 0 Then
+
+            For i As Integer = 0 To dgvBestellungen.SelectedRows.Count - 1
+                countSumme += CDbl(dgvBestellungen.SelectedRows(i).Cells("eb_preis").Value)
+
+            Next
+
+        End If
+
+        txtMarkierteDS._value = countSumme.ToString
    End Sub
 End Class
--- a/Aviso/frmWarenorte.vb
+++ b/Aviso/frmWarenorte.vb
@@ -196,7 +196,7 @@ Public Class frmWarenorte
        WarenortNew.wo_bezeichnung = txtBezeichnung.Text
        WarenortNew.wo_aktiv = cbxAktiv.Checked
        WarenortNew.wo_ort = txtOrt.Text
-        WarenortNew.wo_grenzstelle = cbxGrenzstelle._value
+        WarenortNew.wo_grenzstelle = IIf(cbxGrenzstelle._value = "", DBNull.Value, cbxGrenzstelle._value)
        WarenortNew.wo_firma = cbxFirmaChange._value
        WarenortNew.wo_cluster = txtCluster.Text
        WarenortNew.wo_knnr = txtKennr.Text
@@ -208,12 +208,12 @@ Public Class frmWarenorte
        WarenortNew.wo_ze = cxZE.Checked
        WarenortNew.wo_zv = cxZV.Checked

-        If cbxGrenzstelle._value = "" Then
-            lblWarning.Text = "Grenzstelle muss ausgewählt werden!"
-            Exit Sub
-        Else
-            lblWarning.Text = ""
-        End If
+        'If cbxGrenzstelle._value = "" Then
+        '    lblWarning.Text = "Grenzstelle muss ausgewählt werden!"
+        '    Exit Sub
+        'Else
+        '    lblWarning.Text = ""
+        'End If

        WarenortNew.SAVE()
        dgvWarenorteNew.GetOrder()