From ddb69815b4e39dd113b4158e0a0dd9f53e639c8e Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 4 Apr 2017 11:51:07 +0200 Subject: [PATCH] MS0304 --- app/DD-Record-Organizer/frmConstructor_Main.vb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index b9ef37f..d496b77 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -736,7 +736,7 @@ Public Class frmConstructor_Main GridControlMain.MainView = grvwTiles End Sub Public Function Get_Pos_SQL(FormId As Integer) - POS_SQL = "SELECT T.* FROM VWTEMP_PMO_FORM" & FormId.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = @PARENT_ID" + POS_SQL = "SELECT T.* FROM VWPMO_ENTITY_TABLE" & FormId.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = @PARENT_ID" End Function Public Sub Clear_Grid_View() GridControlMain.DataSource = Nothing @@ -1438,7 +1438,7 @@ Public Class frmConstructor_Main Function ReturnAmountofRecords(EntityID As Integer) ' Statt eine Table zurückzugeben, können wir die anzahl der Zeilen auch in der Datenbank berechnen, ' dadurch wird die Abfrage um einiges schneller - Dim SQL As String = "SELECT COUNT(*) FROM ( SELECT T.* FROM VWTEMP_PMO_FORM" & EntityID & " AS T,TBPMO_RECORD_CONNECT T1 WHERE T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = @RecordID ) x" + Dim SQL As String = String.Format("SELECT COUNT(T.[Record-ID]) FROM VWPMO_ENTITY_TABLE{0} AS T,TBPMO_RECORD_CONNECT T1 WHERE T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = @RecordID", EntityID) 'Abhängig von der Entität dieAnzahl der Datensätze laden Select Case ACT_EBENE @@ -1610,7 +1610,7 @@ Public Class frmConstructor_Main MsgBox(msg, MsgBoxStyle.Exclamation) Try Dim sql - sql = "select * from VWTEMP_PMO_FORM" & PARENT_ENTITYID.ToString + sql = "select * from VWPMO_ENTITY_TABLE" & PARENT_ENTITYID.ToString CURRENT_PARENT_DT = ClassDatabase.Return_Datatable(sql, True) frmChooseParentRecord.ShowDialog() If CURRENT_PARENT_RECORD_ID = 0 Then @@ -2260,7 +2260,7 @@ Public Class frmConstructor_Main If EBENE1_RECID > 0 Then PARENT_RECORDID = EBENE1_RECID If GRID_TYPE = GridType.Grid Then - _ENTITYSQL = "SELECT T.* FROM VWTEMP_PMO_FORM" & ENTITY_ID.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = " & PARENT_RECORDID + _ENTITYSQL = "SELECT T.* FROM VWPMO_ENTITY_TABLE" & ENTITY_ID.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = " & PARENT_RECORDID Else _ENTITYSQL = _ENTITYSQL.Replace("@RecordID", EBENE2_RECID) _ENTITYSQL = _ENTITYSQL.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2") @@ -2301,7 +2301,7 @@ Public Class frmConstructor_Main PARENT_RECORDID = EBENE2_RECID Try If GRID_TYPE = GridType.Grid Then - _ENTITYSQL = "SELECT T.* FROM VWTEMP_PMO_FORM" & ENTITY_ID.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = " & PARENT_RECORDID + _ENTITYSQL = "SELECT T.* FROM VWPMO_ENTITY_TABLE" & ENTITY_ID.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = " & PARENT_RECORDID Else _ENTITYSQL = _ENTITYSQL.Replace("@RecordID", EBENE2_RECID) _ENTITYSQL = _ENTITYSQL.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2") @@ -2404,7 +2404,7 @@ Public Class frmConstructor_Main If IsNothing(DTEntity) Then ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in getting Entity-Data - Check logfile") Else - DTEntity.TableName = "VWTEMP_PMO_FORM" & ENTITY_ID + DTEntity.TableName = "VWPMO_ENTITY_TABLE" & ENTITY_ID Dim SQL_AutoValues = "SELECT GUID AS CONTROL_ID, CONNECTION_ID_1 AS CONNECTION_ID, SQL_COMMAND_1 AS SQL_COMMAND FROM TBPMO_CONTROL WHERE CONNECTION_ID_1 <> '' AND SQL_COMMAND_1 <> '' AND FORM_ID = " & ENTITY_ID Dim DT_AUTOVALUES As DataTable = ClassDatabase.Return_Datatable(SQL_AutoValues, True) CURRENT_SQL_AUTO_VALUES_DT = DT_AUTOVALUES @@ -4893,7 +4893,7 @@ Public Class frmConstructor_Main Dim sql - sql = "select * from VWTEMP_PMO_FORM" & PARENT_ENTITYID.ToString + sql = "select * from VWPMO_ENTITY_TABLE" & PARENT_ENTITYID.ToString CURRENT_PARENT_DT = ClassDatabase.Return_Datatable(sql, True) frmChooseParentRecord.ShowDialog()