AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove ClassDatabase, ClassDataASorDB, replace with DatabaseWithFallback

Browse Source
This commit is contained in:
Jonathan Jenne
2022-01-12 14:34:27 +01:00
parent 482f015d6f
commit 6725d0f7d6
14 changed files with 294 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/DD_PM_WINDREAM/ClassControlCreator.vb
View File

@@ -14,6 +14,8 @@ Imports DigitalData.Controls.LookupGrid
Imports DigitalData.Modules.Language.Utils
Imports DigitalData.GUIs.Common
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
Imports DigitalData.Modules.EDMI.API.Constants
Public Class ClassControlCreator
@@ -516,7 +518,10 @@ Public Class ClassControlCreator
Dim oColumnName As String = oRow.Item("SPALTENNAME")
If Not clsPatterns.HasComplexPatterns(oSqlCommand) Then
oComboboxDataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oConnectionId)
'oComboboxDataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oConnectionId)
oComboboxDataTable = Database.GetDatatable(New GetDatatableOptions(oSqlCommand, DatabaseType.ECM) With {
.ConnectionId = oConnectionId
})
End If
Dim oRepositoryItem = GridTables_GetRepositoryItemForColumn(oColumnName, oComboboxDataTable, oRow.Item("ADVANCED_LOOKUP"))
@@ -844,7 +849,10 @@ Public Class ClassControlCreator
Public Shared Sub GridTables_CacheDatatableForColumn(pControlId As Object, pColumnName As Object, pSqlStatement As Object, pConnectionId As Integer, pAdvancedLookup As Boolean)
Try
Dim oTable As DataTable = ClassDatabase.Return_Datatable_ConId(pSqlStatement, pConnectionId)
'Dim oTable As DataTable = ClassDatabase.Return_Datatable_ConId(pSqlStatement, pConnectionId)
Dim oTable As DataTable = Database.GetDatatable(New GetDatatableOptions(pSqlStatement, DatabaseType.ECM) With {
.ConnectionId = pConnectionId
})
' If no columns for this control have been added, create an empty dict now
If Not GridTables.ContainsKey(pControlId) Then