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

MS_23052016

Browse Source
This commit is contained in:
SchreiberM 2016-05-23 13:37:33 +02:00
parent f6994d7b60
commit b141e20f58
3 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -521,9 +521,9 @@ Public Class ClassControlBuilder
Console.WriteLine("Obacht") Console.WriteLine("Obacht")
End If End If
'SQL für abhängige Auswahllisten 'SQL für abhängige Auswahllisten
Dim SQL As String = String.Format("SELECT GUID, SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE SQL_COMMAND_1 LIKE '%@{0}@%'", controlId) Dim SQL As String = String.Format("SELECT GUID, SQL_COMMAND_1,CONTROL_TYPE_ID,FORMAT_TYPE FROM TBPMO_CONTROL WHERE SQL_COMMAND_1 LIKE '%@{0}@%'", controlId)
'SQL für enable control 'SQL für enable control
Dim SQLenable As String = String.Format("SELECT GUID, SQL_COMMAND_2 FROM TBPMO_CONTROL WHERE SQL_COMMAND_2 LIKE '%@{0}@%'", controlId) Dim SQLenable As String = String.Format("SELECT GUID, SQL_COMMAND_2,CONTROL_TYPE_ID,FORMAT_TYPE FROM TBPMO_CONTROL WHERE SQL_COMMAND_2 LIKE '%@{0}@%'", controlId)
'If CtrlCommandUI.IsInsert = True Then 'If CtrlCommandUI.IsInsert = True Then
' CtrlCommandUI.SaveRecord(0, CURRENT_FORM_ID, CURRENT_PARENT_ID) ' CtrlCommandUI.SaveRecord(0, CURRENT_FORM_ID, CURRENT_PARENT_ID)
'End If 'End If

2
app/DD-Record-Organiser/My Project/AssemblyInfo.vb
View File

@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.4.5.5")> <Assembly: AssemblyVersion("2.4.5.6")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguageAttribute("")> <Assembly: NeutralResourcesLanguageAttribute("")>

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

