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

MS2703

Browse Source
This commit is contained in:
SchreiberM
2017-03-28 08:50:20 +02:00
parent 3eac89a9a3
commit 266af3f0aa
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/DD-Record-Organizer/ClassControlValues.vb
View File

@@ -132,7 +132,7 @@ Public Class ClassControlValues
Continue For Continue For
End If End If
If IsNothing(metadata.Required) OrElse metadata.Required = False Then If IsNothing(metadata.Required) OrElse metadata.Required = False Then
Continue For Continue For
@@ -571,7 +571,7 @@ Public Class ClassControlValues
MsgBox("Unexpected Error in ReplaceSqlCommandPlaceholders:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Unexpected Error in ReplaceSqlCommandPlaceholders:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
Return sqlCommand Return sqlCommand
End Try End Try
End Function End Function
Public Shared Sub UnloadControlValuesList(RecordID As Integer, FormID As Integer, controls As Control.ControlCollection) Public Shared Sub UnloadControlValuesList(RecordID As Integer, FormID As Integer, controls As Control.ControlCollection)

4
app/DD-Record-Organizer/ClassWindreamDocGrid.vb
View File

@@ -270,7 +270,7 @@ Public Class ClassWindreamDocGrid
e.RepositoryItem = checkEdit e.RepositoryItem = checkEdit
End If End If
If typeId = 3 Then If typeId = 4 Then
Dim dateedit As New RepositoryItemDateEdit() Dim dateedit As New RepositoryItemDateEdit()
AddHandler dateedit.EditValueChanged, _datepickerValueChangedHandler AddHandler dateedit.EditValueChanged, _datepickerValueChangedHandler
@@ -286,7 +286,7 @@ Public Class ClassWindreamDocGrid
e.RepositoryItem = dateedit e.RepositoryItem = dateedit
End If End If
If typeId = 4 Then If typeId = 3 Then
Dim dropdown As New RepositoryItemComboBox() Dim dropdown As New RepositoryItemComboBox()
Dim matchingRows() As DataRow = DT_DROPDOWN_ITEMS.Select(String.Format("CONFIG_ID = {0}", configId), "SEQUENCE") Dim matchingRows() As DataRow = DT_DROPDOWN_ITEMS.Select(String.Format("CONFIG_ID = {0}", configId), "SEQUENCE")

4
app/DD-Record-Organizer/ModuleHelperMethods.vb
View File

@@ -441,7 +441,7 @@ Module ModuleHelperMethods
Public Function Get_Grid_Sql(ConstructorId As Integer, FormId As Integer, ConstructorDetailID As Integer, ByRef GRID_TYPE As frmConstructor_Main.GridType, UserGuid As Integer, QUICK_VIEW_SQL As String, Public Function Get_Grid_Sql(ConstructorId As Integer, FormId As Integer, ConstructorDetailID As Integer, ByRef GRID_TYPE As frmConstructor_Main.GridType, UserGuid As Integer, QUICK_VIEW_SQL As String,
IS_SINGLE_RECORD As Boolean, FORM_TYPE As Integer, ByRef VIEW_ID As Integer, ByRef GridControlMain As GridControl, ByRef grvwGrid As GridView, Optional ByRef IS_GEOData As Boolean = False) IS_SINGLE_RECORD As Boolean, FORM_TYPE As Integer, ByRef VIEW_ID As Integer, ByRef GridControlMain As GridControl, ByRef grvwGrid As GridView, Optional ByRef IS_GEOData As Boolean = False)
Try Try
Dim ViewName As String = "TBENTITY_TABLE" & FormId.ToString Dim ViewName As String = "TBPMO_ENTITY_TABLE" & FormId.ToString
CURRENT_VIEWNAME = ViewName CURRENT_VIEWNAME = ViewName
Dim EntitySQL As String Dim EntitySQL As String
@@ -457,7 +457,7 @@ Module ModuleHelperMethods
EntitySQL = QUICK_VIEW_SQL EntitySQL = QUICK_VIEW_SQL
If EntitySQL = String.Empty Then If EntitySQL = String.Empty Then
EntitySQL = "SELECT T.* FROM TBENTITY_TABLE" & FormId.ToString & " T" EntitySQL = "SELECT T.* FROM TBPMO_ENTITY_TABLE" & FormId.ToString & " T"
If IS_SINGLE_RECORD = True Or FORM_TYPE = 5 Then If IS_SINGLE_RECORD = True Or FORM_TYPE = 5 Then
Else Else

2
app/DD-Record-Organizer/frmConstructorDesigner.vb
View File

@@ -836,7 +836,7 @@ Public Class frmConstructorDesigner
Private Sub btnTestSQL_Click(sender As Object, e As EventArgs) Handles btnTestSQL.Click Private Sub btnTestSQL_Click(sender As Object, e As EventArgs) Handles btnTestSQL.Click
Try Try
Dim EntSQL = "SELECT T.* FROM TBENTITY_TABLE" & SELECTED_ENTITY_ID.ToString & " T" Dim EntSQL = "SELECT T.* FROM TBPMO_ENTITY_TABLE" & SELECTED_ENTITY_ID.ToString & " T"
Dim query As String = EntSQL & " " & SQL_COMMANDTextBox.Text Dim query As String = EntSQL & " " & SQL_COMMANDTextBox.Text
For Each row As DataGridViewRow In dgvPlaceholders.Rows For Each row As DataGridViewRow In dgvPlaceholders.Rows

14
app/DD-Record-Organizer/frmConstructor_Main.vb
View File

@@ -740,7 +740,7 @@ Public Class frmConstructor_Main
GridControlMain.MainView = grvwTiles GridControlMain.MainView = grvwTiles
End Sub End Sub
Public Function Get_Pos_SQL(FormId As Integer) Public Function Get_Pos_SQL(FormId As Integer)
POS_SQL = "SELECT T.* FROM TBENTITY_TABLE" & 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 TBPMO_ENTITY_TABLE" & FormId.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = @PARENT_ID"
End Function End Function
Public Sub Clear_Grid_View() Public Sub Clear_Grid_View()
GridControlMain.DataSource = Nothing GridControlMain.DataSource = Nothing
@@ -1442,7 +1442,7 @@ Public Class frmConstructor_Main
Function ReturnAmountofRecords(EntityID As Integer) Function ReturnAmountofRecords(EntityID As Integer)
' Statt eine Table zurückzugeben, können wir die anzahl der Zeilen auch in der Datenbank berechnen, ' Statt eine Table zurückzugeben, können wir die anzahl der Zeilen auch in der Datenbank berechnen,
' dadurch wird die Abfrage um einiges schneller ' dadurch wird die Abfrage um einiges schneller
Dim SQL As String = "SELECT COUNT(*) FROM ( SELECT T.* FROM TBENTITY_TABLE" & EntityID & " AS T,TBPMO_RECORD_CONNECT T1 WHERE T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = @RecordID ) x" Dim SQL As String = "SELECT COUNT(*) FROM ( SELECT T.* FROM TBPMO_ENTITY_TABLE" & EntityID & " AS T,TBPMO_RECORD_CONNECT T1 WHERE T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = @RecordID ) x"
'Abhängig von der Entität dieAnzahl der Datensätze laden 'Abhängig von der Entität dieAnzahl der Datensätze laden
Select Case ACT_EBENE Select Case ACT_EBENE
@@ -1614,7 +1614,7 @@ Public Class frmConstructor_Main
MsgBox(msg, MsgBoxStyle.Exclamation) MsgBox(msg, MsgBoxStyle.Exclamation)
Try Try
Dim sql Dim sql
sql = "select * from TBENTITY_TABLE" & PARENT_ENTITYID.ToString sql = "select * from TBPMO_ENTITY_TABLE" & PARENT_ENTITYID.ToString
CURRENT_PARENT_DT = ClassDatabase.Return_Datatable(sql, True) CURRENT_PARENT_DT = ClassDatabase.Return_Datatable(sql, True)
frmChooseParentRecord.ShowDialog() frmChooseParentRecord.ShowDialog()
If CURRENT_PARENT_RECORD_ID = 0 Then If CURRENT_PARENT_RECORD_ID = 0 Then
@@ -2266,7 +2266,7 @@ Public Class frmConstructor_Main
If EBENE1_RECID > 0 Then If EBENE1_RECID > 0 Then
PARENT_RECORDID = EBENE1_RECID PARENT_RECORDID = EBENE1_RECID
If GRID_TYPE = GridType.Grid Then If GRID_TYPE = GridType.Grid Then
_ENTITYSQL = "SELECT T.* FROM TBENTITY_TABLE" & 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 TBPMO_ENTITY_TABLE" & ENTITY_ID.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = " & PARENT_RECORDID
Else Else
_ENTITYSQL = _ENTITYSQL.Replace("@RecordID", EBENE2_RECID) _ENTITYSQL = _ENTITYSQL.Replace("@RecordID", EBENE2_RECID)
_ENTITYSQL = _ENTITYSQL.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2") _ENTITYSQL = _ENTITYSQL.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
@@ -2307,7 +2307,7 @@ Public Class frmConstructor_Main
PARENT_RECORDID = EBENE2_RECID PARENT_RECORDID = EBENE2_RECID
Try Try
If GRID_TYPE = GridType.Grid Then If GRID_TYPE = GridType.Grid Then
_ENTITYSQL = "SELECT T.* FROM TBENTITY_TABLE" & 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 TBPMO_ENTITY_TABLE" & ENTITY_ID.ToString & " T, TBPMO_RECORD_CONNECT t1 where T.[Record-ID] = T1.RECORD2_ID AND T1.RECORD1_ID = " & PARENT_RECORDID
Else Else
_ENTITYSQL = _ENTITYSQL.Replace("@RecordID", EBENE2_RECID) _ENTITYSQL = _ENTITYSQL.Replace("@RecordID", EBENE2_RECID)
_ENTITYSQL = _ENTITYSQL.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2") _ENTITYSQL = _ENTITYSQL.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
@@ -2414,7 +2414,7 @@ Public Class frmConstructor_Main
If IsNothing(DTEntity) Then If IsNothing(DTEntity) Then
ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in getting Entity-Data - Check logfile") ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in getting Entity-Data - Check logfile")
Else Else
DTEntity.TableName = "TBENTITY_TABLE" & ENTITY_ID DTEntity.TableName = "TBPMO_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 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) Dim DT_AUTOVALUES As DataTable = ClassDatabase.Return_Datatable(SQL_AutoValues, True)
CURRENT_SQL_AUTO_VALUES_DT = DT_AUTOVALUES CURRENT_SQL_AUTO_VALUES_DT = DT_AUTOVALUES
@@ -4901,7 +4901,7 @@ Public Class frmConstructor_Main
Dim sql Dim sql
sql = "select * from TBENTITY_TABLE" & PARENT_ENTITYID.ToString sql = "select * from TBPMO_ENTITY_TABLE" & PARENT_ENTITYID.ToString
CURRENT_PARENT_DT = ClassDatabase.Return_Datatable(sql, True) CURRENT_PARENT_DT = ClassDatabase.Return_Datatable(sql, True)
frmChooseParentRecord.ShowDialog() frmChooseParentRecord.ShowDialog()

