diff --git a/app/DD-Record-Organizer/App.config b/app/DD-Record-Organizer/App.config index 732a342..58c0bf6 100644 --- a/app/DD-Record-Organizer/App.config +++ b/app/DD-Record-Organizer/App.config @@ -1,21 +1,19 @@ - + -
+
-
-
+
+
- + - + @@ -113,15 +111,19 @@ - + - - + + + + + + diff --git a/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb b/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb index bcd0ba9..11afe92 100644 --- a/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb +++ b/app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb @@ -1,5 +1,5 @@ Imports System.IO -Imports DD_LIB_Standards +'Imports DD_LIB_Standards Public Class ClassDOC_SEARCH Private Shared DT_RESULTLIST_OPTIONS As DataTable Private Shared DT_RESULTLIST_SEL_VALUES As DataTable @@ -518,10 +518,6 @@ Public Class ClassDOC_SEARCH Try Dim execute = String.Format("EXEC [dbo].[PRPMO_DOC_CREATE_NEW_DOC] {0},{1},'{2}'", DOC_ID, RECORD_ID, USER_USERNAME) If MYDB_ECM.ExecuteNonQuery(execute) = True Then - If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then - execute = String.Format("EXEC [dbo].[PRPROXY_DOC_CREATE_NEW_DOC] {0},{1},'{2}'", DOC_ID, RECORD_ID, USER_USERNAME) - MYDB_ECM.ExecuteNonQuery(execute) - End If Return True Else Return False @@ -602,7 +598,7 @@ Public Class ClassDOC_SEARCH End Select Catch ex As Exception - clsLogger.Add("Unexpected Error in Get_File_Rights: " & ex.Message) + LOGGER.Warn("Unexpected Error in Get_File_Rights: " & ex.Message) Return Nothing End Try End Function diff --git a/app/DD-Record-Organizer/Classes/ClassWindreamDocGrid.vb b/app/DD-Record-Organizer/Classes/ClassDocGrid.vb similarity index 98% rename from app/DD-Record-Organizer/Classes/ClassWindreamDocGrid.vb rename to app/DD-Record-Organizer/Classes/ClassDocGrid.vb index e3a3405..e3509d2 100644 --- a/app/DD-Record-Organizer/Classes/ClassWindreamDocGrid.vb +++ b/app/DD-Record-Organizer/Classes/ClassDocGrid.vb @@ -7,10 +7,10 @@ Imports DevExpress.XtraEditors.Repository Imports DevExpress.XtraGrid.Views.Base Imports DevExpress.XtraEditors.Controls -Public Class ClassWindreamDocGrid +Public Class ClassDocGrid ' === BEGIN CLASS PART === - Public Class WindreamDoc + Public Class clsWMDoc Public Property DocId As Integer Public Property DocPath As String Public Property Filename As String @@ -20,7 +20,7 @@ Public Class ClassWindreamDocGrid Private ReadOnly GridView As GridView - Public ReadOnly Property SelectedDocuments As List(Of WindreamDoc) + Public ReadOnly Property SelectedDocuments As List(Of clsWMDoc) Get Return GetSelectedDocuments(GridView) End Get @@ -51,7 +51,7 @@ Public Class ClassWindreamDocGrid ' This should replace DT_RESULTFILES and also ' SELECTED_INWORK, SELECTED_DOC_ID, SELECTED_DOC_RIGHT, SELECTED_DOC_PATH - Public Shared SELECTED_DOCUMENTS As New List(Of WindreamDoc) + Public Shared SELECTED_DOCUMENTS As New List(Of clsWMDoc) Public Shared DT_RESULTFILES As DataTable Private Shared DT_DROPDOWN_ITEMS As DataTable @@ -89,9 +89,9 @@ Public Class ClassWindreamDocGrid Return oSelectedRows.Count = 0 End Function - Public Shared Function GetSelectedDocuments(pGridView As GridView) As List(Of WindreamDoc) + Public Shared Function GetSelectedDocuments(pGridView As GridView) As List(Of clsWMDoc) Dim oSelectedRows As List(Of Integer) = pGridView.GetSelectedRows().ToList() - Dim oDocuments As New List(Of WindreamDoc) + Dim oDocuments As New List(Of clsWMDoc) For Each oRowHandle In oSelectedRows Dim oDocId = pGridView.GetRowCellValue(oRowHandle, "DocID") @@ -100,7 +100,7 @@ Public Class ClassWindreamDocGrid Dim oObjecttype = pGridView.GetRowCellValue(oRowHandle, "OBJECTTYPE") Dim oFilename = pGridView.GetRowCellValue(oRowHandle, "Dateiname") - oDocuments.Add(New WindreamDoc With { + oDocuments.Add(New clsWMDoc With { .DocId = oDocId, .DocPath = oDocPath, .DocType = oObjecttype, @@ -560,7 +560,7 @@ Public Class ClassWindreamDocGrid Public Shared Sub gridView_MasterRowExpanded(sender As GridView, e As DevExpress.XtraGrid.Views.Grid.CustomMasterRowEventArgs) Try - ClassWindreamDocGrid.GetDocItems(sender) + ClassDocGrid.GetDocItems(sender) Dim GW As GridView = sender If SELECTED_DOC_ID = 0 Then MsgBox("Sorry no document was selected! Please try again!", MsgBoxStyle.Exclamation) diff --git a/app/DD-Record-Organizer/Classes/ClassFileResult.vb b/app/DD-Record-Organizer/Classes/ClassFileResult.vb index 72fbd8a..7bc8188 100644 --- a/app/DD-Record-Organizer/Classes/ClassFileResult.vb +++ b/app/DD-Record-Organizer/Classes/ClassFileResult.vb @@ -1,4 +1,5 @@ -Public Class ClassFileResult +'Imports DD_LIB_Standards +Public Class ClassFileResult Public Shared Property DocID As Integer Public Shared Property OldDisplayName As String Public Shared Property DocumentPath As String @@ -13,9 +14,9 @@ upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Change_DateTime = GETDATE(), IN_WORK = {0}, IN_WORK_USER = '{1}', IN_WORK_COMMENT = '{2}' WHERE DocID = {3}", state, USER_USERNAME, comment, DocID) End If If MYDB_ECM.ExecuteNonQuery(upd) = True Then - If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then - MYDB_ECM.ExecuteNonQuery(upd) - End If + 'If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then + ' MYDB_ECM.ExecuteNonQuery(upd) + 'End If InWork = True Return True Else @@ -31,9 +32,9 @@ Dim upd As String upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET DISPLAY_NAME = '{0}',CHANGED_WHO = '{2}',Change_DateTime = GETDATE() WHERE DocID = {1}", Displayname, DocID, USER_USERNAME) If MYDB_ECM.ExecuteNonQuery(upd) = True Then - If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then - MYDB_ECM.ExecuteNonQuery(upd) - End If + 'If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then + ' MYDB_ECM.ExecuteNonQuery(upd) + 'End If Return True Else Return False @@ -65,7 +66,7 @@ Dim insert As String = String.Format("INSERT INTO TBPMO_DOC_INDICES (DocID,INDEX_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", DocID, MAN_INDEX_ID, row.Item("MAN_VALUE"), USER_USERNAME) MYDB_ECM.ExecuteNonQuery(insert) End If - + Next End If Return True @@ -90,10 +91,10 @@ End If Dim proc = String.Format("EXEC PRPMO_DELETE_RESULTFILE {0},{1},{2}", RESULT_DOC_ID, RECORD_ID, DELETE_FILE) If MYDB_ECM.ExecuteNonQuery(proc) = True Then - If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then - proc = String.Format("EXEC PRPROXY_DOC_CHECK_DELETE {0}", RESULT_DOC_ID) - MYDB_ECM.ExecuteNonQuery(proc) - End If + 'If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then + ' proc = String.Format("EXEC PRPROXY_DOC_CHECK_DELETE {0}", RESULT_DOC_ID) + ' MYDB_ECM.ExecuteNonQuery(proc) + 'End If Return True Else Return False diff --git a/app/DD-Record-Organizer/Classes/ClassHelper.vb b/app/DD-Record-Organizer/Classes/ClassHelper.vb index fd8839d..268dc60 100644 --- a/app/DD-Record-Organizer/Classes/ClassHelper.vb +++ b/app/DD-Record-Organizer/Classes/ClassHelper.vb @@ -335,8 +335,7 @@ Public Class ClassHelper msg = "The record '" & SELECTED_RECORD_ID & "' could not be deleted. Check the log" End If MsgBox(msg, MsgBoxStyle.Exclamation) - Else - ClassProxy.PRPROXY_RECORD_DEL(SELECTED_RECORD_ID, CURRENT_ENTITY_ID) + End If LOGGER.Info($"Deleted Record [{SELECTED_RECORD_ID}] Result was [{result}]: ") Return result diff --git a/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb b/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb index 4321454..5fcddd0 100644 --- a/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb +++ b/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb @@ -1,8 +1,6 @@ Imports System.IO Imports System.Globalization -Imports WINDREAMLib -Imports DD_LIB_Standards -Imports DD_Record_Organizer.frmChangeDocType +'Imports Microsoft.Office.Interop.Word Public Class ClassImport_Windream Public Shared Function Import_File(QuellDatei_Path As String, DOCTYPE_ID As Integer) @@ -13,7 +11,7 @@ Public Class ClassImport_Windream If Not IsNothing(DT_DOCTYPE) Then Dim Targetpath As String = DT_DOCTYPE.Rows(0).Item("ZIEL_PFAD") Dim Dokart As String = DT_DOCTYPE.Rows(0).Item("BEZEICHNUNG") - clsWindream.MY_WDOBJECTTYPE = DT_DOCTYPE.Rows(0).Item("OBJEKTTYP") + WMOBJECTTYPE = DT_DOCTYPE.Rows(0).Item("OBJEKTTYP") 'Den Namen der Dokumentart generieren If ClassImport_Windream.Name_Generieren(DOCTYPE_ID) = False Then @@ -22,7 +20,7 @@ Public Class ClassImport_Windream End If 'Die Datei nach windream importieren - Dim streamresult = clsWD_SET.Stream_File(QuellDatei_Path, Targetpath) + Dim streamresult = WMMOD.NewFileStream(QuellDatei_Path, Targetpath, WMOBJECTTYPE) If streamresult = True Then Dim sql As String = String.Format("SELECT DocID FROM VWPMO_DOC_SYNC WHERE UPPER(FULL_FILENAME) = UPPER('{0}') AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD) CURRENT_DOC_ID = MYDB_ECM.GetScalarValue(sql) @@ -45,7 +43,7 @@ Public Class ClassImport_Windream End If LOGGER.Debug("Indexvalue: " & idxvalue.ToString) Count += 1 - indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE) + indexierung_erfolgreich = WMMOD.SetFileIndex(CURRENT_FILEIN_WD, indexname, idxvalue, WMOBJECTTYPE) If indexierung_erfolgreich = False Then ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in indexing '" & indexname & "') - Check logfile!") err = True @@ -57,14 +55,14 @@ Public Class ClassImport_Windream Return False End If ''den Entity-Key auslesen - 'sql = "Select Top 1 * from TBPMO_WD_OBJECTTYPE where Upper(object_type) = Upper('" & clsWindream.MY_WDOBJECTTYPE & "')" + 'sql = "Select Top 1 * from TBPMO_WD_OBJECTTYPE where Upper(object_type) = Upper('" & WMOBJECTTYPE & "')" 'dt = MYDB_ECM.GetDatatable(sql) 'If Not dt Is Nothing Then ' If dt.Rows.Count = 1 Then ' Dim indexname = dt.Rows(0).Item("IDXNAME_ENTITYID").ToString ' Dim idxvalue = CURRENT_ENTITY_ID ' LOGGER.Debug("Entity-ID: " & idxvalue.ToString) - ' indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE) + ' indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, WMOBJECTTYPE) ' If indexierung_erfolgreich = False Then ' err = True ' ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in indexing Entity-ID '" & indexname & "') - Check logfile!") @@ -73,7 +71,7 @@ Public Class ClassImport_Windream ' indexname = dt.Rows(0).Item("IDXNAME_PARENTID").ToString ' idxvalue = CURRENT_PARENT_ENTITY_ID ' LOGGER.Debug("Parent-ID: " & idxvalue.ToString) - ' indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE) + ' indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, WMOBJECTTYPE) ' If indexierung_erfolgreich = False Then ' err = True ' ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in indexing Parent-ID '" & indexname & "') - Check logfile!") @@ -150,6 +148,9 @@ Public Class ClassImport_Windream LOGGER.Debug("After CREATE_FOLDER_INDEX - CURRENT_VARIABLE_FOLDER: " & CURRENT_VARIABLE_FOLDER) If oWMTARGET_FOLDER <> CURRENT_VARIABLE_FOLDER Then + If CURRENT_VARIABLE_FOLDER.StartsWith("\") Then + CURRENT_VARIABLE_FOLDER = CURRENT_VARIABLE_FOLDER.Substring(1) + End If oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_VARIABLE_FOLDER.Replace(oWMTARGET_FOLDER, "") Else oWMTARGET_FOLDER = CURRENT_VARIABLE_FOLDER @@ -172,7 +173,6 @@ Public Class ClassImport_Windream If CURRENT_CHECK_SUBFOLDER = True And CURRENT_SUBFOLDER <> "" Then oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_SUBFOLDER End If - oWMTARGET_FOLDER = oWMTARGET_FOLDER.Replace("\\", "\") If oWMTARGET_FOLDER.Contains("/") Then LOGGER.Info(String.Format("Targetpath contains /-sign. / will be replaced with _")) oWMTARGET_FOLDER = oWMTARGET_FOLDER.Replace("/", "_") @@ -180,46 +180,20 @@ Public Class ClassImport_Windream Try - Select Case clsWD_GET.WD_PATH_EXISTS(oWMTARGET_FOLDER.Substring(2)) - Case False - LOGGER.Info(String.Format("Targetpath ({0}) is not existing or result of WD_PATH_EXISTS was false.", oWMTARGET_FOLDER.Substring(2))) - Dim split() As String = oWMTARGET_FOLDER.Split("\") - Dim Path_Combined As String = "" - For Each s As String In split - Path_Combined &= s & "\" - If Path_Combined <> "W:\" Then + If WMMOD.TestFolderExists(oWMTARGET_FOLDER) = False Then + oWMTARGET_FOLDER = oWMTARGET_FOLDER.Replace("W:", "\\windream\objects") + oWMTARGET_FOLDER = WMMOD.GetNormalizedPath(oWMTARGET_FOLDER, 0) + LOGGER.Info(String.Format("Targetpath ({0}) is not existing or result of WD_PATH_EXISTS was false.", oWMTARGET_FOLDER.Substring(2))) - Dim temppath = Path_Combined.Substring(2) - - Try - temppath = Path_Combined.Substring(2).Substring(0, temppath.Length) - - Select Case clsWD_GET.WD_PATH_EXISTS(temppath) - Case False - - LOGGER.Debug("Trying to create folder-part: " & temppath) - - clsWindream.MY_WDSESSION.GetNewWMObjectFS(2, temppath, 0) 'WMEntityFolder,WMObjectEditModeNoEdit) - Case -10 - LOGGER.Warn("WD_PATH_EXISTS returned -10 for: " & temppath) - Return False - End Select - Catch ex As Exception - If Not ex.Message.Contains("Filename exists!") Then - LOGGER.Warn(String.Format("Could not create folder-part: {0} - Complete path is: ({1})", temppath, oWMTARGET_FOLDER.Substring(2))) - LOGGER.Warn(String.Format("ErrorMessage: {0}: ", ex.Message)) - Return False - End If - End Try - End If - Next - Case -10 - MsgBox("Attention: the folder of the doctype does not exist or there was an error while checking....", MsgBoxStyle.Critical) + If WMMOD.NewFolder(oWMTARGET_FOLDER) = False Then + LOGGER.Warn(String.Format("Could not create folder-part: {0} - Complete path is: ({1})", oWMTARGET_FOLDER, oWMTARGET_FOLDER.Substring(2))) Return False - End Select + End If + End If + Catch ex As Exception If Not ex.Message.Contains("Filename exists!") Then - LOGGER.Warn(String.Format("Could not create folder ({0}): " & ex.Message, oWMTARGET_FOLDER.Substring(2))) + LOGGER.Warn(String.Format("Could not create folder ({0}): " & ex.Message, oWMTARGET_FOLDER)) Return False End If End Try diff --git a/app/DD-Record-Organizer/Classes/ClassInit.vb b/app/DD-Record-Organizer/Classes/ClassInit.vb index 9f33c38..95cf2ff 100644 --- a/app/DD-Record-Organizer/Classes/ClassInit.vb +++ b/app/DD-Record-Organizer/Classes/ClassInit.vb @@ -1,7 +1,4 @@ Imports System.IO -Imports DD_LIB_Standards -Imports DevExpress.DataAccess.Native -Imports DevExpress.XtraRichEdit.API.Native Imports DigitalData.Modules.Config Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging @@ -74,7 +71,6 @@ Public Class ClassInit If LoadFileExclusion() = False Then MsgBox("The Exclude File Structure for files in Folderwatch could not be initialized!", MsgBoxStyle.Information) End If - clsDatabase.GUI = True If CONFIG.Config.ConnectionString <> String.Empty Then LOGGER.Debug("Connection String from CONFIG") MyConnectionString = DecryptConnectionString(CONFIG.Config.ConnectionString) @@ -89,23 +85,18 @@ Public Class ClassInit frmConfig_Basic.ShowDialog() ' dbResult = clsDatabase.Init(MyConnectionString) End If - If ClassProxy.MyPROXYConnectionString <> String.Empty Then - If clsDatabase.Init(ClassProxy.MyPROXYConnectionString, True) = False Then - ClassHelper.MSGBOX_Handler("ERROR", "", "Error while Initializing proxyserver - Check logfile") - Else - Dim csb As New SqlClient.SqlConnectionStringBuilder - csb.ConnectionString = ClassProxy.MyPROXYConnectionString - ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("Proxy-Server {0} - Database {1} is used", csb.DataSource, csb.InitialCatalog)) - End If - End If + 'If ClassProxy.MyPROXYConnectionString <> String.Empty Then + ' If clsDatabase.Init(ClassProxy.MyPROXYConnectionString, True) = False Then + ' ClassHelper.MSGBOX_Handler("ERROR", "", "Error while Initializing proxyserver - Check logfile") + ' Else + ' Dim csb As New SqlClient.SqlConnectionStringBuilder + ' csb.ConnectionString = ClassProxy.MyPROXYConnectionString + ' ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("Proxy-Server {0} - Database {1} is used", csb.DataSource, csb.InitialCatalog)) + ' End If + 'End If If Not IsNothing(MYDB_ECM) Then If MYDB_ECM.DBInitialized = False Then - If clsLogger.LOGG_MSG <> String.Empty Then - Throw New Exception("Error while Initializing database:" & vbNewLine & clsLogger.LOGG_MSG) - Else - Throw New Exception("Find more information in the logfile.") - End If - + Throw New Exception("Find more information in the logfile.") End If Else Return False @@ -232,7 +223,7 @@ Public Class ClassInit CURRENT_TBPMO_FORM_VIEW = MYDB_ECM.GetDatatable(oSql) oSql = String.Format("select T.*, T1.HEADER_CAPTION,T1.TYPE_ID ,T1.ENTITY_ID,T1.LANGUAGE from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID") CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS = MYDB_ECM.GetDatatable(oSql) - clsCURRENT.LOG_ERRORS_ONLY = DEBUG + 'clsCURRENT.LOG_ERRORS_ONLY = DEBUG oSql = String.Format("select* from TBPMO_FILE_FORMATS_CHANGE") Dim oDTFF_CHANGE As DataTable = MYDB_ECM.GetDatatable(oSql) @@ -312,7 +303,7 @@ Public Class ClassInit LOGGER.Debug($"USERID_FK_INT_ECM: {USERID_FK_INT_ECM}") USER_IS_ADMIN = USER_DT.Rows(0).Item("IS_ADMIN") USER_LANGUAGE = USER_DT.Rows(0).Item("USER_LANGUAGE") - clsCURRENT.USER_LANGUAGE = USER_LANGUAGE + 'clsCURRENT.USER_LANGUAGE = USER_LANGUAGE USER_DATE_FORMAT = USER_DT.Rows(0).Item("USER_DATE_FORMAT") oMODULE_ACCES = USER_DT.Rows(0).Item("MODULE_ACCESS") Dim oWORKING_MODE = USER_DT.Rows(0).Item("WORKING_MODE") @@ -342,6 +333,9 @@ Public Class ClassInit SHARE_DRIVE_ACTIVE = True LOGGER.Info($"WM SHARE_DRIVE [{WMPATH_PREFIX}] via WORKING_MODE is active") End If + ElseIf oMode = "WM_USER_LOGIN" Then + LOGGER.Info($"WM_IMPERSONATE_LOGIN WILL BE SET TO False via WORKING_MODE!") + WM_IMPERSONATE_LOGIN = False Else If oMode <> "0" Then LOGGER.Info($"Wrong oMode: {oMode}") @@ -404,11 +398,9 @@ Public Class ClassInit End If Dim ConStringMain As String - If clsDatabase.DB_PROXY_INITIALIZED = True Then - ConStringMain = "PROXY: " & ClassProxy.MyPROXYConnectionString & " # MAIN: " & MyConnectionString - Else - ConStringMain = "Main: " & MyConnectionString - End If + + ConStringMain = "Main: " & MyConnectionString + oFNSQL = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME,CONNECTION_STRING) VALUES ({0},{1},'Record-Organizer','{2}','{3}','{4}')", USER_GUID, CLIENT_SELECTED, My.Application.Info.Version.ToString, Environment.MachineName, ConStringMain) MYDB_ECM.ExecuteNonQuery(oFNSQL) @@ -430,7 +422,12 @@ Public Class ClassInit If WM_READ_ONLY = False Then Try LOGGER.Debug($"Connecting to windream-Server via DigitalData.Modules.Windream.Windream...") - WMMOD = New DigitalData.Modules.Windream.Windream(LOGCONFIG, False, WMDriveLetter, WMPATH_PREFIX, True, WM_SERVER, WM_USER, WM_USER_PW, WM_DOMAIN) + If WM_IMPERSONATE_LOGIN = False Then + WMMOD = New DigitalData.Modules.Windream.Windream(LOGCONFIG, False, WMDriveLetter, WMPATH_PREFIX, True, WM_SERVER, "", "", WM_DOMAIN) + Else + WMMOD = New DigitalData.Modules.Windream.Windream(LOGCONFIG, False, WMDriveLetter, WMPATH_PREFIX, True, WM_SERVER, WM_USER, WM_USER_PW, WM_DOMAIN) + End If + If IsNothing(WMMOD) Then MsgBox("Could not connect to windream! Check Your configuration", MsgBoxStyle.Exclamation) Else @@ -445,13 +442,13 @@ Public Class ClassInit WM_READ_ONLY = True End Try - If clsWindream.Create_Session = False Then + If WMMOD.SessionLoggedin = False Then LOGGER.Warn("Could not create the login for windream - No session created!") - ClassHelper.MSGBOX_Handler("ERROR", "windream-login Error:", "Could not create the login/session!", "OrgFlow will start anyway but be aware that searching and importing won't be possible!") + ClassHelper.MSGBOX_Handler("ERROR", "windream-login Error:", "Could not create the login/session!", "orgFLOW will start anyway but be aware that searching and importing won't be possible!") End If End If Catch ex As Exception - LOGGER.Warn("Unexpected Error in clswindream.Init: " & ex.Message) + LOGGER.Warn("Unexpected Error in WINDREAM MOD.Init: " & ex.Message) MsgBox("Unexpected Error in Creating windream-Session: " & ex.Message & vbNewLine & "Please inform Your sysadmin!", MsgBoxStyle.Critical) End Try @@ -496,9 +493,9 @@ Public Class ClassInit End Try End If - If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED Then - SQL_FULLTEXT = "SELECT DISTINCT [dwDocID] FROM [dbo].FullText WHERE CONTAINS([Text], '""*@FULLTEXT*""') " - End If + 'If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED Then + ' SQL_FULLTEXT = "SELECT DISTINCT [dwDocID] FROM [dbo].FullText WHERE CONTAINS([Text], '""*@FULLTEXT*""') " + 'End If Dim oSQL = $"SELECT COUNT(GU.GUID) FROM TBDD_GROUPS_USER GU INNER JOIN TBDD_GROUPS G ON GU.GROUP_ID = G.GUID WHERE G.NAME = 'ORGFLOW-Supervisor' AND GU.USER_ID = {USER_GUID}" USER_IS_SUPERVISOR = MYDB_ECM.GetScalarValue(oSQL) Return True diff --git a/app/DD-Record-Organizer/Classes/ClassLicence.vb b/app/DD-Record-Organizer/Classes/ClassLicence.vb index 38c5daa..87eaa40 100644 --- a/app/DD-Record-Organizer/Classes/ClassLicence.vb +++ b/app/DD-Record-Organizer/Classes/ClassLicence.vb @@ -78,7 +78,7 @@ Public Class ClassLicence If license_Row.Item("NAME") = "Proxy-Server" Then If expired = False Then - LICENSE_PROXY = True + End If ElseIf license_Row.Item("NAME") = "Site-AddOn" Then If expired = False Then diff --git a/app/DD-Record-Organizer/Classes/ClassProxy.vb b/app/DD-Record-Organizer/Classes/ClassProxy.vb index 0410949..2b3dc98 100644 --- a/app/DD-Record-Organizer/Classes/ClassProxy.vb +++ b/app/DD-Record-Organizer/Classes/ClassProxy.vb @@ -20,42 +20,42 @@ Public Class ClassProxy Return False End If End Function - Public Shared Function PRPROXY_SYNC_DOC_OBJECTS() - If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then - Return False - End If - Dim sel = "DECLARE @return_value int" & vbNewLine & - "EXEC @return_value = [dbo].[PRPROXY_SYNC_DOC_OBJECTS]" & vbNewLine & - "SELECT 'Return Value' = @return_value" - Dim Result As DataTable = MYDB_ECM.GetDatatable(sel) - If Not IsNothing(Result) Then - If Result.Rows(0).Item(0) = 0 Then - Return True - Else - Return False - End If - Else - Return False - End If - End Function - Public Shared Function PRPROXY_RECORD_DEL(RECID As Integer, ENTITY_ID As Integer) - If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then - Return False - End If - Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & - "EXEC @return_value = [dbo].[PRPROXY_RECORD_DEL] {0},{1} " & vbNewLine & - "SELECT 'Return Value' = @return_value", RECID, ENTITY_ID) - Dim Result As DataTable = MYDB_ECM.GetDatatable(sel) - If Not IsNothing(Result) Then - If Result.Rows(0).Item(0) = 0 Then - Return True - Else - Return False - End If - Else - Return False - End If - End Function + 'Public Shared Function PRPROXY_SYNC_DOC_OBJECTS() + ' If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then + ' Return False + ' End If + ' Dim sel = "DECLARE @return_value int" & vbNewLine & + ' "EXEC @return_value = [dbo].[PRPROXY_SYNC_DOC_OBJECTS]" & vbNewLine & + ' "SELECT 'Return Value' = @return_value" + ' Dim Result As DataTable = MYDB_ECM.GetDatatable(sel) + ' If Not IsNothing(Result) Then + ' If Result.Rows(0).Item(0) = 0 Then + ' Return True + ' Else + ' Return False + ' End If + ' Else + ' Return False + ' End If + 'End Function + 'Public Shared Function PRPROXY_RECORD_DEL(RECID As Integer, ENTITY_ID As Integer) + ' If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then + ' Return False + ' End If + ' Dim sel = String.Format("DECLARE @return_value int" & vbNewLine & + ' "EXEC @return_value = [dbo].[PRPROXY_RECORD_DEL] {0},{1} " & vbNewLine & + ' "SELECT 'Return Value' = @return_value", RECID, ENTITY_ID) + ' Dim Result As DataTable = MYDB_ECM.GetDatatable(sel) + ' If Not IsNothing(Result) Then + ' If Result.Rows(0).Item(0) = 0 Then + ' Return True + ' Else + ' Return False + ' End If + ' Else + ' Return False + ' End If + 'End Function Public Shared Function PRPROXY_RECORD_UPD_INS(ENT_ID As Integer, RECID As Integer) If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then Return False @@ -182,19 +182,6 @@ Public Class ClassProxy Return False End If End Function - Public Shared Function IS_PROXY_BUSY() - If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then - Return False - End If - Dim sql = "SELECT SYNC_RUNNING FROM TBPROXY_CONFIG WHERE GUID = 1" - Dim BUSY - BUSY = MYDB_ECM.GetScalarValue(sql) - If IsNothing(BUSY) Then - Return True - Else - Return BUSY - End If - End Function Public Shared Function PRPROXY_DOC_VALUES_UPD(DocID As Integer, RecId As Integer) If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then Return False diff --git a/app/DD-Record-Organizer/Classes/ClassRecordState.vb b/app/DD-Record-Organizer/Classes/ClassRecordState.vb index 824b070..507cef1 100644 --- a/app/DD-Record-Organizer/Classes/ClassRecordState.vb +++ b/app/DD-Record-Organizer/Classes/ClassRecordState.vb @@ -6,10 +6,7 @@ Exit Sub End If Dim SQL As String = String.Format("UPDATE TBPMO_RECORD SET IN_WORK = 1, IN_WORK_WHO = '{0}' WHERE GUID = {1}", USER_USERNAME, RecordId) - If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then - MYDB_ECM.ExecuteNonQuery(SQL) - End If - MYDB_ECM.ExecuteNonQuery(Sql) + MYDB_ECM.ExecuteNonQuery(SQL) Catch ex As Exception MsgBox("Error in LockRecord: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try @@ -25,10 +22,7 @@ Exit Sub End If Dim SQL As String = String.Format("UPDATE TBPMO_RECORD SET IN_WORK = 0, IN_WORK_WHO = NULL WHERE GUID = {0}", RecordId) - If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then - MYDB_ECM.ExecuteNonQuery(SQL) - End If - MYDB_ECM.ExecuteNonQuery(Sql) + MYDB_ECM.ExecuteNonQuery(SQL) Catch ex As Exception MsgBox("Error in UnlockRecord: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try diff --git a/app/DD-Record-Organizer/Classes/ClassWDRights.vb b/app/DD-Record-Organizer/Classes/ClassWDRights.vb index 861d966..8931f1b 100644 --- a/app/DD-Record-Organizer/Classes/ClassWDRights.vb +++ b/app/DD-Record-Organizer/Classes/ClassWDRights.vb @@ -1,5 +1,5 @@ Imports WINDREAMLib -Imports DD_LIB_Standards +'Imports DD_LIB_Standards Public Class ClassWDRights #Region "+++++ Konstanten +++++" Const REL_Document_AccessRight = "AccessRight" @@ -42,12 +42,9 @@ Public Class ClassWDRights AD_DOMAIN = DT_KONFIG.Rows(0).Item("AD_DOMAIN") AD_USER = DT_KONFIG.Rows(0).Item("AD_USER") WD_RIGHT_ADMIN = DT_KONFIG.Rows(0).Item("WD_RIGHT") - If clsDatabase.DB_PROXY_INITIALIZED = True And ClassProxy.MyLinkedServer <> String.Empty Then - LOGGER.Info("User configured a proxy: " & ClassProxy.MyLinkedServer) - AD_SERVER = ClassProxy.MyLinkedServer - Else - AD_SERVER = DT_KONFIG.Rows(0).Item("AD_SERVER") - End If + + AD_SERVER = DT_KONFIG.Rows(0).Item("AD_SERVER") + Dim PWplainText As String Dim wrapper As New ClassEncryption("!35452didalog=") @@ -95,23 +92,12 @@ Public Class ClassWDRights DT_GROUP_RIGHT = MYDB_ECM.GetDatatable(sql) If IsNothing(DT_USER_RIGHT) Then Dim msg = "Error while receiving rights for DocID" - clsLogger.Add(msg) + LOGGER.Warn(msg) Return False Else LOGGER.Debug(String.Format("Amount of Userrights: {0}", DT_USER_RIGHT.Rows.Count)) End If LOGGER.Debug(String.Format("Amount of Grouprights: {0}", DT_GROUP_RIGHT.Rows.Count)) - 'Try - ' 'Object definieren - - ' oWMObject = WMCLASS.GetFileByPath(reldocpath) ' oSession.GetWMObjectByPath(1, reldocpath) - ' LOGGER.Debug("oWMObject created.") - 'Catch ex As Exception - ' Dim msg = "ClassWDRights - Error GetWMObjectByPath: " & reldocpath & vbNewLine & Err.Description - ' LOGGER.Warn(msg) - ' LOGGER.Error(ex) - ' Return False - 'End Try Dim lret Try ' Objekt muss zur Rechteänderung gelockt werden @@ -257,7 +243,7 @@ Public Class ClassWDRights LOGGER.Debug("got Group...") Catch ex As Exception Dim msg = String.Format("Could not create windream-Usersession for group '{0}' - check whether group exists in windream!", StringGroupRight) - clsLogger.Add(msg) + LOGGER.Warn(msg) MSG_RESULT &= msg & vbNewLine Continue For End Try @@ -267,7 +253,7 @@ Public Class ClassWDRights LOGGER.Debug("Right was set...") Catch ex As Exception Dim msg = String.Format("Could not set right for docID: {0} group {1} - AccessRights.Insert2: {2}", doc_id, StringGroupRight, ex.Message) - clsLogger.Add(msg) + LOGGER.Warn(msg) Continue For End Try End If @@ -287,7 +273,7 @@ Public Class ClassWDRights _right = "READ WRITE" End Select MSG_RESULT &= String.Format("Error while working on RightChange2:" & vbNewLine & "Fileright: {0}" & vbNewLine & "Group: {1} " & vbNewLine & "File: {2}", _right, StringGroupRight, reldocpath) & vbNewLine - clsLogger.Add(ex.Message) + LOGGER.Warn(ex.Message) End Try Next diff --git a/app/DD-Record-Organizer/Classes/Commands/ClassRecordCommands.vb b/app/DD-Record-Organizer/Classes/Commands/ClassRecordCommands.vb index 651ca16..21f438c 100644 --- a/app/DD-Record-Organizer/Classes/Commands/ClassRecordCommands.vb +++ b/app/DD-Record-Organizer/Classes/Commands/ClassRecordCommands.vb @@ -1,5 +1,5 @@ Imports System.Data.SqlClient -Imports DD_LIB_Standards +'Imports DD_LIB_Standards' Public Class ClassRecordCommands Public Shared Function CreateRecordProcedure(formId As Integer) @@ -21,12 +21,12 @@ Public Class ClassRecordCommands connection.Close() Dim GUID As Integer = cmd.Parameters("@pRESULT").Value - If GUID > 0 And clsDatabase.DB_PROXY_INITIALIZED = True Then - If ClassProxy.PRPROXY_RECORD_UPD_INS(formId, GUID) = True Then - ClassProxy.PRPROXY_CONTROL_VALUE_RENEW(GUID) - End If + 'If GUID > 0 And clsDatabase.DB_PROXY_INITIALIZED = True Then + ' If ClassProxy.PRPROXY_RECORD_UPD_INS(formId, GUID) = True Then + ' ClassProxy.PRPROXY_CONTROL_VALUE_RENEW(GUID) + ' End If - End If + 'End If Return GUID End Using Catch ex As Exception diff --git a/app/DD-Record-Organizer/Classes/Controls/ClassControlCommandsUI.vb b/app/DD-Record-Organizer/Classes/Controls/ClassControlCommandsUI.vb index b4ecd17..43ffe4f 100644 --- a/app/DD-Record-Organizer/Classes/Controls/ClassControlCommandsUI.vb +++ b/app/DD-Record-Organizer/Classes/Controls/ClassControlCommandsUI.vb @@ -1,6 +1,6 @@  Imports DD_Record_Organizer.ClassControlBuilder -Imports DD_LIB_Standards +'Imports DD_LIB_Standards Imports System.Data.SqlClient Public Class ClassControlCommandsUI @@ -578,9 +578,7 @@ Public Class ClassControlCommandsUI Dim sql As String = $"DELETE FROM TBPMO_CONTROL_VALUE WHERE RECORD_ID = {RecordID} AND CONTROL_ID = {CONTROL_ID}" If MYDB_ECM.ExecuteNonQuery(sql) = True Then - If LICENSE_PROXY = True Or clsDatabase.DB_PROXY_INITIALIZED = True Then - MYDB_ECM.ExecuteNonQuery(sql, True) - End If + End If Else @@ -647,7 +645,7 @@ Public Class ClassControlCommandsUI MYDB_ECM.ExecuteNonQuery(String.Format("DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1} AND VALUE = '{2}'", ControlId, RecordId, v)) ' ClassProxy.PRPROXY_CONTROL_DEL(RecordId, CURRENT_ENTITY_ID, ControlId) Next - ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, ControlId, RecordId, "") + 'ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, ControlId, RecordId, "") Catch ex As Exception MsgBox("Error in UpdateMultipleValues:" & vbNewLine & ex.Message) End Try @@ -904,9 +902,6 @@ Public Class ClassControlCommandsUI cmd.ExecuteNonQuery() connection.Close() _result = cmd.Parameters("@pRESULT").Value - If _result = 1 And clsDatabase.DB_PROXY_INITIALIZED = True Then - ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(ENTITY_ID, ControlID, RecordID, converted_value) - End If Return _result End Using Else @@ -926,15 +921,15 @@ Public Class ClassControlCommandsUI If Not IsNothing(converted_value) Then converted_value = converted_value.Replace("'", "´") Dim ins As String = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES ({0}, {1}, '{2}', '{3}')", ControlID, RecordID, converted_value, AddedWho) - If LICENSE_PROXY = True Or clsDatabase.DB_PROXY_INITIALIZED = True Then - If MYDB_ECM.ExecuteNonQuery(ins) = True Then - Return ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(ENTITY_ID, ControlID, RecordID, converted_value) - Else - Return False - End If - Else - Return MYDB_ECM.ExecuteNonQuery(ins) - End If + 'If LICENSE_PROXY = True Or clsDatabase.DB_PROXY_INITIALIZED = True Then + ' If MYDB_ECM.ExecuteNonQuery(ins) = True Then + ' Return ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(ENTITY_ID, ControlID, RecordID, converted_value) + ' Else + ' Return False + ' End If + 'Else + Return MYDB_ECM.ExecuteNonQuery(ins) + 'End If Else Return False End If @@ -956,15 +951,8 @@ Public Class ClassControlCommandsUI If ControlID = 279 Or ControlID = 745 Then LOGGER.Warn(upd) End If - If LICENSE_PROXY = True Or clsDatabase.DB_PROXY_INITIALIZED = True Then - If MYDB_ECM.ExecuteNonQuery(upd) = True Then - Return ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(ENTITY_ID, ControlID, RecordID, converted_value) - Else - Return False - End If - Else - Return MYDB_ECM.ExecuteNonQuery(upd) - End If + Return MYDB_ECM.ExecuteNonQuery(upd) + Catch ex As Exception LOGGER.Warn("Unerwarteter Fehler in UpdateControlValue: " & ex.Message) Return False diff --git a/app/DD-Record-Organizer/Classes/NodeNavigation/ClassDoctypeChange.vb b/app/DD-Record-Organizer/Classes/NodeNavigation/ClassDoctypeChange.vb index 51d7b0d..91f105d 100644 --- a/app/DD-Record-Organizer/Classes/NodeNavigation/ClassDoctypeChange.vb +++ b/app/DD-Record-Organizer/Classes/NodeNavigation/ClassDoctypeChange.vb @@ -1,8 +1,8 @@ -Imports DD_LIB_Standards +'mports DD_LIB_Standards Imports DigitalData.Modules.Base Imports DigitalData.Modules.Logging -Public Class ClassDoctypeChange +Public Class ClassDoctypeChangeDEL Inherits BaseClass Public Sub New(pLogConfig As LogConfig) @@ -12,7 +12,7 @@ Public Class ClassDoctypeChange Public Function ChangeDocType(pFilePaths As List(Of String), pNewDocTypeName As String, pObjectType As String) As Boolean Try For Each oPath As String In pFilePaths - Dim oResult As Boolean = clsWD_SET.IndexFile(oPath, "String 37", pNewDocTypeName, pObjectType) + Dim oResult As Boolean = WMMOD.SetFileIndex(oPath, "String 37", pNewDocTypeName, pObjectType) If oResult = True Then Logger.Debug("Successfully set doctype of file [{0}] to [{1}]", oPath, pNewDocTypeName) Else diff --git a/app/DD-Record-Organizer/Classes/NodeNavigation/ClassNodeCreator.vb b/app/DD-Record-Organizer/Classes/NodeNavigation/ClassNodeCreator.vb index c04157c..8feb1ff 100644 --- a/app/DD-Record-Organizer/Classes/NodeNavigation/ClassNodeCreator.vb +++ b/app/DD-Record-Organizer/Classes/NodeNavigation/ClassNodeCreator.vb @@ -32,7 +32,7 @@ Public Class ClassNodeCreator End If ' Update the proxy? - ClassProxy.PRPROXY_RECORD_UPD_INS(pEntityId, oRecordId) + 'ClassProxy.PRPROXY_RECORD_UPD_INS(pEntityId, oRecordId) ' Create the Node in the Database Dim oNodeIdentifier = $"CONFIG {oRecordId}-{pNodeConfigId}" diff --git a/app/DD-Record-Organizer/ModuleHelperMethods.vb b/app/DD-Record-Organizer/ModuleHelperMethods.vb index 9dc0cc6..110851d 100644 --- a/app/DD-Record-Organizer/ModuleHelperMethods.vb +++ b/app/DD-Record-Organizer/ModuleHelperMethods.vb @@ -285,8 +285,8 @@ Module ModuleHelperMethods CURRENT_OPEN_CONSTRUCTOR_FORMS.Add(id) If NodeNav Then - Dim frmNN As New frmNodeNavigation(EntityID, CURRENT_CONSTRUCTOR_ID) - frmNN.Tag = id + Dim frmNodeNav As New frmNodeNavigation(EntityID, CURRENT_CONSTRUCTOR_ID) + frmNodeNav.Tag = id If My.Settings.EntFormsChild = True Then Dim activeChild1 As Form = MAIN_FORM.ActiveMdiChild If activeChild1 IsNot Nothing Then @@ -300,10 +300,10 @@ Module ModuleHelperMethods JUMP_RECORD_ID = recordId End If If My.Settings.EntFormsChild = True Then - frmNN.MdiParent = MAIN_FORM + frmNodeNav.MdiParent = MAIN_FORM End If - frmNN.Show() + frmNodeNav.Show() Else Dim frm As New frmConstructor_Main() frm.Tag = id @@ -427,17 +427,7 @@ Module ModuleHelperMethods End Try End Sub - Public Sub OpenWindream_Files() - Dim frm As New frmWM_Import_Doc_Record - frm.MdiParent = MAIN_FORM - Dim activeChild As Form = MAIN_FORM.ActiveMdiChild - If activeChild IsNot Nothing Then - activeChild.WindowState = FormWindowState.Normal - End If - - frm.Show() - End Sub Public Sub OpenWiedervorlage() Dim frm As New frmFollowUp frm.MdiParent = MAIN_FORM diff --git a/app/DD-Record-Organizer/ModuleMySettings.vb b/app/DD-Record-Organizer/ModuleMySettings.vb index 4c4fd7f..104e1cb 100644 --- a/app/DD-Record-Organizer/ModuleMySettings.vb +++ b/app/DD-Record-Organizer/ModuleMySettings.vb @@ -1,6 +1,5 @@ Imports System.IO Imports System.Xml -Imports DD_LIB_Standards Imports DevExpress.LookAndFeel Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Windream @@ -37,6 +36,7 @@ Module ModuleMySettings Public WM_DOMAIN As String = "" Public WM_USER As String = "" Public WM_USER_PW As String = "" + Public WM_IMPERSONATE_LOGIN As Boolean = True Public GridDocResult_BestFitColumns As Boolean = True Public SQL_FULLTEXT As String Public CAPTION_CONFIRMATION As String = "Bestätigung" @@ -75,6 +75,8 @@ Module ModuleMySettings Public LOGCONFIG As LogConfig Public LOGGER As Logger + Public WM_RWA As String = "" + Dim rowresult As String = "" Public Function LoadFileExclusion() Dim rowresult As String = "" @@ -201,15 +203,12 @@ Module ModuleMySettings connstring = Row.Item("Value").ToString End If - ClassProxy.MyPROXYConnectionString = connstring - Else - ClassProxy.MyPROXYConnectionString = "" End If Case "MyLinkedServer" - ClassProxy.MyLinkedServer = Row.Item("Value") + 'ClassProxy.MyLinkedServer = Row.Item("Value") Case "LogErrorsOnly" DEBUG = CBool(Row.Item("Value")) - clsCURRENT.LOG_ERRORS_ONLY = DEBUG + 'DD_LIB_Standards.clsCURRENT.LOG_ERRORS_ONLY = DEBUG LOGCONFIG.Debug = DEBUG Case "Sett_TaskOverviewKeepInFront" Sett_TaskOverviewKeepInFront = CBool(Row.Item("Value")) diff --git a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb index 8948251..4825bba 100644 --- a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb +++ b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb @@ -94,7 +94,7 @@ Module ModuleRuntimeVariables Public LICENSE_COUNT As Integer = 0 Public LICENSE_DOSSIER_COUNT As Integer = 0 Public LICENSE_SAP_Connect As Boolean = False - Public LICENSE_PROXY As Boolean = False + 'Public LICENSE_PROXY As Boolean = False Public LICENSE_SITE As Boolean = False Public LICENSE_DATE As Date Public DT_LICENSE_ADDONS As DataTable @@ -199,7 +199,8 @@ Module ModuleRuntimeVariables Public SQL_GLOBAL_SEARCH As String = "" Public SQL_OF_NODE_SEARCH As String = "" Public CONF_SUPPORTPORTAL As String = "https://www.digitaldata.works/Support'" - Public WM_RWA As String = "" + + Public CURRENT_DT_TBPMO_DOC_RECORD_LINK As DataTable Public Property MYDB_ECM As MSSQLServer diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index 1fdd6e9..a22443d 100644 --- a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/app/DD-Record-Organizer/OrgFlow.vbproj b/app/DD-Record-Organizer/OrgFlow.vbproj index 6e6a79b..c2afa54 100644 --- a/app/DD-Record-Organizer/OrgFlow.vbproj +++ b/app/DD-Record-Organizer/OrgFlow.vbproj @@ -29,6 +29,8 @@ false true + + AnyCPU @@ -72,10 +74,6 @@ ..\..\3rdparty\lib\Commandline\CommandLine.dll - - False - ..\..\..\DDLibStandards\DD_LIB_Standards\bin\Debug\DD_LIB_Standards.dll - ..\..\..\DDLibraries\app\DD_Libraries\bin\Debug\DD_Rights.dll @@ -169,8 +167,9 @@ False - - ..\..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll + + False + ..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll ..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll @@ -178,16 +177,20 @@ ..\..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll - - ..\..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + + False + ..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + + + ..\..\..\..\2_DLL Projekte\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll False ..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll - + False - ..\..\..\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll + ..\..\..\..\2_DLL Projekte\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll ..\..\lib\DLLLicenseManager.dll @@ -195,6 +198,9 @@ P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\ERPConnect35.dll + + ..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll + ..\..\3rdparty\lib\MSG.NET\Independentsoft.Msg.dll @@ -295,7 +301,6 @@ - @@ -304,7 +309,7 @@ - + @@ -496,12 +501,6 @@ Form - - frmWM_Import_Doc_Record.vb - - - Form - frmRecordView.vb @@ -761,12 +760,6 @@ Form - - frmWM_EntityImport.vb - - - Form - frmWM_IndexFile.vb @@ -869,9 +862,11 @@ frmLicense.vb + Designer frmLicense_User.vb + Designer frmLicense_User.vb @@ -881,6 +876,7 @@ frmMain.vb + Designer frmMass_Change.vb @@ -959,9 +955,6 @@ frmWM_FulltextChoice.vb - - frmWM_Import_Doc_Record.vb - frmRecordView.vb Designer @@ -1184,12 +1177,6 @@ frmUserKonfig.vb Designer - - frmWM_EntityImport.vb - - - frmWM_EntityImport.vb - frmWM_IndexFile.vb @@ -1662,6 +1649,13 @@ + + + + Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". + + +