@ -13,6 +13,7 @@ Imports WINDREAMLib
Imports System.Runtime.InteropServices Imports System.Runtime.InteropServices
Public Class frmConstructor_Main Public Class frmConstructor_Main
Private DT_VWPMO_CONSTRUCTOR_FORMS As DataTable
Private Const SEE_MASK_INVOKEIDLIST = &HC Private Const SEE_MASK_INVOKEIDLIST = &HC
Private Const SEE_MASK_NOCLOSEPROCESS = &H40 Private Const SEE_MASK_NOCLOSEPROCESS = &H40
Private Const SEE_MASK_FLAG_NO_UI = &H400 Private Const SEE_MASK_FLAG_NO_UI = &H400
@ -218,6 +219,10 @@ Public Class frmConstructor_Main
VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString
Me.TBPMO_FILES_USERTableAdapter.Connection.ConnectionString = MyConnectionString Me.TBPMO_FILES_USERTableAdapter.Connection.ConnectionString = MyConnectionString
Me.VWPMO_WF_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString Me.VWPMO_WF_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString
Dim SQL = String.Format("SELECT *, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), {1}) AS 'CAPTION' " & _
"FROM VWPMO_CONSTRUCTOR_FORMS WHERE SCREEN_ID = {2} AND CONSTRUCT_ID = {3} ORDER BY SEQUENCE", USER_LANGUAGE, CURRENT_SCREEN_ID, CURRENT_SCREEN_ID, CONSTRUCTORID)
sd()
DT_VWPMO_CONSTRUCTOR_FORMS = ClassDatabase.Return_Datatable(SQL)
DT_CONSTRUCT_VIEW = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_FORM_CONSTRUCTOR WHERE GUID = " & CONSTRUCTORID) DT_CONSTRUCT_VIEW = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_FORM_CONSTRUCTOR WHERE GUID = " & CONSTRUCTORID)
If DT_CONSTRUCT_VIEW.Rows.Count = 1 Then If DT_CONSTRUCT_VIEW.Rows.Count = 1 Then
'Load Input Grid 'Load Input Grid
@ -310,7 +315,7 @@ Public Class frmConstructor_Main
GridViewDoc_Search.RestoreLayoutFromXml(XMLPath) GridViewDoc_Search.RestoreLayoutFromXml(XMLPath)
GridViewDoc_Search.GuessAutoFilterRowValuesFromFilter() GridViewDoc_Search.GuessAutoFilterRowValuesFromFilter()
End If End If
Catch ex As Exception Catch ex As Exception
MsgBox("Error in Load_DocGrid_Layout:" & vbNewLine & ex.Message) MsgBox("Error in Load_DocGrid_Layout:" & vbNewLine & ex.Message)
End Try End Try
@ -555,9 +560,9 @@ Public Class frmConstructor_Main
End If End If
Next Next
Catch ex As Exception Catch ex As Exception
ClassLogger.Add(">> Unexpected Error in Hide_Grid_Columns") ClassLogger.Add("Unexpected Error in Hide_Grid_Columns: " & ex.Message, True)
End Try End Try
End Sub End Sub
'Public Function Get_Grid_Sql(ConstructorId As Integer, FormId As Integer) 'Public Function Get_Grid_Sql(ConstructorId As Integer, FormId As Integer)
@ -589,8 +594,19 @@ Public Class frmConstructor_Main
_VIEWNAME = "VWTEMP_PMO_FORM" & FormId.ToString _VIEWNAME = "VWTEMP_PMO_FORM" & FormId.ToString
_ENTITYSQL = "SELECT T.* FROM VWTEMP_PMO_FORM" & FormId.ToString & " T" _ENTITYSQL = "SELECT T.* FROM VWTEMP_PMO_FORM" & FormId.ToString & " T"
Else 'Tiles und Carousel bekommen Quick View Else 'Tiles und Carousel bekommen Quick View
_ENTITYSQL = String.Format("SELECT SQL_QUICK_VIEW FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0} AND FORM_ID = {1} AND SCREEN_ID = {2}", ConstructorId, FormId, CURRENT_SCREEN_ID) ' Define the filter
_ENTITYSQL = ClassDatabase.Execute_Scalar(_ENTITYSQL, True) Dim DT As DataTable = DT_VWPMO_CONSTRUCTOR_FORMS
Dim filter As String = "FORM_ID = " & FormId & " AND SCREEN_ID = " & CURRENT_SCREEN_ID
' Filter the rows using Select() method of DataTable
Dim FilteredRows As DataRow() = DT.Select(filter)
For Each row As DataRow In FilteredRows
_ENTITYSQL = row("SQL_QUICK_VIEW")
' ListBox1.Items.Add(String.Format("{0}, {1}", row("CompanyName"), row("City")))
Next
' _ENTITYSQL = String.Format("SELECT SQL_QUICK_VIEW FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0} AND FORM_ID = {1} AND SCREEN_ID = {2}", ConstructorId, FormId, CURRENT_SCREEN_ID)
' _ENTITYSQL = ClassDatabase.Execute_Scalar(_ENTITYSQL, True)
If _ENTITYSQL = String.Empty Then If _ENTITYSQL = String.Empty Then
_ENTITYSQL = "SELECT T.* FROM VWTEMP_PMO_FORM" & FormId.ToString & " T" _ENTITYSQL = "SELECT T.* FROM VWTEMP_PMO_FORM" & FormId.ToString & " T"
If IS_SINGLE_RECORD = True Or FORM_TYPE = 5 Then If IS_SINGLE_RECORD = True Or FORM_TYPE = 5 Then
@ -1417,7 +1433,7 @@ Public Class frmConstructor_Main
Me.Cursor = Cursors.Default Me.Cursor = Cursors.Default
Return True Return True
End If End If
End If End If
''Update aller Control-Werte ''Update aller Control-Werte
'Dim ResultMessage 'Dim ResultMessage
@ -1452,7 +1468,7 @@ Public Class frmConstructor_Main
Me.Cursor = Cursors.Default Me.Cursor = Cursors.Default
Return False Return False
End If End If
If EDIT_STATE = EditState.Insert Then If EditState.Insert = 1 Then
Select Case ACT_EBENE Select Case ACT_EBENE
Case 1 Case 1
EBENE1_RECID = recid EBENE1_RECID = recid
@ -1474,6 +1490,9 @@ Public Class frmConstructor_Main
'Show_Verknuepfungen() 'Show_Verknuepfungen()
End If End If
End Select End Select
Dim exec = String.Format("EXEC PRPMO_CLIENT_AFTER_RECORD_INSERT {0}", CURRENT_RECORD_ID)
ClassDatabase.Execute_non_Query_withConn(exec, 1)
ElseIf EDIT_STATE = EditState.Update Then ElseIf EDIT_STATE = EditState.Update Then
'Weil es ein Insert war müssen noch die Daten gespeichert/erneuert werden 'Weil es ein Insert war müssen noch die Daten gespeichert/erneuert werden
Select Case ACT_EBENE Select Case ACT_EBENE
@ -1559,7 +1578,7 @@ Public Class frmConstructor_Main
result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
If result = MsgBoxResult.Yes Then If result = MsgBoxResult.Yes Then
Dim del = "EXEC [dbo].[PRPMO_DELETE_RECORD] " & SELECTED_RECORD_ID Dim del = "EXEC [dbo].[PRPMO_DELETE_RECORD] " & SELECTED_RECORD_ID
If ClassDatabase.Execute_non_Query(del, True) = True Then If ClassDatabase.Execute_non_Query_withConn(del, 1) = True Then
RECORD_CHANGED = False RECORD_CHANGED = False
EDIT_STATE = EditState.None EDIT_STATE = EditState.None
CURRENT_RECORD_ENABLED = False CURRENT_RECORD_ENABLED = False
@ -2402,7 +2421,7 @@ Public Class frmConstructor_Main
' Wenn nicht gespeichert werden soll, den Record wieder löschen ' Wenn nicht gespeichert werden soll, den Record wieder löschen
If CtrlCommandUI.IsInsert = True Then If CtrlCommandUI.IsInsert = True Then
Dim del = "EXEC [dbo].[PRPMO_DELETE_RECORD] " & SELECTED_RECORD_ID Dim del = "EXEC [dbo].[PRPMO_DELETE_RECORD] " & SELECTED_RECORD_ID
ClassDatabase.Execute_non_Query(del, True) ClassDatabase.Execute_non_Query_withConn(del, 1)
End If End If
'Dim ResultMessage 'Dim ResultMessage
@ -4913,7 +4932,7 @@ Public Class frmConstructor_Main
result = MessageBox.Show(msg, "Copy Record:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) result = MessageBox.Show(msg, "Copy Record:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
If result = MsgBoxResult.Yes Then If result = MsgBoxResult.Yes Then
Dim SQL = String.Format("EXEC PRDD_COPY_RECORD {0}, '{1}'", RECORD_ID, Environment.UserName) Dim SQL = String.Format("EXEC PRDD_COPY_RECORD {0}, '{1}'", RECORD_ID, Environment.UserName)
If ClassDatabase.Execute_non_Query(SQL, True) = True Then If ClassDatabase.Execute_non_Query_withConn(SQL, 1) = True Then
Load_Entity_Data(ACT_EBENE) Load_Entity_Data(ACT_EBENE)
End If End If
End If End If
@ -5113,7 +5132,7 @@ Public Class frmConstructor_Main
Private Sub tsButtonCancel_Click(sender As Object, e As EventArgs) Handles tsButtonCancel.Click Private Sub tsButtonCancel_Click(sender As Object, e As EventArgs) Handles tsButtonCancel.Click
If CtrlCommandUI.IsInsert = True Then If CtrlCommandUI.IsInsert = True Then
Dim del = "EXEC [dbo].[PRPMO_DELETE_RECORD] " & SELECTED_RECORD_ID Dim del = "EXEC [dbo].[PRPMO_DELETE_RECORD] " & SELECTED_RECORD_ID
ClassDatabase.Execute_non_Query(del, True) ClassDatabase.Execute_non_Query_withConn(del, 1)
End If End If
tsButtonCancel.Visible = False tsButtonCancel.Visible = False
CtrlCommandUI.IsInsert = False CtrlCommandUI.IsInsert = False
@ -5133,12 +5152,12 @@ Public Class frmConstructor_Main
Private Sub tsbtnRedo_Click(sender As Object, e As EventArgs) Handles tsbtnRedo.Click Private Sub tsbtnRedo_Click(sender As Object, e As EventArgs) Handles tsbtnRedo.Click
Me.Cursor = Cursors.WaitCursor Me.Cursor = Cursors.WaitCursor
Dim proc = String.Format("EXEC PRPMO_REDO_RECORD_CHANGES {0}", RECORD_ID) Dim proc = String.Format("EXEC PRPMO_REDO_RECORD_CHANGES {0}", RECORD_ID)
If ClassDatabase.Execute_non_Query(proc) = True Then If ClassDatabase.Execute_non_Query_withConn(proc, 1) = True Then
RECORD_ID = 0 RECORD_ID = 0
Column_Row_Handler() Column_Row_Handler()
Me.Cursor = Cursors.Default Me.Cursor = Cursors.Default
End If End If
End Sub End Sub
#Region "TrySave Funktionen" #Region "TrySave Funktionen"
@ -5250,7 +5269,7 @@ Public Class frmConstructor_Main
' Angelegten Record löschen ' Angelegten Record löschen
If CtrlCommandUI.IsInsert Then If CtrlCommandUI.IsInsert Then
Dim DeleteRecordSQL = String.Format("EXEC [dbo].[PRPMO_DELETE_RECORD] {0}", SELECTED_RECORD_ID) Dim DeleteRecordSQL = String.Format("EXEC [dbo].[PRPMO_DELETE_RECORD] {0}", SELECTED_RECORD_ID)
ClassDatabase.Execute_non_Query(DeleteRecordSQL, True) ClassDatabase.Execute_non_Query_withConn(DeleteRecordSQL, 1)
End If End If
' Änderungen sollen nicht gespeichert werden ' Änderungen sollen nicht gespeichert werden
@ -5271,5 +5290,5 @@ Public Class frmConstructor_Main
End Function End Function
#End Region #End Region
End Class End Class