From bdee5e11764f265784f30ee4d4ec2ff2b08b97b3 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 11 Jan 2023 14:49:31 +0100 Subject: [PATCH] Umbau Warenorte, Neues Feature Essensbestellungen, Sendungsvermerk bei GMVS --- Aviso/UsrCntlEssensbestellungen.Designer.vb | 157 +++++++++++++----- Aviso/UsrCntlEssensbestellungen.vb | 131 ++++++++++++++- Aviso/frmEssensbestellungen.vb | 3 +- ...sensbestellungenAdministration.Designer.vb | 23 ++- Aviso/frmEssensbestellungenAdministration.vb | 23 ++- Aviso/frmSendungsdetailsNEU.vb | 2 +- Aviso/frmWarenorte.Designer.vb | 85 ++++++---- Aviso/frmWarenorte.vb | 78 +++++---- 8 files changed, 376 insertions(+), 126 deletions(-) diff --git a/Aviso/UsrCntlEssensbestellungen.Designer.vb b/Aviso/UsrCntlEssensbestellungen.Designer.vb index f8d848d..cb8d970 100644 --- a/Aviso/UsrCntlEssensbestellungen.Designer.vb +++ b/Aviso/UsrCntlEssensbestellungen.Designer.vb @@ -64,12 +64,18 @@ Partial Class UsrCntlessensbestellungen Me.CheckBox1 = New System.Windows.Forms.CheckBox() Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() Me.CheckBox2 = New System.Windows.Forms.CheckBox() - Me.Button1 = New System.Windows.Forms.Button() - Me.txtGebäude = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.btnSave = New System.Windows.Forms.Button() Me.Label1 = New System.Windows.Forms.Label() Me.CheckBox3 = New System.Windows.Forms.CheckBox() Me.Label3 = New System.Windows.Forms.Label() Me.txtAnmerkung = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label4 = New System.Windows.Forms.Label() + Me.cbxMitarbeiter = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cbxGebäude = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.lblWochenkarte = New System.Windows.Forms.Label() + Me.cbxMenu = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cbxAbteilung = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label5 = New System.Windows.Forms.Label() Me.MyPanel1.SuspendLayout() Me.GroupBoxDienstag.SuspendLayout() Me.GroupBoxMontag.SuspendLayout() @@ -92,7 +98,7 @@ Partial Class UsrCntlessensbestellungen Me.MyPanel1.Controls.Add(Me.Mittwoch) Me.MyPanel1.Controls.Add(Me.GroupBoxDonnerstag) Me.MyPanel1.Controls.Add(Me.txtAnzahlMenu) - Me.MyPanel1.Location = New System.Drawing.Point(3, 48) + Me.MyPanel1.Location = New System.Drawing.Point(3, 77) Me.MyPanel1.Name = "MyPanel1" Me.MyPanel1.Size = New System.Drawing.Size(667, 266) Me.MyPanel1.TabIndex = 19 @@ -563,7 +569,7 @@ Partial Class UsrCntlessensbestellungen 'CheckBox1 ' Me.CheckBox1.AutoSize = True - Me.CheckBox1.Location = New System.Drawing.Point(121, 14) + Me.CheckBox1.Location = New System.Drawing.Point(12, 26) Me.CheckBox1.Name = "CheckBox1" Me.CheckBox1.Size = New System.Drawing.Size(63, 17) Me.CheckBox1.TabIndex = 20 @@ -573,50 +579,27 @@ Partial Class UsrCntlessensbestellungen 'CheckBox2 ' Me.CheckBox2.AutoSize = True - Me.CheckBox2.Location = New System.Drawing.Point(12, 14) + Me.CheckBox2.Location = New System.Drawing.Point(12, 4) Me.CheckBox2.Name = "CheckBox2" Me.CheckBox2.Size = New System.Drawing.Size(86, 17) Me.CheckBox2.TabIndex = 21 Me.CheckBox2.Text = "abgerechnet" Me.CheckBox2.UseVisualStyleBackColor = True ' - 'Button1 + 'btnSave ' - Me.Button1.DialogResult = System.Windows.Forms.DialogResult.OK - Me.Button1.Location = New System.Drawing.Point(595, 320) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(75, 23) - Me.Button1.TabIndex = 22 - Me.Button1.Text = "Speichern" - Me.Button1.UseVisualStyleBackColor = True - ' - 'txtGebäude - ' - Me.txtGebäude._DateTimeOnly = False - Me.txtGebäude._numbersOnly = False - Me.txtGebäude._numbersOnlyKommastellen = "" - Me.txtGebäude._numbersOnlyTrennzeichen = True - Me.txtGebäude._Prozent = False - Me.txtGebäude._ShortDateNew = False - Me.txtGebäude._ShortDateOnly = False - Me.txtGebäude._TimeOnly = False - Me.txtGebäude._TimeOnly_Seconds = False - Me.txtGebäude._value = "" - Me.txtGebäude._Waehrung = False - Me.txtGebäude._WaehrungZeichen = True - Me.txtGebäude.ForeColor = System.Drawing.Color.Black - Me.txtGebäude.Location = New System.Drawing.Point(514, 2) - Me.txtGebäude.MaxLineLength = -1 - Me.txtGebäude.MaxLines_Warning = "" - Me.txtGebäude.MaxLines_Warning_Label = Nothing - Me.txtGebäude.Name = "txtGebäude" - Me.txtGebäude.Size = New System.Drawing.Size(142, 20) - Me.txtGebäude.TabIndex = 30 + Me.btnSave.DialogResult = System.Windows.Forms.DialogResult.OK + Me.btnSave.Location = New System.Drawing.Point(595, 349) + Me.btnSave.Name = "btnSave" + Me.btnSave.Size = New System.Drawing.Size(75, 23) + Me.btnSave.TabIndex = 22 + Me.btnSave.Text = "Speichern" + Me.btnSave.UseVisualStyleBackColor = True ' 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(444, 5) + Me.Label1.Location = New System.Drawing.Point(443, 27) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(54, 13) Me.Label1.TabIndex = 30 @@ -625,7 +608,7 @@ Partial Class UsrCntlessensbestellungen 'CheckBox3 ' Me.CheckBox3.AutoSize = True - Me.CheckBox3.Location = New System.Drawing.Point(225, 14) + Me.CheckBox3.Location = New System.Drawing.Point(12, 49) Me.CheckBox3.Name = "CheckBox3" Me.CheckBox3.Size = New System.Drawing.Size(70, 17) Me.CheckBox3.TabIndex = 31 @@ -635,7 +618,7 @@ Partial Class UsrCntlessensbestellungen 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(444, 26) + Me.Label3.Location = New System.Drawing.Point(444, 50) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(64, 13) Me.Label3.TabIndex = 32 @@ -656,7 +639,7 @@ Partial Class UsrCntlessensbestellungen Me.txtAnmerkung._Waehrung = False Me.txtAnmerkung._WaehrungZeichen = True Me.txtAnmerkung.ForeColor = System.Drawing.Color.Black - Me.txtAnmerkung.Location = New System.Drawing.Point(514, 23) + Me.txtAnmerkung.Location = New System.Drawing.Point(514, 46) Me.txtAnmerkung.MaxLineLength = -1 Me.txtAnmerkung.MaxLines_Warning = "" Me.txtAnmerkung.MaxLines_Warning_Label = Nothing @@ -664,21 +647,99 @@ Partial Class UsrCntlessensbestellungen Me.txtAnmerkung.Size = New System.Drawing.Size(142, 20) Me.txtAnmerkung.TabIndex = 33 ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(210, 5) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(59, 13) + Me.Label4.TabIndex = 34 + Me.Label4.Text = "Mitarbeiter:" + ' + 'cbxMitarbeiter + ' + Me.cbxMitarbeiter._allowedValuesFreiText = Nothing + Me.cbxMitarbeiter._allowFreiText = False + Me.cbxMitarbeiter._value = "" + Me.cbxMitarbeiter.FormattingEnabled = True + Me.cbxMitarbeiter.Location = New System.Drawing.Point(275, 0) + Me.cbxMitarbeiter.Name = "cbxMitarbeiter" + Me.cbxMitarbeiter.Size = New System.Drawing.Size(138, 21) + Me.cbxMitarbeiter.TabIndex = 35 + ' + 'cbxGebäude + ' + Me.cbxGebäude._allowedValuesFreiText = Nothing + Me.cbxGebäude._allowFreiText = False + Me.cbxGebäude._value = "" + Me.cbxGebäude.FormattingEnabled = True + Me.cbxGebäude.Location = New System.Drawing.Point(514, 24) + Me.cbxGebäude.Name = "cbxGebäude" + Me.cbxGebäude.Size = New System.Drawing.Size(142, 21) + Me.cbxGebäude.TabIndex = 36 + ' + 'lblWochenkarte + ' + Me.lblWochenkarte.AutoSize = True + Me.lblWochenkarte.Location = New System.Drawing.Point(210, 26) + Me.lblWochenkarte.Name = "lblWochenkarte" + Me.lblWochenkarte.Size = New System.Drawing.Size(34, 13) + Me.lblWochenkarte.TabIndex = 38 + Me.lblWochenkarte.Text = "Menü" + ' + 'cbxMenu + ' + Me.cbxMenu._allowedValuesFreiText = Nothing + Me.cbxMenu._allowFreiText = False + Me.cbxMenu._value = "" + Me.cbxMenu.DropDownWidth = 200 + Me.cbxMenu.FormattingEnabled = True + Me.cbxMenu.Location = New System.Drawing.Point(275, 27) + Me.cbxMenu.Name = "cbxMenu" + Me.cbxMenu.Size = New System.Drawing.Size(138, 21) + Me.cbxMenu.TabIndex = 37 + ' + 'cbxAbteilung + ' + Me.cbxAbteilung._allowedValuesFreiText = Nothing + Me.cbxAbteilung._allowFreiText = False + Me.cbxAbteilung._value = "" + Me.cbxAbteilung.FormattingEnabled = True + Me.cbxAbteilung.Location = New System.Drawing.Point(514, 0) + Me.cbxAbteilung.Name = "cbxAbteilung" + Me.cbxAbteilung.Size = New System.Drawing.Size(142, 21) + Me.cbxAbteilung.TabIndex = 40 + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Location = New System.Drawing.Point(444, 5) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(54, 13) + Me.Label5.TabIndex = 39 + Me.Label5.Text = "Abteilung:" + ' 'UsrCntlessensbestellungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.cbxAbteilung) + Me.Controls.Add(Me.Label5) + Me.Controls.Add(Me.lblWochenkarte) + Me.Controls.Add(Me.cbxMenu) + Me.Controls.Add(Me.cbxGebäude) + Me.Controls.Add(Me.cbxMitarbeiter) + Me.Controls.Add(Me.Label4) Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.txtAnmerkung) Me.Controls.Add(Me.CheckBox3) Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.txtGebäude) - Me.Controls.Add(Me.Button1) + Me.Controls.Add(Me.btnSave) Me.Controls.Add(Me.CheckBox2) Me.Controls.Add(Me.CheckBox1) Me.Controls.Add(Me.MyPanel1) Me.Name = "UsrCntlessensbestellungen" - Me.Size = New System.Drawing.Size(700, 350) + Me.Size = New System.Drawing.Size(700, 412) Me.MyPanel1.ResumeLayout(False) Me.MyPanel1.PerformLayout() Me.GroupBoxDienstag.ResumeLayout(False) @@ -737,10 +798,16 @@ Partial Class UsrCntlessensbestellungen Friend WithEvents CheckBox1 As CheckBox Friend WithEvents BackgroundWorker1 As System.ComponentModel.BackgroundWorker Friend WithEvents CheckBox2 As CheckBox - Friend WithEvents Button1 As Button - Friend WithEvents txtGebäude As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents btnSave As Button Friend WithEvents Label1 As Label Friend WithEvents CheckBox3 As CheckBox Friend WithEvents Label3 As Label Friend WithEvents txtAnmerkung As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label4 As Label + Friend WithEvents cbxMitarbeiter As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cbxGebäude As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents lblWochenkarte As Label + Friend WithEvents cbxMenu As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cbxAbteilung As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label5 As Label End Class diff --git a/Aviso/UsrCntlEssensbestellungen.vb b/Aviso/UsrCntlEssensbestellungen.vb index fbd78a9..f7b891e 100644 --- a/Aviso/UsrCntlEssensbestellungen.vb +++ b/Aviso/UsrCntlEssensbestellungen.vb @@ -10,6 +10,7 @@ Public Class UsrCntlessensbestellungen Private ToolTipFont As New Font("Courier New", 12) Dim preisProMahlzeit As Double = 3 Dim menu As String = "Menu" + Dim aLaCarte As String = "a La Carte" @@ -21,6 +22,13 @@ Public Class UsrCntlessensbestellungen ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + initCBOFields() + + cbxGebäude.changeItem("") + + essen = New cEssensbestellung() + btnSave.Enabled = False + End Sub @@ -33,11 +41,11 @@ Public Class UsrCntlessensbestellungen ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. Me.CheckBox1.Checked = storniert Me.CheckBox2.Checked = abgerechnet - 'dt = SQL.loadDgvBySql("SELECT Top 1 * FROM tblEBMenu where [MenuTitel] = '" & menu & "' order by MenuDateVon desc", "AVISO", 100, True) + Me.CheckBox3.Checked = essen.eb_gesendet dt = SQL.loadDgvBySql("Select Top 1 * from (Select (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)) as kwDate, * FROM tblEBMenu) kwDate where kwDate = '" & menutitle & "'", "AVISO", 100, True) loadMenuInfo(dt) essen = New cEssensbestellung() - txtGebäude.Text = essen.eb_gebaeude.ToString + cbxGebäude.Text = essen.eb_gebaeude.ToString txtAnmerkung.Text = If(essen.eb_anmerkung IsNot Nothing, essen.eb_anmerkung.ToString, "") End Sub @@ -50,14 +58,22 @@ Public Class UsrCntlessensbestellungen ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + initCBOFields() + essen = bestellung Dim menutitle = bestellung.eb_kw.ToString() Me.CheckBox1.Checked = essen.eb_storniert Me.CheckBox2.Checked = essen.eb_abgerechnet - 'dt = SQL.loadDgvBySql("SELECT Top 1 * FROM tblEBMenu where [MenuTitel] = '" & menutitle & "' order by MenuDateVon desc", "AVISO", 100, True) + Me.CheckBox3.Checked = essen.eb_gesendet dt = SQL.loadDgvBySql("Select Top 1 * from (Select (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)) as kwDate, * FROM tblEBMenu) kwDate where kwDate = '" & menutitle & "'", "AVISO", 100, True) loadMenuInfo(dt) - txtGebäude.Text = essen.eb_gebaeude.ToString + cbxGebäude.changeItem(essen.eb_gebaeude) + cbxMitarbeiter.changeItem(essen.eb_mitid) + cbxAbteilung.changeItem(essen.eb_abteilung) + cbxMenu.changeItem(essen.eb_kw) + cbxMitarbeiter.Enabled = False + cbxMenu.Enabled = False + cbxAbteilung.Enabled = False txtAnmerkung.Text = If(essen.eb_anmerkung IsNot Nothing, essen.eb_anmerkung.ToString, "") End Sub @@ -192,7 +208,7 @@ Public Class UsrCntlessensbestellungen If TypeOf gb Is GroupBox Then For Each c As Control In gb.Controls - If c.Text.ToLower.StartsWith("menü") AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then + If c.Text.ToLower.StartsWith("menu") 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 @@ -215,17 +231,31 @@ Public Class UsrCntlessensbestellungen Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox1.CheckedChanged, CheckBox2.CheckedChanged If CheckBox1.Checked Or CheckBox2.Checked Or CheckBox3.Checked Then MyPanel1.Enabled = False - txtGebäude.Enabled = False + cbxGebäude.Enabled = False + cbxMenu.Enabled = False + cbxAbteilung.Enabled = False + cbxMitarbeiter.Enabled = False txtAnmerkung.Enabled = False Else MyPanel1.Enabled = True - txtGebäude.Enabled = True + cbxGebäude.Enabled = True + cbxMenu.Enabled = True + cbxAbteilung.Enabled = True + cbxMitarbeiter.Enabled = True txtAnmerkung.Enabled = True End If End Sub - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnSave.Click + + + If cbxGebäude._value = "" Then + MsgBox("Bitte Gebäude für die Essensbestellung angeben!") + Exit Sub + End If + + essen = New cEssensbestellung(cbxMenu._value, cbxMitarbeiter._value, cbxGebäude._value, cbxAbteilung._value, cbxMitarbeiter.Text, txtAnmerkung.Text) If cb_montag.Checked Then @@ -325,7 +355,7 @@ Public Class UsrCntlessensbestellungen End If essen.eb_datum = CDate(dt.Rows(0).Item("MenuDateVon")) - essen.eb_gebaeude = txtGebäude.Text.ToString + essen.eb_gebaeude = cbxGebäude._value If CheckBox1.Checked = False Then essen.eb_abgerechnet = False @@ -417,6 +447,72 @@ Public Class UsrCntlessensbestellungen Private Sub UsrCntlessensbestellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load + initFields() + initPanelFields() + + + + End Sub + + Private Sub initFields() + cbxMitarbeiter.Enabled = True + cbxMenu.Enabled = True + cbxAbteilung.Enabled = True + End Sub + + Private Sub cbxMenu_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxMenu.SelectedValueChanged + + If cbxMenu._value Is Nothing Or cbxMenu._value = "" Then + 'Button1.Visible = False + + btnSave.Enabled = False + + For Each comp As System.ComponentModel.Component In Me.components.Components + If TypeOf comp Is ToolTip Then + Dim tip = DirectCast(comp, ToolTip) + tip.RemoveAll() + End If + Next + + Exit Sub + End If + + btnSave.Enabled = True + 'Button1.Visible = True + dt.Clear() + dt = SQL.loadDgvBySql("SELECT Top 1 * from (SELECT (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)) as kwDate, * FROM tblEBMenu) kwDate where kwDate = '" & cbxMenu._value & "'", "AVISO", 100, True) + + If dt.Rows.Count > 0 Then + + loadMenuInfo(dt) + + btnSave.Enabled = True + Else + btnSave.Enabled = False + End If + + uncheckGroupBoxesAndRadioButtons(sender, e) + + End Sub + + Private Sub cbxMitarbeiter_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxMitarbeiter.SelectedValueChanged + If cbxMitarbeiter._value Is "" Then + cbxAbteilung.changeItem("") + cbxGebäude.changeItem("") + cbxMenu.changeItem("") + txtAnmerkung.Text = "" + Else + + cbxAbteilung.changeItem(New cMitarbeiter(cbxMitarbeiter._value).mit_abteilung) + uncheckGroupBoxesAndRadioButtons(sender, e) + End If + + + + End Sub + + Private Sub initPanelFields() + If essen.eb_montag IsNot Nothing Then cb_montag.Checked = True @@ -481,4 +577,21 @@ Public Class UsrCntlessensbestellungen End If End Sub + + + Private Sub initCBOFields() + + + cbxMenu.fillWithSQL("SELECT Distinct Top 10 (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)), MenuDateVon from tblEBMenu order by MenuDateVon desc", True, "AVISO", True) '/ where MenuDateVon >= GETDATE() + cbxMitarbeiter.fillWithSQL("SELECT top 100 [mit_id], ([mit_vname] + ' ' + [mit_nname]) as name FROM [tblMitarbeiter] where mit_gekuendigt = 0 order by name ", False, "ADMIN", True) + cbxAbteilung.fillWithSQL("SELECT [abt_kuerzel], [abt_bezeichnung] from [tblAbteilungen] ", False, "ADMIN", True,, "") + + cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Frontoffice", "Frontoffice")) + cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Asfinag", "Asfinag")) + cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verag Verrechnung", "Verag Verrechnung")) + cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Maut", "Maut")) + cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + + End Sub + End Class diff --git a/Aviso/frmEssensbestellungen.vb b/Aviso/frmEssensbestellungen.vb index ac1005e..e04a03e 100644 --- a/Aviso/frmEssensbestellungen.vb +++ b/Aviso/frmEssensbestellungen.vb @@ -11,6 +11,7 @@ Public Class frmEssensbestellungen Private ToolTipFont As New Font("Courier New", 12) Dim preisProMahlzeit As Double = 3 Dim menu As String = "Menü" + Dim alacarte As String = "A la carte" @@ -364,7 +365,7 @@ Public Class frmEssensbestellungen If TypeOf gb Is GroupBox Then For Each c As Control In gb.Controls - If c.Text.ToLower.StartsWith("menü") AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then + If c.Text.ToLower.StartsWith("menu") 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 diff --git a/Aviso/frmEssensbestellungenAdministration.Designer.vb b/Aviso/frmEssensbestellungenAdministration.Designer.vb index 1a57b9d..16584ae 100644 --- a/Aviso/frmEssensbestellungenAdministration.Designer.vb +++ b/Aviso/frmEssensbestellungenAdministration.Designer.vb @@ -71,6 +71,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.btnNew = New System.Windows.Forms.Button() Me.pnlTop.SuspendLayout() Me.Panel1.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() @@ -111,6 +112,7 @@ Partial Class frmEssensbestellungenAdministration ' 'Panel1 ' + Me.Panel1.Controls.Add(Me.btnNew) Me.Panel1.Controls.Add(Me.cbKW) Me.Panel1.Controls.Add(Me.Label6) Me.Panel1.Controls.Add(Me.cbxNichtAbgeschickt) @@ -204,7 +206,7 @@ Partial Class frmEssensbestellungenAdministration Me.FlatButton7.ForeColor = System.Drawing.Color.Black Me.FlatButton7.Image = Global.AVISO.My.Resources.Resources.refresh Me.FlatButton7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.FlatButton7.Location = New System.Drawing.Point(1007, 25) + Me.FlatButton7.Location = New System.Drawing.Point(1035, 5) Me.FlatButton7.Name = "FlatButton7" Me.FlatButton7.Size = New System.Drawing.Size(41, 34) Me.FlatButton7.TabIndex = 48 @@ -216,9 +218,9 @@ Partial Class frmEssensbestellungenAdministration Me.btnSuche.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSuche.Location = New System.Drawing.Point(1068, 13) + Me.btnSuche.Location = New System.Drawing.Point(1098, 3) Me.btnSuche.Name = "btnSuche" - Me.btnSuche.Size = New System.Drawing.Size(162, 52) + Me.btnSuche.Size = New System.Drawing.Size(132, 38) Me.btnSuche.TabIndex = 47 Me.btnSuche.Text = "Suche starten" Me.btnSuche.UseVisualStyleBackColor = True @@ -679,6 +681,20 @@ Partial Class frmEssensbestellungenAdministration Me.Label9.Text = "Gesamtbetrag" Me.Label9.TextAlign = System.Drawing.ContentAlignment.TopRight ' + 'btnNew + ' + Me.btnNew.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnNew.BackgroundImage = Global.AVISO.My.Resources.Resources.plus + Me.btnNew.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnNew.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnNew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnNew.Location = New System.Drawing.Point(1180, 46) + Me.btnNew.Name = "btnNew" + Me.btnNew.Size = New System.Drawing.Size(50, 29) + Me.btnNew.TabIndex = 54 + Me.btnNew.UseVisualStyleBackColor = True + ' 'frmEssensbestellungenAdministration ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -761,4 +777,5 @@ Partial Class frmEssensbestellungenAdministration Friend WithEvents lblWarning As Label Friend WithEvents Button2 As Button Friend WithEvents Label9 As Label + Friend WithEvents btnNew As Button End Class diff --git a/Aviso/frmEssensbestellungenAdministration.vb b/Aviso/frmEssensbestellungenAdministration.vb index ae36695..a0bc5f8 100644 --- a/Aviso/frmEssensbestellungenAdministration.vb +++ b/Aviso/frmEssensbestellungenAdministration.vb @@ -563,7 +563,7 @@ Public Class frmEssensbestellungenAdministration Dim SQLStringBEstellungen As String = "SELECT [eb_mitname] as Name ,[eb_mitid] as ID , [eb_kw] as KW , [eb_gebaeude] as Gebaeude ,[eb_abteilung] as Abteilung ,[eb_montag] As Montag ,[eb_dienstag] As Dienstag,[eb_mittwoch] As Mittwoch, [eb_donnerstag] As Donnerstag ,[eb_freitag] as Freitag, [eb_anmerkung] as Anmerkung ,[eb_datum] as Datum , [eb_storniert] as Storniert FROM - [tblEssensbestellungen] " 'WHERE eb_kw = '" & cbxMailKW._value & "' AND eb_gebaeude = '" & cbxMailGebäude._value & "' AND ISNULL(eb_storniert,1)=0 Order by eb_datum" + [tblEssensbestellungen] WHERE eb_kw = '" & cbxMailKW._value & "' AND eb_gebaeude = '" & cbxMailGebäude._value & "' AND ISNULL(eb_storniert,1)=0 Order by eb_datum" dtBestellungen = SQL.loadDgvBySql(SQLStringBEstellungen, "AVISO", 100, True) @@ -664,4 +664,25 @@ Public Class frmEssensbestellungenAdministration End Function + Private Sub btnNew_Click(sender As Object, e As EventArgs) Handles btnNew.Click + + + Using UserControl1 As UsrCntlessensbestellungen = New UsrCntlessensbestellungen() + Using tmpForm As Form = New Form() + tmpForm.Width = UserControl1.Width + tmpForm.Height = UserControl1.Height + 60 + tmpForm.Text = "NEUE BESTELLUNG" + tmpForm.StartPosition = tmpForm.StartPosition.CenterParent + tmpForm.Controls.Add(UserControl1) + If tmpForm.ShowDialog() = DialogResult.OK Then + dgvBestellungen.SetOrder() + loadBestellungen() + dgvBestellungen.GetOrder() + End If + + End Using + End Using + + + End Sub End Class \ No newline at end of file diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index a2e9fe0..4fa2d87 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -5571,7 +5571,7 @@ Public Class frmSendungsdetailsNEU Mail.Display() End If - 'AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "Doks an Fremdspedition (SUBEN) weitergeleitet.", 46) + AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "GMVS/ EIDR Notification sent to Client.", 99) Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim Öffnen der Mail!") diff --git a/Aviso/frmWarenorte.Designer.vb b/Aviso/frmWarenorte.Designer.vb index 58a6e28..e3ad8e6 100644 --- a/Aviso/frmWarenorte.Designer.vb +++ b/Aviso/frmWarenorte.Designer.vb @@ -40,15 +40,17 @@ Partial Class frmWarenorte Me.Label7 = New System.Windows.Forms.Label() Me.txtKennr = New System.Windows.Forms.TextBox() Me.cbxAktiv = New System.Windows.Forms.CheckBox() - Me.cbxGrenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label8 = New System.Windows.Forms.Label() Me.txtCluster = New System.Windows.Forms.TextBox() Me.mainPanel = New System.Windows.Forms.Panel() + Me.txtStrasse = New System.Windows.Forms.TextBox() + Me.Label10 = New System.Windows.Forms.Label() Me.cbxFirmaChange = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label = New System.Windows.Forms.Label() Me.Label9 = New System.Windows.Forms.Label() Me.txtReihenfolge = New System.Windows.Forms.TextBox() Me.btnSave = New System.Windows.Forms.Button() + Me.cbxGrenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.dgvWarenorteNew = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlTop.SuspendLayout() Me.mainPanel.SuspendLayout() @@ -104,6 +106,7 @@ Partial Class frmWarenorte Me.cbxFirma._allowedValuesFreiText = Nothing Me.cbxFirma._allowFreiText = False Me.cbxFirma._value = "" + Me.cbxFirma.DropDownWidth = 150 Me.cbxFirma.FormattingEnabled = True Me.cbxFirma.Location = New System.Drawing.Point(417, 15) Me.cbxFirma.Name = "cbxFirma" @@ -115,7 +118,7 @@ Partial Class frmWarenorte Me.btnAdd.BackgroundImage = Global.AVISO.My.Resources.Resources.plus Me.btnAdd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAdd.Location = New System.Drawing.Point(97, 283) + Me.btnAdd.Location = New System.Drawing.Point(128, 283) Me.btnAdd.Name = "btnAdd" Me.btnAdd.Size = New System.Drawing.Size(24, 20) Me.btnAdd.TabIndex = 97 @@ -126,7 +129,7 @@ Partial Class frmWarenorte Me.btnDelete.BackgroundImage = Global.AVISO.My.Resources.Resources.del Me.btnDelete.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnDelete.Location = New System.Drawing.Point(120, 283) + Me.btnDelete.Location = New System.Drawing.Point(151, 283) Me.btnDelete.Name = "btnDelete" Me.btnDelete.Size = New System.Drawing.Size(24, 20) Me.btnDelete.TabIndex = 96 @@ -167,7 +170,7 @@ Partial Class frmWarenorte 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(137, 63) + Me.Label5.Location = New System.Drawing.Point(137, 59) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(21, 13) Me.Label5.TabIndex = 7 @@ -175,15 +178,15 @@ Partial Class frmWarenorte ' 'txtOrt ' - Me.txtOrt.Location = New System.Drawing.Point(140, 79) + Me.txtOrt.Location = New System.Drawing.Point(140, 75) Me.txtOrt.Name = "txtOrt" Me.txtOrt.Size = New System.Drawing.Size(100, 20) - Me.txtOrt.TabIndex = 6 + Me.txtOrt.TabIndex = 5 ' 'Label6 ' Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(16, 164) + Me.Label6.Location = New System.Drawing.Point(262, 114) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(65, 13) Me.Label6.TabIndex = 9 @@ -203,34 +206,22 @@ Partial Class frmWarenorte Me.txtKennr.Location = New System.Drawing.Point(140, 130) Me.txtKennr.Name = "txtKennr" Me.txtKennr.Size = New System.Drawing.Size(100, 20) - Me.txtKennr.TabIndex = 10 + Me.txtKennr.TabIndex = 8 ' 'cbxAktiv ' Me.cbxAktiv.AutoSize = True - Me.cbxAktiv.Location = New System.Drawing.Point(293, 8) + Me.cbxAktiv.Location = New System.Drawing.Point(268, 9) Me.cbxAktiv.Name = "cbxAktiv" Me.cbxAktiv.Size = New System.Drawing.Size(50, 17) - Me.cbxAktiv.TabIndex = 12 + Me.cbxAktiv.TabIndex = 3 Me.cbxAktiv.Text = "Aktiv" Me.cbxAktiv.UseVisualStyleBackColor = True ' - 'cbxGrenzstelle - ' - Me.cbxGrenzstelle._allowedValuesFreiText = Nothing - Me.cbxGrenzstelle._allowFreiText = False - Me.cbxGrenzstelle._value = "" - Me.cbxGrenzstelle.DropDownWidth = 120 - Me.cbxGrenzstelle.FormattingEnabled = True - Me.cbxGrenzstelle.Location = New System.Drawing.Point(19, 180) - Me.cbxGrenzstelle.Name = "cbxGrenzstelle" - Me.cbxGrenzstelle.Size = New System.Drawing.Size(100, 21) - Me.cbxGrenzstelle.TabIndex = 14 - ' 'Label8 ' Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(16, 63) + Me.Label8.Location = New System.Drawing.Point(265, 59) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(39, 13) Me.Label8.TabIndex = 16 @@ -238,13 +229,15 @@ Partial Class frmWarenorte ' 'txtCluster ' - Me.txtCluster.Location = New System.Drawing.Point(19, 79) + Me.txtCluster.Location = New System.Drawing.Point(268, 75) Me.txtCluster.Name = "txtCluster" Me.txtCluster.Size = New System.Drawing.Size(100, 20) - Me.txtCluster.TabIndex = 15 + Me.txtCluster.TabIndex = 6 ' 'mainPanel ' + Me.mainPanel.Controls.Add(Me.txtStrasse) + Me.mainPanel.Controls.Add(Me.Label10) Me.mainPanel.Controls.Add(Me.cbxFirmaChange) Me.mainPanel.Controls.Add(Me.Label) Me.mainPanel.Controls.Add(Me.Label9) @@ -263,11 +256,27 @@ Partial Class frmWarenorte Me.mainPanel.Controls.Add(Me.Label5) Me.mainPanel.Controls.Add(Me.txtKennr) Me.mainPanel.Controls.Add(Me.Label6) - Me.mainPanel.Location = New System.Drawing.Point(150, 54) + Me.mainPanel.Location = New System.Drawing.Point(181, 55) Me.mainPanel.Name = "mainPanel" Me.mainPanel.Size = New System.Drawing.Size(368, 242) Me.mainPanel.TabIndex = 17 ' + 'txtStrasse + ' + Me.txtStrasse.Location = New System.Drawing.Point(19, 75) + Me.txtStrasse.Name = "txtStrasse" + Me.txtStrasse.Size = New System.Drawing.Size(100, 20) + Me.txtStrasse.TabIndex = 4 + ' + 'Label10 + ' + Me.Label10.AutoSize = True + Me.Label10.Location = New System.Drawing.Point(16, 59) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(42, 13) + Me.Label10.TabIndex = 23 + Me.Label10.Text = "Strasse" + ' 'cbxFirmaChange ' Me.cbxFirmaChange._allowedValuesFreiText = Nothing @@ -276,7 +285,7 @@ Partial Class frmWarenorte Me.cbxFirmaChange.DropDownWidth = 120 Me.cbxFirmaChange.Enabled = False Me.cbxFirmaChange.FormattingEnabled = True - Me.cbxFirmaChange.Location = New System.Drawing.Point(140, 180) + Me.cbxFirmaChange.Location = New System.Drawing.Point(19, 175) Me.cbxFirmaChange.Name = "cbxFirmaChange" Me.cbxFirmaChange.Size = New System.Drawing.Size(100, 21) Me.cbxFirmaChange.TabIndex = 21 @@ -285,7 +294,7 @@ Partial Class frmWarenorte 'Label ' Me.Label.AutoSize = True - Me.Label.Location = New System.Drawing.Point(137, 164) + Me.Label.Location = New System.Drawing.Point(16, 159) Me.Label.Name = "Label" Me.Label.Size = New System.Drawing.Size(32, 13) Me.Label.TabIndex = 20 @@ -306,17 +315,29 @@ Partial Class frmWarenorte Me.txtReihenfolge.Location = New System.Drawing.Point(19, 130) Me.txtReihenfolge.Name = "txtReihenfolge" Me.txtReihenfolge.Size = New System.Drawing.Size(100, 20) - Me.txtReihenfolge.TabIndex = 18 + Me.txtReihenfolge.TabIndex = 7 ' 'btnSave ' Me.btnSave.Location = New System.Drawing.Point(281, 207) Me.btnSave.Name = "btnSave" Me.btnSave.Size = New System.Drawing.Size(75, 23) - Me.btnSave.TabIndex = 17 + Me.btnSave.TabIndex = 10 Me.btnSave.Text = "Speichern" Me.btnSave.UseVisualStyleBackColor = True ' + 'cbxGrenzstelle + ' + Me.cbxGrenzstelle._allowedValuesFreiText = Nothing + Me.cbxGrenzstelle._allowFreiText = False + Me.cbxGrenzstelle._value = "" + Me.cbxGrenzstelle.DropDownWidth = 120 + Me.cbxGrenzstelle.FormattingEnabled = True + Me.cbxGrenzstelle.Location = New System.Drawing.Point(265, 130) + Me.cbxGrenzstelle.Name = "cbxGrenzstelle" + Me.cbxGrenzstelle.Size = New System.Drawing.Size(100, 21) + Me.cbxGrenzstelle.TabIndex = 9 + ' 'dgvWarenorteNew ' Me.dgvWarenorteNew.AKTUALISIERUNGS_INTERVALL = -1 @@ -326,7 +347,7 @@ Partial Class frmWarenorte Me.dgvWarenorteNew.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvWarenorteNew.Location = New System.Drawing.Point(0, 49) Me.dgvWarenorteNew.Name = "dgvWarenorteNew" - Me.dgvWarenorteNew.Size = New System.Drawing.Size(144, 254) + Me.dgvWarenorteNew.Size = New System.Drawing.Size(175, 254) Me.dgvWarenorteNew.TabIndex = 98 ' 'frmWarenorte @@ -378,4 +399,6 @@ Partial Class frmWarenorte Friend WithEvents dgvWarenorteNew As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents cbxFirmaChange As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label As Label + Friend WithEvents txtStrasse As TextBox + Friend WithEvents Label10 As Label End Class diff --git a/Aviso/frmWarenorte.vb b/Aviso/frmWarenorte.vb index 335ebb5..bf08c3f 100644 --- a/Aviso/frmWarenorte.vb +++ b/Aviso/frmWarenorte.vb @@ -10,8 +10,8 @@ Public Class frmWarenorte initDGVWarenort() cbxGrenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True) cbxGrenzstelle.changeItem("") - cbxFirma.fillWithSQL("SELECT [Firma_Bez] FROM [tblFirma] WHERE FIRMENGRUPPE IN ('VERAG') ", False, "FMZOLL", True) - cbxFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG")) + cbxFirma.fillWithSQL("SELECT [Firma_id],[Firma_Bez] FROM [tblFirma] WHERE ISNULL(Firma_Warenort,0) = 1 ", False, "FMZOLL", True) + 'cbxFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG")) cbxFirmaChange.Items.AddRange(cbxFirma.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray()) End Sub @@ -21,7 +21,7 @@ Public Class frmWarenorte lblWarning.Text = "" - Dim SQLString As String = "SELECT [wo_warenort] ,[wo_bezeichnung], [wo_aktiv], [wo_firma] FROM [tblWarenorte]" + Dim SQLString As String = "SELECT [wo_id], [wo_warenort] ,[wo_bezeichnung], [wo_aktiv], [wo_firma] FROM [tblWarenorte]" Dim SQLWHere = "" If firma <> "" Then SQLWHere = " WHERE wo_firma = '" & firma & "'" @@ -40,30 +40,43 @@ Public Class frmWarenorte .RowHeadersVisible = False .ReadOnly = True .SelectionMode = DataGridViewSelectionMode.FullRowSelect + .Columns("wo_id").Visible = False .Columns("wo_warenort").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("wo_warenort").HeaderText = "Warenort" .Columns("wo_bezeichnung").Visible = False .Columns("wo_aktiv").Visible = False '.Columns("wo_firma").Visible = False .Columns("wo_firma").HeaderText = "Firma" - .Columns("wo_firma").Width = 70 + .Columns("wo_firma").Width = 100 End With For Each row As DataGridViewRow In dgvWarenorteNew.Rows - If Not IsDBNull(row.Cells("wo_aktiv").Value) Then - If Not row.Cells("wo_aktiv").Value Then - row.DefaultCellStyle.BackColor = Color.IndianRed + + + If row.Cells("wo_firma").Value IsNot DBNull.Value AndAlso row.Cells("wo_firma").Value <> "" Then + If CInt(row.Cells("wo_firma").Value) > 0 Then + + Dim tmpFirma = New VERAG_PROG_ALLGEMEIN.cFirmen(row.Cells("wo_firma").Value) + row.Cells("wo_firma").Value = tmpFirma.Firma_Bez.ToString End If End If + If Not IsDBNull(row.Cells("wo_aktiv").Value) Then + If Not row.Cells("wo_aktiv").Value Then + row.DefaultCellStyle.BackColor = Color.IndianRed + End If + End If + Next + + End Sub Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click - If checkIfFirmaIsFilled() = False Then Exit Sub + If checkIfFirmaIsFilled(True) = False Then Exit Sub Dim input = InputBox("Bitte geben Sie die Bezeichnung des neuen Warenorts ein:", "Warenort anlegen") If input <> "" Then @@ -76,6 +89,7 @@ Public Class frmWarenorte WarenortNew.wo_knnr = "" WarenortNew.wo_ort = "" WarenortNew.wo_reihenfolge = "-1" + WarenortNew.wo_strasse = "" If WarenortNew.SAVE() Then initDGVWarenort(cbxFirma._value) @@ -93,8 +107,10 @@ Public Class frmWarenorte Private Sub btnDelete_Click(sender As Object, e As EventArgs) Handles btnDelete.Click If dgvWarenorteNew.SelectedRows.Count > 0 Then - If vbYes = MsgBox("Möchten Sie diesen Warenort " & dgvWarenorteNew.SelectedRows(0).Cells("wo_warenort").Value & " in " & dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value & " wirklich löschen?", vbYesNo) Then - warenort.deleteWarenort(dgvWarenorteNew.SelectedRows(0).Cells("wo_warenort").Value, dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value) + Dim Warenort As New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_id").Value) + + If vbYes = MsgBox("Möchten Sie diesen Warenort " & Warenort.wo_warenort & " in " & Warenort.wo_firma & " wirklich löschen?", vbYesNo) Then + Warenort.deleteWarenort(Warenort.wo_id) initDGVWarenort(cbxFirma._value) End If @@ -105,7 +121,7 @@ Public Class frmWarenorte Private Function checkNameIsValid(name As String) As Boolean If dgvWarenorteNew.Rows.Count = 0 Then Return True - If checkIfFirmaIsFilled() = False Then Return False + If checkIfFirmaIsFilled(False) = False Then Return False For Each row As DataGridViewRow In dgvWarenorteNew.Rows @@ -132,34 +148,26 @@ Public Class frmWarenorte End If - Dim WarenortNew As cWarenorte + Dim Warenort = New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_id").Value) - If dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is DBNull.Value Then - WarenortNew = New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_warenort").Value, DBNull.Value) - Else - WarenortNew = New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_warenort").Value, dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value) - - End If - - - txtWarenort.Text = WarenortNew.wo_warenort - txtBezeichnung.Text = WarenortNew.wo_bezeichnung - cbxAktiv.Checked = WarenortNew.wo_aktiv - txtOrt.Text = WarenortNew.wo_ort - cbxGrenzstelle.changeItem(WarenortNew.wo_grenzstelle) - cbxFirmaChange.changeItem(WarenortNew.wo_firma) - txtCluster.Text = WarenortNew.wo_cluster - txtKennr.Text = WarenortNew.wo_knnr - txtReihenfolge.Text = WarenortNew.wo_reihenfolge + txtWarenort.Text = Warenort.wo_warenort + txtBezeichnung.Text = Warenort.wo_bezeichnung + cbxAktiv.Checked = Warenort.wo_aktiv + txtOrt.Text = Warenort.wo_ort + cbxGrenzstelle.changeItem(Warenort.wo_grenzstelle) + cbxFirmaChange.changeItem(Warenort.wo_firma) + txtCluster.Text = Warenort.wo_cluster + txtKennr.Text = Warenort.wo_knnr + txtReihenfolge.Text = Warenort.wo_reihenfolge + txtStrasse.Text = Warenort.wo_strasse End Sub Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click - checkIfFirmaIsFilled() - - Dim WarenortNew As New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_warenort").Value, dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value) + checkIfFirmaIsFilled(False) + Dim WarenortNew As New cWarenorte(dgvWarenorteNew.SelectedRows(0).Cells("wo_id").Value) WarenortNew.wo_warenort = txtWarenort.Text WarenortNew.wo_bezeichnung = txtBezeichnung.Text @@ -170,6 +178,7 @@ Public Class frmWarenorte WarenortNew.wo_cluster = txtCluster.Text WarenortNew.wo_knnr = txtKennr.Text WarenortNew.wo_reihenfolge = txtReihenfolge.Text + WarenortNew.wo_strasse = txtStrasse.Text If cbxGrenzstelle._value = "" Then lblWarning.Text = "Grenzstelle muss ausgewählt werden!" @@ -193,13 +202,12 @@ Public Class frmWarenorte dgvWarenorteNew.SetOrder() End Sub - Private Function checkIfFirmaIsFilled() + Private Function checkIfFirmaIsFilled(initialSave As Boolean) 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) Then - + If (dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is DBNull.Value Or dgvWarenorteNew.SelectedRows(0).Cells("wo_firma").Value Is Nothing) Or initialSave Then lblWarning.Text = "Bitte Firma auswählen!" Return False