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

rename ECM references to IDB

Browse Source
This commit is contained in:
Jonathan Jenne
2019-05-24 11:31:36 +02:00
parent 9296a08f93
commit dfb9cf2ea9
51 changed files with 862 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
GUIs.ClientSuite/App.config
View File

@@ -7,7 +7,6 @@
<section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection" requirePermission="false" />
</sectionGroup>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="DigitalData.GUIs.ClientSuite.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="ClientSuite.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
@@ -30,7 +29,7 @@
</system.serviceModel>
<applicationSettings>
<DigitalData.GUIs.ClientSuite.My.MySettings>
<setting name="EDM_NetworkService_Adress" serializeAs="String">
<setting name="IDBNetworkServiceAddress" serializeAs="String">
<value>net.tcp://172.24.12.67:9000/DigitalData/Services/Main</value>
</setting>
</DigitalData.GUIs.ClientSuite.My.MySettings>
@@ -85,11 +84,6 @@
</DbProviderFactories>
</system.data>
<userSettings>
<DigitalData.GUIs.ClientSuite.My.MySettings>
<setting name="ICMServiceAddress" serializeAs="String">
<value />
</setting>
</DigitalData.GUIs.ClientSuite.My.MySettings>
<ClientSuite.My.MySettings>
<setting name="ICMServiceAddress" serializeAs="String">
<value />

8
GUIs.ClientSuite/ClassService.vb
View File

@@ -1,7 +1,7 @@
Imports System.ServiceModel
Imports System.ServiceModel.Channels
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.EDMIAPI.EDMIServiceReference
Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
Imports DigitalData.GUIs.ClientSuite.Base
Public Class ClassService
@@ -67,15 +67,15 @@ Public Class ClassService
End Function)
End Function
Public Function GetChannelFactory() As IChannelFactory(Of IEDMServiceChannel)
Public Function GetChannelFactory() As IChannelFactory(Of IIDBServiceChannel)
Return GetChannelFactory(My.SysConfig.ServiceConnection)
End Function
Public Function GetChannelFactory(EndpointURL As String) As ChannelFactory(Of IEDMServiceChannel)
Public Function GetChannelFactory(EndpointURL As String) As ChannelFactory(Of IIDBServiceChannel)
Dim oBinding = GetBinding()
Dim oEndpoint = New EndpointAddress(EndpointURL)
Dim oFactory As New ChannelFactory(Of IEDMServiceChannel)(oBinding, oEndpoint)
Dim oFactory As New ChannelFactory(Of IIDBServiceChannel)(oBinding, oEndpoint)
Return oFactory
End Function

4
GUIs.ClientSuite/ClassTimer.vb
View File

@@ -2,7 +2,7 @@
Imports System.Threading
Imports System.Timers
Imports DigitalData.GUIs.ClientSuite.Base
Imports DigitalData.Modules.EDMIAPI.EDMIServiceReference
Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
Imports DigitalData.Modules.Logging
Public Class ClassTimer
@@ -12,7 +12,7 @@ Public Class ClassTimer
Private _LogConfig As LogConfig
Private _Logger As Logger
Private _Timer As Timers.Timer
Private _Channel As IEDMServiceChannel
Private _Channel As IIDBServiceChannel
Public Event OnlineChanged As OnlineChangedEventHandler
Public Delegate Sub OnlineChangedEventHandler(sender As Object, Online As Boolean)

4
GUIs.ClientSuite/ClientSuite.vbproj
View File

@@ -469,9 +469,9 @@
<Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
<Name>Logging</Name>
</ProjectReference>
<ProjectReference Include="..\SERVICES\DDEDM_NetworkService\DDEDMService.vbproj">
<ProjectReference Include="..\SERVICES\DDEDM_NetworkService\IDBService.vbproj">
<Project>{A8C3F298-76AB-4359-AB3C-986E313B4336}</Project>
<Name>DDEDMService</Name>
<Name>IDBService</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>

18
GUIs.ClientSuite/Common/ClassCommonCommands.vb
View File

