neu

2022-09-01 10:37:14 +02:00
parent 46c14b6500
commit 5809e9c89c
13 changed files with 291 additions and 217 deletions
--- a/UID/Dienstplan/cFeiertage.vb
+++ b/UID/Dienstplan/cFeiertage.vb
@@ -202,7 +202,7 @@
            Case "DE" 'BAYERN 
                If datum = CDate("03.10." & _Year) Then Return True ' Tag der Deutschen Einheit
                '    If datum = BussUndBettag Then Return True ' Buß- und Bettag '!!!!ABEWEICHEND --> kein Feiertag in BAYERN
-                If datum = CDate("08.08." & _Year) Then Return True ' Augsburger Friedensfest 
+                '  If datum = CDate("08.08." & _Year) Then Return True ' Augsburger Friedensfest 
                If datum = CDate("01.05." & _Year) Then Return True ' Maifeiertag
                If datum = Karfreitag Then Return True
        End Select
--- a/UID/Dienstplan/usrCntlDienstplan.Designer.vb
+++ b/UID/Dienstplan/usrCntlDienstplan.Designer.vb
@@ -31,6 +31,8 @@ Partial Class usrCntlDienstplan
        Me.btnDienstplan = New System.Windows.Forms.Button()
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.Panel3 = New System.Windows.Forms.Panel()
+        Me.cbxAuswertungPDF = New System.Windows.Forms.CheckBox()
+        Me.Button5 = New System.Windows.Forms.Button()
        Me.cbxInaktiv = New System.Windows.Forms.CheckBox()
        Me.numJahr = New System.Windows.Forms.NumericUpDown()
        Me.cboMonat = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -49,8 +51,7 @@ Partial Class usrCntlDienstplan
        Me.tbImex = New System.Windows.Forms.TabPage()
        Me.tbFrontOffice = New System.Windows.Forms.TabPage()
        Me.tbAMBAR = New System.Windows.Forms.TabPage()
-        Me.Button5 = New System.Windows.Forms.Button()
-        Me.cbxAuswertungPDF = New System.Windows.Forms.CheckBox()
+        Me.Button6 = New System.Windows.Forms.Button()
        CType(Me.dgvMA, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.Panel3.SuspendLayout()
@@ -142,6 +143,7 @@ Partial Class usrCntlDienstplan
        '
        'Panel3
        '
+        Me.Panel3.Controls.Add(Me.Button6)
        Me.Panel3.Controls.Add(Me.cbxAuswertungPDF)
        Me.Panel3.Controls.Add(Me.Button5)
        Me.Panel3.Controls.Add(Me.cbxInaktiv)
@@ -160,6 +162,34 @@ Partial Class usrCntlDienstplan
        Me.Panel3.Size = New System.Drawing.Size(121, 771)
        Me.Panel3.TabIndex = 6
        '
+        'cbxAuswertungPDF
+        '
+        Me.cbxAuswertungPDF.AutoSize = True
+        Me.cbxAuswertungPDF.Checked = True
+        Me.cbxAuswertungPDF.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxAuswertungPDF.Location = New System.Drawing.Point(6, 541)
+        Me.cbxAuswertungPDF.Name = "cbxAuswertungPDF"
+        Me.cbxAuswertungPDF.Size = New System.Drawing.Size(92, 17)
+        Me.cbxAuswertungPDF.TabIndex = 14
+        Me.cbxAuswertungPDF.Text = "PDF Ausgabe"
+        Me.cbxAuswertungPDF.UseVisualStyleBackColor = True
+        Me.cbxAuswertungPDF.Visible = False
+        '
+        'Button5
+        '
+        Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button5.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Button5.Image = CType(resources.GetObject("Button5.Image"), System.Drawing.Image)
+        Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button5.Location = New System.Drawing.Point(3, 454)
+        Me.Button5.Name = "Button5"
+        Me.Button5.Size = New System.Drawing.Size(115, 35)
+        Me.Button5.TabIndex = 13
+        Me.Button5.Text = "Monatsauswert." & Global.Microsoft.VisualBasic.ChrW(13)
+        Me.Button5.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button5.UseVisualStyleBackColor = True
+        Me.Button5.Visible = False
+        '
        'cbxInaktiv
        '
        Me.cbxInaktiv.AutoSize = True
@@ -363,33 +393,19 @@ Partial Class usrCntlDienstplan
        Me.tbAMBAR.Text = "AMBAR"
        Me.tbAMBAR.UseVisualStyleBackColor = True
        '
-        'Button5
+        'Button6
        '
-        Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button5.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.Button5.Image = CType(resources.GetObject("Button5.Image"), System.Drawing.Image)
-        Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button5.Location = New System.Drawing.Point(3, 454)
-        Me.Button5.Name = "Button5"
-        Me.Button5.Size = New System.Drawing.Size(115, 35)
-        Me.Button5.TabIndex = 13
-        Me.Button5.Text = "Monatsauswert." & Global.Microsoft.VisualBasic.ChrW(13)
-        Me.Button5.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button5.UseVisualStyleBackColor = True
-        Me.Button5.Visible = False
-        '
-        'cbxAuswertungPDF
-        '
-        Me.cbxAuswertungPDF.AutoSize = True
-        Me.cbxAuswertungPDF.Checked = True
-        Me.cbxAuswertungPDF.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbxAuswertungPDF.Location = New System.Drawing.Point(6, 541)
-        Me.cbxAuswertungPDF.Name = "cbxAuswertungPDF"
-        Me.cbxAuswertungPDF.Size = New System.Drawing.Size(92, 17)
-        Me.cbxAuswertungPDF.TabIndex = 14
-        Me.cbxAuswertungPDF.Text = "PDF Ausgabe"
-        Me.cbxAuswertungPDF.UseVisualStyleBackColor = True
-        Me.cbxAuswertungPDF.Visible = False
+        Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button6.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.Button6.Image = Global.ADMIN.My.Resources.Resources.Excel_2013_logo_155x110
+        Me.Button6.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button6.Location = New System.Drawing.Point(3, 619)
+        Me.Button6.Name = "Button6"
+        Me.Button6.Size = New System.Drawing.Size(115, 50)
+        Me.Button6.TabIndex = 15
+        Me.Button6.Text = "Excel"
+        Me.Button6.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button6.UseVisualStyleBackColor = True
        '
        'usrCntlDienstplan
        '
@@ -438,4 +454,5 @@ Partial Class usrCntlDienstplan
    Friend WithEvents tbAMBAR As TabPage
    Friend WithEvents Button5 As Button
    Friend WithEvents cbxAuswertungPDF As CheckBox
+    Friend WithEvents Button6 As Button
 End Class
--- a/UID/Dienstplan/usrCntlDienstplan.vb
+++ b/UID/Dienstplan/usrCntlDienstplan.vb
@@ -569,4 +569,10 @@ Public Class usrCntlDienstplan
        Next

    End Sub
+
+    Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click
+        Dim table As New DataTable()
+        Me.dataAdapterMA.Fill(table)
+        VERAG_PROG_ALLGEMEIN.cProgramFunctions.genCSVFromDT(table, True) '
+    End Sub
 End Class