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

3
UID/ADMIN.vbproj
View File

@@ -699,6 +699,9 @@
<None Include="Resources\Buergschaften_JahresauswertungSplit.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\Dienstplan Variabel Monat AMBAR.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\Dienstplan Variabel Monat IMEX.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>

12
UID/Dienstplan/frmDienstplan.vb
View File

@@ -48,8 +48,11 @@ Public Class frmDienstplan
End Sub
Public Sub initDienstplan()
Dim datum As Date = CalendarWeek(aktWoche, aktJahr)
Dim pf As New cProgramFunctions
pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
Dim STD_LIST = cDienstMitarbAbweichendeWochenstunden.GET_STD_LIST(datum)
pf.KWAbschluss(STD_LIST, niederlassung, aktJahr, aktWoche, SCHICHT)
' initDienstplan()
If pnl.Controls.Count > 0 Then DirectCast(pnl.Controls(0), usrcntlDienstplanStunden).loaded = False
@@ -63,7 +66,6 @@ Public Class frmDienstplan
Else
Button14.Text = "Woche abschließen"
End If
Dim datum As Date = CalendarWeek(aktWoche, aktJahr)
Dim arrZoll1 As String() = {"dgvZoll1_Mo", "dgvZoll1_Di", "dgvZoll1_Mi", "dgvZoll1_Do", "dgvZoll1_Fr", "dgvZoll1_Sa", "dgvZoll1_So"}
Dim arrZoll2 As String() = {"dgvZoll2_Mo", "dgvZoll2_Di", "dgvZoll2_Mi", "dgvZoll2_Do", "dgvZoll2_Fr", "dgvZoll2_Sa", "dgvZoll2_So"}
@@ -1844,9 +1846,9 @@ Public Class frmDienstplan
Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click
Exit Sub
Dim pf As New cProgramFunctions
pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
initDienstplan()
'Dim pf As New cProgramFunctions
'pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
'initDienstplan()
End Sub

9
UID/Dienstplan/frmDienstplanATILLA.vb
View File

@@ -49,9 +49,10 @@ Public Class frmDienstplanATILLA
End Sub
Public Sub initDienstplan()
Dim STD_LIST = cDienstMitarbAbweichendeWochenstunden.GET_STD_LIST(CalendarWeek(aktWoche, aktJahr))
Dim pf As New cProgramFunctions
pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
pf.KWAbschluss(STD_LIST, niederlassung, aktJahr, aktWoche, SCHICHT)
' initDienstplan()
If pnl.Controls.Count > 0 Then DirectCast(pnl.Controls(0), usrcntlDienstplanStunden).loaded = False
@@ -1897,9 +1898,9 @@ Public Class frmDienstplanATILLA
Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click
Exit Sub
Dim pf As New cProgramFunctions
pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
initDienstplan()
'Dim pf As New cProgramFunctions
'pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
'initDienstplan()
End Sub

62
UID/Dienstplan/frmDienstplanVariabel.vb
View File

@@ -56,7 +56,9 @@ Public Class frmDienstplanVariabel
End Sub
Public Sub initDienstplan()
pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
Dim STD_LIST = cDienstMitarbAbweichendeWochenstunden.GET_STD_LIST(CalendarWeek(aktWoche, aktJahr))
pf.KWAbschluss(STD_LIST, niederlassung, aktJahr, aktWoche, SCHICHT)
' initDienstplan()
If Panel6.Controls.Count > 0 Then DirectCast(Panel6.Controls(0), usrcntlDienstplanStunden).loaded = False
@@ -636,7 +638,7 @@ Public Class frmDienstplanVariabel
End If
End Function
Public Function CalendarWeek(ByVal nWeek As Integer, ByVal nYear As Integer) As Date
Public Shared Function CalendarWeek(ByVal nWeek As Integer, ByVal nYear As Integer) As Date
' Wochentag des 4. Januar des Jahres ermitteln
Dim dStart As New Date(nYear, 1, 4)
@@ -2355,8 +2357,8 @@ Public Class frmDienstplanVariabel
Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click
Exit Sub
' Dim pf As New cProgramFunctions
pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
initDienstplan()
'pf.KWAbschluss(niederlassung, aktJahr, aktWoche, SCHICHT)
'initDienstplan()
End Sub
@@ -2449,12 +2451,18 @@ Public Class frmDienstplanVariabel
Try
With exclApp
.Visible = False
Dim useAlwaysTime = False
If SQLDienst.getValueTxtBySql("SELECT isnull([dpset_firma],'') FROM [tblDienstSettings] WHERE [dpset_niederlassung]='" & niederlassung & "'", "ADMIN") = "IMEX" Then
Datei = .Workbooks.Open(AppDomain.CurrentDomain.BaseDirectory & "Resources\Dienstplan Variabel Monat IMEX.xlsx")
Else
Datei = .Workbooks.Open(AppDomain.CurrentDomain.BaseDirectory & "Resources\Dienstplan Variabel Monat.xlsx")
End If
Select Case SQLDienst.getValueTxtBySql("SELECT isnull([dpset_firma],'') FROM [tblDienstSettings] WHERE [dpset_niederlassung]='" & niederlassung & "'", "ADMIN")
Case "IMEX"
Datei = .Workbooks.Open(AppDomain.CurrentDomain.BaseDirectory & "Resources\Dienstplan Variabel Monat IMEX.xlsx")
Case "AMBAR"
Datei = .Workbooks.Open(AppDomain.CurrentDomain.BaseDirectory & "Resources\Dienstplan Variabel Monat AMBAR.xlsx")
useAlwaysTime = True
Case Else
Datei = .Workbooks.Open(AppDomain.CurrentDomain.BaseDirectory & "Resources\Dienstplan Variabel Monat.xlsx")
End Select
Blatt = Datei.Worksheets("DIENSTPLAN")
@@ -2464,11 +2472,12 @@ Public Class frmDienstplanVariabel
Dim cnt = 0
If dt_Ma IsNot Nothing Then
'-----------------------Datum-------------------
Dim dateWork = CDate("01." & aktDate.Month & "." & aktDate.Year & "")
Dim dateEnde = dateWork.AddMonths(1).AddDays(-1)
Blatt.Range("C1").Value = dateWork.ToString("MMMM yyyy")
Dim FT As New cFeiertage(dateWork.Year) 'Evtl Jahressprung, darum neu definieren
Dim cnt3 = 0
@@ -2495,9 +2504,6 @@ Public Class frmDienstplanVariabel
'-----------------------------------------------
Blatt.Range("C1").Value = dateWork.ToString("MMMM yyyy")
For Each r As DataRow In dt_Ma.Rows
Dim splate = Chr(Asc("B") + cnt)
Blatt.Range(splate & "2").Value = r("dstma_kuerzel")
@@ -2515,30 +2521,36 @@ Public Class frmDienstplanVariabel
If dt_Tag IsNot Nothing AndAlso dt_Tag.Rows.Count > 0 Then
If dt_Tag.Rows(0)("dstetr_info") IsNot DBNull.Value AndAlso dt_Tag.Rows(0)("dstetr_info") <> "" Then
Tag_Bez = dt_Tag.Rows(0)("dstetr_info")
Else
Tag_Bez = dt_Tag.Rows(0)("dstetr_von") & "-" & dt_Tag.Rows(0)("dstetr_bis")
'useAlwaysTime --> keine Bezeichnungen der Schicht zulassen, nur die Uhrzeiten
Dim dt_Zeit = SQLDienst.loadDGV("SELECT * FROM [ADMIN].[dbo].[tblDienstplanSchichtenZeiten] where dsz_dedetId=" & dt_Tag.Rows(0)("dedet_id") & " and dsz_woTag='" & dateWork.ToString("ddd").Replace(".", "").ToUpper & "'")
If dt_Tag IsNot Nothing AndAlso dt_Tag.Rows.Count > 0 Then
If Not useAlwaysTime Or dt_Tag.Rows(0)("dedet_benutzerdefinierteSchicht") = 0 Then
'Wenn keine benutzerdefinierteSchicht ODER von=von, bis=bis --> Bezeichnung hinschreiben, sonst wird die Zeit (lt. oben) genau angegeben.
If dt_Tag.Rows(0)("dedet_benutzerdefinierteSchicht") = 0 Or (dt_Zeit.Rows(0)("dsz_von") = dt_Tag.Rows(0)("dstetr_von") And dt_Zeit.Rows(0)("dsz_bis") = dt_Tag.Rows(0)("dstetr_bis")) Then
If dt_Tag.Rows(0)("dedet_ExcelMonatBezeichnung") IsNot DBNull.Value AndAlso dt_Tag.Rows(0)("dedet_ExcelMonatBezeichnung") <> "" Then
Tag_Bez = dt_Tag.Rows(0)("dedet_ExcelMonatBezeichnung")
If dt_Tag.Rows(0)("dedet_ExcelMonatFarbe") IsNot DBNull.Value Then BGcolor = dt_Tag.Rows(0)("dedet_ExcelMonatFarbe")
ElseIf dt_Tag.Rows(0)("dedet_bezeichnungDP") IsNot DBNull.Value AndAlso dt_Tag.Rows(0)("dedet_bezeichnungDP") <> "" Then
Tag_Bez = dt_Tag.Rows(0)("dedet_bezeichnungDP")
Else
Tag_Bez = dt_Tag.Rows(0)("dedet_abt")
End If
' Tag_Bez = If(dt_Tag.Rows(0)("dedet_bezeichnungDP") <> "", dt_Tag.Rows(0)("dedet_bezeichnungDP"), dt_Tag.Rows(0)("dedet_abt"))
'Wenn keine benutzerdefinierteSchicht ODER von=von, bis=bis --> Bezeichnung hinschreiben, sonst wird die Zeit (lt. oben) genau angegeben.
If dt_Tag.Rows(0)("dedet_benutzerdefinierteSchicht") = 0 Or (dt_Zeit.Rows(0)("dsz_von") = dt_Tag.Rows(0)("dstetr_von") And dt_Zeit.Rows(0)("dsz_bis") = dt_Tag.Rows(0)("dstetr_bis")) Then
If dt_Tag.Rows(0)("dedet_ExcelMonatBezeichnung") IsNot DBNull.Value AndAlso dt_Tag.Rows(0)("dedet_ExcelMonatBezeichnung") <> "" Then
Tag_Bez = dt_Tag.Rows(0)("dedet_ExcelMonatBezeichnung")
If dt_Tag.Rows(0)("dedet_ExcelMonatFarbe") IsNot DBNull.Value Then BGcolor = dt_Tag.Rows(0)("dedet_ExcelMonatFarbe")
ElseIf dt_Tag.Rows(0)("dedet_bezeichnungDP") IsNot DBNull.Value AndAlso dt_Tag.Rows(0)("dedet_bezeichnungDP") <> "" Then
Tag_Bez = dt_Tag.Rows(0)("dedet_bezeichnungDP")
Else
Tag_Bez = dt_Tag.Rows(0)("dedet_abt")
End If
' Tag_Bez = If(dt_Tag.Rows(0)("dedet_bezeichnungDP") <> "", dt_Tag.Rows(0)("dedet_bezeichnungDP"), dt_Tag.Rows(0)("dedet_abt"))
End If
End If
End If
End If

