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

Essensbestellungen -> Menüanzeige

Browse Source
This commit is contained in:
d.breimaier
2024-06-11 16:13:28 +02:00
parent 978884cd2b
commit 6ae38089a2
4 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SDL/UsrCntlEssensbestellungen.vb
View File

@@ -259,9 +259,9 @@ Public Class UsrCntlessensbestellungen
Dim mitarbeiter As New cMitarbeiter(cbxMitarbeiter._value) Dim mitarbeiter As New cMitarbeiter(cbxMitarbeiter._value)
Dim MenuID = SQL.getValueTxtBySql("select MenuID from tblEBMenu where MenuDateVon = " & cbxMenu._value, "AVISO") Dim MenuID As String = SQL.getValueTxtBySql("select MenuID from tblEBMenu where MenuDateVon = '" & cbxMenu.SelectedItem.ToString & "'", "AVISO")
essen = New cEssensbestellung(cbxMenu._value, cbxMitarbeiter._value, cbxGebäude._value, cbxAbteilung._value, cbxMitarbeiter.Text, txtAnmerkung.Text, MenuID) essen = New cEssensbestellung(cbxMenu._value, cbxMitarbeiter._value, cbxGebäude._value, cbxAbteilung._value, cbxMitarbeiter.Text, txtAnmerkung.Text)
If cb_montag.Checked Then If cb_montag.Checked Then
If rbMenu_montag.Checked Then If rbMenu_montag.Checked Then
@@ -378,6 +378,7 @@ Public Class UsrCntlessensbestellungen
essen.eb_gesendet_am = DBNull.Value essen.eb_gesendet_am = DBNull.Value
End If End If
essen.eb_MenuID = MenuID
If essen.SAVE() Then If essen.SAVE() Then
btnSave.DialogResult = DialogResult.OK btnSave.DialogResult = DialogResult.OK
@@ -589,7 +590,12 @@ Public Class UsrCntlessensbestellungen
cbxMitarbeiter.DropDownWidth = 200 cbxMitarbeiter.DropDownWidth = 200
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() 'cbxMenu.fillWithSQL("SELECT Distinct Top 50 (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)), MenuDateVon from tblEBMenu order by MenuDateVon desc", False, "AVISO", True)
cbxMenu.fillWithSQL("SELECT Distinct Top 50 (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)), MenuDateVon from tblEBMenu order by MenuDateVon desc", False, "AVISO", True) '/ where MenuDateVon >= GETDATE()
'/ where MenuDateVon >= GETDATE()
Dim sqlMA = "SELECT [mit_id], ([mit_vname] + ' ' + [mit_nname]) + ' (' + mit_firma +')' as name FROM [tblMitarbeiter] " Dim sqlMA = "SELECT [mit_id], ([mit_vname] + ' ' + [mit_nname]) + ' (' + mit_firma +')' as name FROM [tblMitarbeiter] "
sqlMA &= "where [mit_ChatBenutzer] = 1 AND [mit_pseudoUser] = 0 AND [mit_gekuendigt] = 0 AND mit_niederlassung = 'SUB'" sqlMA &= "where [mit_ChatBenutzer] = 1 AND [mit_pseudoUser] = 0 AND [mit_gekuendigt] = 0 AND mit_niederlassung = 'SUB'"

5
SDL/frmEssensbestellungen.vb
View File