@@ -1,5 +1,5 @@
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.EDMIAPI.EDMIServiceReference
Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
Public Class ClassCommonCommands
Private _LogConfig As LogConfig
@@ -10,9 +10,9 @@ Public Class ClassCommonCommands
_Logger = LogConfig.GetLogger()
End Sub
Public Async Function FNICM_RADM_NEW_USER2GROUP(UserId As Integer, GroupId As Integer) As Task(Of Integer)
Public Async Function FNIDB_RADM_NEW_USER2GROUP(UserId As Integer, GroupId As Integer) As Task(Of Integer)
Try
Dim oSQL = $"SELECT FNICM_RADM_NEW_USER2GROUP({UserId},{GroupId}, '{Environment.UserName}') FROM RDB$DATABASE;"
Dim oSQL = $"SELECT FNIDB_RADM_NEW_USER2GROUP({UserId},{GroupId}, '{Environment.UserName}') FROM RDB$DATABASE;"
Dim oRequest = Await My.Channel.CreateDatabaseRequestAsync($"Add User To Group", False)
Dim oResult = Await My.Channel.ReturnScalarAsync(oSQL)
@@ -29,9 +29,9 @@ Public Class ClassCommonCommands
End Try
End Function
Public Async Function FNICM_RADM_NEW_GROUP2GROUP(ParentGroupId As Integer, GroupId As Integer) As Task(Of Integer)
Public Async Function FNIDB_RADM_NEW_GROUP2GROUP(ParentGroupId As Integer, GroupId As Integer) As Task(Of Integer)
Try
Dim oSQL = $"SELECT FNICM_RADM_NEW_GROUP2GROUP({GroupId},{ParentGroupId}, '{Environment.UserName}') FROM RDB$DATABASE;"
Dim oSQL = $"SELECT FNIDB_RADM_NEW_GROUP2GROUP({GroupId},{ParentGroupId}, '{Environment.UserName}') FROM RDB$DATABASE;"
Dim oRequest = Await My.Channel.CreateDatabaseRequestAsync($"Add Group To Group", False)
Dim oRecordIds As New List(Of Integer)
@@ -49,9 +49,9 @@ Public Class ClassCommonCommands
End Try
End Function
Public Async Function FNICM_DELETE_RECORD_FINALLY(RecordId As Integer) As Task(Of Boolean)
Public Async Function FNIDB_DELETE_RECORD_FINALLY(RecordId As Integer) As Task(Of Boolean)
Try
Dim oSQL = $"SELECT FNICM_DELETE_RECORD_FINALLY({RecordId},'{Environment.UserName}') FROM RDB$DATABASE;"
Dim oSQL = $"SELECT FNIDB_DELETE_RECORD_FINALLY({RecordId},'{Environment.UserName}') FROM RDB$DATABASE;"
Dim oRequest = Await My.Channel.CreateDatabaseRequestAsync($"Delete Record", False)
Dim oResult = Await My.Channel.ReturnScalarAsync(oSQL)
@@ -64,9 +64,9 @@ Public Class ClassCommonCommands
End Try
End Function
Public Async Function FNICM_NEW_DOC_VALUE(DocumentId As Int64, Syskey As String, LanguageKey As String, Value As String) As Task(Of ScalarResult)
Public Async Function FNIDB_NEW_DOC_VALUE(DocumentId As Int64, Syskey As String, LanguageKey As String, Value As String) As Task(Of ScalarResult)
Try
Dim oSQL = $"SELECT FNICM_NEW_DOC_VALUE({DocumentId}, '{Syskey}', '{LanguageKey}', '{My.Application.User.UserName}', '{Value}') FROM RDB$DATABASE;"
Dim oSQL = $"SELECT FNIDB_NEW_DOC_VALUE({DocumentId}, '{Syskey}', '{LanguageKey}', '{My.Application.User.UserName}', '{Value}') FROM RDB$DATABASE;"
Dim oRequest = Await My.Channel.CreateDatabaseRequestAsync($"Delete Record", False)
Dim oResult = Await My.Channel.ReturnScalarAsync(oSQL)

8
GUIs.ClientSuite/Common/ClassCommonViews.vb
View File