33
UID/Dienstplan/frmDiestAddMa.Designer.vb generated
View File

@@ -22,6 +22,7 @@ Partial Class frmDiestAddMa
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDiestAddMa))
Me.cboMA = New System.Windows.Forms.ComboBox()
Me.txtWoStd = New System.Windows.Forms.TextBox()
@@ -264,6 +265,7 @@ Partial Class frmDiestAddMa
Me.txtBlau2BisMo = New System.Windows.Forms.TextBox()
Me.cboBlau2So = New System.Windows.Forms.ComboBox()
Me.txtBlau2VonMo = New System.Windows.Forms.TextBox()
Me.dgvAbwWStd = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Label26 = New System.Windows.Forms.Label()
Me.txtReihenfolge = New System.Windows.Forms.TextBox()
Me.ColorDialog1 = New System.Windows.Forms.ColorDialog()
@@ -276,6 +278,7 @@ Partial Class frmDiestAddMa
Me.cbxInaktiv = New System.Windows.Forms.CheckBox()
Me.Label57 = New System.Windows.Forms.Label()
Me.txtStdFeiertagTZ = New System.Windows.Forms.TextBox()
Me.Label58 = New System.Windows.Forms.Label()
Me.grpTeilzeit.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPage1.SuspendLayout()
@@ -284,6 +287,7 @@ Partial Class frmDiestAddMa
Me.pnl4.SuspendLayout()
Me.TabPage3.SuspendLayout()
Me.pnl3.SuspendLayout()
CType(Me.dgvAbwWStd, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'cboMA
@@ -402,7 +406,7 @@ Partial Class frmDiestAddMa
'
Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnOK.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.btnOK.Location = New System.Drawing.Point(15, 427)
Me.btnOK.Location = New System.Drawing.Point(15, 555)
Me.btnOK.Name = "btnOK"
Me.btnOK.Size = New System.Drawing.Size(161, 37)
Me.btnOK.TabIndex = 22
@@ -2711,6 +2715,15 @@ Partial Class frmDiestAddMa
Me.txtBlau2VonMo.TabIndex = 22
Me.txtBlau2VonMo.Text = "00:00"
'
'dgvAbwWStd
'
Me.dgvAbwWStd.AKTUALISIERUNGS_INTERVALL = -1
Me.dgvAbwWStd.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvAbwWStd.Location = New System.Drawing.Point(21, 439)
Me.dgvAbwWStd.Name = "dgvAbwWStd"
Me.dgvAbwWStd.Size = New System.Drawing.Size(459, 110)
Me.dgvAbwWStd.TabIndex = 0
'
'Label26
'
Me.Label26.AutoSize = True
@@ -2771,7 +2784,7 @@ Partial Class frmDiestAddMa
'
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.Button2.Location = New System.Drawing.Point(182, 427)
Me.Button2.Location = New System.Drawing.Point(182, 555)
Me.Button2.Name = "Button2"
Me.Button2.Size = New System.Drawing.Size(86, 37)
Me.Button2.TabIndex = 23
@@ -2817,12 +2830,23 @@ Partial Class frmDiestAddMa
Me.txtStdFeiertagTZ.TabIndex = 26
Me.txtStdFeiertagTZ.Visible = False
'
'Label58
'
Me.Label58.AutoSize = True
Me.Label58.Location = New System.Drawing.Point(18, 423)
Me.Label58.Name = "Label58"
Me.Label58.Size = New System.Drawing.Size(138, 13)
Me.Label58.TabIndex = 27
Me.Label58.Text = "Abweichende WochenStd.:"
'
'frmDiestAddMa
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.White
Me.ClientSize = New System.Drawing.Size(503, 476)
Me.ClientSize = New System.Drawing.Size(503, 626)
Me.Controls.Add(Me.Label58)
Me.Controls.Add(Me.dgvAbwWStd)
Me.Controls.Add(Me.Label57)
Me.Controls.Add(Me.txtStdFeiertagTZ)
Me.Controls.Add(Me.cbxInaktiv)
@@ -2867,6 +2891,7 @@ Partial Class frmDiestAddMa
Me.TabPage3.ResumeLayout(False)
Me.pnl3.ResumeLayout(False)
Me.pnl3.PerformLayout()
CType(Me.dgvAbwWStd, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -3124,4 +3149,6 @@ Partial Class frmDiestAddMa
Friend WithEvents cbxInaktiv As CheckBox
Friend WithEvents Label57 As Label
Friend WithEvents txtStdFeiertagTZ As TextBox
Friend WithEvents dgvAbwWStd As VERAG_PROG_ALLGEMEIN.MyDatagridview
Friend WithEvents Label58 As Label
End Class

36
UID/Dienstplan/frmDiestAddMa.vb
View File

@@ -12,6 +12,7 @@ Public Class frmDiestAddMa
Dim MusterErr As Boolean = False
Dim SCHICHTEN_ARTEN As New List(Of cDienstplanSchicht)
Dim ADMIN As New cOptionenDAL
Dim DGVBind As VERAG_PROG_ALLGEMEIN.cEasyBinding
Private Sub frmDiestAddMa_KeyPress(sender As Object, e As KeyPressEventArgs) Handles Me.KeyPress
If e.KeyChar = Microsoft.VisualBasic.ChrW(Keys.Return) Then
@@ -34,8 +35,6 @@ Public Class frmDiestAddMa
initCboMuster()
fillCboMA()
'
If niederlassung = "ATILLA" Then
cboAbt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ZOLL", "ZOLL"))
@@ -64,7 +63,13 @@ Public Class frmDiestAddMa
If cboMyItemSelect(cboMA, SQLDienst.getValueTxtBySql("SELECT isnull([dstma_mitId],-1) FROM [tblDienstMitarb] WHERE dstma_id=" & MA_ID, "ADMIN")) Then
loadMA()
End If
Else
dgvAbwWStd.Enabled = False
End If
initDgvAbwWStd()
loaded = True
End Sub
Sub fillCboMA()
@@ -73,6 +78,31 @@ Public Class frmDiestAddMa
Next
End Sub
Sub initDgvAbwWStd()
Try
With dgvAbwWStd
' .DataSource = SQLDienst.loadDGV("SELECT * FROM [tblDienstMitarbAbweichendeWochenstunden] WHERE [dstaw_dstmaId]=133")
DGVBind = New VERAG_PROG_ALLGEMEIN.cEasyBinding("ADMIN")
DGVBind.initBinding("SELECT * FROM [tblDienstMitarbAbweichendeWochenstunden] WHERE [dstaw_dstmaId]='" & MA.dstma_id & "'", "tblDienstMitarbAbweichendeWochenstunden")
.DataSource = DGVBind.bindingdataTable
DGVBind.bindingdataTable.Columns("dstaw_dstmaId").DefaultValue = MA.dstma_id
If .Columns.Count > 0 Then
.Columns("dstaw_id").Visible = False
.Columns("dstaw_dstmaId").Visible = False
.Columns("dstaw_von").HeaderText = "von"
.Columns("dstaw_bis").HeaderText = "bis"
.Columns("dstaw_std").HeaderText = "Std."
End If
End With
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
End Sub
Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
' MsgBox(txtRotVonMo.Text)
MusterErr = False
@@ -80,7 +110,7 @@ Public Class frmDiestAddMa
If initMA() Then
Dim tz As List(Of cDienstTeilzeit) = initArbVerh()
If MusterErr Then MsgBox("Bei der Prüfung der Daten für die Muster-Vorlage ist ein Fehler aufgetreten! Bitte um Prüfung!") : Exit Sub
If SQLDienst.insertDienstMA(MA, niederlassung) Then ' Me.Close()
If SQLDienst.insertDienstMA(MA, niederlassung) And DGVBind.updateBinding Then ' Me.Close()
SQLDienst.delDienstTeilzeit(MA.dstma_id)
If cbxMuster.Checked Then 'cboArbVerh.SelectedIndex = 1 Then
For Each t In tz

7
UID/Dienstplan/usrCntlAuswertungWocheAuslastung.vb
View File

@@ -77,7 +77,9 @@
Return getStd
End Function
Function getAbf(datum As Date) As Double
Dim art = ""
Try
Dim art = ""
Dim nl = ""
If DP_SETTINGS Is Nothing Then Return 0
@@ -115,5 +117,8 @@
' Return cDIENST.getValueTxtBySql("SELECT count(*) as anz FROM [Speditionsbuch] where Abfertigungsdatum = '" & datum.ToShortDateString & "' AND FilialenNr IN (" & filiale & ") AND Abfertigungsart IN(" & art & ")", "FMZOLL")
Return cDIENST.getValueTxtBySql(sql, "FMZOLL")
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
End Try
End Function
End Class

4
UID/Dienstplan/usrCntlDienstplan.vb
View File

@@ -452,7 +452,9 @@ Public Class usrCntlDienstplan
Dim aktJahr = cPF.DateToWeek(datumMO).Substring(0, 4)
Dim SCHICHT = cPF.getSchicht(aktWoche, aktJahr)
Dim sollStd As Double = cPF.getWochenstunden(MA_DST.dstma_wochenStunden, datumMO, SCHICHT, MA_DST.dstma_mitId, MA_DST.dstma_muster, MA_DST.dstma_WEStdRegelAZ, MA_DST.dstma_arbvh, niederlassung, MA_DST.dstma_TzFeiertageStd)
Dim STD_LIST = cDienstMitarbAbweichendeWochenstunden.GET_STD_LIST(datumMO)
Dim sollStd As Double = cPF.getWochenstunden(STD_LIST, MA_DST.dstma_wochenStunden, datumMO, SCHICHT, MA_DST.dstma_mitId, MA_DST.dstma_muster, MA_DST.dstma_WEStdRegelAZ, MA_DST.dstma_arbvh, niederlassung, MA_DST.dstma_TzFeiertageStd)
Dim tatStd As Double = SQLDienst.getDstStunden(MA_DST.dstma_id, datumMO, datumMO.AddDays(6), niederlassung)
' MsgBox(sollStd)

7
UID/Dienstplan/usrcntlDienstplanStunden.vb
View File

@@ -79,6 +79,7 @@ Public Class usrcntlDienstplanStunden
MsgBox("initStdMa-Error: " & ex.StackTrace)
End Try
Dim STD_LIST = cDienstMitarbAbweichendeWochenstunden.GET_STD_LIST(CalendarWeek(aktWoche, aktJahr))
For Each r As DataGridViewRow In .Rows
Try : r.DefaultCellStyle.ForeColor = ColorTranslator.FromHtml(r.Cells("dstma_farbe").Value) : Catch : End Try
@@ -90,14 +91,15 @@ Public Class usrcntlDienstplanStunden
Dim Wochenstunden As Double = 0
If IsNumeric(ma.dstma_wochenStunden) Then Wochenstunden = ma.dstma_wochenStunden
'MsgBox(ma.dstma_wochenStunden)
'hier wird berechnet, wie viele Stunden tatsächlich zu arbeiten sind (abzgl. Feiertage)
Wochenstunden = cPF.getWochenstunden(Wochenstunden, datum, SCHICHT, r.Cells("dstma_id").Value, ma.dstma_muster, ma.dstma_WEStdRegelAZ, ma.dstma_arbvh, niederlassung, ma.dstma_TzFeiertageStd)
Wochenstunden = cPF.getWochenstunden(STD_LIST, Wochenstunden, datum, SCHICHT, r.Cells("dstma_id").Value, ma.dstma_muster, ma.dstma_WEStdRegelAZ, ma.dstma_arbvh, niederlassung, ma.dstma_TzFeiertageStd)
'Hier wird berechnet wie viele Std tastächlich gearbeitet wurden:
Dim tatStd As Double = SQLDienst.getDstStunden(r.Cells("dstma_id").Value, datum_montag, datum_montag.AddDays(6), niederlassung)
r.Cells("stundenBerechnet").Value = (Wochenstunden)
r.Cells("stunden").Value = (tatStd) & " (" & tatStd - Wochenstunden & ")"
Dim arb As New cArbeitstage
@@ -108,7 +110,6 @@ Public Class usrcntlDienstplanStunden
loaded = True
Catch ex As Exception
MsgBox("initStdMa-Error: " & ex.Message)
End Try
initUestd()
End Sub

149
UID/Mitarbeiter/frmMitarbDetails.Designer.vb generated
View File

@@ -62,6 +62,10 @@ Partial Class frmMitarbDetails
Me.cboATLAS_SB = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label4 = New System.Windows.Forms.Label()
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
Me.cboALIASDomain2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.txtALIASUser2 = New System.Windows.Forms.TextBox()
Me.Label54 = New System.Windows.Forms.Label()
Me.cboFirmaHaupt = New System.Windows.Forms.ComboBox()
Me.cboTeam = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label53 = New System.Windows.Forms.Label()
Me.cboALIASDomain = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -95,6 +99,7 @@ Partial Class frmMitarbDetails
Me.cboNiederlassung = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label9 = New System.Windows.Forms.Label()
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
Me.cbxChatBenutzer = New System.Windows.Forms.CheckBox()
Me.cbxTestaccount = New System.Windows.Forms.CheckBox()
Me.cbxGebDat = New System.Windows.Forms.CheckBox()
Me.txtGebDat = New System.Windows.Forms.DateTimePicker()
@@ -164,9 +169,6 @@ Partial Class frmMitarbDetails
Me.PictureBox6 = New System.Windows.Forms.PictureBox()
Me.cboAdminBer = New System.Windows.Forms.ComboBox()
Me.Label7 = New System.Windows.Forms.Label()
Me.cboFirmaHaupt = New System.Windows.Forms.ComboBox()
Me.Label54 = New System.Windows.Forms.Label()
Me.cbxChatBenutzer = New System.Windows.Forms.CheckBox()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
Me.TabControl2.SuspendLayout()
@@ -243,9 +245,10 @@ Partial Class frmMitarbDetails
'
'btnCancel
'
Me.btnCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.btnCancel.BackColor = System.Drawing.Color.White
Me.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnCancel.Location = New System.Drawing.Point(191, 795)
Me.btnCancel.Location = New System.Drawing.Point(191, 844)
Me.btnCancel.Name = "btnCancel"
Me.btnCancel.Size = New System.Drawing.Size(88, 36)
Me.btnCancel.TabIndex = 52
@@ -254,9 +257,10 @@ Partial Class frmMitarbDetails
'
'btnOK
'
Me.btnOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.btnOK.BackColor = System.Drawing.Color.White
Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnOK.Location = New System.Drawing.Point(12, 795)
Me.btnOK.Location = New System.Drawing.Point(12, 844)
Me.btnOK.Name = "btnOK"
Me.btnOK.Size = New System.Drawing.Size(173, 36)
Me.btnOK.TabIndex = 51
@@ -270,7 +274,7 @@ Partial Class frmMitarbDetails
Me.TabControl2.Location = New System.Drawing.Point(12, 63)
Me.TabControl2.Name = "TabControl2"
Me.TabControl2.SelectedIndex = 0
Me.TabControl2.Size = New System.Drawing.Size(723, 726)
Me.TabControl2.Size = New System.Drawing.Size(723, 773)
Me.TabControl2.TabIndex = 0
'
'TabPage1
@@ -283,7 +287,7 @@ Partial Class frmMitarbDetails
Me.TabPage1.Location = New System.Drawing.Point(4, 22)
Me.TabPage1.Name = "TabPage1"
Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage1.Size = New System.Drawing.Size(715, 700)
Me.TabPage1.Size = New System.Drawing.Size(715, 747)
Me.TabPage1.TabIndex = 0
Me.TabPage1.Text = "Daten"
Me.TabPage1.UseVisualStyleBackColor = True
@@ -292,7 +296,7 @@ Partial Class frmMitarbDetails
'
Me.tbcntr.Controls.Add(Me.TabPage2)
Me.tbcntr.Controls.Add(Me.TabPage4)
Me.tbcntr.Location = New System.Drawing.Point(2, 494)
Me.tbcntr.Location = New System.Drawing.Point(2, 539)
Me.tbcntr.Name = "tbcntr"
Me.tbcntr.SelectedIndex = 0
Me.tbcntr.Size = New System.Drawing.Size(450, 200)
@@ -616,7 +620,7 @@ Partial Class frmMitarbDetails
'Label4
'
Me.Label4.AutoSize = True
Me.Label4.Location = New System.Drawing.Point(461, 494)
Me.Label4.Location = New System.Drawing.Point(461, 539)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(28, 13)
Me.Label4.TabIndex = 85
@@ -624,6 +628,8 @@ Partial Class frmMitarbDetails
'
'GroupBox2
'
Me.GroupBox2.Controls.Add(Me.cboALIASDomain2)
Me.GroupBox2.Controls.Add(Me.txtALIASUser2)
Me.GroupBox2.Controls.Add(Me.Label54)
Me.GroupBox2.Controls.Add(Me.cboFirmaHaupt)
Me.GroupBox2.Controls.Add(Me.cboTeam)
@@ -661,11 +667,53 @@ Partial Class frmMitarbDetails
Me.GroupBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.GroupBox2.Location = New System.Drawing.Point(2, 245)
Me.GroupBox2.Name = "GroupBox2"
Me.GroupBox2.Size = New System.Drawing.Size(709, 243)
Me.GroupBox2.Size = New System.Drawing.Size(709, 288)
Me.GroupBox2.TabIndex = 84
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "Firmendaten"
'
'cboALIASDomain2
'
Me.cboALIASDomain2._allowedValuesFreiText = Nothing
Me.cboALIASDomain2._allowFreiText = False
Me.cboALIASDomain2._value = ""
Me.cboALIASDomain2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboALIASDomain2.FormattingEnabled = True
Me.cboALIASDomain2.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
Me.cboALIASDomain2.Location = New System.Drawing.Point(409, 60)
Me.cboALIASDomain2.Name = "cboALIASDomain2"
Me.cboALIASDomain2.Size = New System.Drawing.Size(116, 21)
Me.cboALIASDomain2.TabIndex = 106
'
'txtALIASUser2
'
Me.txtALIASUser2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtALIASUser2.Location = New System.Drawing.Point(524, 60)
Me.txtALIASUser2.Name = "txtALIASUser2"
Me.txtALIASUser2.Size = New System.Drawing.Size(179, 20)
Me.txtALIASUser2.TabIndex = 105
'
'Label54
'
Me.Label54.AutoSize = True
Me.Label54.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label54.Location = New System.Drawing.Point(135, 60)
Me.Label54.Name = "Label54"
Me.Label54.Size = New System.Drawing.Size(42, 13)
Me.Label54.TabIndex = 104
Me.Label54.Text = "Haupt.:"
'
'cboFirmaHaupt
'
Me.cboFirmaHaupt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cboFirmaHaupt.Enabled = False
Me.cboFirmaHaupt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboFirmaHaupt.FormattingEnabled = True
Me.cboFirmaHaupt.Location = New System.Drawing.Point(138, 76)
Me.cboFirmaHaupt.Name = "cboFirmaHaupt"
Me.cboFirmaHaupt.Size = New System.Drawing.Size(57, 21)
Me.cboFirmaHaupt.TabIndex = 103
'
'cboTeam
'
Me.cboTeam._allowedValuesFreiText = Nothing
@@ -736,7 +784,7 @@ Partial Class frmMitarbDetails
'
Me.Label45.AutoSize = True
Me.Label45.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label45.Location = New System.Drawing.Point(548, 87)
Me.Label45.Location = New System.Drawing.Point(548, 104)
Me.Label45.Name = "Label45"
Me.Label45.Size = New System.Drawing.Size(146, 26)
Me.Label45.TabIndex = 97
@@ -747,7 +795,7 @@ Partial Class frmMitarbDetails
Me.MyListBox1._value = ""
Me.MyListBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.MyListBox1.FormattingEnabled = True
Me.MyListBox1.Location = New System.Drawing.Point(551, 116)
Me.MyListBox1.Location = New System.Drawing.Point(551, 133)
Me.MyListBox1.MultiColumn = True
Me.MyListBox1.Name = "MyListBox1"
Me.MyListBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple
@@ -803,7 +851,7 @@ Partial Class frmMitarbDetails
Me.cbxEinsteigsDat.Checked = True
Me.cbxEinsteigsDat.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxEinsteigsDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxEinsteigsDat.Location = New System.Drawing.Point(20, 214)
Me.cbxEinsteigsDat.Location = New System.Drawing.Point(16, 238)
Me.cbxEinsteigsDat.Name = "cbxEinsteigsDat"
Me.cbxEinsteigsDat.Size = New System.Drawing.Size(15, 14)
Me.cbxEinsteigsDat.TabIndex = 90
@@ -813,7 +861,7 @@ Partial Class frmMitarbDetails
'
Me.Label30.AutoSize = True
Me.Label30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label30.Location = New System.Drawing.Point(17, 195)
Me.Label30.Location = New System.Drawing.Point(31, 238)
Me.Label30.Name = "Label30"
Me.Label30.Size = New System.Drawing.Size(81, 13)
Me.Label30.TabIndex = 89
@@ -822,7 +870,7 @@ Partial Class frmMitarbDetails
'datEinstiegsdatum
'
Me.datEinstiegsdatum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.datEinstiegsdatum.Location = New System.Drawing.Point(41, 212)
Me.datEinstiegsdatum.Location = New System.Drawing.Point(113, 234)
Me.datEinstiegsdatum.Name = "datEinstiegsdatum"
Me.datEinstiegsdatum.Size = New System.Drawing.Size(200, 20)
Me.datEinstiegsdatum.TabIndex = 2
@@ -832,7 +880,7 @@ Partial Class frmMitarbDetails
Me.cboPosition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboPosition.FormattingEnabled = True
Me.cboPosition.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
Me.cboPosition.Location = New System.Drawing.Point(406, 76)
Me.cboPosition.Location = New System.Drawing.Point(18, 155)
Me.cboPosition.Name = "cboPosition"
Me.cboPosition.Size = New System.Drawing.Size(136, 21)
Me.cboPosition.TabIndex = 5
@@ -841,7 +889,7 @@ Partial Class frmMitarbDetails
'
Me.Label29.AutoSize = True
Me.Label29.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label29.Location = New System.Drawing.Point(403, 60)
Me.Label29.Location = New System.Drawing.Point(15, 139)
Me.Label29.Name = "Label29"
Me.Label29.Size = New System.Drawing.Size(47, 13)
Me.Label29.TabIndex = 87
@@ -851,7 +899,7 @@ Partial Class frmMitarbDetails
'
Me.datGekuendigtAm.Enabled = False
Me.datGekuendigtAm.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.datGekuendigtAm.Location = New System.Drawing.Point(301, 212)
Me.datGekuendigtAm.Location = New System.Drawing.Point(113, 257)
Me.datGekuendigtAm.Name = "datGekuendigtAm"
Me.datGekuendigtAm.Size = New System.Drawing.Size(200, 20)
Me.datGekuendigtAm.TabIndex = 9
@@ -860,7 +908,7 @@ Partial Class frmMitarbDetails
'
Me.cbxGekuendigt.AutoSize = True
Me.cbxGekuendigt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxGekuendigt.Location = New System.Drawing.Point(301, 194)
Me.cbxGekuendigt.Location = New System.Drawing.Point(16, 262)
Me.cbxGekuendigt.Name = "cbxGekuendigt"
Me.cbxGekuendigt.Size = New System.Drawing.Size(96, 17)
Me.cbxGekuendigt.TabIndex = 8
@@ -870,7 +918,7 @@ Partial Class frmMitarbDetails
'txtEmail
'
Me.txtEmail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtEmail.Location = New System.Drawing.Point(304, 160)
Me.txtEmail.Location = New System.Drawing.Point(304, 204)
Me.txtEmail.Name = "txtEmail"
Me.txtEmail.Size = New System.Drawing.Size(241, 20)
Me.txtEmail.TabIndex = 7
@@ -879,7 +927,7 @@ Partial Class frmMitarbDetails
'
Me.Label20.AutoSize = True
Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label20.Location = New System.Drawing.Point(301, 144)
Me.Label20.Location = New System.Drawing.Point(301, 188)
Me.Label20.Name = "Label20"
Me.Label20.Size = New System.Drawing.Size(39, 13)
Me.Label20.TabIndex = 83
@@ -888,7 +936,7 @@ Partial Class frmMitarbDetails
'txtDurchwahl
'
Me.txtDurchwahl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtDurchwahl.Location = New System.Drawing.Point(18, 160)
Me.txtDurchwahl.Location = New System.Drawing.Point(18, 204)
Me.txtDurchwahl.Name = "txtDurchwahl"
Me.txtDurchwahl.Size = New System.Drawing.Size(272, 20)
Me.txtDurchwahl.TabIndex = 6
@@ -897,7 +945,7 @@ Partial Class frmMitarbDetails
'
Me.Label19.AutoSize = True
Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label19.Location = New System.Drawing.Point(15, 144)
Me.Label19.Location = New System.Drawing.Point(15, 188)
Me.Label19.Name = "Label19"
Me.Label19.Size = New System.Drawing.Size(86, 13)
Me.Label19.TabIndex = 81
@@ -1034,6 +1082,19 @@ Partial Class frmMitarbDetails
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Person"
'
'cbxChatBenutzer
'
Me.cbxChatBenutzer.AutoSize = True
Me.cbxChatBenutzer.Checked = True
Me.cbxChatBenutzer.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxChatBenutzer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxChatBenutzer.Location = New System.Drawing.Point(304, 194)
Me.cbxChatBenutzer.Name = "cbxChatBenutzer"
Me.cbxChatBenutzer.Size = New System.Drawing.Size(93, 17)
Me.cbxChatBenutzer.TabIndex = 93
Me.cbxChatBenutzer.Text = "Chat-Benutzer"
Me.cbxChatBenutzer.UseVisualStyleBackColor = True
'
'cbxTestaccount
'
Me.cbxTestaccount.AutoSize = True
@@ -1285,7 +1346,7 @@ Partial Class frmMitarbDetails
'
'txtInfo
'
Me.txtInfo.Location = New System.Drawing.Point(464, 510)
Me.txtInfo.Location = New System.Drawing.Point(464, 555)
Me.txtInfo.Name = "txtInfo"
Me.txtInfo.Size = New System.Drawing.Size(245, 184)
Me.txtInfo.TabIndex = 0
@@ -1337,7 +1398,7 @@ Partial Class frmMitarbDetails
Me.TabPage3.Location = New System.Drawing.Point(4, 22)
Me.TabPage3.Name = "TabPage3"
Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage3.Size = New System.Drawing.Size(715, 700)
Me.TabPage3.Size = New System.Drawing.Size(715, 747)
Me.TabPage3.TabIndex = 1
Me.TabPage3.Text = "Programme"
Me.TabPage3.UseVisualStyleBackColor = True
@@ -1772,46 +1833,12 @@ Partial Class frmMitarbDetails
Me.Label7.TabIndex = 78
Me.Label7.Text = "Berechtigung:"
'
'cboFirmaHaupt
'
Me.cboFirmaHaupt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
Me.cboFirmaHaupt.Enabled = False
Me.cboFirmaHaupt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboFirmaHaupt.FormattingEnabled = True
Me.cboFirmaHaupt.Location = New System.Drawing.Point(138, 76)
Me.cboFirmaHaupt.Name = "cboFirmaHaupt"
Me.cboFirmaHaupt.Size = New System.Drawing.Size(57, 21)
Me.cboFirmaHaupt.TabIndex = 103
'
'Label54
'
Me.Label54.AutoSize = True
Me.Label54.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label54.Location = New System.Drawing.Point(135, 60)
Me.Label54.Name = "Label54"
Me.Label54.Size = New System.Drawing.Size(42, 13)
Me.Label54.TabIndex = 104
Me.Label54.Text = "Haupt.:"
'
'cbxChatBenutzer
'
Me.cbxChatBenutzer.AutoSize = True
Me.cbxChatBenutzer.Checked = True
Me.cbxChatBenutzer.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxChatBenutzer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxChatBenutzer.Location = New System.Drawing.Point(304, 194)
Me.cbxChatBenutzer.Name = "cbxChatBenutzer"
Me.cbxChatBenutzer.Size = New System.Drawing.Size(93, 17)
Me.cbxChatBenutzer.TabIndex = 93
Me.cbxChatBenutzer.Text = "Chat-Benutzer"
Me.cbxChatBenutzer.UseVisualStyleBackColor = True
'
'frmMitarbDetails
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackColor = System.Drawing.Color.WhiteSmoke
Me.ClientSize = New System.Drawing.Size(747, 841)
Me.ClientSize = New System.Drawing.Size(747, 892)
Me.Controls.Add(Me.TabControl2)
Me.Controls.Add(Me.btnCancel)
Me.Controls.Add(Me.btnOK)
@@ -1992,4 +2019,6 @@ Partial Class frmMitarbDetails
Friend WithEvents Label54 As Label
Friend WithEvents cboFirmaHaupt As ComboBox
Friend WithEvents cbxChatBenutzer As CheckBox
Friend WithEvents cboALIASDomain2 As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents txtALIASUser2 As TextBox
End Class

15
UID/Mitarbeiter/frmMitarbDetails.vb
View File

@@ -77,6 +77,16 @@
cboALIASDomain.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG-NCTS (ATILLA)", "VERAG-NCTS"))
cboALIASDomain.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISU.AT"))
cboALIASDomain2.Items.Clear()
cboALIASDomain2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
cboALIASDomain2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAGOST", "VERAGOST"))
cboALIASDomain2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
cboALIASDomain2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG-SBG", "VERAG-SBG"))
cboALIASDomain2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAGNEUHAUS", "VERAGNEUHAUS"))
cboALIASDomain2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG-NCTS (ATILLA)", "VERAG-NCTS"))
cboALIASDomain2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISU.AT"))
cboFirma.Items.Clear()
cboFirma.Items.Add("VERAG")
@@ -229,6 +239,9 @@
cboALIASDomain.changeItem(mitarbeiter.mit_AliasAD_Domain)
txtALIASUser.Text = mitarbeiter.mit_AliasAD_Username
cboALIASDomain2.changeItem(mitarbeiter.mit_AliasAD_Domain2)
txtALIASUser2.Text = mitarbeiter.mit_AliasAD_Username2
If mitarbeiter.mit_firma = "ALL" Then
cboFirma.Text = "ALLE"
@@ -469,6 +482,8 @@
mitarbeiter.mit_TELOTEC_SB = txtTelotecSB.Text
mitarbeiter.mit_AliasAD_Domain = cboALIASDomain._value
mitarbeiter.mit_AliasAD_Username = txtALIASUser.Text
mitarbeiter.mit_AliasAD_Domain2 = cboALIASDomain2._value
mitarbeiter.mit_AliasAD_Username2 = txtALIASUser2.Text
mitarbeiter.mit_teamId = If(cboTeam._value = "", Nothing, cboTeam._value)

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

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

2
UID/My Project/Resources.resx
View File

@@ -188,7 +188,7 @@
<value>Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;</value>
</data>
<data name="Version" xml:space="preserve">
<value>1.9.2</value>
<value>1.9.6</value>
</data>
<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>

BIN
UID/Resources/Dienstplan Variabel Monat AMBAR.xlsx Normal file
View File

Binary file not shown.

BIN
UID/Resources/Dienstplan Variabel Monat IMEX.xlsx
View File

Binary file not shown.

BIN
UID/Resources/Dienstplan Variabel Monat.xlsx
View File

Binary file not shown.

91
UID/cClasses.vb
View File

@@ -202,4 +202,93 @@ Public Class cDienstNA
Property dstna_grund As String = ""
Property dstna_info As String = ""
End Class
End Class
Public Class cDienstMitarbAbweichendeWochenstunden
Property dstaw_id As Integer
Property dstaw_dstmaId As Integer
Property dstaw_von As Date
Property dstaw_bis As Date
Property dstaw_std As Integer
Shared Function GET_STD(dstmaId As Integer, datum As Date) As Double
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
Return sql.getValueTxtBySql("SELECT TOP 1 [dstaw_std] FROM [tblDienstMitarbAbweichendeWochenstunden] where [dstaw_dstmaId]='" & dstmaId & "' and '" & datum.ToShortDateString & "' between dstaw_von and dstaw_bis", "ADMIN",,, -1)
End Function
Shared Function GET_STD_LIST(datum As Date) As List(Of cDienstMitarbAbweichendeWochenstunden)
GET_STD_LIST = New List(Of cDienstMitarbAbweichendeWochenstunden)
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
Dim dt = sql.loadDgvBySql("SELECT * FROM [tblDienstMitarbAbweichendeWochenstunden]", "ADMIN")
If dt IsNot Nothing Then
For Each r In dt.Rows
Dim ABW As New cDienstMitarbAbweichendeWochenstunden
ABW.dstaw_id = r("dstaw_id")
ABW.dstaw_dstmaId = r("dstaw_dstmaId")
ABW.dstaw_von = r("dstaw_von")
ABW.dstaw_bis = r("dstaw_bis")
ABW.dstaw_std = r("dstaw_std")
GET_STD_LIST.Add(ABW)
Next
End If
' Return sql.getValueTxtBySql("SELECT TOP 1 [dstaw_std] FROM [tblDienstMitarbAbweichendeWochenstunden] where [dstaw_dstmaId]='" & dstmaId & "' and '" & datum.ToShortDateString & "' between dstaw_von and dstaw_bis", "ADMIN",,, -1)
End Function
Shared Function GET_STD(dstmaId As Integer, datumMontag As Date, NormalWochenstunden As Integer, TZTagesStunden As Integer) As Double
GET_STD = 0
Dim abw_bool As Boolean = False
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
Dim exists = sql.getValueTxtBySql("SELECT count(*) FROM [tblDienstMitarbAbweichendeWochenstunden] where [dstaw_dstmaId]='" & dstmaId & "' and dstaw_bis > '" & datumMontag.ToShortDateString & "' ", "ADMIN",,, -1)
If exists <= 0 Then Return NormalWochenstunden
For i = 0 To 4
Dim abw = sql.getValueTxtBySql("SELECT TOP 1 [dstaw_std] FROM [tblDienstMitarbAbweichendeWochenstunden] where [dstaw_dstmaId]='" & dstmaId & "' and '" & datumMontag.AddDays(i).ToShortDateString & "' between dstaw_von and dstaw_bis", "ADMIN",,, -1)
If abw > 0 Then
GET_STD += abw / 5
abw_bool = True
Else
If False Then 'TZTagesStunden > 0 Then
GET_STD += TZTagesStunden
Else
GET_STD += NormalWochenstunden / 5
End If
End If
Next
If Not abw_bool Then GET_STD = NormalWochenstunden ' Wenn keine Abweicheung, einfach normal belassen...
End Function
Shared Function GET_STD_LIST(STD_LIST As List(Of cDienstMitarbAbweichendeWochenstunden), dstmaId As Integer, datumMontag As Date, NormalWochenstunden As Integer, TZTagesStunden As Integer) As Double
If STD_LIST Is Nothing Then Return NormalWochenstunden
GET_STD_LIST = 0
Dim abw_bool As Boolean = False
For i = 0 To 4
Dim abw = 0
For Each l In STD_LIST
If l.dstaw_dstmaId = dstmaId AndAlso (datumMontag.AddDays(i) >= l.dstaw_von And datumMontag.AddDays(i) <= l.dstaw_bis) Then
abw = l.dstaw_std
End If
Next
If abw > 0 Then
GET_STD_LIST += abw / 5
abw_bool = True
Else
If False Then 'TZTagesStunden > 0 Then
GET_STD_LIST += TZTagesStunden
Else
GET_STD_LIST += NormalWochenstunden / 5
End If
End If
Next
If Not abw_bool Then GET_STD_LIST = NormalWochenstunden ' Wenn keine Abweicheung, einfach normal belassen...
End Function
End Class

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"""""!!!!!!!!!!!!!!!!!!!!

36
UID/cSqlDb.vb
View File

@@ -1512,8 +1512,12 @@ Public Class cMitarbeiter
'Änderung
Dim sql = "INSERT INTO tblMitarbeiter " &
"(mit_username, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_DpUserStandardFirma2,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_teamId,mit_ChatBenutzer,mit_FirmaHaupt) VALUES " &
"(@mit_username,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_DpUserStandardFirma2,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_teamId,@mit_ChatBenutzer,@mit_FirmaHaupt )"
"(mit_username, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_DpUserStandardFirma2,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_AliasAD_Domain2,mit_AliasAD_Username2,mit_teamId,mit_ChatBenutzer,mit_FirmaHaupt,mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname,mit_foto_DocId,mit_MAVerzeichnis_Motto ) VALUES " &
"(@mit_username,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_DpUserStandardFirma2,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_AliasAD_Domain2,@mit_AliasAD_Username2,@mit_teamId,@mit_ChatBenutzer,@mit_FirmaHaupt,@mit_ChatEasteregg,@mit_MAVerzeichnis_SettingsTstmp,@mit_MAVerzeichnis_allowGebDat,@mit_MAVerzeichnis_allowWohnadresse,@mit_MAVerzeichnis_allowGebDatOhneJahr,@mit_MAVerzeichnis_Spitzname,@mit_foto_DocId,@mit_MAVerzeichnis_Motto )"
Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
Using cmd As New SqlCommand(sql, conn)
@@ -1561,11 +1565,23 @@ Public Class cMitarbeiter
cmd.Parameters.AddWithValue("@mit_TELOTEC_SB", If(m.mit_TELOTEC_SB, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_AliasAD_Domain", If(m.mit_AliasAD_Domain, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_AliasAD_Username", If(m.mit_AliasAD_Username, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_AliasAD_Domain2", If(m.mit_AliasAD_Domain2, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_AliasAD_Username2", If(m.mit_AliasAD_Username2, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_teamId", If(m.mit_teamId, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_ChatBenutzer", m.mit_ChatBenutzer)
cmd.Parameters.AddWithValue("@mit_FirmaHaupt", If(m.mit_FirmaHaupt, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_ChatEasteregg", m.mit_ChatEasteregg)
cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_SettingsTstmp ", If(m.mit_MAVerzeichnis_SettingsTstmp, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_allowGebDat ", m.mit_MAVerzeichnis_allowGebDat)
cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_allowWohnadresse ", m.mit_MAVerzeichnis_allowWohnadresse)
cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_allowGebDatOhneJahr ", m.mit_MAVerzeichnis_allowGebDatOhneJahr)
cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_Spitzname ", If(m.mit_MAVerzeichnis_Spitzname, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_foto_DocId", If(m.mit_foto_DocId, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_Motto", If(m.mit_MAVerzeichnis_Motto, DBNull.Value))
Try
cmd.ExecuteNonQuery()
Return True
@@ -1582,7 +1598,8 @@ Public Class cMitarbeiter
Dim hAuswahl As String = ""
Dim sql = "UPDATE tblMitarbeiter " &
"SET mit_username=@mit_username, mit_pwd=@mit_pwd, mit_geschlecht=@mit_geschlecht, mit_affix=@mit_affix, mit_vname=@mit_vname, mit_nname=@mit_nname, mit_gebdat=@mit_gebdat, mit_strasse=@mit_strasse, mit_hausnr=@mit_hausnr, mit_land=@mit_land, mit_plz=@mit_plz, mit_ort=@mit_ort, mit_niederlassung=@mit_niederlassung, mit_abteilung=@mit_abteilung, mit_position=@mit_position, mit_durchwahl=@mit_durchwahl, mit_email=@mit_email, mit_mobiltel=@mit_mobiltel, mit_allowAnruf=@mit_allowAnruf, mit_info=@mit_info, mit_einstiegsdatum=@mit_einstiegsdatum, mit_gekuendigt=@mit_gekuendigt, mit_kuendigungsdatum=@mit_kuendigungsdatum, mit_foto=@mit_foto, mit_firma=@mit_firma,mit_firmaFMZoll=@mit_firmaFMZoll,mit_FMZollPersID=@mit_FMZollPersID, mit_FMZollPersIDKasseIsnotSpedBuch=@mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch=@mit_FMZollPersIDSpedBuch,mit_standartFiliale=@mit_standartFiliale,mit_standardPreisliste=@mit_standardPreisliste,mit_DpUserStandardDP=@mit_DpUserStandardDP, mit_EZOLL_SB=@mit_EZOLL_SB, mit_ATLAS_SB=@mit_ATLAS_SB,mit_FirmenDatenAnzeige=@mit_FirmenDatenAnzeige,mit_DAKOSY_SB=@mit_DAKOSY_SB, mit_DAKOSY_SBFull=@mit_DAKOSY_SBFull ,mit_DpUserStandardFirma=@mit_DpUserStandardFirma,mit_DpUserStandardFirma2=@mit_DpUserStandardFirma2, mit_TESTonly=@mit_TESTonly,mit_PasswortChanged=@mit_PasswortChanged,mit_TELOTEC_SB=@mit_TELOTEC_SB,mit_AliasAD_Domain=@mit_AliasAD_Domain,mit_AliasAD_Username=@mit_AliasAD_Username,mit_teamId=@mit_teamId,mit_ChatBenutzer=@mit_ChatBenutzer,mit_FirmaHaupt=@mit_FirmaHaupt " &
"SET mit_username=@mit_username, mit_pwd=@mit_pwd, mit_geschlecht=@mit_geschlecht, mit_affix=@mit_affix, mit_vname=@mit_vname, mit_nname=@mit_nname, mit_gebdat=@mit_gebdat, mit_strasse=@mit_strasse, mit_hausnr=@mit_hausnr, mit_land=@mit_land, mit_plz=@mit_plz, mit_ort=@mit_ort, mit_niederlassung=@mit_niederlassung, mit_abteilung=@mit_abteilung, mit_position=@mit_position, mit_durchwahl=@mit_durchwahl, mit_email=@mit_email, mit_mobiltel=@mit_mobiltel, mit_allowAnruf=@mit_allowAnruf, mit_info=@mit_info, mit_einstiegsdatum=@mit_einstiegsdatum, mit_gekuendigt=@mit_gekuendigt, mit_kuendigungsdatum=@mit_kuendigungsdatum, mit_foto=@mit_foto, mit_firma=@mit_firma,mit_firmaFMZoll=@mit_firmaFMZoll,mit_FMZollPersID=@mit_FMZollPersID, mit_FMZollPersIDKasseIsnotSpedBuch=@mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch=@mit_FMZollPersIDSpedBuch,mit_standartFiliale=@mit_standartFiliale,mit_standardPreisliste=@mit_standardPreisliste,mit_DpUserStandardDP=@mit_DpUserStandardDP, mit_EZOLL_SB=@mit_EZOLL_SB, mit_ATLAS_SB=@mit_ATLAS_SB,mit_FirmenDatenAnzeige=@mit_FirmenDatenAnzeige,mit_DAKOSY_SB=@mit_DAKOSY_SB, mit_DAKOSY_SBFull=@mit_DAKOSY_SBFull ,mit_DpUserStandardFirma=@mit_DpUserStandardFirma,mit_DpUserStandardFirma2=@mit_DpUserStandardFirma2, mit_TESTonly=@mit_TESTonly,mit_PasswortChanged=@mit_PasswortChanged,mit_TELOTEC_SB=@mit_TELOTEC_SB,mit_AliasAD_Domain=@mit_AliasAD_Domain,mit_AliasAD_Username=@mit_AliasAD_Username,mit_AliasAD_Domain2=@mit_AliasAD_Domain2,mit_AliasAD_Username2=@mit_AliasAD_Username2,mit_teamId=@mit_teamId,mit_ChatBenutzer=@mit_ChatBenutzer,mit_FirmaHaupt=@mit_FirmaHaupt " &
" ,mit_ChatEasteregg=@mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp=@mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat=@mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse=@mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr=@mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname=@mit_MAVerzeichnis_Spitzname,mit_foto_DocId=@mit_foto_DocId,mit_MAVerzeichnis_Motto=@mit_MAVerzeichnis_Motto " &
" WHERE mit_id=@mit_id "
@@ -1636,11 +1653,24 @@ Public Class cMitarbeiter
cmd.Parameters.AddWithValue("@mit_TELOTEC_SB", If(m.mit_TELOTEC_SB, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_AliasAD_Domain", If(m.mit_AliasAD_Domain, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_AliasAD_Username", If(m.mit_AliasAD_Username, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_AliasAD_Domain2", If(m.mit_AliasAD_Domain2, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_AliasAD_Username2", If(m.mit_AliasAD_Username2, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_teamId", If(m.mit_teamId, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_ChatBenutzer", m.mit_ChatBenutzer)
cmd.Parameters.AddWithValue("@mit_FirmaHaupt", If(m.mit_FirmaHaupt, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_ChatEasteregg", m.mit_ChatEasteregg)
cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_SettingsTstmp ", If(m.mit_MAVerzeichnis_SettingsTstmp, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_allowGebDat ", m.mit_MAVerzeichnis_allowGebDat)
cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_allowWohnadresse ", m.mit_MAVerzeichnis_allowWohnadresse)
cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_allowGebDatOhneJahr ", m.mit_MAVerzeichnis_allowGebDatOhneJahr)
cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_Spitzname ", If(m.mit_MAVerzeichnis_Spitzname, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_foto_DocId", If(m.mit_foto_DocId, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_MAVerzeichnis_Motto", If(m.mit_MAVerzeichnis_Motto, DBNull.Value))
Try
cmd.ExecuteNonQuery()

8
UID/frmLogin.vb
View File

@@ -54,9 +54,11 @@ Public Class frmLogin
Dim pf As New cProgramFunctions
Dim kw As Integer = pf.DateToWeek(Now.AddDays(-1)).Substring(4)
Dim year As Integer = Now.AddDays(-1).Year
If parameter(i) = "initDP_ATILLA" Then pf.KWAbschluss("ATILLA", year, kw, pf.getSchicht(kw, year)) : Application.Exit()
If parameter(i) = "initDP_SUB" Then pf.KWAbschluss("SUB", year, kw, pf.getSchicht(kw, year)) : Application.Exit()
If parameter(i) = "initDP_WAI" Then pf.KWAbschluss("WAI", year, kw, pf.getSchicht(kw, year)) : Application.Exit()
Dim STD_LIST = cDienstMitarbAbweichendeWochenstunden.GET_STD_LIST(frmDienstplanVariabel.CalendarWeek(kw, year))
If parameter(i) = "initDP_ATILLA" Then pf.KWAbschluss(STD_LIST, "ATILLA", year, kw, pf.getSchicht(kw, year)) : Application.Exit()
If parameter(i) = "initDP_SUB" Then pf.KWAbschluss(STD_LIST, "SUB", year, kw, pf.getSchicht(kw, year)) : Application.Exit()
If parameter(i) = "initDP_WAI" Then pf.KWAbschluss(STD_LIST, "WAI", year, kw, pf.getSchicht(kw, year)) : Application.Exit()
Next
End If

12
UID/usrctlProcedures.vb
View File

@@ -1703,15 +1703,15 @@ Public Class usrctlProcedures
End Function
Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
Dim pf As New cProgramFunctions
'Dim pf As New cProgramFunctions
For i = CInt(TextBox6.Text) To CInt(TextBox7.Text)
'For i = CInt(TextBox6.Text) To CInt(TextBox7.Text)
Dim kw = i
Dim jahr = TextBox5.Text
pf.KWAbschluss(TextBox4.Text, jahr, kw, getSchicht(kw, jahr))
' Dim kw = i
' Dim jahr = TextBox5.Text
' pf.KWAbschluss(TextBox4.Text, jahr, kw, getSchicht(kw, jahr))
Next
'Next
End Sub
Function getSchicht(aktWoche, aktJahr) As String