diff --git a/app/DD_PM_WINDREAM/App.config b/app/DD_PM_WINDREAM/App.config index 0f6cdd1..a475aff 100644 --- a/app/DD_PM_WINDREAM/App.config +++ b/app/DD_PM_WINDREAM/App.config @@ -15,7 +15,7 @@ False - TEST + PROD @@ -87,7 +87,9 @@ - + diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index b6cccbd..14cbf65 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -438,7 +438,7 @@ Public Class ClassInit .FilterExpression = $"GUID = 1" }) WMSUFFIX = BASEDATA_DT_CONFIG.Rows.Item(0).Item("WM_REL_PATH") - WMDriveLetter = "W" + WMDRIVE_LETTER = BASEDATA_DT_CONFIG.Rows.Item(0).Item("WM_DRIVE_LETTER") Settings_LoadBasicConfig() oStep = "TBDD_CONNECTION" diff --git a/app/DD_PM_WINDREAM/ClassPMWindream.vb b/app/DD_PM_WINDREAM/ClassPMWindream.vb index 94eefb5..e7965aa 100644 --- a/app/DD_PM_WINDREAM/ClassPMWindream.vb +++ b/app/DD_PM_WINDREAM/ClassPMWindream.vb @@ -65,9 +65,9 @@ Public Class ClassPMWindream End Function Public Function GetValuesfromAuswahlliste(ByVal listname As String) Try - 'Dim oAttribute = Me.oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, listname) - 'Dim vType = oAttribute.getVariableValue("vItems") - 'Return vType + If listname = "" Then + Return "" + End If Dim oChoiceList = oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityChoiceList, listname) If Err.Number = 0 And TypeName(oChoiceList) <> "Nothing" Then Dim Values = oChoiceList @@ -95,7 +95,7 @@ Public Class ClassPMWindream Catch ex As Exception LOGGER.Error(ex) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler in GetValuesfromAuswahlliste:") + MsgBox(ex.Message, MsgBoxStyle.Critical, $"Error in GetValuesfromAuswahlliste ({listname}):") Return Nothing End Try End Function diff --git a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb b/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb index 65ef79d..43fccf6 100644 --- a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb +++ b/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb @@ -244,8 +244,8 @@ LOGGER.Error(ex) oNormalizedPath = pPath.Substring(1) ElseIf pPath.StartsWith("\") Then Return pPath - ElseIf pPath.StartsWith(WMDriveLetter) Then - oNormalizedPath = pPath.Replace(WMDriveLetter & ":", "") + ElseIf pPath.StartsWith(WMDRIVE_LETTER) Then + oNormalizedPath = pPath.Replace(WMDRIVE_LETTER & ":", "") ElseIf pPath.StartsWith("\") = False Then oNormalizedPath = "\" & pPath Else diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index 3e9916c..373dcdb 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -9078,6 +9078,8 @@ Partial Public Class DD_DMSLiteDataSet Private columnSHOW_DOCUMENT As Global.System.Data.DataColumn + Private columnTARGET_PATH_BLIND_FILE As Global.System.Data.DataColumn + _ Public Sub New() @@ -9329,6 +9331,14 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property TARGET_PATH_BLIND_FILEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnTARGET_PATH_BLIND_FILE + End Get + End Property + _ @@ -9392,9 +9402,10 @@ Partial Public Class DD_DMSLiteDataSet ByVal WORK_HISTORY_ENTRY As String, _ ByVal DISPLAY_MODE As String, _ ByVal SQL_BTN_FINISH As String, _ - ByVal SHOW_DOCUMENT As Boolean) As TBPM_PROFILERow + ByVal SHOW_DOCUMENT As Boolean, _ + ByVal TARGET_PATH_BLIND_FILE As String) As TBPM_PROFILERow Dim rowTBPM_PROFILERow As TBPM_PROFILERow = CType(Me.NewRow,TBPM_PROFILERow) - Dim columnValuesArray() As Object = New Object() {Nothing, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, LOG_INDEX, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY, WORK_HISTORY_ENTRY, DISPLAY_MODE, SQL_BTN_FINISH, SHOW_DOCUMENT} + Dim columnValuesArray() As Object = New Object() {Nothing, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, LOG_INDEX, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY, WORK_HISTORY_ENTRY, DISPLAY_MODE, SQL_BTN_FINISH, SHOW_DOCUMENT, TARGET_PATH_BLIND_FILE} rowTBPM_PROFILERow.ItemArray = columnValuesArray Me.Rows.Add(rowTBPM_PROFILERow) Return rowTBPM_PROFILERow @@ -9450,6 +9461,7 @@ Partial Public Class DD_DMSLiteDataSet Me.columnDISPLAY_MODE = MyBase.Columns("DISPLAY_MODE") Me.columnSQL_BTN_FINISH = MyBase.Columns("SQL_BTN_FINISH") Me.columnSHOW_DOCUMENT = MyBase.Columns("SHOW_DOCUMENT") + Me.columnTARGET_PATH_BLIND_FILE = MyBase.Columns("TARGET_PATH_BLIND_FILE") End Sub _ + Public Property TARGET_PATH_BLIND_FILE() As String + Get + Return CType(Me(Me.tableTBPM_PROFILE.TARGET_PATH_BLIND_FILEColumn),String) + End Get + Set + Me(Me.tableTBPM_PROFILE.TARGET_PATH_BLIND_FILEColumn) = value + End Set + End Property + _ Public Function IsDESCRIPTIONNull() As Boolean @@ -24054,6 +24082,7 @@ Namespace DD_DMSLiteDataSetTableAdapters tableMapping.ColumnMappings.Add("DISPLAY_MODE", "DISPLAY_MODE") tableMapping.ColumnMappings.Add("SQL_BTN_FINISH", "SQL_BTN_FINISH") tableMapping.ColumnMappings.Add("SHOW_DOCUMENT", "SHOW_DOCUMENT") + tableMapping.ColumnMappings.Add("TARGET_PATH_BLIND_FILE", "TARGET_PATH_BLIND_FILE") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -24112,18 +24141,18 @@ Namespace DD_DMSLiteDataSetTableAdapters "HANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ " WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, LOG_INDEX, SQL_VIEW, ANNOT"& _ "ATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY, WORK_HISTORY_ENTRY, D"& _ - "ISPLAY_MODE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SQL_BTN_FINISH, SHOW_DOCUMENT)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES "& _ - " (@NAME,@TITLE,@PRIORITY,@DESCRIPTION,@ACTIVE,@WD_SEARCH,@NO_OF_DOCUMENTS,@"& _ - "ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@FINAL_PROFILE,@FINAL_TEXT,@MOV"& _ - "E2FOLDER,@TYPE,@WD_OBJECTTYPE,@SORT_BY_LATEST,@PM_VEKTOR_INDEX,@LOG_INDEX,@SQL_V"& _ - "IEW,@ANNOTATE_ALL_WORK_HISTORY_ENTRIES,@ANNOTATE_WORK_HISTORY_ENTRY,@WORK_HISTOR"& _ - "Y_ENTRY,@DISPLAY_MODE,@SQL_BTN_FINISH,@SHOW_DOCUMENT); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, TITL"& _ - "E, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_W"& _ - "HEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD"& _ - "_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, LOG_INDEX, SQL_VIEW, ANNOTATE_ALL_"& _ - "WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY, WORK_HISTORY_ENTRY, DISPLAY_M"& _ - "ODE, SQL_BTN_FINISH FROM TBPM_PROFILE WHERE (GUID = SCOPE_IDENTITY()) ORDER BY N"& _ - "AME" + "ISPLAY_MODE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SQL_BTN_FINISH, SHOW_DOCUMENT, TARGET_PA"& _ + "TH_BLIND_FILE)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@NAME,@TITLE,@PRIORITY,@DESCRIPTION,@ACTIVE,@WD_S"& _ + "EARCH,@NO_OF_DOCUMENTS,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@FINAL_"& _ + "PROFILE,@FINAL_TEXT,@MOVE2FOLDER,@TYPE,@WD_OBJECTTYPE,@SORT_BY_LATEST,@PM_VEKTOR"& _ + "_INDEX,@LOG_INDEX,@SQL_VIEW,@ANNOTATE_ALL_WORK_HISTORY_ENTRIES,@ANNOTATE_WORK_HI"& _ + "STORY_ENTRY,@WORK_HISTORY_ENTRY,@DISPLAY_MODE,@SQL_BTN_FINISH,@SHOW_DOCUMENT,@TA"& _ + "RGET_PATH_BLIND_FILE); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIV"& _ + "E, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN,"& _ + " FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST, PM"& _ + "_VEKTOR_INDEX, LOG_INDEX, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_"& _ + "WORK_HISTORY_ENTRY, WORK_HISTORY_ENTRY, DISPLAY_MODE, SQL_BTN_FINISH FROM TBPM_P"& _ + "ROFILE WHERE (GUID = SCOPE_IDENTITY()) ORDER BY NAME" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TITLE", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -24151,6 +24180,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DISPLAY_MODE", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "DISPLAY_MODE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_BTN_FINISH", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_BTN_FINISH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SHOW_DOCUMENT", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SHOW_DOCUMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TARGET_PATH_BLIND_FILE", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "TARGET_PATH_BLIND_FILE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection Me._adapter.UpdateCommand.CommandText = "UPDATE TBPM_PROFILE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET NAME = @NAME, TITLE = @TITLE, PRIOR"& _ @@ -24164,13 +24194,14 @@ Namespace DD_DMSLiteDataSetTableAdapters "ANNOTATE_ALL_WORK_HISTORY_ENTRIES = @ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE"& _ "_WORK_HISTORY_ENTRY = @ANNOTATE_WORK_HISTORY_ENTRY, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" W"& _ "ORK_HISTORY_ENTRY = @WORK_HISTORY_ENTRY, DISPLAY_MODE = @DISPLAY_MODE, SQL_BTN_F"& _ - "INISH = @SQL_BTN_FINISH, SHOW_DOCUMENT = @SHOW_DOCUMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @O"& _ - "riginal_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SE"& _ - "ARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_P"& _ - "ROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_"& _ - "INDEX, LOG_INDEX, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HIS"& _ - "TORY_ENTRY, WORK_HISTORY_ENTRY, DISPLAY_MODE, SQL_BTN_FINISH FROM TBPM_PROFILE W"& _ - "HERE (GUID = @GUID) ORDER BY NAME" + "INISH = @SQL_BTN_FINISH, SHOW_DOCUMENT = @SHOW_DOCUMENT, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " TARGET_PATH_BLIND_FILE = @TARGET_PATH_BLIND_FILE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Orig"& _ + "inal_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEAR"& _ + "CH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PRO"& _ + "FILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_IN"& _ + "DEX, LOG_INDEX, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTO"& _ + "RY_ENTRY, WORK_HISTORY_ENTRY, DISPLAY_MODE, SQL_BTN_FINISH FROM TBPM_PROFILE WHE"& _ + "RE (GUID = @GUID) ORDER BY NAME" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TITLE", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -24198,6 +24229,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DISPLAY_MODE", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "DISPLAY_MODE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_BTN_FINISH", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_BTN_FINISH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SHOW_DOCUMENT", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SHOW_DOCUMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TARGET_PATH_BLIND_FILE", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "TARGET_PATH_BLIND_FILE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub @@ -24220,8 +24252,8 @@ Namespace DD_DMSLiteDataSetTableAdapters "L_TEXT, MOVE2FOLDER, TYPE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" WD_OBJECTTYPE, SORT_BY_LAT"& _ "EST, PM_VEKTOR_INDEX, LOG_INDEX, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, AN"& _ "NOTATE_WORK_HISTORY_ENTRY, WORK_HISTORY_ENTRY, DISPLAY_MODE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ - " SQL_BTN_FINISH, SHOW_DOCUMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_PROFILE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY NA"& _ - "ME" + " SQL_BTN_FINISH, SHOW_DOCUMENT, TARGET_PATH_BLIND_FILE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM T"& _ + "BPM_PROFILE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY NAME" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text End Sub @@ -24441,7 +24473,8 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal WORK_HISTORY_ENTRY As String, _ ByVal DISPLAY_MODE As String, _ ByVal SQL_BTN_FINISH As String, _ - ByVal SHOW_DOCUMENT As Boolean) As Integer + ByVal SHOW_DOCUMENT As Boolean, _ + ByVal TARGET_PATH_BLIND_FILE As String) As Integer If (NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("NAME") Else @@ -24532,6 +24565,11 @@ Namespace DD_DMSLiteDataSetTableAdapters Me.Adapter.InsertCommand.Parameters(24).Value = CType(SQL_BTN_FINISH,String) End If Me.Adapter.InsertCommand.Parameters(25).Value = CType(SHOW_DOCUMENT,Boolean) + If (TARGET_PATH_BLIND_FILE Is Nothing) Then + Throw New Global.System.ArgumentNullException("TARGET_PATH_BLIND_FILE") + Else + Me.Adapter.InsertCommand.Parameters(26).Value = CType(TARGET_PATH_BLIND_FILE,String) + End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -24578,6 +24616,7 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal DISPLAY_MODE As String, _ ByVal SQL_BTN_FINISH As String, _ ByVal SHOW_DOCUMENT As Boolean, _ + ByVal TARGET_PATH_BLIND_FILE As String, _ ByVal Original_GUID As Integer, _ ByVal GUID As Integer) As Integer If (NAME Is Nothing) Then @@ -24670,8 +24709,13 @@ Namespace DD_DMSLiteDataSetTableAdapters Me.Adapter.UpdateCommand.Parameters(24).Value = CType(SQL_BTN_FINISH,String) End If Me.Adapter.UpdateCommand.Parameters(25).Value = CType(SHOW_DOCUMENT,Boolean) - Me.Adapter.UpdateCommand.Parameters(26).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(27).Value = CType(GUID,Integer) + If (TARGET_PATH_BLIND_FILE Is Nothing) Then + Throw New Global.System.ArgumentNullException("TARGET_PATH_BLIND_FILE") + Else + Me.Adapter.UpdateCommand.Parameters(26).Value = CType(TARGET_PATH_BLIND_FILE,String) + End If + Me.Adapter.UpdateCommand.Parameters(27).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(28).Value = CType(GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index bd12db0..b601b8b 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -1844,8 +1844,8 @@ ORDER BY Netto DESC INSERT INTO TBPM_PROFILE (NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, LOG_INDEX, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY, WORK_HISTORY_ENTRY, DISPLAY_MODE, - SQL_BTN_FINISH, SHOW_DOCUMENT) -VALUES (@NAME,@TITLE,@PRIORITY,@DESCRIPTION,@ACTIVE,@WD_SEARCH,@NO_OF_DOCUMENTS,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@FINAL_PROFILE,@FINAL_TEXT,@MOVE2FOLDER,@TYPE,@WD_OBJECTTYPE,@SORT_BY_LATEST,@PM_VEKTOR_INDEX,@LOG_INDEX,@SQL_VIEW,@ANNOTATE_ALL_WORK_HISTORY_ENTRIES,@ANNOTATE_WORK_HISTORY_ENTRY,@WORK_HISTORY_ENTRY,@DISPLAY_MODE,@SQL_BTN_FINISH,@SHOW_DOCUMENT); + SQL_BTN_FINISH, SHOW_DOCUMENT, TARGET_PATH_BLIND_FILE) +VALUES (@NAME,@TITLE,@PRIORITY,@DESCRIPTION,@ACTIVE,@WD_SEARCH,@NO_OF_DOCUMENTS,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@FINAL_PROFILE,@FINAL_TEXT,@MOVE2FOLDER,@TYPE,@WD_OBJECTTYPE,@SORT_BY_LATEST,@PM_VEKTOR_INDEX,@LOG_INDEX,@SQL_VIEW,@ANNOTATE_ALL_WORK_HISTORY_ENTRIES,@ANNOTATE_WORK_HISTORY_ENTRY,@WORK_HISTORY_ENTRY,@DISPLAY_MODE,@SQL_BTN_FINISH,@SHOW_DOCUMENT,@TARGET_PATH_BLIND_FILE); SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, LOG_INDEX, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY, WORK_HISTORY_ENTRY, DISPLAY_MODE, SQL_BTN_FINISH FROM TBPM_PROFILE WHERE (GUID = SCOPE_IDENTITY()) ORDER BY NAME @@ -1874,6 +1874,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME + @@ -1881,7 +1882,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, LOG_INDEX, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY, WORK_HISTORY_ENTRY, DISPLAY_MODE, - SQL_BTN_FINISH, SHOW_DOCUMENT + SQL_BTN_FINISH, SHOW_DOCUMENT, TARGET_PATH_BLIND_FILE FROM TBPM_PROFILE ORDER BY NAME @@ -1894,8 +1895,9 @@ SET NAME = @NAME, TITLE = @TITLE, PRIORITY = @PRIORITY, DESCRIPTI ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN, FINAL_PROFILE = @FINAL_PROFILE, FINAL_TEXT = @FINAL_TEXT, MOVE2FOLDER = @MOVE2FOLDER, TYPE = @TYPE, WD_OBJECTTYPE = @WD_OBJECTTYPE, SORT_BY_LATEST = @SORT_BY_LATEST, PM_VEKTOR_INDEX = @PM_VEKTOR_INDEX, LOG_INDEX = @LOG_INDEX, SQL_VIEW = @SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES = @ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY = @ANNOTATE_WORK_HISTORY_ENTRY, - WORK_HISTORY_ENTRY = @WORK_HISTORY_ENTRY, DISPLAY_MODE = @DISPLAY_MODE, SQL_BTN_FINISH = @SQL_BTN_FINISH, SHOW_DOCUMENT = @SHOW_DOCUMENT -WHERE (GUID = @Original_GUID); + WORK_HISTORY_ENTRY = @WORK_HISTORY_ENTRY, DISPLAY_MODE = @DISPLAY_MODE, SQL_BTN_FINISH = @SQL_BTN_FINISH, SHOW_DOCUMENT = @SHOW_DOCUMENT, + TARGET_PATH_BLIND_FILE = @TARGET_PATH_BLIND_FILE +WHERE (GUID = @Original_GUID); SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUMENTS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FINAL_PROFILE, FINAL_TEXT, MOVE2FOLDER, TYPE, WD_OBJECTTYPE, SORT_BY_LATEST, PM_VEKTOR_INDEX, LOG_INDEX, SQL_VIEW, ANNOTATE_ALL_WORK_HISTORY_ENTRIES, ANNOTATE_WORK_HISTORY_ENTRY, WORK_HISTORY_ENTRY, DISPLAY_MODE, SQL_BTN_FINISH FROM TBPM_PROFILE WHERE (GUID = @GUID) ORDER BY NAME @@ -1924,6 +1926,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME + @@ -1959,6 +1962,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME + @@ -3264,7 +3268,14 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + + + + + + + + @@ -3341,9 +3352,9 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - - - + + + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index 48ad03d..855e047 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -158,7 +158,8 @@ Module ModuleRuntimeVariables Public Property _Client As Client - + Public Property WMSUFFIX As String + Public Property WMDRIVE_LETTER As String Public Property DatabaseFallback As DatabaseWithFallback Public Property dbECMInitialized As Boolean = False @@ -168,8 +169,6 @@ Module ModuleRuntimeVariables Public Property TimerRefresh_running As Boolean = False Public Property SQL_PROFILES_USER As String = "" - Public WMDriveLetter As String = "W" - Public WMSUFFIX As String = "\\windream\objects" Public WM_AHWF_docPath As String Public LIC_MODULES As String = "NONE" diff --git a/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb b/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb index 0355eef..46a3aba 100644 --- a/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb +++ b/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -54,17 +54,6 @@ Namespace My End Get End Property - _ - Public ReadOnly Property ConnectionString() As String - Get - Return CType(Me("ConnectionString"),String) - End Get - End Property - _ + Global.System.Configuration.DefaultSettingValueAttribute("PROD")> _ Public ReadOnly Property UserConfig_Prefix() As String Get Return CType(Me("UserConfig_Prefix"),String) End Get End Property + + _ + Public ReadOnly Property ConnectionString() As String + Get + Return CType(Me("ConnectionString"),String) + End Get + End Property End Class End Namespace diff --git a/app/DD_PM_WINDREAM/My Project/Settings.settings b/app/DD_PM_WINDREAM/My Project/Settings.settings index 00aa215..2af233e 100644 --- a/app/DD_PM_WINDREAM/My Project/Settings.settings +++ b/app/DD_PM_WINDREAM/My Project/Settings.settings @@ -2,14 +2,6 @@ - - <?xml version="1.0" encoding="utf-16"?> -<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString> - <ProviderName>System.Data.SqlClient</ProviderName> -</SerializableConnectionString> - Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd - 0, 0 @@ -68,7 +60,15 @@ False - TEST + PROD + + + <?xml version="1.0" encoding="utf-16"?> +<SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <ConnectionString>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString> + <ProviderName>System.Data.SqlClient</ProviderName> +</SerializableConnectionString> + Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb index 7a7bccf..f3f18ad 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb @@ -154,6 +154,7 @@ Partial Class frmAdministration Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.pnlEdit = New System.Windows.Forms.Panel() + Me.SHOW_DOCUMENTCheckBox = New System.Windows.Forms.CheckBox() Me.tabctrl_Profilkonfig = New System.Windows.Forms.TabControl() Me.TabPage5 = New System.Windows.Forms.TabPage() Me.lblDescription = New System.Windows.Forms.Label() @@ -250,7 +251,8 @@ Partial Class frmAdministration Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.FolderBrowserDialog2 = New System.Windows.Forms.FolderBrowserDialog() - Me.SHOW_DOCUMENTCheckBox = New System.Windows.Forms.CheckBox() + Me.TARGET_PATH_BLIND_FILETextBox = New System.Windows.Forms.TextBox() + Me.lblTargetPath = New System.Windows.Forms.Label() GUIDLabel = New System.Windows.Forms.Label() NAMELabel = New System.Windows.Forms.Label() ADDED_WHOLabel = New System.Windows.Forms.Label() @@ -1284,6 +1286,13 @@ Partial Class frmAdministration Me.pnlEdit.Controls.Add(Me.NAMETextBox) Me.pnlEdit.Name = "pnlEdit" ' + 'SHOW_DOCUMENTCheckBox + ' + Me.SHOW_DOCUMENTCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILEBindingSource, "SHOW_DOCUMENT", True)) + resources.ApplyResources(Me.SHOW_DOCUMENTCheckBox, "SHOW_DOCUMENTCheckBox") + Me.SHOW_DOCUMENTCheckBox.Name = "SHOW_DOCUMENTCheckBox" + Me.SHOW_DOCUMENTCheckBox.UseVisualStyleBackColor = True + ' 'tabctrl_Profilkonfig ' resources.ApplyResources(Me.tabctrl_Profilkonfig, "tabctrl_Profilkonfig") @@ -1295,6 +1304,8 @@ Partial Class frmAdministration 'TabPage5 ' resources.ApplyResources(Me.TabPage5, "TabPage5") + Me.TabPage5.Controls.Add(Me.lblTargetPath) + Me.TabPage5.Controls.Add(Me.TARGET_PATH_BLIND_FILETextBox) Me.TabPage5.Controls.Add(Me.lblDescription) Me.TabPage5.Controls.Add(Me.btnofbAHW) Me.TabPage5.Controls.Add(Me.lblPriority) @@ -1928,12 +1939,16 @@ Partial Class frmAdministration Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' - 'SHOW_DOCUMENTCheckBox + 'TARGET_PATH_BLIND_FILETextBox ' - Me.SHOW_DOCUMENTCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILEBindingSource, "SHOW_DOCUMENT", True)) - resources.ApplyResources(Me.SHOW_DOCUMENTCheckBox, "SHOW_DOCUMENTCheckBox") - Me.SHOW_DOCUMENTCheckBox.Name = "SHOW_DOCUMENTCheckBox" - Me.SHOW_DOCUMENTCheckBox.UseVisualStyleBackColor = True + Me.TARGET_PATH_BLIND_FILETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILEBindingSource, "TARGET_PATH_BLIND_FILE", True)) + resources.ApplyResources(Me.TARGET_PATH_BLIND_FILETextBox, "TARGET_PATH_BLIND_FILETextBox") + Me.TARGET_PATH_BLIND_FILETextBox.Name = "TARGET_PATH_BLIND_FILETextBox" + ' + 'lblTargetPath + ' + resources.ApplyResources(Me.lblTargetPath, "lblTargetPath") + Me.lblTargetPath.Name = "lblTargetPath" ' 'frmAdministration ' @@ -2247,4 +2262,6 @@ Partial Class frmAdministration Friend WithEvents lblDescription As Label Friend WithEvents FolderBrowserDialog2 As FolderBrowserDialog Friend WithEvents SHOW_DOCUMENTCheckBox As CheckBox + Friend WithEvents TARGET_PATH_BLIND_FILETextBox As TextBox + Friend WithEvents lblTargetPath As Label End Class diff --git a/app/DD_PM_WINDREAM/frmAdministration.resx b/app/DD_PM_WINDREAM/frmAdministration.resx index 9b64584..b18716d 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.resx +++ b/app/DD_PM_WINDREAM/frmAdministration.resx @@ -1803,7 +1803,7 @@ Tahoma, 9.75pt - 16, 221 + 16, 253 77, 16 @@ -1824,7 +1824,7 @@ TabPage5 - 16 + 18 False @@ -1836,7 +1836,7 @@ Tahoma, 9.75pt - 447, 221 + 447, 253 86, 16 @@ -1857,7 +1857,7 @@ TabPage5 - 19 + 21 False @@ -1869,7 +1869,7 @@ Tahoma, 9.75pt - 15, 252 + 15, 284 92, 16 @@ -1890,7 +1890,7 @@ TabPage5 - 26 + 28 False @@ -1902,7 +1902,7 @@ Tahoma, 9.75pt - 447, 252 + 447, 284 101, 16 @@ -1923,7 +1923,7 @@ TabPage5 - 20 + 22 False @@ -2019,7 +2019,7 @@ TabPage5 - 8 + 10 1669, 17 @@ -2061,7 +2061,7 @@ TabPage5 - 12 + 14 Tahoma, 9.75pt @@ -2085,13 +2085,13 @@ TabPage5 - 14 + 16 Tahoma, 9.75pt - 19, 129 + 19, 161 188, 24 @@ -2112,13 +2112,13 @@ TabPage5 - 7 + 9 Tahoma, 9.75pt - 202, 129 + 202, 161 546, 23 @@ -2136,7 +2136,7 @@ TabPage5 - 6 + 8 1116, 17 @@ -2163,7 +2163,7 @@ TabPage5 - 25 + 27 Tahoma, 9.75pt @@ -2199,7 +2199,7 @@ TabPage5 - 24 + 26 Tahoma, 9.75pt @@ -2226,7 +2226,7 @@ TabPage5 - 21 + 23 192, 40 @@ -2313,7 +2313,7 @@ TabPage5 - 13 + 15 Tahoma, 9.75pt @@ -2337,7 +2337,7 @@ TabPage5 - 15 + 17 718, 13 @@ -2367,7 +2367,7 @@ Tahoma, 9.75pt - 202, 218 + 202, 250 235, 23 @@ -2385,13 +2385,13 @@ TabPage5 - 18 + 20 Tahoma, 9.75pt - 554, 218 + 554, 250 194, 23 @@ -2409,13 +2409,13 @@ TabPage5 - 22 + 24 Tahoma, 9.75pt - 202, 249 + 202, 281 235, 23 @@ -2433,13 +2433,13 @@ TabPage5 - 23 + 25 Tahoma, 9.75pt - 553, 249 + 553, 281 194, 23 @@ -2457,7 +2457,7 @@ TabPage5 - 17 + 19 959, 17 @@ -2507,6 +2507,66 @@ True + + True + + + Tahoma, 9.75pt + + + 16, 135 + + + 61, 16 + + + 93 + + + Ziel Pfad: + + + False + + + lblTargetPath + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 0 + + + Tahoma, 9.75pt + + + 202, 132 + + + 545, 23 + + + 92 + + + False + + + TARGET_PATH_BLIND_FILETextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPage5 + + + 1 + True @@ -2535,7 +2595,7 @@ TabPage5 - 0 + 2 Tahoma, 9.75pt @@ -2544,7 +2604,7 @@ NoControl - 754, 72 + 754, 132 31, 23 @@ -2568,7 +2628,7 @@ TabPage5 - 1 + 3 True @@ -2598,7 +2658,7 @@ TabPage5 - 2 + 4 True @@ -2628,7 +2688,7 @@ TabPage5 - 3 + 5 True @@ -2637,7 +2697,7 @@ Tahoma, 9.75pt - 15, 161 + 15, 193 129, 16 @@ -2658,7 +2718,7 @@ TabPage5 - 4 + 6 True @@ -2667,7 +2727,7 @@ Tahoma, 9.75pt - 16, 191 + 16, 223 91, 16 @@ -2688,7 +2748,7 @@ TabPage5 - 5 + 7 Tahoma, 9.75pt @@ -2727,13 +2787,13 @@ TabPage5 - 9 + 11 Tahoma, 9.75pt - 202, 188 + 202, 220 345, 24 @@ -2751,13 +2811,13 @@ TabPage5 - 10 + 12 Tahoma, 9.75pt - 202, 158 + 202, 190 345, 24 @@ -2775,7 +2835,7 @@ TabPage5 - 11 + 13 Tahoma, 9.75pt, style=Bold diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index af40d9e..caefd68 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -1535,30 +1535,40 @@ Public Class frmAdministration End Sub Private Sub DISPLAY_MODEComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles DISPLAY_MODEComboBox.SelectedIndexChanged + If FORM_LOADED = False Then Exit Sub + If DISPLAY_MODEComboBox.SelectedIndex <> -1 Then - If DISPLAY_MODEComboBox.Text.StartsWith("AdHoc BlindFile") Then - lblSearch.Text = "Select BlindDocument:" - btnWMopenSuche.Visible = False - lblDescription.Text = "Targetpath WM:" - btnofbAHW.Visible = True - Else - btnofbAHW.Visible = False - lblDescription.Text = "Beschreibung:" - If IDB_ACTIVE Then - lblSearch.Text = "SQL-Command:" - Else - lblSearch.Text = "WM-Search:" - End If - - btnWMopenSuche.Visible = True - End If - + AHWF_SHOWN() + End If + End Sub + Private Sub DISPLAY_MODEComboBox_TextChanged(sender As Object, e As EventArgs) Handles DISPLAY_MODEComboBox.TextChanged + If FORM_LOADED = False Then Exit Sub + AHWF_SHOWN() + End Sub + Sub AHWF_SHOWN() + If DISPLAY_MODEComboBox.Text.StartsWith("AdHoc BlindFile") Then + lblSearch.Text = "Select BlindDocument:" + btnWMopenSuche.Visible = False + btnofbAHW.Visible = True + TARGET_PATH_BLIND_FILETextBox.Visible = True + lblTargetPath.Visible = True + Else + btnofbAHW.Visible = False + If IDB_ACTIVE Then + lblSearch.Text = "SQL-Command:" + Else + lblSearch.Text = "WM-Search:" + End If + TARGET_PATH_BLIND_FILETextBox.Visible = False + lblTargetPath.Visible = False + btnWMopenSuche.Visible = True End If End Sub - Private Sub btnofbAHW_Click(sender As Object, e As EventArgs) Handles btnofbAHW.Click If Me.FolderBrowserDialog1.ShowDialog() = Windows.Forms.DialogResult.OK Then Me.DESCRIPTIONTextBox.Text = Me.FolderBrowserDialog1.SelectedPath End If End Sub + + End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmGhostMode.vb b/app/DD_PM_WINDREAM/frmGhostMode.vb index 662f97e..b47d380 100644 --- a/app/DD_PM_WINDREAM/frmGhostMode.vb +++ b/app/DD_PM_WINDREAM/frmGhostMode.vb @@ -1,20 +1,20 @@ Public Class frmGhostMode Private Sub frmGhostMode_Load(sender As Object, e As EventArgs) Handles Me.Load - Dim oSQL = "SELECT CONFIG_VALUE FROM TBIDB_BASE WHERE CONFIG_NAME = 'GHOST_SELECT'" - oSQL = DatabaseFallback.GetScalarValueIDB(oSQL) ',CONNECTION_STRING_IDB, "frmGhostMode_Load") - Dim DT_USER = DatabaseFallback.GetDatatableECM(oSQL) ', "frmGhostMode_LoadDT") + Dim oSQL = "SELECT [SQL_COMMAND] FROM TBDD_SQL_COMMANDS where TITLE = 'GHOST_SELECT'" + Dim DT_USER = DatabaseFallback.GetDatatableECM(oSQL) ',CONNECTION_STRING_IDB, "frmGhostMode_Load") + ' If IsNothing(DT_USER) Then - oSQL = "SELECT [SQL_COMMAND] FROM TBDD_SQL_COMMANDS where TITLE = 'GHOST_SELECT'" + oSQL = "SELECT CONFIG_VALUE FROM TBIDB_BASE WHERE CONFIG_NAME = 'GHOST_SELECT'" If Not IsNothing(oSQL) Then - oSQL = DatabaseFallback.GetScalarValueECM(oSQL) ', CONNECTION_STRING_ECM) - DT_USER = DatabaseFallback.GetDatatableECM(oSQL) '(oSQL, "frmGhostMode_LoadDT2") + oSQL = DatabaseFallback.GetScalarValueIDB(oSQL) ', CONNECTION_STRING_ECM) + DT_USER = DatabaseFallback.GetDatatableIDB(oSQL) '(oSQL, "frmGhostMode_LoadDT2") Else - MsgBox("No SQL for Ghostmode via DD_ECM. Check Your configuration.", MsgBoxStyle.Exclamation) + MsgBox("No SQL for Ghostmode via IDB. Check Your configuration.", MsgBoxStyle.Exclamation) Exit Sub End If End If - Try + Try If Not IsNothing(DT_USER) Then GridControl1.DataSource = DT_USER End If diff --git a/app/DD_PM_WINDREAM/frmKonfig.vb b/app/DD_PM_WINDREAM/frmKonfig.vb index a39d7ab..d4a6061 100644 --- a/app/DD_PM_WINDREAM/frmKonfig.vb +++ b/app/DD_PM_WINDREAM/frmKonfig.vb @@ -25,10 +25,6 @@ Public Class frmKonfig chkLogErrorsOnly.Checked = CBool(DEBUG) txtIntervall.Text = CONFIG.Config.ReminderTimer - - - - Catch ex As Exception LOGGER.Error(ex) MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Formload Grundkonfig:") @@ -254,4 +250,5 @@ Public Class frmKonfig MsgBox("Error in Export: " & ex.Message) End Try End Sub + End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 6e73294..5eb8266 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -95,6 +95,7 @@ Partial Class frmMain Me.BbtnitmAHWF1 = New DevExpress.XtraBars.BarButtonItem() Me.BbtnitmAHWF2 = New DevExpress.XtraBars.BarButtonItem() Me.BbtnitmAHWF3 = New DevExpress.XtraBars.BarButtonItem() + Me.BbtnitmAHWF4 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -186,7 +187,6 @@ Partial Class frmMain Me.TimerInactivity = New System.Windows.Forms.Timer(Me.components) Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem() - Me.BbtnitmAHWF4 = New DevExpress.XtraBars.BarButtonItem() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() CType(Me.GridControl_Docs, System.ComponentModel.ISupportInitialize).BeginInit() @@ -776,6 +776,16 @@ Partial Class frmMain Me.BbtnitmAHWF3.Name = "BbtnitmAHWF3" Me.BbtnitmAHWF3.Visibility = DevExpress.XtraBars.BarItemVisibility.Never ' + 'BbtnitmAHWF4 + ' + resources.ApplyResources(Me.BbtnitmAHWF4, "BbtnitmAHWF4") + Me.BbtnitmAHWF4.Id = 50 + Me.BbtnitmAHWF4.ImageOptions.Image = CType(resources.GetObject("BbtnitmAHWF4.ImageOptions.Image"), System.Drawing.Image) + Me.BbtnitmAHWF4.ImageOptions.LargeImage = CType(resources.GetObject("BbtnitmAHWF4.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BbtnitmAHWF4.Name = "BbtnitmAHWF4" + Me.BbtnitmAHWF4.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large + Me.BbtnitmAHWF4.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + ' 'RibbonPageStart ' Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroupBasicConf, Me.RibbonPageGroup7, Me.RibbonPageGroup4, Me.RibbonPageGroupAHW}) @@ -1533,16 +1543,6 @@ Partial Class frmMain Me.BarButtonItem9.Name = "BarButtonItem9" Me.BarButtonItem9.Visibility = DevExpress.XtraBars.BarItemVisibility.Never ' - 'BbtnitmAHWF4 - ' - resources.ApplyResources(Me.BbtnitmAHWF4, "BbtnitmAHWF4") - Me.BbtnitmAHWF4.Id = 50 - Me.BbtnitmAHWF4.ImageOptions.Image = CType(resources.GetObject("BarButtonItem10.ImageOptions.Image"), System.Drawing.Image) - Me.BbtnitmAHWF4.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem10.ImageOptions.LargeImage"), System.Drawing.Image) - Me.BbtnitmAHWF4.Name = "BbtnitmAHWF4" - Me.BbtnitmAHWF4.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large - Me.BbtnitmAHWF4.Visibility = DevExpress.XtraBars.BarItemVisibility.Never - ' 'frmMain ' Me.Appearance.Options.UseFont = True diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index f6f59b3..1746a73 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAagBCQGoAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAbgBCQG4AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1726,32 +1726,32 @@ BarButtonItem10 - + - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAJXRFWHRUaXRsZQBzaG9wO2Nh - cnQ7YnV5O3N0dWZmO2dvb2RzO2Z1bGw7kuUJygAAAPhJREFUOE+l0aFOw0Acx/GugicYDo1bhgFVQzI7 - wSTJ5DweSULCA2D2CjUTPAFLJpC8AAg0QSEI2fH9Xe4uf3pdm4H49Hq/+/+v17Zwzv1La1hV1RVeNbat - W61haHYaTRbVYU3qrDkUZyfgXk4Qm73ORjvHAZZQ4zX8proMMArjr6PbOYb4xDeOkDaYQ0W36DrBDVS3 - gm8WXU6xxRfGCsW8lujp79AG5yHz4s09tPiGCUqzwRk20PoT9KrZBvpAD1DRLi84RmoWOymxwBrxuB94 - xh0OYeu9LNhXM7jAI6Y9WdIM9JF0dDV0ZUkzuIQaZj1Zkv7337jiBysWl4xXz/GOAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAldEVYdFRpdGxlAHNob3A7Y2FydDtidXk7c3R1ZmY7 + Z29vZHM7ZnVsbDuS5QnKAAAA+ElEQVQ4T6XRoU7DQBzH8a6CJxgOjVuGAVVDMjvBJMnkPB5JQsIDYPYK + NRM8AUsmkLwACDRBIQjZ8f1d7i5/el2bgfj0er/7/6/XtnDO/UtrWFXVFV41tq1brWFodhpNFtVhTeqs + ORRnJ+BeThCbvc5GO8cBllDjNfymugwwCuOvo9s5hvjEN46QNphDRbfoOsENVLeCbxZdTrHFF8YKxbyW + 6Onv0AbnIfPizT20+IYJSrPBGTbQ+hP0qtkG+kAPUNEuLzhGahY7KbHAGvG4H3jGHQ5h670s2FczuMAj + pj1Z0gz0kXR0NXRlSTO4hBpmPVmS/vffuOIHKxaXjFfP8Y4AAAAASUVORK5CYII= - + - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAJXRFWHRUaXRsZQBzaG9wO2Nh - cnQ7YnV5O3N0dWZmO2dvb2RzO2Z1bGw7kuUJygAAAjNJREFUWEfF1T1oFGEQgOEYJURBEIkBAyJIWlu1 - uC4KNgmIldorpEgjEcEmaGcnCLYWKUQEUSwlBNHKUgKKoFaCWAmJiqLrO8fMMjs7d593xV3gSS6z83fZ - L3sTVVWNVRocpTQ4St1vnU4nFZNLsh6OfL3ED1T4iZW+hXFASdZDXcIfyGDvbd/COKAk64Ej2EYc/g3L - /QpbA0qyHrgLG/oRJzGJ7vV+ha0BJUmPPfgCW2ABjZxehV2h+RzWsKXk9VzIic7Chr/RWEOvwrqpay4D - rZlZCznRfVjuDY019Cqsm7rm8q79cLEVcrxpyEGz3HnEnIFuwaALnIflvdZYS1ZYC80HvQWPYHlXNdZi - hftxDRfsgvIH7x029ad/XR9IWN0ByJNOhv+FPAt835otcBu27Wm5oNJ3rbK41V3WmHihsZQtcBNWsCEX - VHrfVRa3OvnrWPyKxlK2wGF8hxWdgsSHWeAo7Ln/CzOoB0b+8NyDNXuisWFuwXUXe6axnvwCx/AbUigH - 5wTSp5/K4rvxHrbARTQGRn4BsQ4rlkaH4K+X3ILVf8VeZHm1uMBx+M/tD1jEPvg8bxZn8BhWJ1aR5TfE - BcQd+EbDeIUpxN4t2QJS+ABZ4//xHAcR+6ayBcw5PMVnyKHMhokdfMJDLGEXsn6p7gLjlAYF26X/aoPm - lKRBoc3inzt++hVzStKgoJG8o9g8fv4Xc0rSoJBGoXGrufwerrdyStKgoNHYb8F4D+FoVBP/AFUrX/E8 - p6dMAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAldEVYdFRpdGxlAHNob3A7Y2FydDtidXk7c3R1ZmY7 + Z29vZHM7ZnVsbDuS5QnKAAACM0lEQVRYR8XVPWgUYRCA4RglREEQiQEDIkhaW7W4Lgo2CYiV2iukSCMR + wSZoZycIthYpRARRLCUE0cpSAoqgVoJYCYmKous7x8wyOzt3n3fFXeBJLrPzd9kvexNVVY1VGhylNDhK + 3W+dTicVk0uyHo58vcQPVPiJlb6FcUBJ1kNdwh/IYO9t38I4oCTrgSPYRhz+Dcv9ClsDSrIeuAsb+hEn + MYnu9X6FrQElSY89+AJbYAGNnF6FXaH5HNawpeT1XMiJzsKGv9FYQ6/CuqlrLgOtmVkLOdF9WO4NjTX0 + Kqybuubyrv1wsRVyvGnIQbPcecScgW7BoAuch+W91lhLVlgLzQe9BY9geVc11mKF+3ENF+yC8gfvHTb1 + p39dH0hY3QHIk06G/4U8C3zfmi1wG7btabmg0netsrjVXdaYeKGxlC1wE1awIRdUet9VFrc6+etY/IrG + UrbAYXyHFZ2CxIdZ4Cjsuf8LM6gHRv7w3IM1e6KxYW7BdRd7prGe/ALH8BtSKAfnBNKnn8riu/EetsBF + NAZGfgGxDiuWRofgr5fcgtV/xV5kebW4wHH4z+0PWMQ++DxvFmfwGFYnVpHlN8QFxB34RsN4hSnE3i3Z + AlL4AFnj//EcBxH7prIFzDk8xWfIocyGiR18wkMsYReyfqnuAuOUBgXbpf9qg+aUpEGhzeKfO376FXNK + 0qCgkbyj2Dx+/hdzStKgkEahcau5/B6ut3JK0qCg0dhvwXgP4WhUE/8AVStf8Tynp0wAAAAASUVORK5C + YII= @@ -2478,6 +2478,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BbtnitmAHWF4 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPageStart @@ -2994,12 +3000,6 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BbtnitmAHWF4 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmMain diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 87ab77b..560a9c6 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -1778,7 +1778,7 @@ Public Class frmMain Private Function Init_windream() Try WINDREAM = New ClassPMWindream() - WINDREAM_MOD = New Windream(LOGCONFIG, False, WMDriveLetter, WMSUFFIX, True, "", "", "", "") + WINDREAM_MOD = New Windream(LOGCONFIG, False, WMDRIVE_LETTER, WMSUFFIX, True, "", "", "", "") WINDREAM.Create_Session() WINDREAM_ALLG = New ClassWindream_allgemein @@ -3140,7 +3140,7 @@ where (CONVERT(DATE,GETDATE()) <= NOTE.DISPLAY_UNTIL or NOTE.DISPLAY_UNTIL IS NU CURRENT_ProfilGUID = pProfileID Dim sGUID As String sGUID = System.Guid.NewGuid.ToString() - Dim oTargetPath = CURRENT_DT_PROFILE.Rows(0).Item("DESCRIPTION") + Dim oTargetPath = CURRENT_DT_PROFILE.Rows(0).Item("TARGET_PATH_BLIND_FILE") Dim oSourcePath = CURRENT_DT_PROFILE.Rows(0).Item("WD_SEARCH") Dim oWMObjecttype = CURRENT_DT_PROFILE.Rows(0).Item("WD_OBJECTTYPE") LOGGER.Debug($"oTargetPath: {oTargetPath}") diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index 63a6fa6..3abee05 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -727,7 +727,11 @@ Partial Class frmValidator ' resources.ApplyResources(Me.BarButtonItem6, "BarButtonItem6") Me.BarButtonItem6.Id = 32 + Me.BarButtonItem6.ImageOptions.Image = CType(resources.GetObject("BarButtonItem6.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonItem6.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem6.ImageOptions.LargeImage"), System.Drawing.Image) Me.BarButtonItem6.Name = "BarButtonItem6" + Me.BarButtonItem6.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large + Me.BarButtonItem6.Visibility = DevExpress.XtraBars.BarItemVisibility.Never ' 'RibbonPageConversations ' diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index 6e2d358..e7de6e3 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -131,6 +131,31 @@ 0, 0 + + Top, Left, Right + + + Segoe UI Symbol, 12pt, style=Bold + + + 3, 4 + + + No + + + 433, 29 + + + + 1 + + + Label1 + + + MiddleLeft + TITLELabel1 @@ -143,6 +168,30 @@ 0 + + Bottom, Left, Right + + + Tahoma, 9.75pt + + + MiddleLeft + + + 7, 446 + + + 3, 4, 3, 4 + + + 445, 50 + + + 11 + + + Validierung speichern - Nächstes Dokument + btnSave @@ -155,6 +204,21 @@ 1 + + Top, Left, Right + + + 5, 33 + + + 447, 48 + + + 1 + + + Label3 + DESCRIPTIONLabel @@ -167,6 +231,24 @@ 2 + + Top, Bottom, Left, Right + + + True + + + 8, 85 + + + 3, 4, 3, 4 + + + 444, 353 + + + 18 + PanelValidatorControl @@ -191,7 +273,6 @@ 455, 503 - 24 @@ -360,135 +441,6 @@ 0 - - Top, Left, Right - - - Segoe UI Symbol, 12pt, style=Bold - - - 3, 4 - - - No - - - 433, 29 - - - 1 - - - Label1 - - - MiddleLeft - - - TITLELabel1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 0 - - - Bottom, Left, Right - - - Tahoma, 9.75pt - - - MiddleLeft - - - 7, 446 - - - 3, 4, 3, 4 - - - 445, 50 - - - 11 - - - Validierung speichern - Nächstes Dokument - - - btnSave - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 1 - - - Top, Left, Right - - - 5, 33 - - - 447, 48 - - - 1 - - - Label3 - - - DESCRIPTIONLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 2 - - - Top, Bottom, Left, Right - - - True - - - 8, 85 - - - 3, 4, 3, 4 - - - 444, 353 - - - 18 - - - PanelValidatorControl - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 3 - 17, 17 @@ -1075,14 +1027,77 @@ Tahoma, 8.25pt, style=Bold - BarButtonItem6 + Beleg anzeigen + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAD3RFWHRUaXRsZQBTaG93O0V5 + ZTtJ4wclAAABN0lEQVQ4T6WSsUrEUBBF8xuW2vkBwmLjF/g3+gMSCFikDIhgUqaxECwWG4sUkRTZKKTQ + 3kYMWggLJmGc88iTtzHiqgMH3ty5d7L7Ek9E/sWk+Bu+CL7v7yqnURRJEAQG7R/QmI39bnBTuUqSRBaL + hTRNI13XGTijMcODd2WBCnvKS57n2oq8LVu5vnuUw7Mb07uFBy8ZbT3C28prXdfGQPj4/Fb2j+aGqcJL + hiwL5kVRDCMxT7bh7xZQZMiyYNm27SCL+dnrLCBD9scFLu6duAsu7OVR47/gwsyW5g7IsmBLea6qygzG + l2hBY0bhJUPWvsadMAwlyzJjcF8jcLZhPOp/IqPtyoe0kaapxHEsZVmaj6fvewNnNPXkyiVem/tcYNHh + TDlR7pX3Ac5os7F/pfkLk+L6iPcBKtAI3ZqhjFYAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAD3RFWHRUaXRsZQBTaG93O0V5 + ZTtJ4wclAAACbUlEQVRYR8WWP4tTQRTFd/0SW2xtZyV+Dbstt7H1S4iyVrEQttoyIRaWIYRIICnFwiwh + FmlNxEAwi2iQFRIcz+85k7z35j6NLowXfpA5c+65N5t/e+Cc+6+YYkpMMSWmmBJTTIkppsQUq6jVavfE + U9EXH8V3D4/RuMODN8LKNMU8arwlTsU74fYELz30/vsCarojhiILbjQabjAYuOl06larlVuv1xk8RuMO + T/D7XjL+fgE1PBTXwjWbTTcajSTvV3jpoddnkGXOiQQZDwWVBXS7Xcm7+vTl2rXevHePXrx1p88GXrWL + 3pBDoOpQcmFe4QAyPRdZ02QykbSryYfP7uzlpbv/5NWWPxUZIY9sSYV5hYMMD4J5Pp9L2hXPvDx8nwUo + skIuMyTFC+jiWHzDNB6PJRWLP3t5+L4LUGT6BZhxLCla4AJDu93WMS5e85ssQJHtl7jQMVrgisvlcqlj + XLzhbroA2X6BKx2jBZZcLhYLHeOqWsCi6tNBtl+AZxktcM5lq9XSMa6ql8ACr1Vk+wXOdYwWOBJfMfR6 + PUnFqnoTWuAtF5l+ODOOJBUXAF2ciB8YZ7OZpF1VfQzL4MGbL7LI9NknkrYzCwuADGfeHH39Wl9EebjD + ky8yQh7ZkgrzCocAxtDU6XTcZrOR/KvKX8XAY7T8M6eH3pBDpuRoViQE1MDPafaeqNfrbjgcSt6v8NLj + B5NBljnHFANqui1eiyyM0H6/X/lzzF1uMNBLBlnmDFPMo0Z+HXlzXop8+O/ASw+92XCw8k2xCoXcFY9F + 1b9k3OHZDs1jZZpiSkwxJaaYElNMiSmmxBTT4Q5+AlC9CknmAE1pAAAAAElFTkSuQmCC + 0, 0 + + Aktionen + + + Beendete Konversationen + + + Funktionen + Konversationen + + Datei + + + Aktionen + + + Anhänge zu Beleg + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEluZm87bRIthgAAAVxJREFUWEfF + l7FxwzAMRT2Bq4yjPp1nyAAZxNu4dZkt0rnLCm4ZPF+gg5LPCLJko3h3Ovn/T5gCSWnXWitF3nwm48Uw + DHPsjYNxNM7Gxbj+wDX3+A0NWpUxsqSAF+Pd+DBaErR48KrMdAGvxslQg2TAS8af7EwBb8anoYKXQAZZ + k/y5AjB8GSrwHsiaFPFfAUzZFv/8N2SOj6NXAE2z5pnPQfatMXsF0LnKuCWMIQtg7aaXmvuCX+oEjLF3 + XwxgA1EGifuCX+o6HNwXA9jFlFjivuCXug5H98UAtlIllrgv+KWuw9l9MYD9XIkl7gt+qetwcV8M4FBR + Yon7gl/qOlzdFwPKCyh/BOVNWL4MF21EK5EbUflWDOnDyH3BL3WC7mEE5ccxlL6QOKWvZA6GLWaCjMng + kCkAmLI1PYF3nPZItgCgaejc9BI10OK5NZxiSQHOYz/NqpA3n0fbfQM/tJcKTygMggAAAABJRU5ErkJg + gg== + + + + Information + Start @@ -2016,39 +2031,6 @@ Zoom - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYyMS4yLCBWZXJzaW9uPTIxLjIu - NC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFlE - ZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVi - bGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29s - VGlwBwAAAA1BbGxvd0h0bWxUZXh0EUZpeGVkVG9vbFRpcFdpZHRoCkl0ZW1zQ291bnQJaXRlbVR5cGUw - BWl0ZW0wCWl0ZW1UeXBlMQVpdGVtMQQAAAQEBAQfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVh - bgMAAAABCCVEZXZFeHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAgAAACFEZXZFeHByZXNz - LlV0aWxzLlRvb2xUaXBUaXRsZUl0ZW0CAAAAJURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29sVGlwSXRl - bVR5cGUCAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0CAAAAAgAAAAX8////H0RldkV4cHJl - c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4BAAAAB3ZhbHVlX18ACAMAAAACAAAAAAIAAAAF+////yVEZXZF - eHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAQAAAAd2YWx1ZV9fAAgCAAAAAQAAAAkGAAAA - Afn////7////AAAAAAkIAAAADAkAAABRU3lzdGVtLkRyYXdpbmcsIFZlcnNpb249NC4wLjAuMCwgQ3Vs - dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQYAAAAhRGV2RXhwcmVz - cy5VdGlscy5Ub29sVGlwVGl0bGVJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25z - CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl - c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl - c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA - AAAAAAAAPAEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN - QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs - b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT - eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp - b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAApw4RuZGVybiBkZXIg - Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ - dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k - ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl - c3MuVXRpbHMuVG9vbFRpcEltYWdlQWxpZ25tZW50AgAAAAgIAgAAAAYQAAAAAAXv////E1N5c3RlbS5E - cmF3aW5nLlNpemUCAAAABXdpZHRoBmhlaWdodAAACAgJAAAAAAAAAAAAAAAF7v///yZEZXZFeHByZXNz - LlV0aWxzLlRvb2xUaXBJbWFnZUFsaWdubWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAD/////DgAAAAEO - AAAACwAAAAkQAAAAAe3////v////AAAAAAAAAAAB7P///+7///8AAAAA/////w4AAAAL - - 10 % @@ -2091,6 +2073,39 @@ sichtbare einpassen + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYyMS4yLCBWZXJzaW9uPTIxLjIu + NC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFlE + ZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVi + bGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29s + VGlwBwAAAA1BbGxvd0h0bWxUZXh0EUZpeGVkVG9vbFRpcFdpZHRoCkl0ZW1zQ291bnQJaXRlbVR5cGUw + BWl0ZW0wCWl0ZW1UeXBlMQVpdGVtMQQAAAQEBAQfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVh + bgMAAAABCCVEZXZFeHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAgAAACFEZXZFeHByZXNz + LlV0aWxzLlRvb2xUaXBUaXRsZUl0ZW0CAAAAJURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29sVGlwSXRl + bVR5cGUCAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0CAAAAAgAAAAX8////H0RldkV4cHJl + c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4BAAAAB3ZhbHVlX18ACAMAAAACAAAAAAIAAAAF+////yVEZXZF + eHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAQAAAAd2YWx1ZV9fAAgCAAAAAQAAAAkGAAAA + Afn////7////AAAAAAkIAAAADAkAAABRU3lzdGVtLkRyYXdpbmcsIFZlcnNpb249NC4wLjAuMCwgQ3Vs + dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQYAAAAhRGV2RXhwcmVz + cy5VdGlscy5Ub29sVGlwVGl0bGVJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25z + CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl + c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl + c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA + AAAAAAAAPAEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN + QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs + b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT + eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp + b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAApw4RuZGVybiBkZXIg + Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ + dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k + ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl + c3MuVXRpbHMuVG9vbFRpcEltYWdlQWxpZ25tZW50AgAAAAgIAgAAAAYQAAAAAAXv////E1N5c3RlbS5E + cmF3aW5nLlNpemUCAAAABXdpZHRoBmhlaWdodAAACAgJAAAAAAAAAAAAAAAF7v///yZEZXZFeHByZXNz + LlV0aWxzLlRvb2xUaXBJbWFnZUFsaWdubWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAD/////DgAAAAEO + AAAACwAAAAkQAAAAAe3////v////AAAAAAAAAAAB7P///+7///8AAAAA/////w4AAAAL + + BarButtonItem1 @@ -2103,40 +2118,6 @@ 1029, 17 - - Funktionen - - - Aktionen - - - Beendete Konversationen - - - Datei - - - Aktionen - - - Anhänge zu Beleg - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEluZm87bRIthgAAAVxJREFUWEfF - l7FxwzAMRT2Bq4yjPp1nyAAZxNu4dZkt0rnLCm4ZPF+gg5LPCLJko3h3Ovn/T5gCSWnXWitF3nwm48Uw - DHPsjYNxNM7Gxbj+wDX3+A0NWpUxsqSAF+Pd+DBaErR48KrMdAGvxslQg2TAS8af7EwBb8anoYKXQAZZ - k/y5AjB8GSrwHsiaFPFfAUzZFv/8N2SOj6NXAE2z5pnPQfatMXsF0LnKuCWMIQtg7aaXmvuCX+oEjLF3 - XwxgA1EGifuCX+o6HNwXA9jFlFjivuCXug5H98UAtlIllrgv+KWuw9l9MYD9XIkl7gt+qetwcV8M4FBR - Yon7gl/qOlzdFwPKCyh/BOVNWL4MF21EK5EbUflWDOnDyH3BL3WC7mEE5ccxlL6QOKWvZA6GLWaCjMng - kCkAmLI1PYF3nPZItgCgaejc9BI10OK5NZxiSQHOYz/NqpA3n0fbfQM/tJcKTygMggAAAABJRU5ErkJg - gg== - - - - Information - RibbonPage2 diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 566e261..551da25 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -2516,8 +2516,8 @@ Public Class frmValidator LOGGER.Debug($"oWMOwnPath: {oWMOwnPath}") Try - Dim oNormalizedPath = WINDREAM.NormalizePath(oWMOwnPath) - CURRENT_WMFILE = WINDREAM.oSession.GetWMObjectByPath(WMEntity.WMEntityDocument, oNormalizedPath) + Dim oNormalizedPath = WINDREAM_MOD.GetNormalizedPath(oWMOwnPath, 1) + CURRENT_WMFILE = WINDREAM_MOD.Session.GetWMObjectByPath(WMEntity.WMEntityDocument, oNormalizedPath) WMDocFileString = oNormalizedPath LOGGER.Debug("WMDocFileString: " & WMDocFileString) Return True @@ -4051,7 +4051,7 @@ Public Class frmValidator Dim oContinueOnIndifferentState As Boolean = CBool(oFinalIndexRow.Item("CONTINUE_INDETERMINED")) Dim oIndexType = 0 If IDB_ACTIVE = False Then - oIndexType = WINDREAM.GetTypeOfIndex(oFinalIndexRow.Item("INDEXNAME")) + oIndexType = WINDREAM_MOD.GetIndexType(oFinalIndexRow.Item("INDEXNAME")) End If If oValue.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ### LOGGER.Debug("Indexing wih dynamic sql...") @@ -6033,7 +6033,4 @@ Public Class frmValidator Return tmpImg End Function - Private Sub BarButtonItem6_ItemClick_2(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem6.ItemClick - TakeScreenShot(PanelValidatorControl).Save("D:\Screenshot.png", System.Drawing.Imaging.ImageFormat.Png) - End Sub End Class \ No newline at end of file