@@ -9,11 +9,11 @@ Public Class ClassCommonViews
_Logger = LogConfig.GetLogger()
End Sub
Public Async Function VWICM_FORM_CONTROL(FormId As Int64) As Task(Of DataTable)
Public Async Function VWIDB_FORM_CONTROL(FormId As Int64) As Task(Of DataTable)
Try
My.Channel.CreateDatabaseRequest("Load Controls", True)
Dim oSQL As String = $"SELECT * FROM VWICM_FORMCONTROL WHERE FORMID = {FormId}"
Dim oSQL As String = $"SELECT * FROM VWIDB_FORMCONTROL WHERE FORMID = {FormId}"
Dim oResult = Await My.Channel.ReturnDatatableAsync(oSQL)
Dim oTable = oResult.Table
@@ -31,11 +31,11 @@ Public Class ClassCommonViews
End Try
End Function
Public Async Function VWICM_WF_REQUESTCONTROLDATA(FormId As Int64, RequestId As Int64) As Task(Of DataTable)
Public Async Function VWIDB_WF_REQUESTCONTROLDATA(FormId As Int64, RequestId As Int64) As Task(Of DataTable)
Try
My.Channel.CreateDatabaseRequest("Load Control Data", True)
Dim oSQL As String = $"SELECT * FROM VWICM_WF_REQUESTCONTROLDATA WHERE FORMID = {FormId} AND REQUESTID = {RequestId}"
Dim oSQL As String = $"SELECT * FROM VWIDB_WF_REQUESTCONTROLDATA WHERE FORMID = {FormId} AND REQUESTID = {RequestId}"
Dim oResult = Await My.Channel.ReturnDatatableAsync(oSQL)
Dim oTable = oResult.Table

2
GUIs.ClientSuite/FormDesigner/frmFormDesigner.vb
View File

@@ -109,7 +109,7 @@ Public Class frmFormDesigner
_ControlLoader = New ControlLoader(My.LogConfig, LayoutControlGroupMain)
Dim oTable = Await My.Common.Views.VWICM_FORM_CONTROL(_FormId)
Dim oTable = Await My.Common.Views.VWIDB_FORM_CONTROL(_FormId)
_ControlLoader.LoadControls(oTable)
End Sub

10
GUIs.ClientSuite/FormUserManager/frmUserManager.vb
View File

@@ -83,32 +83,32 @@ Public Class frmUserManager
End Function
Private Async Sub HandleUserAddedToGroup(GroupId As Integer, UserId As Integer, RelationRecordId As Integer)
Dim oRecordId = Await My.Common.Commands.FNICM_RADM_NEW_USER2GROUP(UserId, GroupId)
Dim oRecordId = Await My.Common.Commands.FNIDB_RADM_NEW_USER2GROUP(UserId, GroupId)
Await UpdateDataAsync()
End Sub
Private Async Sub HandleUserRemovedFromGroup(GroupId As Integer, UserId As Integer, RelationRecordId As Integer)
Dim oResult = Await My.Common.Commands.FNICM_DELETE_RECORD_FINALLY(RelationRecordId)
Dim oResult = Await My.Common.Commands.FNIDB_DELETE_RECORD_FINALLY(RelationRecordId)
Await UpdateDataAsync()
End Sub
Private Async Sub HandleGroupAddedToGroup(ParentGroupId As Integer, GroupId As Integer, RelationRecordId As Integer)
Dim oRecordId = Await My.Common.Commands.FNICM_RADM_NEW_GROUP2GROUP(GroupId, ParentGroupId)
Dim oRecordId = Await My.Common.Commands.FNIDB_RADM_NEW_GROUP2GROUP(GroupId, ParentGroupId)
Await UpdateDataAsync()
End Sub
Private Async Sub HandleGroupRemovedFromGroup(ParentGroupId As Integer, GroupId As Integer, RelationRecordId As Integer)
Dim oResult = Await My.Common.Commands.FNICM_DELETE_RECORD_FINALLY(RelationRecordId)
Dim oResult = Await My.Common.Commands.FNIDB_DELETE_RECORD_FINALLY(RelationRecordId)
Await UpdateDataAsync()
End Sub
Private Async Function GetAttributeListAsync(AttributeName As String) As Task(Of DataTable)
Try
Dim oSQL = $"SELECT * FROM VWICM_{AttributeName.ToUpper}"
Dim oSQL = $"SELECT * FROM VWIDB_{AttributeName.ToUpper}"
Dim oRequest = Await My.Channel.CreateDatabaseRequestAsync($"List Attribute {AttributeName}", False)
Dim oResult = Await My.Channel.ReturnDatatableAsync(oSQL)

6
GUIs.ClientSuite/FormWorkflow/frmWorkflowStep.vb
View File