@@ -58,9 +58,9 @@ Public Class frmEssensbestellungen
Exit Sub Exit Sub
End If End If
Dim MenuID = SQL.getValueTxtBySql("select MenuID from tblEBMenu where MenuDateVon = " & cbxMenu._value, "AVISO") Dim MenuID As String = SQL.getValueTxtBySql("select MenuID from tblEBMenu where MenuDateVon = '" & cbxMenu.SelectedItem.ToString & "'", "AVISO")
essen = New cEssensbestellung(cbxMenu._value, cAllgemein.USRID, cbxGebauede._value, cAllgemein.ABTEILUNG, cAllgemein.MITARBEITER.mit_vname & " " & cAllgemein.MITARBEITER.mit_nname, txtAnmerkung, MenuID) essen = New cEssensbestellung(cbxMenu._value, cAllgemein.USRID, cbxGebauede._value, cAllgemein.ABTEILUNG, cAllgemein.MITARBEITER.mit_vname & " " & cAllgemein.MITARBEITER.mit_nname, txtAnmerkung)
If cb_montag.Checked Then If cb_montag.Checked Then
If rbMenu_montag.Checked Then If rbMenu_montag.Checked Then
@@ -172,6 +172,7 @@ Public Class frmEssensbestellungen
essen.eb_gebaeude = cbxGebauede._value essen.eb_gebaeude = cbxGebauede._value
essen.eb_anmerkung = txtAnmerkung.Text essen.eb_anmerkung = txtAnmerkung.Text
essen.eb_firma = cAllgemein.MITARBEITER.getFirma essen.eb_firma = cAllgemein.MITARBEITER.getFirma
essen.eb_MenuID = MenuID
essen.SAVE() essen.SAVE()
loadDGVBestellungen() loadDGVBestellungen()

2
SDL/frmEssensbestellungenAdministration.vb
View File

@@ -1049,6 +1049,8 @@ Public Class frmEssensbestellungenAdministration
Private Function ReplaceFirst(text As String, search As String, replace As String, startIndex As Integer, EndIndex As Integer) As String Private Function ReplaceFirst(text As String, search As String, replace As String, startIndex As Integer, EndIndex As Integer) As String
If startIndex + EndIndex > (text.Length - 1) Then Return text
Dim pos As Integer = text.IndexOf(search, startIndex, IIf(startIndex + EndIndex > text.Length - 1, text.Length - startIndex - 1, EndIndex)) Dim pos As Integer = text.IndexOf(search, startIndex, IIf(startIndex + EndIndex > text.Length - 1, text.Length - startIndex - 1, EndIndex))
If (pos < 0) Then Return text If (pos < 0) Then Return text

11
SDL/kunden/Vorauskasse/frmVorauskasse.vb
View File

@@ -295,7 +295,16 @@ Public Class frmVorauskasse
If cboSachbearbeiterQS._value <> "" Then sqlstr &= " AND [vk_QS_SachbearbeiterId] = @PersonalnummerQS " If cboSachbearbeiterQS._value <> "" Then sqlstr &= " AND [vk_QS_SachbearbeiterId] = @PersonalnummerQS "
If cboSachbearbeiterBH._value <> "" Then sqlstr &= " AND [vk_BH_SachbearbeiterId] = @PersonalnummerBH " If cboSachbearbeiterBH._value <> "" Then sqlstr &= " AND [vk_BH_SachbearbeiterId] = @PersonalnummerBH "
If MyTextBox1.Text <> "" Then sqlstr &= " AND [vk_LKW] LIKE @LKW " If MyTextBox1.Text <> "" Then sqlstr &= " AND [vk_LKW] LIKE @LKW "
If txtFirma.Text <> "" Then sqlstr &= " AND ([vk_Firma] LIKE @Firma or vk_KdNr=@Firma) "
If txtFirma.Text <> "" Then
If IsNumeric(txtFirma.Text) Then
sqlstr &= " AND vk_KdNr=@Firma "
Else
sqlstr &= " AND ([vk_Firma] LIKE @Firma ) "
End If
End If
Select Case cbxAbgerechnet.CheckState Select Case cbxAbgerechnet.CheckState
Case CheckState.Unchecked : sqlstr &= " and (SELECT count(*) FROM Rechnungsausgang RG WHERE RG.FilialenNr = vk_FilialeNr and RG.AbfertigungsNr= vk_AbfertigungsNr and vk_KdNr=rg.RechnungsKundenNr and Trdin=1)= 0 " Case CheckState.Unchecked : sqlstr &= " and (SELECT count(*) FROM Rechnungsausgang RG WHERE RG.FilialenNr = vk_FilialeNr and RG.AbfertigungsNr= vk_AbfertigungsNr and vk_KdNr=rg.RechnungsKundenNr and Trdin=1)= 0 "