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-10-02 10:36:37 +02:00
parent f5248e4a51
commit fa670231f7
17 changed files with 297 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
UID/Dienstplan/frmDienstplanVariabel.vb
View File

@@ -1232,7 +1232,7 @@ Public Class frmDienstplanVariabel
eintrag.dstetr_dstmaId = m.dstma_id
eintrag.dstetr_datum = datum
If Not FT.isFeiertag(datum) Then
If Not FT.isFeiertag(datum, SETTINGS.dpset_land) Then
If m.dstma_muster Then
' MsgBox("HIER")
@@ -2467,7 +2467,7 @@ Public Class frmDienstplanVariabel
Blatt = Datei.Worksheets("DIENSTPLAN")
Dim dt_Ma As DataTable = SQLDienst.loadDGV("SELECT TOP 25 [dstma_id],[dstma_mitId],[dstma_kuerzel],[dstma_arbvh] FROM [ADMIN].[dbo].[tblDienstMitarb] inner join tblMitarbeiter ON mit_id=dstma_mitId where dstma_niederlassung='" & niederlassung & "' and mit_gekuendigt=0 order by dstma_reihenfolge, dstma_kuerzel")
Dim dt_Ma As DataTable = SQLDienst.loadDGV("SELECT TOP 25 [dstma_id],[dstma_mitId],[dstma_kuerzel],[dstma_arbvh] FROM [ADMIN].[dbo].[tblDienstMitarb] inner join tblMitarbeiter ON mit_id=dstma_mitId where dstma_niederlassung='" & niederlassung & "' and mit_gekuendigt=0 and dstma_inaktiv=0 order by dstma_reihenfolge, dstma_kuerzel")
Dim cnt = 0
If dt_Ma IsNot Nothing Then
@@ -2487,7 +2487,7 @@ Public Class frmDienstplanVariabel
Blatt.Range("A" & CInt(14 + cnt3).ToString).Font.Color = Color.Red
End If
If FT.isFeiertag(dateWork) Then
If FT.isFeiertag(dateWork, SETTINGS.dpset_land) Then
Blatt.Range("B" & CInt(14 + cnt3).ToString & ":" & "Z" & CInt(14 + cnt3).ToString).Interior.Color = Color.Orange
Blatt.Range("A" & CInt(14 + cnt3).ToString).Font.Color = Color.Red
End If