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

Merge

Browse Source
This commit is contained in:
Andreas Luxbauer
2023-01-18 10:25:32 +01:00
parent de3829202c f67afff2a1
commit 5e980b3666
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
UID/Dienstplan/frmDienstplanVariabel.vb
View File

@@ -1083,7 +1083,7 @@ Public Class frmDienstplanVariabel
End If End If
' ctxtDgvSchicht1.Items(0).Text = String.Format("This is the cell at {0}, {1}", ht.ColumnIndex, ht.RowIndex) ' ctxtDgvSchicht1.Items(0).Text = String.Format("This is the cell at {0}, {1}", ht.ColumnIndex, ht.RowIndex)
If o IsNot Nothing Then
If o.SCHICHT.dedet_Splitschicht = True Then If o.SCHICHT.dedet_Splitschicht = True Then
thisDgv.ContextMenuStrip = ContextMenuStrip1 thisDgv.ContextMenuStrip = ContextMenuStrip1
If thisDgv.SelectedCells.Count = 0 Then If thisDgv.SelectedCells.Count = 0 Then
@@ -1094,6 +1094,8 @@ Public Class frmDienstplanVariabel
End If End If
End If
End If End If
Else Else
@@ -2094,6 +2096,11 @@ Public Class frmDienstplanVariabel
Dim o As usrCntlDienstWoche = Nothing Dim o As usrCntlDienstWoche = Nothing
If dgv_tmp.Parent.Parent.GetType() Is GetType(usrCntlDienstWoche) Then o = dgv_tmp.Parent.Parent If dgv_tmp.Parent.Parent.GetType() Is GetType(usrCntlDienstWoche) Then o = dgv_tmp.Parent.Parent
If o Is Nothing Then
MsgBox("Keine Splitschichten erlaubt!")
Exit Sub
End If
If o.SCHICHT.dedet_Hauptsplitschicht = False Then If o.SCHICHT.dedet_Hauptsplitschicht = False Then
MsgBox("In Schicht " & o.schicht_name & " sind keine Splitschichten erlaubt!") MsgBox("In Schicht " & o.schicht_name & " sind keine Splitschichten erlaubt!")