@@ -25,7 +25,7 @@ Public Class frmWorkflowStep
Private Async Function GetRequestData(RequestId) As Task
Await My.Channel.CreateDatabaseRequestAsync("Get Request Data", True)
Dim oResult = Await My.Channel.ReturnDatatableAsync($"SELECT PROCESS_NAME, TITLE, FORM_ID FROM VWICM_WF_REQUEST WHERE RECORD_ID = {RequestId}")
Dim oResult = Await My.Channel.ReturnDatatableAsync($"SELECT PROCESS_NAME, TITLE, FORM_ID FROM VWIDB_WF_REQUEST WHERE RECORD_ID = {RequestId}")
If Not oResult.OK Then
Throw New ApplicationException("Request data could not be fetched!")
@@ -49,8 +49,8 @@ Public Class frmWorkflowStep
Private Async Sub frmWorkflowStep_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Await GetRequestData(_RequestId)
Dim oControlTable = Await My.Common.Views.VWICM_FORM_CONTROL(_FormId)
Dim oControlData = Await My.Common.Views.VWICM_WF_REQUESTCONTROLDATA(_FormId, _RequestId)
Dim oControlTable = Await My.Common.Views.VWIDB_FORM_CONTROL(_FormId)
Dim oControlData = Await My.Common.Views.VWIDB_WF_REQUESTCONTROLDATA(_FormId, _RequestId)
_HeaderGroup = LayoutControlGroupMain.AddGroup("Request Header")
_BodyGroup = LayoutControlGroupMain.AddGroup("Control Body")

16
GUIs.ClientSuite/My Project/Settings.Designer.vb generated
View File

@@ -57,23 +57,11 @@ Namespace My
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("net.tcp://172.24.12.67:9000/DigitalData/Services/Main")> _
Public ReadOnly Property EDM_NetworkService_Adress() As String
Public ReadOnly Property IDBNetworkServiceAddress() As String
Get
Return CType(Me("EDM_NetworkService_Adress"),String)
Return CType(Me("IDBNetworkServiceAddress"),String)
End Get
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("")> _
Public Property ICMServiceAddress() As String
Get
Return CType(Me("ICMServiceAddress"),String)
End Get
Set
Me("ICMServiceAddress") = value
End Set
End Property
End Class
End Namespace

5
GUIs.ClientSuite/My Project/Settings.settings
View File

@@ -2,11 +2,8 @@
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="My" GeneratedClassName="MySettings" UseMySettingsClassName="true">
<Profiles />
<Settings>
<Setting Name="EDM_NetworkService_Adress" Type="System.String" Scope="Application">
<Setting Name="IDBNetworkServiceAddress" Type="System.String" Scope="Application">
<Value Profile="(Default)">net.tcp://172.24.12.67:9000/DigitalData/Services/Main</Value>
</Setting>
<Setting Name="ICMServiceAddress" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
</Settings>
</SettingsFile>

6
GUIs.ClientSuite/MyApplication.vb
View File

