From e4233652574001ac46b18d86d7d654687cf18794 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 21 Sep 2023 15:51:09 +0200 Subject: [PATCH] clean up --- .../{ => Commands}/ClassFormCommands.vb | 20 +++++++++++ .../{ => Commands}/ClassFunctionCommands.vb | 0 .../{ => Commands}/ClassFunctionCommandsUI.vb | 0 .../ClassNodeCommands.vb} | 2 +- .../{ => Commands}/ClassRecordCommands.vb | 0 app/DD-Record-Organizer/OrgFlow.vbproj | 10 +++--- .../frmNodeNavigation.resx | 3 -- app/DD-Record-Organizer/frmNodeNavigation.vb | 34 +++++++++---------- 8 files changed, 43 insertions(+), 26 deletions(-) rename app/DD-Record-Organizer/Classes/{ => Commands}/ClassFormCommands.vb (85%) rename app/DD-Record-Organizer/Classes/{ => Commands}/ClassFunctionCommands.vb (100%) rename app/DD-Record-Organizer/Classes/{ => Commands}/ClassFunctionCommandsUI.vb (100%) rename app/DD-Record-Organizer/Classes/{NodeNavigation/ClassNodeLoader.vb => Commands/ClassNodeCommands.vb} (97%) rename app/DD-Record-Organizer/Classes/{ => Commands}/ClassRecordCommands.vb (100%) diff --git a/app/DD-Record-Organizer/Classes/ClassFormCommands.vb b/app/DD-Record-Organizer/Classes/Commands/ClassFormCommands.vb similarity index 85% rename from app/DD-Record-Organizer/Classes/ClassFormCommands.vb rename to app/DD-Record-Organizer/Classes/Commands/ClassFormCommands.vb index a0ed8e7..4b49874 100644 --- a/app/DD-Record-Organizer/Classes/ClassFormCommands.vb +++ b/app/DD-Record-Organizer/Classes/Commands/ClassFormCommands.vb @@ -1,5 +1,25 @@ Public Class ClassFormCommands + Public Shared Function LoadConstructorForms(pScreenId As Integer, pConstructorId As Integer, pLanguage As String) + Try + Dim Sql = $"SELECT *, [dbo].[FNPMO_GETOBJECTCAPTION]( + '{pLanguage}', + 'FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), + {pScreenId}) AS 'CAPTION' + FROM VWPMO_CONSTRUCTOR_FORMS + WHERE + SCREEN_ID = {pScreenId} AND + CONSTRUCT_ID = {pConstructorId} + ORDER BY SEQUENCE" + + Dim oTable = MYDB_ECM.GetDatatable(Sql) + + Return oTable + Catch ex As Exception + Return Nothing + End Try + End Function + Public Shared Function LoadForm(guid) As DataTable Try Dim SQL As String = "SELECT NAME, LEVEL FROM TBPMO_FORM WHERE GUID = " & guid diff --git a/app/DD-Record-Organizer/Classes/ClassFunctionCommands.vb b/app/DD-Record-Organizer/Classes/Commands/ClassFunctionCommands.vb similarity index 100% rename from app/DD-Record-Organizer/Classes/ClassFunctionCommands.vb rename to app/DD-Record-Organizer/Classes/Commands/ClassFunctionCommands.vb diff --git a/app/DD-Record-Organizer/Classes/ClassFunctionCommandsUI.vb b/app/DD-Record-Organizer/Classes/Commands/ClassFunctionCommandsUI.vb similarity index 100% rename from app/DD-Record-Organizer/Classes/ClassFunctionCommandsUI.vb rename to app/DD-Record-Organizer/Classes/Commands/ClassFunctionCommandsUI.vb diff --git a/app/DD-Record-Organizer/Classes/NodeNavigation/ClassNodeLoader.vb b/app/DD-Record-Organizer/Classes/Commands/ClassNodeCommands.vb similarity index 97% rename from app/DD-Record-Organizer/Classes/NodeNavigation/ClassNodeLoader.vb rename to app/DD-Record-Organizer/Classes/Commands/ClassNodeCommands.vb index 8f74c91..f26d6ee 100644 --- a/app/DD-Record-Organizer/Classes/NodeNavigation/ClassNodeLoader.vb +++ b/app/DD-Record-Organizer/Classes/Commands/ClassNodeCommands.vb @@ -2,7 +2,7 @@ Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging -Public Class ClassNodeLoader +Public Class ClassNodeCommands Inherits BaseClass Private ReadOnly Database As MSSQLServer diff --git a/app/DD-Record-Organizer/Classes/ClassRecordCommands.vb b/app/DD-Record-Organizer/Classes/Commands/ClassRecordCommands.vb similarity index 100% rename from app/DD-Record-Organizer/Classes/ClassRecordCommands.vb rename to app/DD-Record-Organizer/Classes/Commands/ClassRecordCommands.vb diff --git a/app/DD-Record-Organizer/OrgFlow.vbproj b/app/DD-Record-Organizer/OrgFlow.vbproj index 63493c9..5fedb8e 100644 --- a/app/DD-Record-Organizer/OrgFlow.vbproj +++ b/app/DD-Record-Organizer/OrgFlow.vbproj @@ -272,6 +272,7 @@ + @@ -295,7 +296,7 @@ - + @@ -307,7 +308,6 @@ - True True @@ -533,9 +533,9 @@ - - - + + + diff --git a/app/DD-Record-Organizer/frmNodeNavigation.resx b/app/DD-Record-Organizer/frmNodeNavigation.resx index a133821..ab69742 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.resx +++ b/app/DD-Record-Organizer/frmNodeNavigation.resx @@ -469,9 +469,6 @@ 17, 17 - - 17, 17 - diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb index 0098923..c161d04 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.vb @@ -11,12 +11,10 @@ Imports DevExpress.XtraPrinting Imports System.Threading Imports System.Text Imports System.IO -Imports System.Runtime.InteropServices Imports DD_LIB_Standards Imports DigitalData.Modules.Base Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Database -Imports System.Configuration Public Class frmNodeNavigation #Region "Laufzeitvariablen & Konstanten" @@ -77,7 +75,7 @@ Public Class frmNodeNavigation Public CtrlBuilder As ClassControlBuilder Public CtrlCommandUI As ClassControlCommandsUI - Private ClassNodeLoader As ClassNodeLoader + Private ClassNodeCommands As ClassNodeCommands Private Debug As Boolean = False @@ -100,7 +98,7 @@ Public Class frmNodeNavigation DocList = New ClassWindreamDocGrid(GridViewDoc_Search) WindowsEx = New WindowsEx(LOGCONFIG) - ClassNodeLoader = New ClassNodeLoader(LOGCONFIG, MYDB_ECM) + ClassNodeCommands = New ClassNodeCommands(LOGCONFIG, MYDB_ECM) End Sub Private Function Get_Splitter_Layout_Filename() @@ -155,16 +153,18 @@ Public Class frmNodeNavigation End Sub Private Async Function frmNodeNavigation_Load(sender As Object, e As EventArgs) As Task Handles Me.Load CONSTRUCTORID = CURRENT_CONSTRUCTOR_ID - 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, oConstructID) - DT_VWPMO_CONSTRUCTOR_FORMS = MYDB_ECM.GetDatatable(Sql) + DT_VWPMO_CONSTRUCTOR_FORMS = ClassFormCommands.LoadConstructorForms(CURRENT_SCREEN_ID, oConstructID, USER_LANGUAGE) + + '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, oConstructID) + 'DT_VWPMO_CONSTRUCTOR_FORMS = MYDB_ECM.GetDatatable(Sql) + CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS = MYDB_ECM.GetDatatable(String.Format("SELECT T.* FROM TBPMO_ENTITY_RIGHT_CONTROLS T INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID where T1.CONSTRUCT_ID = {0}", CONSTRUCTORID)) Dim oGDPictureLicenseKey = MYDB_ECM.GetScalarValue(Queries.DD_ECM.ThirdPartyModules.GdPictureLicense) DocumentViewer.Init(LOGCONFIG, oGDPictureLicenseKey) - ' Hintergrund Bild initialisieren 'If (System.IO.File.Exists(Application.StartupPath + "\Resources\windream-portrait_col_RGB_Wordpress.png")) Then ' WM_LOGO = New Bitmap(Application.StartupPath + "\Resources\windream-portrait_col_RGB_Wordpress.png") @@ -204,7 +204,7 @@ Public Class frmNodeNavigation Private Async Function Load_nodes() As Task Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) Try - Dim oTable = Await ClassNodeLoader.LoadNodes(CURRENT_ENTITY_ID) + Dim oTable = Await ClassNodeCommands.LoadNodes(CURRENT_ENTITY_ID) DT_STRUCTURE_NODES = oTable 'Dim oToken = RunningTaskTokenSource.Token 'Dim oStructureNodeSql = $"SELECT @@ -602,17 +602,17 @@ Public Class frmNodeNavigation ' tsButtonDelete.Enabled = True End If - Dim resultDT_VWPMO_CONSTRUCTOR_FORMS = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() - Select form - Where form.Item("FORM_ID") = _EntityId).Single() + Dim oRow = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() + Select form + Where form.Item("FORM_ID") = _EntityId).Single() - CURRENT_CONSTRUCTOR_DETAIL_ID = resultDT_VWPMO_CONSTRUCTOR_FORMS.Item("GUID") - CONTROL_DOCTYPE_MATCH = resultDT_VWPMO_CONSTRUCTOR_FORMS.Item("CONTROL_DOCTYPE_MATCH") - SQL_RECORD_AND_FILE_READ_ONLY = resultDT_VWPMO_CONSTRUCTOR_FORMS.Item("SQL_RIGHT_READ_AND_VIEW_ONLY") - SQL_DOC_READ_ONLY = resultDT_VWPMO_CONSTRUCTOR_FORMS.Item("SQL_RIGHT_WINDREAM_VIEW") + CURRENT_CONSTRUCTOR_DETAIL_ID = oRow.Item("GUID") + CONTROL_DOCTYPE_MATCH = oRow.Item("CONTROL_DOCTYPE_MATCH") + SQL_RECORD_AND_FILE_READ_ONLY = oRow.Item("SQL_RIGHT_READ_AND_VIEW_ONLY") + SQL_DOC_READ_ONLY = oRow.Item("SQL_RIGHT_WINDREAM_VIEW") Try - ADD_RECORDS_CONSTR = resultDT_VWPMO_CONSTRUCTOR_FORMS.Item("ADD_RECORDS") + ADD_RECORDS_CONSTR = oRow.Item("ADD_RECORDS") Catch ex As Exception ADD_RECORDS_CONSTR = True End Try