edv/AVISO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Essensbestellungen, Firma wird nun mitangegeben

Browse Source
This commit is contained in:
d.breimaier
2023-10-17 15:24:16 +02:00
parent e74939b1ef
commit 8b8c0b8e3b
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Aviso/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.9.3.1")>
<Assembly: AssemblyFileVersion("3.9.3.1")>
<Assembly: AssemblyVersion("3.9.3.2")>
<Assembly: AssemblyFileVersion("3.9.3.2")>

3
Aviso/UsrCntlEssensbestellungen.vb
View File

@@ -256,6 +256,8 @@ Public Class UsrCntlessensbestellungen
Exit Sub
End If
Dim mitarbeiter As New cMitarbeiter(cbxMitarbeiter._value)
essen = New cEssensbestellung(cbxMenu._value, cbxMitarbeiter._value, cbxGebäude._value, cbxAbteilung._value, cbxMitarbeiter.Text, txtAnmerkung.Text)
@@ -357,6 +359,7 @@ Public Class UsrCntlessensbestellungen
essen.eb_datum = CDate(dt.Rows(0).Item("MenuDateVon"))
essen.eb_gebaeude = cbxGebäude._value
essen.eb_firma = mitarbeiter.getFirma
If CheckBox1.Checked = False Then
essen.eb_abgerechnet = False

13
Aviso/frmEssensbestellungenAdministration.vb
View File

@@ -43,7 +43,7 @@ Public Class frmEssensbestellungenAdministration
Private Sub loadBestellungen()
Dim SQLString As String = "SELECT [eb_mitid] , [eb_mitname] , [eb_kw] , [eb_gebaeude],[eb_abteilung],[eb_montag],[eb_dienstag],[eb_mittwoch],
Dim SQLString As String = "SELECT [eb_mitid] , [eb_mitname] ,[eb_firma] , [eb_kw] , [eb_gebaeude],[eb_abteilung],[eb_montag],[eb_dienstag],[eb_mittwoch],
[eb_donnerstag] ,[eb_freitag],[eb_datum],[eb_preis], [eb_anmerkung],[eb_storniert],[eb_storniert_am],[eb_abgerechnet],[eb_abgerechnet_am], [eb_gesendet], [eb_gesendet_am]
FROM
[tblEssensbestellungen] WHERE 1=1"
@@ -66,6 +66,8 @@ Public Class frmEssensbestellungenAdministration
.Columns("eb_mitname").HeaderText = "Mitarbeiter"
.Columns("eb_mitname").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns("eb_abteilung").Visible = False
.Columns("eb_firma").Width = 80
.Columns("eb_firma").HeaderText = "Firma"
.Columns("eb_datum").Width = 80
.Columns("eb_datum").HeaderText = "Datum"
.Columns("eb_montag").Width = 80
@@ -447,7 +449,7 @@ Public Class frmEssensbestellungenAdministration
Dim TextHTMLtable = ""
TextHTMLtable &= "<table border=1>"
TextHTMLtable &= "<tr><td>Mitarbeiter</td><td>Montag</td><td>Dienstag</td><td>Mittwoch</td><td>Donnerstag</td><td>Freitag</td><td>Gebäude</td><td>Anmerkung</td></tr>"
TextHTMLtable &= "<tr><td>Mitarbeiter</td><td>Montag</td><td>Dienstag</td><td>Mittwoch</td><td>Donnerstag</td><td>Freitag</td><td>Gebäude</td><td>Anmerkung</td><td>Firma</td></tr>"
If sender.Text = "Email" Then
@@ -469,6 +471,7 @@ Public Class frmEssensbestellungenAdministration
TextHTMLtable &= "<td><b>" & row("Freitag") & "</b></td>"
TextHTMLtable &= "<td><b>" & row("Gebaeude") & "</b></td>"
TextHTMLtable &= "<td><b>" & row("Anmerkung") & "</b></td>"
TextHTMLtable &= "<td><b>" & row("Firma") & "</b></td>"
TextHTMLtable &= "</tr>"
If row("ID") <> 0 Then
@@ -499,6 +502,7 @@ Public Class frmEssensbestellungenAdministration
TextHTMLtable &= "<td><b>" & row.Cells("eb_freitag").Value & "</b></td>"
TextHTMLtable &= "<td><b>" & row.Cells("eb_gebaeude").Value & "</b></td>"
TextHTMLtable &= "<td><b>" & row.Cells("eb_anmerkung").Value & "</b></td>"
TextHTMLtable &= "<td><b>" & row.Cells("eb_firma").Value & "</b></td>"
TextHTMLtable &= "</tr>"
Next
@@ -614,7 +618,7 @@ Public Class frmEssensbestellungenAdministration
''LEFT([eb_kw],5)
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
[eb_donnerstag] As Donnerstag , [eb_freitag] As Freitag, [eb_anmerkung] As Anmerkung , [eb_datum] As Datum , [eb_storniert] as Storniert, [eb_firma] as Firma
FROM
[tblEssensbestellungen] WHERE eb_kw = '" & cbxMailKW._value & "' AND eb_gebaeude = '" & cbxMailGebäude._value & "' AND ISNULL(eb_storniert,1)=0 Order by eb_datum"
@@ -704,6 +708,7 @@ Public Class frmEssensbestellungenAdministration
R("Anmerkung") = DBNull.Value
R("Datum") = DBNull.Value
R("Storniert") = DBNull.Value
R("Firma") = DBNull.Value
R("Montag") = String.Join(" ", resultMontag)
R("Dienstag") = String.Join(" ", resultDienstag)
R("Mittwoch") = String.Join(" ", resultMittwoch)
@@ -858,6 +863,7 @@ Public Class frmEssensbestellungenAdministration
drFirst.Item("eb_gebaeude") = " "
drFirst.Item("eb_abteilung") = " "
drFirst.Item("eb_preis") = 0
drFirst.Item("eb_firma") = " "
dt.Rows.InsertAt(drFirst, 0)
@@ -868,6 +874,7 @@ Public Class frmEssensbestellungenAdministration
drLast.Item("eb_gebaeude") = " "
drLast.Item("eb_abteilung") = " "
drLast.Item("eb_preis") = txtMarkierteDS.Text.Replace("€", "")
drLast.Item("eb_firma") = " "
dt.Rows.InsertAt(drLast, dt.Rows.Count)
dt.Columns.Remove("eb_mitid")