Gesamtsicherheiten Bugfix beim Weiterschalten

This commit is contained in:
2023-04-25 09:31:27 +02:00
parent 17b8dae263
commit 55720c9ded
3 changed files with 27 additions and 14 deletions

View File

@@ -15,10 +15,10 @@ Public Class frmGesamtsicherheitenMenuNEU
Select Case Standort Select Case Standort
Case "Verag GmbH" : firmaId = 2 Case "Verag GmbH" : firmaId = 2 : chkOffen.Checked = True
Case "VERAG AG" : firmaId = 1 Case "VERAG AG" : firmaId = 1 : chkOffen.Checked = False
Case "IMEX" : firmaId = 20 Case "IMEX" : firmaId = 20 : chkOffen.Checked = False
Case "Verag CS" : firmaId = 11 Case "Verag CS" : firmaId = 11 : chkOffen.Checked = False
End Select End Select
@@ -39,7 +39,6 @@ Public Class frmGesamtsicherheitenMenuNEU
txtDatVon.Text = Date.Parse("01.01.2001") txtDatVon.Text = Date.Parse("01.01.2001")
txtDatBis.Text = Now.ToShortDateString txtDatBis.Text = Now.ToShortDateString
chkOffen.Checked = True
btnMonat.Text = MONAT.ToString("MMMM") btnMonat.Text = MONAT.ToString("MMMM")
btnJahr.Text = JAHR.Year btnJahr.Text = JAHR.Year

View File

@@ -1170,6 +1170,7 @@ Partial Class frmGesamtsicherheitenNEU
Me.btnSaveDatetime.TabIndex = 11 Me.btnSaveDatetime.TabIndex = 11
Me.btnSaveDatetime.Text = "speichern" Me.btnSaveDatetime.Text = "speichern"
Me.btnSaveDatetime.UseVisualStyleBackColor = False Me.btnSaveDatetime.UseVisualStyleBackColor = False
Me.btnSaveDatetime.Visible = False
' '
'lblId 'lblId
' '

View File

@@ -1,4 +1,5 @@
 
Imports System.Web.UI.WebControls.Expressions
Imports VERAG_PROG_ALLGEMEIN Imports VERAG_PROG_ALLGEMEIN
Public Class frmGesamtsicherheitenNEU Public Class frmGesamtsicherheitenNEU
@@ -1176,12 +1177,20 @@ Public Class frmGesamtsicherheitenNEU
Private Sub setPrevAndNextGesIDAllOpen() Private Sub setPrevAndNextGesIDAllOpen()
Dim isInList As Boolean = False Dim isInList As Boolean = False
Dim onlyOpenDT As DataTable Dim onlyOpenDT As DataTable
dataTable.DefaultView.Sort = "gs_gsnr ASC" dataTable.DefaultView.Sort = "gs_gsnr ASC"
dataTable = dataTable.DefaultView.ToTable dataTable = dataTable.DefaultView.ToTable
onlyOpenDT = dataTable.Select("gs_isOpen = True").CopyToDataTable If dataTable.Select("gs_isOpen = True").Any Then
onlyOpenDT = dataTable.Select("gs_isOpen = True").CopyToDataTable
Else
MsgBox("keine offenen Gesamtsicherheiten gefunden!")
Exit Sub
End If
For i As Integer = 0 To onlyOpenDT.Rows.Count - 1 For i As Integer = 0 To onlyOpenDT.Rows.Count - 1
@@ -1265,16 +1274,20 @@ Public Class frmGesamtsicherheitenNEU
For i As Integer = 0 To dataTable.Rows.Count - 1 For i As Integer = 0 To dataTable.Rows.Count - 1
If dataTable.Rows(i).Item("gs_gsnr") = Me.gessicherheitID Then If dataTable.Rows(i).Item("gs_gsnr") = Me.gessicherheitID Then
prevGessicherheitID = dataTable.Rows(i).Item("gs_gsnr") - 1 If i = 0 Then
prevGessicherheitID = -1 ' no prev Sicherheit
Else
prevGessicherheitID = dataTable.Rows(i - 1).Item("gs_gsnr")
End If
nextGessicherheitID = dataTable.Rows(i).Item("gs_gsnr") + 1 If i = dataTable.Rows.Count - 1 Then
nextGessicherheitID = -1 ' ' no next Sicherheit
Else
nextGessicherheitID = dataTable.Rows(i + 1).Item("gs_gsnr")
End If
MsgBox("prevGessicherheitID " & prevGessicherheitID)
If i = 0 Then prevGessicherheitID = -1 ' no prev Sicherheit MsgBox("nextGessicherheitID " & nextGessicherheitID)
If i = dataTable.Rows.Count - 1 Then nextGessicherheitID = -1 ' ' no next Sicherheit
'MsgBox("prevGessicherheitID " & prevGessicherheitID)
'MsgBox("nextGessicherheitID " & nextGessicherheitID)
Return i Return i
End If End If