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

DIenstplan: Excelausausgabe (Woche)

Browse Source
This commit is contained in:
d.breimaier
2022-12-30 15:58:41 +01:00
parent 3509baf3ed
commit 13dca138c2
4 changed files with 117 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
UID/Dienstplan/frmDienstplanVariabel.vb
View File

@@ -1,4 +1,5 @@
Imports System.Globalization Imports System.Globalization
Imports System.Security.Authentication.ExtendedProtection
Imports Microsoft.Office.Interop Imports Microsoft.Office.Interop
Public Class frmDienstplanVariabel Public Class frmDienstplanVariabel
@@ -398,7 +399,7 @@ Public Class frmDienstplanVariabel
Dim SCHICHT As New cDienstplanSchicht(r("dedet_id")) Dim SCHICHT As New cDienstplanSchicht(r("dedet_id"))
Dim u As New usrCntlDienstWoche(SCHICHT, SETTINGS) Dim u As New usrCntlDienstWoche(SCHICHT, SETTINGS)
If True Then 'SCHICHT.dedet_Splitschicht = False Then 'Splitschichten nicht im als DGV anzeigen If True Then 'SCHICHT.dedet_Splitschicht = False Then 'Splitschichten nicht im DGV anzeigen
u.Height = (FlowLayoutPanel.Height - 5) * (SCHICHT.dedet_ProzentGrafik / 100) u.Height = (FlowLayoutPanel.Height - 5) * (SCHICHT.dedet_ProzentGrafik / 100)
FlowLayoutPanel.Controls.Add(u) FlowLayoutPanel.Controls.Add(u)
'MsgBox(SCHICHT.dedet_info) 'MsgBox(SCHICHT.dedet_info)
@@ -1529,6 +1530,8 @@ Public Class frmDienstplanVariabel
Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
Dim cc = New ColorConverter
Dim DPmitSplitschichten As Boolean = False
Dim txt As String = Button4.Text Dim txt As String = Button4.Text
Button4.Text = txt & " (0 %)" Button4.Text = txt & " (0 %)"
@@ -1543,149 +1546,19 @@ Public Class frmDienstplanVariabel
' FirstDayOfWeek.Monday, FirstWeekOfYear.FirstFourDays) ' FirstDayOfWeek.Monday, FirstWeekOfYear.FirstFourDays)
If Not My.Computer.FileSystem.DirectoryExists(Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\tmp\") Then If Not My.Computer.FileSystem.DirectoryExists(Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\tmp\") Then
My.Computer.FileSystem.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\tmp\") My.Computer.FileSystem.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\tmp\")
End If End If
Dim strFileName As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\tmp\tmp.xlsx" Dim strFileName As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\tmp\tmp.xlsx"
Try Try
If DPcontainsSplitschichten() Then If DPcontainsSplitschichten() Then
If vbYes = MsgBox("Dieser Dienstplan enthält Splitschichten." & vbCrLf & "DP mit Splitschichten ausgeben?", vbYesNo) Then
DPmitSplitschichten = True
With exclApp
.Visible = False
Datei = .Workbooks.Open(AppDomain.CurrentDomain.BaseDirectory & "Resources\Dienstplan Variabel.xlsx")
Blatt = Datei.Worksheets("DIENSTPLAN")
Dim d As Date = CalendarWeek(aktWoche, aktJahr)
Blatt.Range("B2").Value = "MONTAG, " & d.ToString("dd.MMM") : d = d.AddDays(1)
Blatt.Range("D2").Value = "DIENSTAG, " & d.ToString("dd.MMM") : d = d.AddDays(1)
Blatt.Range("F2").Value = "MITTWOCH, " & d.ToString("dd.MMM") : d = d.AddDays(1)
Blatt.Range("H2").Value = "DONNERSTAG, " & d.ToString("dd.MMM") : d = d.AddDays(1)
Blatt.Range("J2").Value = "FREITAG, " & d.ToString("dd.MMM") : d = d.AddDays(1)
Blatt.Range("L2").Value = "SAMSTAG, " & d.ToString("dd.MMM") : d = d.AddDays(1)
Blatt.Range("N2").Value = "SO, " & d.ToString("dd.MMM")
If SCHICHT.contains("ROT") Then
Blatt.Range("A3").Font.Color = Color.Red
Blatt.Range("H1").Font.Color = Color.Red
Blatt.Range("H1").Value = "ROT"
Else
Blatt.Range("A3").Font.Color = Color.Blue
Blatt.Range("H1").Font.Color = Color.Blue
Blatt.Range("H1").Value = "BLAU"
End If End If
Blatt.Range("A2").Value = "KW " & aktWoche
Button4.Text = txt & " (10 %)"
Dim pos As Integer = 0
Dim zeilenheader = 1
'BORDER
pos = 14
For Each s In BEN_SCHICHTEN
If s.SCHICHT.dedet_Hauptsplitschicht = True Then
Blatt.Range("A" & pos).Value = s.SCHICHT.dedet_bezeichnungExcel
' Blatt.Range("A" & pos).Style= = s.SCHICHT.dedet_bezeichnungExcel
Blatt.Range("A" & pos + 1).Value = s.SCHICHT.dedet_bezeichnungExcel2
Blatt.Range("A" & pos + 2).Value = s.SCHICHT.dedet_bezeichnungExcel3
pos += s.SCHICHT.dedet_ZeilenExcel + zeilenheader
End If End If
Try
' MsgBox("A14:N" & pos - 1)
Blatt.Range("A14:N" & pos - 1).BorderAround(Microsoft.Office.Interop.Excel.XlLineStyle.xlContinuous, Microsoft.Office.Interop.Excel.XlBorderWeight.xlMedium, Microsoft.Office.Interop.Excel.XlColorIndex.xlColorIndexAutomatic, Microsoft.Office.Interop.Excel.XlColorIndex.xlColorIndexAutomatic)
Catch ex As Exception
End Try
Next
'Zeilenheader
pos = 14
For Each s In BEN_SCHICHTEN
For Each z In s.SCHICHT.ZEITEN
Select Case z.dsz_woTag.ToUpper
Case "MO" : Blatt.Range("B" & pos).Value = " " & z.dsz_von & " - " & z.dsz_bis & " Uhr"
Case "DI" : Blatt.Range("D" & pos).Value = " " & z.dsz_von & " - " & z.dsz_bis & " Uhr"
Case "MI" : Blatt.Range("F" & pos).Value = " " & z.dsz_von & " - " & z.dsz_bis & " Uhr"
Case "DO" : Blatt.Range("H" & pos).Value = " " & z.dsz_von & " - " & z.dsz_bis & " Uhr"
Case "FR" : Blatt.Range("J" & pos).Value = " " & z.dsz_von & " - " & z.dsz_bis & " Uhr"
Case "SA" : Blatt.Range("L" & pos).Value = " " & z.dsz_von & " - " & z.dsz_bis & " Uhr"
Case "SO" : Blatt.Range("N" & pos).Value = " " & z.dsz_von & " - " & z.dsz_bis & " Uhr"
End Select
Next
Blatt.Range("B" & pos & ":N" & pos).Interior.Color = Color.FromArgb(197, 217, 241)
pos += s.SCHICHT.dedet_ZeilenExcel + zeilenheader
Next
'MONTAG
pos = 15
For Each s In BEN_SCHICHTEN
If s.SCHICHT.dedet_Hauptsplitschicht = True Then
Dim z = s.SCHICHT.dedet_ZeilenExcel
Dim Tag(z * 2 - 1) As String
For i = 0 To z - 1 : Tag(i) = "B" & i + pos : Next
For i = 0 To z - 1 : Tag(i + z) = "C" & i + pos : Next
Blatt = fill(s.dgv_Mo, Tag, Blatt, "MO", s.SCHICHT)
pos += z + zeilenheader
End If
Next
Dim Zeile_ZA As Integer = 45
Dim Zeile_URL As Integer = 47
Dim Zeile_SO As Integer = 53
Dim Zeile_KS As Integer = 55
Dim ZAMo(4) As String
For i = 0 To 1 : ZAMo(i) = "B" & i + Zeile_ZA : Next
For i = 0 To 1 : ZAMo(i + 2) = "C" & i + Zeile_ZA : Next
Dim UrlMo(8) As String
For i = 0 To 3 : UrlMo(i) = "B" & i + Zeile_URL : Next
For i = 0 To 3 : UrlMo(i + 4) = "C" & i + Zeile_URL : Next
Dim SOMo(4) As String
For i = 0 To 1 : SOMo(i) = "B" & i + Zeile_SO : Next
For i = 0 To 1 : SOMo(i + 2) = "C" & i + Zeile_SO : Next
Dim KSMo(6) As String
For i = 0 To 2 : KSMo(i) = "B" & i + Zeile_KS : Next
For i = 0 To 2 : KSMo(i + 3) = "C" & i + Zeile_KS : Next
Blatt = fill(dgvZA_Mo, ZAMo, Blatt)
Blatt = fill(dgvUrl_Mo, UrlMo, Blatt)
Blatt = fill(dgvDR_Mo, SOMo, Blatt)
Blatt = fill(dgvKS_Mo, KSMo, Blatt)
Button4.Text = txt & " (25 %)"
Button4.Text = txt & " (100 %)"
.Visible = True
.DisplayAlerts = Word.WdAlertLevel.wdAlertsNone
Try : Datei.SaveAs(strFileName) : Catch : End Try
End With
Else
With exclApp With exclApp
.Visible = False .Visible = False
Datei = .Workbooks.Open(AppDomain.CurrentDomain.BaseDirectory & "Resources\Dienstplan Variabel.xlsx") Datei = .Workbooks.Open(AppDomain.CurrentDomain.BaseDirectory & "Resources\Dienstplan Variabel.xlsx")
@@ -1722,11 +1595,14 @@ Public Class frmDienstplanVariabel
'BORDER 'BORDER
pos = 14 pos = 14
For Each s In BEN_SCHICHTEN For Each s In BEN_SCHICHTEN
If s.SCHICHT.dedet_Splitschicht = DPmitSplitschichten Or s.SCHICHT.dedet_Splitschicht = False Then
Blatt.Range("A" & pos).Value = s.SCHICHT.dedet_bezeichnungExcel Blatt.Range("A" & pos).Value = s.SCHICHT.dedet_bezeichnungExcel
' Blatt.Range("A" & pos).Style= = s.SCHICHT.dedet_bezeichnungExcel ' Blatt.Range("A" & pos).Style= = s.SCHICHT.dedet_bezeichnungExcel
Blatt.Range("A" & pos + 1).Value = s.SCHICHT.dedet_bezeichnungExcel2 Blatt.Range("A" & pos + 1).Value = s.SCHICHT.dedet_bezeichnungExcel2
Blatt.Range("A" & pos + 2).Value = s.SCHICHT.dedet_bezeichnungExcel3 Blatt.Range("A" & pos + 2).Value = s.SCHICHT.dedet_bezeichnungExcel3
pos += s.SCHICHT.dedet_ZeilenExcel + zeilenheader pos += s.SCHICHT.dedet_ZeilenExcel + zeilenheader
End If
Try Try
' MsgBox("A14:N" & pos - 1) ' MsgBox("A14:N" & pos - 1)
Blatt.Range("A14:N" & pos - 1).BorderAround(Microsoft.Office.Interop.Excel.XlLineStyle.xlContinuous, Microsoft.Office.Interop.Excel.XlBorderWeight.xlMedium, Microsoft.Office.Interop.Excel.XlColorIndex.xlColorIndexAutomatic, Microsoft.Office.Interop.Excel.XlColorIndex.xlColorIndexAutomatic) Blatt.Range("A14:N" & pos - 1).BorderAround(Microsoft.Office.Interop.Excel.XlLineStyle.xlContinuous, Microsoft.Office.Interop.Excel.XlBorderWeight.xlMedium, Microsoft.Office.Interop.Excel.XlColorIndex.xlColorIndexAutomatic, Microsoft.Office.Interop.Excel.XlColorIndex.xlColorIndexAutomatic)
@@ -1738,25 +1614,27 @@ Public Class frmDienstplanVariabel
'Zeilenheader 'Zeilenheader
pos = 14 pos = 14
For Each s In BEN_SCHICHTEN For Each s In BEN_SCHICHTEN
If s.SCHICHT.dedet_Splitschicht = DPmitSplitschichten Or s.SCHICHT.dedet_Splitschicht = False Then
For Each z In s.SCHICHT.ZEITEN For Each z In s.SCHICHT.ZEITEN
Select Case z.dsz_woTag.ToUpper Select Case z.dsz_woTag.ToUpper
Case "MO" : Blatt.Range("B" & pos).Value = " " & z.dsz_von & " - " & z.dsz_bis & " Uhr" Case "MO" : Blatt.Range("B" & pos).Value = " " & IIf(z.dsz_von <> "" AndAlso z.dsz_bis <> "", z.dsz_von & " - " & z.dsz_bis & " Uhr", "")
Case "DI" : Blatt.Range("D" & pos).Value = " " & z.dsz_von & " - " & z.dsz_bis & " Uhr" Case "DI" : Blatt.Range("D" & pos).Value = " " & IIf(z.dsz_von <> "" AndAlso z.dsz_bis <> "", z.dsz_von & " - " & z.dsz_bis & " Uhr", "")
Case "MI" : Blatt.Range("F" & pos).Value = " " & z.dsz_von & " - " & z.dsz_bis & " Uhr" Case "MI" : Blatt.Range("F" & pos).Value = " " & IIf(z.dsz_von <> "" AndAlso z.dsz_bis <> "", z.dsz_von & " - " & z.dsz_bis & " Uhr", "")
Case "DO" : Blatt.Range("H" & pos).Value = " " & z.dsz_von & " - " & z.dsz_bis & " Uhr" Case "DO" : Blatt.Range("H" & pos).Value = " " & IIf(z.dsz_von <> "" AndAlso z.dsz_bis <> "", z.dsz_von & " - " & z.dsz_bis & " Uhr", "")
Case "FR" : Blatt.Range("J" & pos).Value = " " & z.dsz_von & " - " & z.dsz_bis & " Uhr" Case "FR" : Blatt.Range("J" & pos).Value = " " & IIf(z.dsz_von <> "" AndAlso z.dsz_bis <> "", z.dsz_von & " - " & z.dsz_bis & " Uhr", "")
Case "SA" : Blatt.Range("L" & pos).Value = " " & z.dsz_von & " - " & z.dsz_bis & " Uhr" Case "SA" : Blatt.Range("L" & pos).Value = " " & IIf(z.dsz_von <> "" AndAlso z.dsz_bis <> "", z.dsz_von & " - " & z.dsz_bis & " Uhr", "")
Case "SO" : Blatt.Range("N" & pos).Value = " " & z.dsz_von & " - " & z.dsz_bis & " Uhr" Case "SO" : Blatt.Range("N" & pos).Value = " " & IIf(z.dsz_von <> "" AndAlso z.dsz_bis <> "", z.dsz_von & " - " & z.dsz_bis & " Uhr", "")
End Select End Select
Next Next
End If
Blatt.Range("B" & pos & ":N" & pos).Interior.Color = Color.FromArgb(197, 217, 241) Blatt.Range("B" & pos & ":N" & pos).Interior.Color = Color.FromArgb(197, 217, 241)
pos += s.SCHICHT.dedet_ZeilenExcel + zeilenheader pos += s.SCHICHT.dedet_ZeilenExcel + zeilenheader
Next Next
'MONTAG 'MONTAG
pos = 15 pos = 15
For Each s In BEN_SCHICHTEN For Each s In BEN_SCHICHTEN
If s.SCHICHT.dedet_Splitschicht = DPmitSplitschichten Or s.SCHICHT.dedet_Splitschicht = False Then
Dim z = s.SCHICHT.dedet_ZeilenExcel Dim z = s.SCHICHT.dedet_ZeilenExcel
Dim Tag(z * 2 - 1) As String Dim Tag(z * 2 - 1) As String
@@ -1764,7 +1642,12 @@ Public Class frmDienstplanVariabel
For i = 0 To z - 1 : Tag(i + z) = "C" & i + pos : Next For i = 0 To z - 1 : Tag(i + z) = "C" & i + pos : Next
Blatt = fill(s.dgv_Mo, Tag, Blatt, "MO", s.SCHICHT) Blatt = fill(s.dgv_Mo, Tag, Blatt, "MO", s.SCHICHT)
If (s.SCHICHT.dedet_ExcelMonatFarbe IsNot Nothing AndAlso s.SCHICHT.dedet_ExcelMonatFarbe.Substring(0, 1) = "#") Then
For i = 0 To z - 1 : Blatt.Range("B" & i + pos & ":N" & i + pos).Interior.Color = ColorTranslator.ToOle(cc.ConvertFromString(s.SCHICHT.dedet_ExcelMonatFarbe.ToString())) : Next
End If
pos += z + zeilenheader pos += z + zeilenheader
End If
Next Next
Dim Zeile_ZA As Integer = 45 Dim Zeile_ZA As Integer = 45
@@ -1799,6 +1682,7 @@ Public Class frmDienstplanVariabel
'DIENSTAG 'DIENSTAG
pos = 15 pos = 15
For Each s In BEN_SCHICHTEN For Each s In BEN_SCHICHTEN
If s.SCHICHT.dedet_Splitschicht = DPmitSplitschichten Or s.SCHICHT.dedet_Splitschicht = False Then
Dim z = s.SCHICHT.dedet_ZeilenExcel Dim z = s.SCHICHT.dedet_ZeilenExcel
Dim Tag(z * 2 - 1) As String Dim Tag(z * 2 - 1) As String
@@ -1807,6 +1691,7 @@ Public Class frmDienstplanVariabel
Blatt = fill(s.dgv_Di, Tag, Blatt, "DI", s.SCHICHT) Blatt = fill(s.dgv_Di, Tag, Blatt, "DI", s.SCHICHT)
pos += z + zeilenheader pos += z + zeilenheader
End If
Next Next
Dim ZADi(4) As String Dim ZADi(4) As String
@@ -1839,12 +1724,15 @@ Public Class frmDienstplanVariabel
'MITTWOCH 'MITTWOCH
pos = 15 pos = 15
For Each s In BEN_SCHICHTEN For Each s In BEN_SCHICHTEN
If s.SCHICHT.dedet_Splitschicht = DPmitSplitschichten Or s.SCHICHT.dedet_Splitschicht = False Then
Dim z = s.SCHICHT.dedet_ZeilenExcel Dim z = s.SCHICHT.dedet_ZeilenExcel
Dim Tag(z * 2 - 1) As String Dim Tag(z * 2 - 1) As String
For i = 0 To z - 1 : Tag(i) = "F" & i + pos : Next For i = 0 To z - 1 : Tag(i) = "F" & i + pos : Next
For i = 0 To z - 1 : Tag(i + z) = "G" & i + pos : Next For i = 0 To z - 1 : Tag(i + z) = "G" & i + pos : Next
Blatt = fill(s.dgv_Mi, Tag, Blatt, "MI", s.SCHICHT) Blatt = fill(s.dgv_Mi, Tag, Blatt, "MI", s.SCHICHT)
pos += z + zeilenheader pos += z + zeilenheader
End If
Next Next
Dim ZAMi(4) As String Dim ZAMi(4) As String
@@ -1877,12 +1765,14 @@ Public Class frmDienstplanVariabel
'DONNERSTAG 'DONNERSTAG
pos = 15 pos = 15
For Each s In BEN_SCHICHTEN For Each s In BEN_SCHICHTEN
If s.SCHICHT.dedet_Splitschicht = DPmitSplitschichten Or s.SCHICHT.dedet_Splitschicht = False Then
Dim z = s.SCHICHT.dedet_ZeilenExcel Dim z = s.SCHICHT.dedet_ZeilenExcel
Dim Tag(z * 2 - 1) As String Dim Tag(z * 2 - 1) As String
For i = 0 To z - 1 : Tag(i) = "H" & i + pos : Next For i = 0 To z - 1 : Tag(i) = "H" & i + pos : Next
For i = 0 To z - 1 : Tag(i + z) = "I" & i + pos : Next For i = 0 To z - 1 : Tag(i + z) = "I" & i + pos : Next
Blatt = fill(s.dgv_Do, Tag, Blatt, "DO", s.SCHICHT) Blatt = fill(s.dgv_Do, Tag, Blatt, "DO", s.SCHICHT)
pos += z + zeilenheader pos += z + zeilenheader
End If
Next Next
Dim ZADo(4) As String Dim ZADo(4) As String
@@ -1915,12 +1805,14 @@ Public Class frmDienstplanVariabel
'FREITAG 'FREITAG
pos = 15 pos = 15
For Each s In BEN_SCHICHTEN For Each s In BEN_SCHICHTEN
If s.SCHICHT.dedet_Splitschicht = DPmitSplitschichten Or s.SCHICHT.dedet_Splitschicht = False Then
Dim z = s.SCHICHT.dedet_ZeilenExcel Dim z = s.SCHICHT.dedet_ZeilenExcel
Dim Tag(z * 2 - 1) As String Dim Tag(z * 2 - 1) As String
For i = 0 To z - 1 : Tag(i) = "J" & i + pos : Next For i = 0 To z - 1 : Tag(i) = "J" & i + pos : Next
For i = 0 To z - 1 : Tag(i + z) = "K" & i + pos : Next For i = 0 To z - 1 : Tag(i + z) = "K" & i + pos : Next
Blatt = fill(s.dgv_Fr, Tag, Blatt, "FR", s.SCHICHT) Blatt = fill(s.dgv_Fr, Tag, Blatt, "FR", s.SCHICHT)
pos += z + zeilenheader pos += z + zeilenheader
End If
Next Next
Dim ZAFr(4) As String Dim ZAFr(4) As String
@@ -1953,12 +1845,14 @@ Public Class frmDienstplanVariabel
'SAMSTAG 'SAMSTAG
pos = 15 pos = 15
For Each s In BEN_SCHICHTEN For Each s In BEN_SCHICHTEN
If s.SCHICHT.dedet_Splitschicht = DPmitSplitschichten Or s.SCHICHT.dedet_Splitschicht = False Then
Dim z = s.SCHICHT.dedet_ZeilenExcel Dim z = s.SCHICHT.dedet_ZeilenExcel
Dim Tag(z * 2 - 1) As String Dim Tag(z * 2 - 1) As String
For i = 0 To z - 1 : Tag(i) = "L" & i + pos : Next For i = 0 To z - 1 : Tag(i) = "L" & i + pos : Next
For i = 0 To z - 1 : Tag(i + z) = "M" & i + pos : Next For i = 0 To z - 1 : Tag(i + z) = "M" & i + pos : Next
Blatt = fill(s.dgv_Sa, Tag, Blatt, "SA", s.SCHICHT) Blatt = fill(s.dgv_Sa, Tag, Blatt, "SA", s.SCHICHT)
pos += z + zeilenheader pos += z + zeilenheader
End If
Next Next
Dim ZASa(4) As String Dim ZASa(4) As String
@@ -1991,11 +1885,13 @@ Public Class frmDienstplanVariabel
'SONNTAG 'SONNTAG
pos = 15 pos = 15
For Each s In BEN_SCHICHTEN For Each s In BEN_SCHICHTEN
If s.SCHICHT.dedet_Splitschicht = DPmitSplitschichten Or s.SCHICHT.dedet_Splitschicht = False Then
Dim z = s.SCHICHT.dedet_ZeilenExcel Dim z = s.SCHICHT.dedet_ZeilenExcel
Dim Tag(z) As String Dim Tag(z) As String
For i = 0 To z - 1 : Tag(i) = "N" & i + pos : Next For i = 0 To z - 1 : Tag(i) = "N" & i + pos : Next
Blatt = fill(s.dgv_So, Tag, Blatt, "SO") Blatt = fill(s.dgv_So, Tag, Blatt, "SO")
pos += z + zeilenheader pos += z + zeilenheader
End If
Next Next
Dim ZASo(2) As String Dim ZASo(2) As String
@@ -2024,10 +1920,9 @@ Public Class frmDienstplanVariabel
.Visible = True .Visible = True
.DisplayAlerts = Word.WdAlertLevel.wdAlertsNone .DisplayAlerts = Word.WdAlertLevel.wdAlertsNone
Try : Datei.SaveAs(strFileName) : Catch : End Try Try : Datei.SaveAs(strFileName) : Catch : End Try
End With End With
End If
Catch ex As Exception Catch ex As Exception
MsgBox("ERRDP 7: " & ex.Message & ex.StackTrace) MsgBox("ERRDP 7: " & ex.Message & ex.StackTrace)
@@ -2484,8 +2379,7 @@ Public Class frmDienstplanVariabel
SQLDienst.updateDienstEintragArtChange(r.Cells(0).Value, datum.ToShortDateString, abt, von, bis, pause) SQLDienst.updateDienstEintragArtChange(r.Cells(0).Value, datum.ToShortDateString, abt, von, bis, pause)
If r.Cells("dstetr_hauptsplitschicht").Value Then If r.Cells("dstetr_hauptsplitschicht").Value Then
If SQLDienst.getCountEntrys(r.Cells("dstma_id").Value, datum, datum, True) AndAlso If SQLDienst.getCountEntrys(r.Cells("dstma_id").Value, datum, datum, True) AndAlso (abt = "URL" Or abt = "DR" Or abt = "FREI" Or abt = "QS" Or abt = "KS" Or abt = "ZA") Then
(abt = "URL" Or abt = "DR" Or abt = "FREI" Or abt = "QS" Or abt = "KS" Or abt = "ZA") Then
deleteSplitschichten(r.Cells("dstma_id").Value, datum, r.Cells(1).Value) deleteSplitschichten(r.Cells("dstma_id").Value, datum, r.Cells(1).Value)
End If End If
End If End If
@@ -3012,9 +2906,7 @@ Public Class frmDienstplanVariabel
Private Function DPcontainsSplitschichten() As Boolean Private Function DPcontainsSplitschichten() As Boolean
For Each s In BEN_SCHICHTEN For Each s In BEN_SCHICHTEN
If s.SCHICHT.dedet_Splitschicht Then Return True If s.SCHICHT.dedet_Splitschicht Then Return True
Next Next
Return False Return False
End Function End Function

2
UID/My Project/Resources.Designer.vb generated
View File

@@ -655,7 +655,7 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die 2.0.8 ähnelt. ''' Sucht eine lokalisierte Zeichenfolge, die 1.2.0.9 ähnelt.
'''</summary> '''</summary>
Friend ReadOnly Property Version() As String Friend ReadOnly Property Version() As String
Get Get

2
UID/My Project/Resources.resx
View File

@@ -188,7 +188,7 @@
<value>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</value> <value>Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$;</value>
</data> </data>
<data name="Version" xml:space="preserve"> <data name="Version" xml:space="preserve">
<value>2.0.8</value> <value>1.2.0.9</value>
</data> </data>
<data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

7
UID/cSqlDb.vb
View File

@@ -4149,8 +4149,11 @@ Public Class cDienstplan
Dim sqlWhere As String = "" Dim sqlWhere As String = ""
If onlySplitschichten Then If onlySplitschichten Then
sqlWhere &= "AND dstetr_splitschicht = 1 AND dstetr_art = '" sqlWhere &= "AND dstetr_splitschicht = 1"
sqlWhere &= art & "'" End If
If art <> "" Then
sqlWhere &= "And dstetr_art = '" & art & "'"
End If End If
Try Try
Dim stunden As Integer Dim stunden As Integer