@@ -2,7 +2,7 @@
Imports System.Threading
Imports DigitalData.Modules.Config
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.EDMIAPI.EDMIServiceReference
Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
Namespace My
''' <summary>
@@ -26,8 +26,8 @@ Namespace My
End Property
Property LogConfig As LogConfig
Property ChannelFactory As ChannelFactory(Of IEDMServiceChannel)
Property Channel As IEDMServiceChannel
Property ChannelFactory As ChannelFactory(Of IIDBServiceChannel)
Property Channel As IIDBServiceChannel
Property MainForm As frmMain
Property Common As ClassCommon
End Module

4
GUIs.ClientSuite/_TEST/frmDocTest.vb
View File

@@ -8,7 +8,7 @@ Public Class frmDocTest
ProcessContainer(AddressOf GridControlDefaults.DefaultGridSettings).
ProcessContainer(AddressOf GridControlDefaults.ReadOnlyGridSettings)
Dim oSQL = "SELECT * FROM VWICM_DOC_METADATA_DE"
Dim oSQL = "SELECT * FROM VWIDB_DOC_METADATA_DE"
My.Channel.CreateDatabaseRequest("Load Doc Values", True)
Dim oResult = My.Channel.ReturnDatatable(oSQL)
@@ -35,7 +35,7 @@ Public Class frmDocTest
Dim oDocId As Int64 = Int64.Parse(txtDocId.Text)
Dim oValue As String = txtDoctype.Text
Dim oSyskey As String = "001-DOCTYPE"
Dim oResult = Await My.Common.Commands.FNICM_NEW_DOC_VALUE(oDocId, oSyskey, My.Application.User.Language, oValue)
Dim oResult = Await My.Common.Commands.FNIDB_NEW_DOC_VALUE(oDocId, oSyskey, My.Application.User.Language, oValue)
If Not oResult.OK Then
MsgBox(oResult.ErrorMessage)

2
GUIs.ClientSuite/_TEST/frmFileTest.vb
View File

@@ -8,7 +8,7 @@ Public Class frmFileTest
Private Sub frmFileTest_Load(sender As Object, e As EventArgs) Handles Me.Load
Try
_fileOp = New Document(My.LogConfig, My.Settings.EDM_NetworkService_Adress)
_fileOp = New Document(My.LogConfig, My.Settings.IDBNetworkServiceAddress)
_fileOp.Connect()
Catch ex As Exception
Logger.Warn($"Unexpected error in frmFileTest_Load: {ex.Message}")

2
GUIs.ClientSuite/frmHome.vb
View File

@@ -14,7 +14,7 @@ Public Class frmHome
oTreeListPatcher.
ProcessContainer(AddressOf TreeListDefaults.DefaultTreeListSettings)
Dim oSQL As String = "SELECT * FROM VWICM_DOC_METADATA_DE;"
Dim oSQL As String = "SELECT * FROM VWIDB_DOC_METADATA_DE;"
My.Channel.CreateDatabaseRequest("Doc Metadata", True)
Dim oTable = My.Channel.ReturnDatatable(oSQL)
My.Channel.CloseDatabaseRequest()

4
GUIs.ClientSuite/frmObjectEditor.vb
View File

@@ -102,7 +102,7 @@ Public Class frmObjectEditor
Private Async Function LoadLanguageTableAsync(UserLanguage As String) As Task
Try
Dim oSQL = $"SELECT * FROM VWICM_ATTRIBUTE_LANGUAGE WHERE LANGUAGE_CODE = '{UserLanguage}' AND PARENT_ATTRIBUTE_ID = '{_AttributeId}' ORDER BY ""SEQUENCE"";"
Dim oSQL = $"SELECT * FROM VWIDB_ATTRIBUTE_LANGUAGE WHERE LANGUAGE_CODE = '{UserLanguage}' AND PARENT_ATTRIBUTE_ID = '{_AttributeId}' ORDER BY ""SEQUENCE"";"
Await My.Channel.CreateDatabaseRequestAsync("Language Syskey", False)
Dim oResult = Await My.Channel.ReturnDatatableAsync(oSQL)
@@ -190,7 +190,7 @@ Public Class frmObjectEditor
Private Sub LoadDetailForm()
' Counter is used to match SEQUENCE in Attributes
' to column order in the used View (eg. VWICM_USER)
' to column order in the used View (eg. VWIDB_USER)
Dim oCounter = 0
For Each oColumn As DataColumn In _Datatable.Columns

2
GUIs.ClientSuite/frmSearch.vb
View File

@@ -20,7 +20,7 @@ Public Class frmSearch
Dim oData As DataTable
My.Channel.CreateDatabaseRequest("Get Users", False)
oData = My.Channel.ReturnDatatable("SELECT * FROM VWICM_USER").Table
oData = My.Channel.ReturnDatatable("SELECT * FROM VWIDB_USER").Table
My.Channel.CloseDatabaseRequest()
oList.Add(New PanelInfo(oPanel, DockingStyle.Bottom, oData) With {

10
GUIs.ClientSuite/frmSplash.vb
View File

@@ -2,12 +2,12 @@
Imports System.ServiceModel
Imports System.Threading
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.EDMIAPI.EDMIServiceReference
Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
Public NotInheritable Class frmSplash
Private _Worker As New BackgroundWorker()
Private _ChannelFactory As ChannelFactory(Of IEDMServiceChannel)
Private _Channel As IEDMServiceChannel
Private _ChannelFactory As ChannelFactory(Of IIDBServiceChannel)
Private _Channel As IIDBServiceChannel
Private _Logger As Logger
Private _CurrentRetry As Integer = 0
@@ -98,12 +98,12 @@ Public NotInheritable Class frmSplash
Thread.Sleep(SLEEP_TIME)
End Sub
Private Sub bw_ProgressChanged(sender As Object, e As System.ComponentModel.ProgressChangedEventArgs)
Private Sub bw_ProgressChanged(sender As Object, e As ProgressChangedEventArgs)
pbStatus.Value = e.ProgressPercentage
lblStatus.Text = e.UserState.ToString()
End Sub
Private Sub bw_RunWorkerCompleted(sender As Object, e As System.ComponentModel.RunWorkerCompletedEventArgs)
Private Sub bw_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs)
' Bei Fehler MsgBox anzeigen und Programm beenden
If e.Error IsNot Nothing Then
MsgBox(e.Error.Message, MsgBoxStyle.Critical, "Unhandled Error")