2
app/DD-Record-Organizer/frmDocLink_to_Record.vb
View File

@@ -152,7 +152,7 @@ Public Class frmDocLink_to_Record
Dim RecordId As Integer Dim RecordId As Integer
If LogErrorsOnly = False Then ClassLogger.Add(" >> GridType = Grid", False) If LogErrorsOnly = False Then ClassLogger.Add(" >> GridType = Grid", False)
ResultViewName = "TBENTITY_TABLE" & FormId.ToString ResultViewName = "TBPMO_ENTITY_TABLE" & FormId.ToString
ResultSQL = "SELECT T.* FROM " & ResultViewName & " T" ResultSQL = "SELECT T.* FROM " & ResultViewName & " T"
Try Try

2
app/DD-Record-Organizer/frmGeodataNavigation.vb
View File

@@ -80,7 +80,7 @@ Public Class frmGeodataNavigation
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
Me.ConstructorMain_Grid = gridControl Me.ConstructorMain_Grid = gridControl
'Me.EntityId = EntityId 'Me.EntityId = EntityId
'Me.EntitySql = String.Format("SELECT T.*, T1.LATITUDE, T1.LONGITUDE from TBENTITY_TABLE{0} T,TBPMO_RECORD_GEODATA T1 WHERE T.[Record-ID] = T1.RECORD_ID", Me.EntityId) 'Me.EntitySql = String.Format("SELECT T.*, T1.LATITUDE, T1.LONGITUDE from TBPMO_ENTITY_TABLE{0} T,TBPMO_RECORD_GEODATA T1 WHERE T.[Record-ID] = T1.RECORD_ID", Me.EntityId)
End Sub End Sub
Private Sub frmGeodataNavigation_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub frmGeodataNavigation_Load(sender As Object, e As EventArgs) Handles MyBase.Load

