This commit is contained in:
2020-05-31 22:26:21 +02:00
parent a40477b387
commit 6e3e35ac70
37 changed files with 2287 additions and 437 deletions

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