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
2020-05-31 22:26:21 +02:00
parent a40477b387
commit 6e3e35ac70
37 changed files with 2287 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
UID/cProgramFunctions.vb
View File

@@ -901,8 +901,9 @@ Public Class cProgramFunctions
Dim SQLDienst As New cDienstplan
Public Function getWochenstunden(Wochenstunden As Double, datum As Date, SCHICHT As String, dstma_id As Integer, dstma_muster As Boolean, dstma_WEStdRegelAZ As Boolean, dstma_arbvh As String, niederlassung As String, StdFeiertag As Object) As Double
getWochenstunden = Wochenstunden
Public Function getWochenstunden(STD_LIST As List(Of cDienstMitarbAbweichendeWochenstunden), Wochenstunden As Double, datum As Date, SCHICHT As String, dstma_id As Integer, dstma_muster As Boolean, dstma_WEStdRegelAZ As Boolean, dstma_arbvh As String, niederlassung As String, StdFeiertag As Object) As Double
getWochenstunden = cDienstMitarbAbweichendeWochenstunden.GET_STD_LIST(STD_LIST, dstma_id, datum, Wochenstunden, If(StdFeiertag, -1))
Dim UrlStd As Double = 8
If StdFeiertag IsNot Nothing Then UrlStd = StdFeiertag
@@ -1046,7 +1047,7 @@ Public Class cProgramFunctions
End Function
Public Sub KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
Public Sub KWAbschluss(STD_LIST, niederlassung, aktJahr, aktWoche, SCHICHT)
Try
Dim SQLDienst As New cDienstplan
@@ -1069,7 +1070,7 @@ Public Class cProgramFunctions
If IsNumeric(ma.dstma_wochenStunden) Then Wochenstunden = ma.dstma_wochenStunden
' MsgBox(Wochenstunden)
Wochenstunden = cPF.getWochenstunden(Wochenstunden, datum, SCHICHT, r("dstma_id"), ma.dstma_muster, ma.dstma_WEStdRegelAZ, ma.dstma_arbvh, niederlassung, ma.dstma_TzFeiertageStd)
Wochenstunden = cPF.getWochenstunden(STD_LIST, Wochenstunden, datum, SCHICHT, r("dstma_id"), ma.dstma_muster, ma.dstma_WEStdRegelAZ, ma.dstma_arbvh, niederlassung, ma.dstma_TzFeiertageStd)
Dim tatStd As Double = SQLDienst.getDstStunden(r("dstma_id"), datum_montag, datum_montag.AddDays(6), niederlassung)
' : ANDERES ERG"""""!!!!!!!!!!!!!!!!!!!!