GoLife: Essensbestellungen
This commit is contained in:
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("3.8.4.8")>
|
||||
<Assembly: AssemblyFileVersion("3.8.4.8")>
|
||||
<Assembly: AssemblyVersion("3.8.5.0")>
|
||||
<Assembly: AssemblyFileVersion("3.8.5.0")>
|
||||
|
||||
1
Aviso/UsrCntlEssensbestellungen.Designer.vb
generated
1
Aviso/UsrCntlEssensbestellungen.Designer.vb
generated
@@ -694,6 +694,7 @@ Partial Class UsrCntlessensbestellungen
|
||||
Me.cbxMenu._value = ""
|
||||
Me.cbxMenu.DropDownWidth = 200
|
||||
Me.cbxMenu.FormattingEnabled = True
|
||||
Me.cbxMenu.IntegralHeight = False
|
||||
Me.cbxMenu.Location = New System.Drawing.Point(275, 27)
|
||||
Me.cbxMenu.Name = "cbxMenu"
|
||||
Me.cbxMenu.Size = New System.Drawing.Size(138, 21)
|
||||
|
||||
@@ -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") 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 Then
|
||||
Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c
|
||||
If rb.Checked Then countMenus = countMenus + 1
|
||||
End If
|
||||
|
||||
If c.Text.ToLower.StartsWith("a la carte") AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then
|
||||
If c.Text.ToLower.StartsWith("a la carte") AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton Then
|
||||
Dim rb As VERAG_PROG_ALLGEMEIN.MyRadioButton = c
|
||||
If rb.Checked Then countlaCarte = countlaCarte + 1
|
||||
End If
|
||||
@@ -557,7 +557,7 @@ Public Class UsrCntlessensbestellungen
|
||||
If essen.eb_donnerstag IsNot Nothing Then txtAlt_donnerstag.Text = essen.eb_donnerstag.ToString
|
||||
End If
|
||||
Else
|
||||
cb_mittwoch.Checked = False
|
||||
cbdonnerstag.Checked = False
|
||||
End If
|
||||
|
||||
|
||||
@@ -579,13 +579,13 @@ Public Class UsrCntlessensbestellungen
|
||||
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_ChatBenutzer] = 1 AND [mit_pseudoUser] = 0 AND [mit_gekuendigt] = 0 AND (CAse when mit_firma = 'ALL' Then mit_FirmaHaupt else mit_firma END ) = 'VERAG' AND mit_niederlassung = 'SUB' order by name ", False, "ADMIN", True)
|
||||
cbxMenu.fillWithSQL("SELECT Distinct Top 50 (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)), MenuDateVon from tblEBMenu order by MenuDateVon desc", True, "AVISO", True) '/ where MenuDateVon >= GETDATE()
|
||||
cbxMitarbeiter.fillWithSQL("SELECT [mit_id], ([mit_vname] + ' ' + [mit_nname]) as name FROM [tblMitarbeiter] where [mit_ChatBenutzer] = 1 AND [mit_pseudoUser] = 0 AND [mit_gekuendigt] = 0 AND (CAse when mit_firma = 'ALL' Then mit_FirmaHaupt else mit_firma END ) = 'VERAG' AND mit_niederlassung = 'SUB' 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("Verag VERR", "Verag Verrechnung"))
|
||||
cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Maut", "Maut"))
|
||||
cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
|
||||
|
||||
|
||||
3
Aviso/frmEssensbestellungen.Designer.vb
generated
3
Aviso/frmEssensbestellungen.Designer.vb
generated
@@ -198,7 +198,7 @@ Partial Class frmEssensbestellungen
|
||||
Me.cbxGebauede._allowedValuesFreiText = Nothing
|
||||
Me.cbxGebauede._allowFreiText = True
|
||||
Me.cbxGebauede._value = ""
|
||||
Me.cbxGebauede.DropDownWidth = 150
|
||||
Me.cbxGebauede.DropDownWidth = 100
|
||||
Me.cbxGebauede.FormattingEnabled = True
|
||||
Me.cbxGebauede.Location = New System.Drawing.Point(580, 89)
|
||||
Me.cbxGebauede.Name = "cbxGebauede"
|
||||
@@ -807,6 +807,7 @@ Partial Class frmEssensbestellungen
|
||||
Me.cbxMenu._value = ""
|
||||
Me.cbxMenu.DropDownWidth = 200
|
||||
Me.cbxMenu.FormattingEnabled = True
|
||||
Me.cbxMenu.IntegralHeight = False
|
||||
Me.cbxMenu.Location = New System.Drawing.Point(15, 81)
|
||||
Me.cbxMenu.Name = "cbxMenu"
|
||||
Me.cbxMenu.Size = New System.Drawing.Size(136, 21)
|
||||
|
||||
@@ -19,7 +19,7 @@ Public Class frmEssensbestellungen
|
||||
|
||||
|
||||
|
||||
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()
|
||||
cbxMenu.fillWithSQL("SELECT Distinct Top 50 (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)), MenuDateVon from tblEBMenu order by MenuDateVon desc", True, "AVISO", True) '/ where MenuDateVon >= GETDATE()
|
||||
|
||||
txtMA.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
|
||||
txtAbteilung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG
|
||||
@@ -27,7 +27,7 @@ Public Class frmEssensbestellungen
|
||||
|
||||
cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Frontoffice", "Frontoffice"))
|
||||
cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Asfinag", "Asfinag"))
|
||||
cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verag Verrechnung", "Verag Verrechnung"))
|
||||
cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verag VERR", "Verag Verrechnung"))
|
||||
cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Maut", "Maut"))
|
||||
cbxGebauede.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
|
||||
cbxGebauede.changeItem("")
|
||||
@@ -365,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("menu") AndAlso TypeOf c Is VERAG_PROG_ALLGEMEIN.MyRadioButton AndAlso c.Enabled = True Then
|
||||
If c.Text.ToLower.StartsWith("menü") 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
|
||||
@@ -493,7 +493,7 @@ Public Class frmEssensbestellungen
|
||||
If currentEssen.eb_donnerstag IsNot Nothing Then txtAlt_donnerstag.Text = currentEssen.eb_donnerstag.ToString
|
||||
End If
|
||||
Else
|
||||
cb_mittwoch.Checked = False
|
||||
cbdonnerstag.Checked = False
|
||||
End If
|
||||
|
||||
|
||||
@@ -546,7 +546,7 @@ Public Class frmEssensbestellungen
|
||||
Try
|
||||
Dim startMenu = Date.Parse(dt.Rows(0).Item("MenuDateVon"))
|
||||
|
||||
Dim tageBisBestellende = 10000 '-5
|
||||
Dim tageBisBestellende = -5
|
||||
|
||||
If tageBisBestellende > 0 Then
|
||||
lblTest.Text = "Zu Testzwecken darf aktuell " & tageBisBestellende & " Tage im Nachhinein bestellt werden!"
|
||||
|
||||
@@ -28,6 +28,7 @@ Partial Class frmEssensbestellungenAdministration
|
||||
Me.Label4 = New System.Windows.Forms.Label()
|
||||
Me.Label22 = New System.Windows.Forms.Label()
|
||||
Me.Panel1 = New System.Windows.Forms.Panel()
|
||||
Me.btnNew = New System.Windows.Forms.Button()
|
||||
Me.cbKW = New VERAG_PROG_ALLGEMEIN.MyComboBox()
|
||||
Me.Label6 = New System.Windows.Forms.Label()
|
||||
Me.cbxNichtAbgeschickt = New System.Windows.Forms.CheckBox()
|
||||
@@ -72,7 +73,6 @@ 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()
|
||||
@@ -145,6 +145,20 @@ Partial Class frmEssensbestellungenAdministration
|
||||
Me.Panel1.Size = New System.Drawing.Size(1242, 85)
|
||||
Me.Panel1.TabIndex = 2
|
||||
'
|
||||
'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
|
||||
'
|
||||
'cbKW
|
||||
'
|
||||
Me.cbKW._allowedValuesFreiText = Nothing
|
||||
@@ -510,7 +524,7 @@ Partial Class frmEssensbestellungenAdministration
|
||||
'
|
||||
Me.AbgerechnetToolStripMenuItem.Name = "AbgerechnetToolStripMenuItem"
|
||||
Me.AbgerechnetToolStripMenuItem.Size = New System.Drawing.Size(282, 22)
|
||||
Me.AbgerechnetToolStripMenuItem.Text = "abgerechnen"
|
||||
Me.AbgerechnetToolStripMenuItem.Text = "abgerechnet"
|
||||
'
|
||||
'BearbeitenToolStripMenuItem
|
||||
'
|
||||
@@ -682,20 +696,6 @@ 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!)
|
||||
|
||||
@@ -63,10 +63,11 @@ Public Class frmEssensbestellungenAdministration
|
||||
|
||||
.RowHeadersWidth = 10
|
||||
.Columns("eb_kw").HeaderText = "KW"
|
||||
.Columns("eb_kw").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||
.Columns("eb_kw").Width = 80
|
||||
.Columns("eb_mitid").HeaderText = "MID"
|
||||
.Columns("eb_mitid").Width = 40
|
||||
.Columns("eb_mitname").HeaderText = "Mitarbeiter"
|
||||
.Columns("eb_mitname").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
|
||||
.Columns("eb_abteilung").Visible = False
|
||||
.Columns("eb_datum").Width = 80
|
||||
.Columns("eb_datum").HeaderText = "Datum"
|
||||
@@ -82,13 +83,16 @@ Public Class frmEssensbestellungenAdministration
|
||||
.Columns("eb_freitag").HeaderText = "Freitag"
|
||||
.Columns("eb_freitag").Width = 80
|
||||
.Columns("eb_gebaeude").HeaderText = "Gebäude"
|
||||
.Columns("eb_gebaeude").Width = 80
|
||||
.Columns("eb_gebaeude").Width = 100
|
||||
.Columns("eb_preis").HeaderText = "Preis"
|
||||
.Columns("eb_preis").Width = 40
|
||||
.Columns("eb_preis").DefaultCellStyle.Format = "N"
|
||||
.Columns("eb_storniert_am").HeaderText = "Storniert am"
|
||||
.Columns("eb_storniert_am").Width = 80
|
||||
.Columns("eb_abgerechnet_am").HeaderText = "Abgerechnet am"
|
||||
.Columns("eb_abgerechnet_am").Width = 80
|
||||
.Columns("eb_gesendet_am").HeaderText = "Gesendet am"
|
||||
.Columns("eb_gesendet_am").Width = 80
|
||||
.Columns("eb_storniert").Visible = False
|
||||
.Columns("eb_abgerechnet").Visible = False
|
||||
.Columns("eb_gesendet").Visible = False
|
||||
@@ -269,7 +273,7 @@ Public Class frmEssensbestellungenAdministration
|
||||
If dgvBestellungen.SelectedRows.Count = 0 Then Exit Sub
|
||||
|
||||
Select Case sender.Text
|
||||
Case "abgerechnen"
|
||||
Case "abgerechnet"
|
||||
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
|
||||
@@ -350,7 +354,10 @@ Public Class frmEssensbestellungenAdministration
|
||||
|
||||
End If
|
||||
|
||||
dgvBestellungen.SetOrder()
|
||||
bestellung.SAVE()
|
||||
dgvBestellungen.LOAD()
|
||||
dgvBestellungen.GetOrder()
|
||||
|
||||
|
||||
Next
|
||||
@@ -375,6 +382,7 @@ Public Class frmEssensbestellungenAdministration
|
||||
|
||||
dgvBestellungen.SetOrder()
|
||||
bestellung.SAVE()
|
||||
dgvBestellungen.LOAD()
|
||||
dgvBestellungen.GetOrder()
|
||||
Next
|
||||
|
||||
@@ -398,6 +406,7 @@ Public Class frmEssensbestellungenAdministration
|
||||
|
||||
dgvBestellungen.SetOrder()
|
||||
bestellung.SAVE()
|
||||
dgvBestellungen.LOAD()
|
||||
dgvBestellungen.GetOrder()
|
||||
Next
|
||||
|
||||
@@ -420,7 +429,10 @@ Public Class frmEssensbestellungenAdministration
|
||||
Dim dtBestellungenMail = generateDTBestellungen()
|
||||
kw = cbxMailKW._value
|
||||
gebaeude = cbxMailGebäude._value
|
||||
|
||||
If dtBestellungenMail.Rows.Count = 0 Then
|
||||
Me.Cursor = Cursors.Default
|
||||
Exit Sub
|
||||
End If
|
||||
For Each row As DataRow In dtBestellungenMail.Rows
|
||||
|
||||
TextHTMLtable &= "<tr>"
|
||||
@@ -443,9 +455,14 @@ Public Class frmEssensbestellungenAdministration
|
||||
End If
|
||||
Next
|
||||
|
||||
|
||||
dgvBestellungen.LOAD()
|
||||
|
||||
Else
|
||||
If dgvBestellungen.SelectedRows.Count = 0 Then
|
||||
lblWarning.Text = "keine Bestellungen markiert!"
|
||||
Me.Cursor = Cursors.Default
|
||||
Exit Sub
|
||||
End If
|
||||
For Each row In dgvBestellungen.SelectedRows
|
||||
|
||||
TextHTMLtable &= "<tr>"
|
||||
@@ -463,6 +480,7 @@ Public Class frmEssensbestellungenAdministration
|
||||
|
||||
End If
|
||||
|
||||
|
||||
lblWarning.Text = ""
|
||||
|
||||
Dim outl As New Outlook.Application
|
||||
@@ -470,6 +488,7 @@ Public Class frmEssensbestellungenAdministration
|
||||
|
||||
|
||||
Mail = outl.CreateItem(0)
|
||||
Mail.To = "info@highway-118.de; service@highway-118.de"
|
||||
|
||||
|
||||
Mail.Subject = "Essensbestellung: " & IIf(kw <> "", kw, "") & " " & IIf(gebaeude <> "", gebaeude, "")
|
||||
@@ -491,7 +510,7 @@ Public Class frmEssensbestellungenAdministration
|
||||
EndTextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
|
||||
EndTextHTML &= "<br>"
|
||||
|
||||
Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & DETextHTML & TextHTMLtable & EndTextHTML & SDL.cFakturierung.getSignature("DE") & "</div>"
|
||||
Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & DETextHTML & TextHTMLtable & EndTextHTML & SDL.cFakturierung.getSignature("DE", cAllgemein.FIRMA_ID, True, True) & "</div>"
|
||||
Mail.Display()
|
||||
|
||||
Catch ex As Exception
|
||||
@@ -540,6 +559,7 @@ Public Class frmEssensbestellungenAdministration
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
|
||||
Select Case sender.Text
|
||||
|
||||
Case "Email"
|
||||
@@ -567,6 +587,12 @@ Public Class frmEssensbestellungenAdministration
|
||||
|
||||
dtBestellungen = SQL.loadDgvBySql(SQLStringBEstellungen, "AVISO", 100, True)
|
||||
|
||||
If dtBestellungen.Rows.Count = 0 Then
|
||||
lblWarning.Text = "Keine Bestellungen vorhanden!"
|
||||
Me.Cursor = Cursors.Default
|
||||
Return dtBestellungen
|
||||
End If
|
||||
|
||||
|
||||
Dim uniqueMenusMontag = dtBestellungen.AsEnumerable() _
|
||||
.GroupBy(Function(row) _
|
||||
@@ -654,12 +680,6 @@ Public Class frmEssensbestellungenAdministration
|
||||
|
||||
' MessageBox.Show(String.Join(Environment.NewLine, result))
|
||||
|
||||
If dtBestellungen.Rows.Count = 0 Then
|
||||
lblWarning.Text = "keine Datensätze vorhanden"
|
||||
Me.Cursor = Cursors.Default
|
||||
Exit Function
|
||||
End If
|
||||
|
||||
Return dtBestellungen
|
||||
|
||||
End Function
|
||||
@@ -685,4 +705,8 @@ Public Class frmEssensbestellungenAdministration
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub dgvBestellungen_SelectionChanged(sender As Object, e As EventArgs) Handles dgvBestellungen.SelectionChanged
|
||||
lblWarning.Text = ""
|
||||
End Sub
|
||||
End Class
|
||||
Reference in New Issue
Block a user