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-11-01 09:11:35 +01:00
parent 4099944709 7b5c593bd8
commit 30239c41e5
11 changed files with 1766 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
UID/cSqlDb.vb
View File

@@ -1724,6 +1724,7 @@ Public Class cMitarbeiter
cmd.Parameters.AddWithValue("@mit_CSuser", If(m.mit_CSuser, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_CSpwd", If(m.mit_CSpwd, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_PersonalNr", If(m.mit_PersonalNr, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_timasId", If(m.mit_timasId, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_telefonnr", If(m.mit_telefonnr, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_ATGRNAccessCode_AT51FP7 ", If(m.mit_ATGRNAccessCode_AT51FP7, DBNull.Value))
cmd.Parameters.AddWithValue("@mit_ATGRNAccessCode_AT52VA6 ", If(m.mit_ATGRNAccessCode_AT52VA6, DBNull.Value))
@@ -3022,11 +3023,11 @@ Public Class cDienstplan
Return False
End Function
Public Function insertEintraegeDetails(dedet_info, dedet_niederlassung, dedet_aktiv) As Boolean
Public Function insertEintraegeDetails(dedet_info, dedet_niederlassung, dedet_aktiv, dedet_abt) As Boolean
Dim sql As String = "INSERT INTO [tblDienstplanEintraegeDetails] " &
"(dedet_info, dedet_niederlassung, dedet_aktiv ) VALUES " &
"(@dedet_info, @dedet_niederlassung, @dedet_aktiv) "
"(dedet_info, dedet_niederlassung, dedet_aktiv, dedet_abt ) VALUES " &
"(@dedet_info, @dedet_niederlassung, @dedet_aktiv, @dedet_abt) "
Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
@@ -3035,6 +3036,7 @@ Public Class cDienstplan
cmd.Parameters.AddWithValue("@dedet_info", dedet_info)
cmd.Parameters.AddWithValue("@dedet_niederlassung", dedet_niederlassung)
cmd.Parameters.AddWithValue("@dedet_aktiv", dedet_aktiv)
cmd.Parameters.AddWithValue("@dedet_abt", dedet_abt)
Try
cmd.ExecuteNonQuery()
@@ -3792,16 +3794,16 @@ Public Class cDienstplan
Public Function getDienstEintragList(datum As Date, niederlassung As String) As List(Of cDienstEintrag)
Dim sql As String = " SELECT * FROM tblDienstplanEintraege WHERE dstetr_datum = @dstetr_datum AND dstetr_niederlassung=@dstetr_niederlassung "
Dim sql As String = " SELECT * FROM tblDienstplanEintraege WHERE dstetr_datum = @dstetr_datum AND dstetr_niederlassung=@dstetr_niederlassung "
Dim daten As List(Of cDienstEintrag) = Nothing
Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
Using cmd As New SqlCommand(sql, conn)
cmd.Parameters.AddWithValue("@dstetr_datum", datum)
cmd.Parameters.AddWithValue("@dstetr_niederlassung", niederlassung)
'MsgBox(daten.dstetr_dstmaId)
'MsgBox(daten.dstetr_dstmaId)
Try
Dim dr = cmd.ExecuteReader()
If dr.HasRows Then
@@ -3835,7 +3837,7 @@ Public Class cDienstplan
Public Function getDienstEintragListBenSchicht(datum As Date, niederlassung As String) As List(Of cDienstEintrag)
Dim sql As String = " SELECT * FROM tblDienstplanEintraege WHERE dstetr_datum = @dstetr_datum AND dstetr_niederlassung=@dstetr_niederlassung AND [dstetr_art] IN (SELECT case WHEN dedet_bezeichnungDP<>'' then dedet_bezeichnungDP ELSE dedet_abt END FROM [tblDienstplanEintraegeDetails] WHERE dedet_niederlassung=@dstetr_niederlassung AND dedet_benutzerdefinierteSchicht=1)"
Dim daten As New List(Of cDienstEintrag)
Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
Using cmd As New SqlCommand(sql, conn)