AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://scmadmin@172.24.11.74:90/scm/git/RecordOrganizer

Browse Source
This commit is contained in:
SchreiberM 2016-08-18 14:42:37 +02:00
commit 98a527c8b8
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/DD-Record-Organiser/ClassHelper.vb
View File

@ -166,7 +166,7 @@ Public Class ClassHelper
Try Try
Dim listcheck As New List(Of String) Dim listcheck As New List(Of String)
' Alle Checkboxen für aktuelle Ansicht heraussuchen ' Alle Checkboxen für aktuelle Ansicht heraussuchen
Dim sqlcheck As String = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE CONTROL_TYPE_ID in (10,11) AND FORM_ID = " & ENTITY_ID Dim sqlcheck As String = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE CONTROL_TYPE_ID in (10,11) AND SHOW_COLUMN = 1 AND FORM_ID = " & ENTITY_ID
Dim dtcheck As DataTable = ClassDatabase.Return_Datatable(sqlcheck) Dim dtcheck As DataTable = ClassDatabase.Return_Datatable(sqlcheck)
'Liste von allen Spaltentiteln mit Checkbox erstellen 'Liste von allen Spaltentiteln mit Checkbox erstellen
If dtcheck.Rows.Count > 0 Then If dtcheck.Rows.Count > 0 Then
@ -184,7 +184,7 @@ Public Class ClassHelper
Try Try
Dim listdate As New List(Of String) Dim listdate As New List(Of String)
' Alle Checkboxen für aktuelle Ansicht heraussuchen ' Alle Checkboxen für aktuelle Ansicht heraussuchen
Dim sqlcheck As String = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE CONTROL_TYPE_ID = 4 AND FORM_ID = " & ENTITY_ID Dim sqlcheck As String = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE CONTROL_TYPE_ID = 4 AND SHOW_COLUMN = 1 AND FORM_ID = " & ENTITY_ID
Dim dtdate As DataTable = ClassDatabase.Return_Datatable(sqlcheck) Dim dtdate As DataTable = ClassDatabase.Return_Datatable(sqlcheck)
'Liste von allen Spaltentiteln mit Checkbox erstellen 'Liste von allen Spaltentiteln mit Checkbox erstellen
If dtdate.Rows.Count > 0 Then If dtdate.Rows.Count > 0 Then

10
app/DD-Record-Organiser/frmConstructor_Main.vb
View File

@ -566,7 +566,15 @@ Public Class frmConstructor_Main
If btn.IsMain Then If btn.IsMain Then
ResetNav() ResetNav()
ElseIf btn.Name = "NavButtonRefresh" Then ElseIf btn.Name = "NavButtonRefresh" Then
Load_Datafor_Entity() If TrySave_Automatic() = True Then
' Setzt die RECORD_ID auf Null
' damit beim Refresh keine alten Werte
' in die Datenbank geschrieben werden
SELECTED_RECORD_ID = 0
RECORD_ID = 0
CURRENT_RECORD_ID = 0
Load_Datafor_Entity()
End If
End If End If
Else Else