2
app/DD-Record-Organizer/frmTemplates.vb
View File

@@ -220,7 +220,7 @@
If loaded = False Then Exit Sub If loaded = False Then Exit Sub
If cmbControls.SelectedIndex <> -1 Then If cmbControls.SelectedIndex <> -1 Then
If cmbControls.Text <> "System.Data.DataRowView" Then If cmbControls.Text <> "System.Data.DataRowView" Then
Dim Sql = "select TOP 30 [" & cmbControls.Text & "] FROM TBENTITY_TABLE" & _ENTITY_ID & " WHERE [" & cmbControls.Text & "] IS NOT NULL AND [" & cmbControls.Text & "] <> '' GROUP BY [" & cmbControls.Text & "]" Dim Sql = "select TOP 30 [" & cmbControls.Text & "] FROM TBPMO_ENTITY_TABLE" & _ENTITY_ID & " WHERE [" & cmbControls.Text & "] IS NOT NULL AND [" & cmbControls.Text & "] <> '' GROUP BY [" & cmbControls.Text & "]"
Dim DT As DataTable = ClassDatabase.Return_Datatable(Sql) Dim DT As DataTable = ClassDatabase.Return_Datatable(Sql)
If DT.Rows.Count > 0 Then If DT.Rows.Count > 0 Then
ListBoxVorschau.DataSource = DT ListBoxVorschau.DataSource = DT