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

neu

Browse Source
This commit is contained in:
Andreas Luxbauer
2022-07-08 08:12:07 +02:00
parent e3843466c8
commit 46c14b6500
34 changed files with 1958 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
UID/Dienstplan/usrCntlDienstplan.vb
View File

@@ -369,7 +369,7 @@ Public Class usrCntlDienstplan
AddHandler rpt.Detail.Format, Sub()
If Not IsDBNull(rpt.Fields.Item("dstetr_datum").Value) Then
If Not IsDBNull(rpt.Fields.Item("dstetr_datum").Value) AndAlso rpt.Fields.Item("dstetr_datum").Value <> "" AndAlso IsDate(rpt.Fields.Item("dstetr_datum").Value) Then
'MsgBox(rpt.Fields.Item("dstetr_datum").Value)
datumKW = CDate(rpt.Fields.Item("dstetr_datum").Value).ToShortDateString
End If
@@ -487,6 +487,7 @@ Public Class usrCntlDienstplan
' rpt.txtSumWoStunden.Text = CDbl(sumUeStd).ToString("N2")
'Zuerst den montag der aktueellen Woche lt. Datum ermitteln:
MsgBox(cPF.DateToWeek(datumKW))
Dim datumMO As Date = cPF.GetWeekStartDate(cPF.DateToWeek(datumKW).Substring(4, 2), cPF.DateToWeek(datumKW).Substring(0, 4))
'Aktuelle Woche und Jahr anhand des Montages ermitteln:
@@ -499,7 +500,7 @@ Public Class usrCntlDienstplan
' MsgBox(sollStd)
If groupKW Then
Dim sollStd As Double = cPF.getWochenstunden(STD_LIST, MA_DST.dstma_wochenStunden, datumMO, SCHICHT, MA_DST.dstma_mitId, MA_DST.dstma_muster, MA_DST.dstma_WEStdRegelAZ, MA_DST.dstma_arbvh, niederlassung, MA_DST.dstma_TzFeiertageStd)
Dim sollStd As Double = cPF.getWochenstunden(STD_LIST, MA_DST.dstma_wochenStunden, datumMO, SCHICHT, MA_DST.dstma_mitId, MA_DST.dstma_muster, MA_DST.dstma_WEStdRegelAZ, MA_DST.dstma_arbvh, niederlassung, MA_DST.dstma_TzFeiertageStd, MA_DST.dstma_4wo)
Dim tatStd As Double = SQLDienst.getDstStunden(MA_DST.dstma_id, datumMO, datumMO.AddDays(6), niederlassung)
rpt.txtSumWoStunden.Text = CDbl(tatStd).ToString("N2")