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

Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

Browse Source
This commit is contained in:
Andreas Luxbauer
2023-11-09 17:03:11 +01:00
parent eeaaf47a64 530552aaa6
commit 4d4919bf0f
2 changed files with 33 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
SDL/SDL.vbproj
View File

@@ -269,16 +269,6 @@
<Reference Include="Microsoft.Office.Tools.Outlook, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.ReportViewer.Common, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91">
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.ReportViewer.ProcessingObjectModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Windows\assembly\GAC_MSIL\Microsoft.ReportViewer.ProcessingObjectModel\11.0.0.0__89845dcd8080cc91\Microsoft.ReportViewer.ProcessingObjectModel.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ReportViewer.WinForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91">
<Private>True</Private>
</Reference>
<Reference Include="NumericBox">
<HintPath>..\..\..\dll\NumericBox.dll</HintPath>
</Reference>
@@ -286,9 +276,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\dll\SharpSSH\Org.Mentalis.Security.dll</HintPath>
</Reference>
<Reference Include="Parkzeit">
<HintPath>..\..\..\Parkzeit\Parkzeit\Parkzeit\bin\Debug\Parkzeit.exe</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="QRCode">
@@ -486,12 +473,6 @@
<Compile Include="Checkliste\frmEoriLink.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Checkliste\frmPrintView.Designer.vb">
<DependentUpon>frmPrintView.vb</DependentUpon>
</Compile>
<Compile Include="Checkliste\frmPrintView.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Checkliste\frmUidLink.Designer.vb">
<DependentUpon>frmUidLink.vb</DependentUpon>
</Compile>
@@ -3023,9 +3004,6 @@
<EmbeddedResource Include="Checkliste\frmEoriLink.resx">
<DependentUpon>frmEoriLink.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Checkliste\frmPrintView.resx">
<DependentUpon>frmPrintView.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Checkliste\frmUidLink.resx">
<DependentUpon>frmUidLink.vb</DependentUpon>
</EmbeddedResource>
@@ -4970,6 +4948,10 @@
<Project>{110c923b-cb02-4fd0-af24-95e0f0eeeff5}</Project>
<Name>Gemeinsames</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Parkzeit\Parkzeit\Parkzeit\Parkzeit.vbproj">
<Project>{e4190547-b222-4ae3-a0be-a44eaee70335}</Project>
<Name>Parkzeit</Name>
</ProjectReference>
<ProjectReference Include="..\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
<Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
<Name>VERAG_PROG_ALLGEMEIN</Name>

47
SDL/frmEssensbestellungenAdministration.vb
View File

@@ -26,24 +26,8 @@ Public Class frmEssensbestellungenAdministration
cboAbteilung.fillWithSQL("SELECT DISTINCT(eb_abteilung) FROM [tblEssensbestellungen]", False, "AVISO", True)
If cAllgemein.MITARBEITER.mit_abteilung = "MDM" Then 'Verag360 darf nur seine Bestellungen sehen!
cboAbteilung.changeItem("MDM")
setMDM()
cboAbteilung.Enabled = False
cboGebaeude.changeItem("Maut")
cbxMailGebäude.changeItem("Maut")
cboGebaeude.Enabled = False
cbxMailGebäude.Enabled = False
Else
cboAbteilung.changeItem("")
cboAbteilung.Enabled = True
cboGebaeude.changeItem("")
cboGebaeude.Enabled = True
cbxMailGebäude.Enabled = True
End If
cbKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen] UNION SELECT (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)) as kwDateNew FROM [tblEBMenu] where MenuDateVon > GETDATE()ORDER BY eb_kw desc", False, "AVISO", True)
@@ -269,6 +253,9 @@ Public Class frmEssensbestellungenAdministration
cbxAbgerechnet.Checked = False
txtBestellDat.Text = Date.Parse("01.01.2001")
txtBestellDatBis.Text = Now.AddDays(7).ToShortDateString 'Um die aktuellen EB für nächste Woche zu sehen
setMDM()
Me.btnSuche.PerformClick()
End Sub
@@ -901,9 +888,33 @@ Public Class frmEssensbestellungenAdministration
SDL.cProgramFunctions.genExcelFromDT_NEW(dt)
Me.Cursor = Cursors.Default
Me.Cursor = Cursors.Default
Catch ex As Exception
MsgBox(ex.Message)
End Try
End Sub
Private Sub setMDM()
If cAllgemein.MITARBEITER.mit_abteilung = "MDM" Then 'Verag360 darf nur seine Bestellungen sehen!
cboAbteilung.changeItem("MDM")
cboAbteilung.Enabled = False
cboGebaeude.changeItem("Maut")
cbxMailGebäude.changeItem("Maut")
cboGebaeude.Enabled = False
cbxMailGebäude.Enabled = False
Else
cboAbteilung.changeItem("")
cboAbteilung.Enabled = True
cboGebaeude.changeItem("")
cboGebaeude.Enabled = True
cbxMailGebäude.Enabled = True
End If
End Sub
End Class