diff --git a/app/DD_PM_WINDREAM/clsPatterns.vb b/app/DD_PM_WINDREAM/clsPatterns.vb index b08356c..3f6cfa1 100644 --- a/app/DD_PM_WINDREAM/clsPatterns.vb +++ b/app/DD_PM_WINDREAM/clsPatterns.vb @@ -104,30 +104,31 @@ Public Class clsPatterns Dim result = input While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_PRENAME) - result = ReplacePattern(input, PATTERN_USER, prename) + result = ReplacePattern(result, PATTERN_USER, prename) End While While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_USER_ID) - result = ReplacePattern(input, PATTERN_USER, userId) + result = ReplacePattern(result, PATTERN_USER, userId) End While While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_SURNAME) - result = ReplacePattern(input, PATTERN_USER, surname) + result = ReplacePattern(result, PATTERN_USER, surname) End While While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_SHORTNAME) - result = ReplacePattern(input, PATTERN_USER, shortname) + result = ReplacePattern(result, PATTERN_USER, shortname) End While + While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_LANGUAGE) - result = ReplacePattern(input, PATTERN_USER, language) + result = ReplacePattern(result, PATTERN_USER, language) End While While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_EMAIL) - result = ReplacePattern(input, PATTERN_USER, email) + result = ReplacePattern(result, PATTERN_USER, email) End While - + While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_PROFILE_ID) - result = ReplacePattern(input, PATTERN_USER, profileId) + result = ReplacePattern(result, PATTERN_USER, profileId) End While Return result @@ -275,7 +276,7 @@ Public Class clsPatterns Public Shared Function ReplacePattern(input As String, type As String, replacement As String) As String Dim elements As MatchCollection = regex.Matches(input) - If IsNothing(replacement) Or replacement = String.Empty Then + If IsNothing(replacement) Then Return input End If diff --git a/app/DD_PM_WINDREAM/clsWMDocGrid.vb b/app/DD_PM_WINDREAM/clsWMDocGrid.vb index e8b62ca..f66305e 100644 --- a/app/DD_PM_WINDREAM/clsWMDocGrid.vb +++ b/app/DD_PM_WINDREAM/clsWMDocGrid.vb @@ -33,7 +33,7 @@ Public Class clsWMDocGrid Dim oNewDataTable As New DataTable oNewDataTable.TableName = "TBSELECTED_FILES" ' Create two columns, ID and Name. - oNewDataTable.Columns.Add("DOC_ID", GetType(Integer)) + oNewDataTable.Columns.Add("DocID", GetType(Integer)) oNewDataTable.Columns.Add("DOC_PATH", GetType(System.String)) oNewDataTable.Columns.Add("OBJECTTYPE", GetType(System.String)) oNewDataTable.Columns.Add("INWORK", GetType(System.Boolean)) @@ -59,11 +59,11 @@ Public Class clsWMDocGrid For Each row In ActiveDocGrid.GetSelectedRows Dim newRow As DataRow = DTDocuments.NewRow() Try - Dim DOC_ID = ActiveDocGrid.GetRowCellValue(row, "DocID") - SELECTED_DOC_ID = DOC_ID - newRow("DOC_ID") = ActiveDocGrid.GetRowCellValue(row, "DocID") + Dim DocID = ActiveDocGrid.GetRowCellValue(row, "DocID") + SELECTED_DOC_ID = DocID + newRow("DocID") = ActiveDocGrid.GetRowCellValue(row, "DocID") Catch ex As Exception - newRow("DOC_ID") = 0 + newRow("DocID") = 0 SELECTED_DOC_ID = 0 End Try Try @@ -105,11 +105,11 @@ Public Class clsWMDocGrid Else Dim newRow As DataRow = DTDocuments.NewRow() Try - Dim DOC_ID = ActiveDocGrid.GetFocusedRowCellValue(ActiveDocGrid.Columns("DocID")) - SELECTED_DOC_ID = DOC_ID - newRow("DOC_ID") = ActiveDocGrid.GetFocusedRowCellValue(ActiveDocGrid.Columns("DocID")) + Dim DocID = ActiveDocGrid.GetFocusedRowCellValue(ActiveDocGrid.Columns("DocID")) + SELECTED_DOC_ID = DocID + newRow("DocID") = ActiveDocGrid.GetFocusedRowCellValue(ActiveDocGrid.Columns("DocID")) Catch ex As Exception - newRow("DOC_ID") = 0 + newRow("DocID") = 0 SELECTED_DOC_ID = 0 End Try Try diff --git a/app/DD_PM_WINDREAM/frmAdmin2.Designer.vb b/app/DD_PM_WINDREAM/frmAdmin2.Designer.vb index af0f851..c86d439 100644 --- a/app/DD_PM_WINDREAM/frmAdmin2.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdmin2.Designer.vb @@ -464,6 +464,9 @@ Partial Class frmAdmin2 Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colTITLE}) Me.GridView1.GridControl = Me.GridControl1 Me.GridView1.Name = "GridView1" + Me.GridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridView1.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridView1.OptionsBehavior.Editable = False Me.GridView1.OptionsView.EnableAppearanceEvenRow = True Me.GridView1.OptionsView.ShowAutoFilterRow = True ' @@ -687,6 +690,9 @@ Partial Class frmAdmin2 Me.GridView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn1, Me.GridColumn2, Me.GridColumn3, Me.GridColumn4}) Me.GridView2.GridControl = Me.GridControl2 Me.GridView2.Name = "GridView2" + Me.GridView2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridView2.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridView2.OptionsBehavior.Editable = False Me.GridView2.OptionsView.EnableAppearanceEvenRow = True Me.GridView2.OptionsView.ShowAutoFilterRow = True ' diff --git a/app/DD_PM_WINDREAM/frmAdmin2.resx b/app/DD_PM_WINDREAM/frmAdmin2.resx index 70190b2..330002d 100644 --- a/app/DD_PM_WINDREAM/frmAdmin2.resx +++ b/app/DD_PM_WINDREAM/frmAdmin2.resx @@ -1108,6 +1108,12 @@ 0, 0 + + Vorlagen Verwaltung + + + Phrasen Verwaltung + Aktionen @@ -1144,12 +1150,6 @@ 2 - - Vorlagen Verwaltung - - - Phrasen Verwaltung - RibbonPage2 @@ -1163,387 +1163,6 @@ True - - Button1 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 0 - - - GridControl1 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPage1 - - - 1 - - - GUIDTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 3 - - - TITLETextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 5 - - - EMAIL_SUBJECTTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 7 - - - EMAIL_BODY1TextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 9 - - - EMAIL_BODY2TextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 11 - - - EMAIL_BODY3TextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 13 - - - ADDED_WHOTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 15 - - - ADDED_WHENTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 17 - - - CHANGED_WHOTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 19 - - - CHANGED_WHENTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage1 - - - 21 - - - 917, 376 - - - Email Inhalte Workflow - - - XtraTabPage1 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl1 - - - 0 - - - 919, 401 - - - 2 - - - True - - - CHANGED_WHENTextBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 1 - - - CHANGED_WHOTextBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 3 - - - ADDED_WHENTextBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 5 - - - ADDED_WHOTextBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 7 - - - STRING6TextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 9 - - - STRING5TextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 11 - - - STRING4TextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 13 - - - STRING3TextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 15 - - - STRING2TextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 17 - - - STRING1TextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 19 - - - CAPT_TYPEComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 21 - - - LANGUAGEComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 23 - - - TITLETextBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 25 - - - GUIDTextBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - XtraTabPage2 - - - 27 - - - GridControl2 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPage2 - - - 28 - - - 917, 376 - - - GUI Phrasen - - - XtraTabPage2 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl1 - - - 1 - - - XtraTabControl1 - - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 0 - 769, 39 @@ -1622,9 +1241,6 @@ 1 - - 17, 17 - 323, 14 @@ -1853,6 +1469,33 @@ 21 + + 917, 376 + + + Email Inhalte Workflow + + + XtraTabPage1 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 0 + + + 919, 401 + + + 2 + + + True + 17, 56 @@ -1877,9 +1520,6 @@ 1 - - 17, 56 - 399, 305 @@ -2243,6 +1883,36 @@ 28 + + 917, 376 + + + GUI Phrasen + + + XtraTabPage2 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 1 + + + XtraTabControl1 + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 0 + 442, 17 @@ -2263,17 +1933,16 @@ - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAALXRFWHRUaXRsZQBEQjtTb3Vy - Y2U7U3RvcjtkYXRhc291cmNlO0RhdGFiYXNlO0VkaXQo9rqcAAABpUlEQVRYR8WVMU7DQBBFU9Aj0XED - CgokKKgRlJBrUCKqFCAFjkDHTZBoKNIilI5LQBOkFEgs/yE7cnZmQ7xexcWTnNn5/08cjzMIIfSKW9wk - bnGTuMXPyXWTbXEirsSjeBbv4kN8V3BNjTN66EWDduHlZbnFSrAvbsWrCJmgxQMvN8stqnkopsIzzQGv - oZdlClAJPKMuTL0sUwA1zyJxCWZelimAmueRuARzL8sUgOZIXIJWA/T+E/T+EPa+hiNxIUq9iPAaeVmm - AGrmGXgTd+JU5L6K0eKBV/YafokX8SAuxZnYEztiq4JrapzRQy8atLVP72t442WZAqj5JxJ3ZXx+/zQQ - hyJUcJ0coOQGeOGLIVIDlFrDONwMkRqgxBqmvvnS59QAXdfwWOap2w6LO5IaoMsaHsl4VXgN58XXcNUD - 1+QvHFID5Pwbtg6H1ABtN2CMrjL3QmuWwtGYcJBhmzXMCgd0JhxkCuuuYVY4kGXCAdOKXXEgWMXUGmJW - h8TBdd2EA1kmPAeZNcPWCge0xiwHmcWh/4YDWmOWg8yaA6wVDiGEwS9IKlJjkp5nnAAAAABJRU5ErkJg - gg== + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAtdEVYdFRpdGxlAERCO1NvdXJjZTtTdG9yO2RhdGFz + b3VyY2U7RGF0YWJhc2U7RWRpdCj2upwAAAGlSURBVFhHxZUxTsNAEEVT0CPRcQMKCiQoqBGUkGtQIqoU + IAWOQMdNkGgo0iKUjktAE6QUSCz/ITtydmZDvF7FxZOc2fn/TxyPMwgh9Ipb3CRucZO4xc/JdZNtcSKu + xKN4Fu/iQ3xXcE2NM3roRYN24eVlucVKsC9uxasImaDFAy83yy2qeSimwjPNAa+hl2UKUAk8oy5MvSxT + ADXPInEJZl6WKYCa55G4BHMvyxSA5khcglYD9P4T9P4Q9r6GI3EhSr2I8Bp5WaYAauYZeBN34lTkvorR + 4oFX9hp+iRfxIC7FmdgTO2KrgmtqnNFDLxq0tU/va3jjZZkCqPknEndlfH7/NBCHIlRwnRyg5AZ44Ysh + UgOUWsM43AyRGqDEGqa++dLn1ABd1/BY5qnbDos7khqgyxoeyXhVeA3nxddw1QPX5C8cUgPk/Bu2DofU + AG03YIyuMvdCa5bC0ZhwkGGbNcwKB3QmHGQK665hVjiQZcIB04pdcSBYxdQaYlaHxMF13YQDWSY8B5k1 + w9YKB7TGLAeZxaH/hgNaY5aDzJoDrBUOIYTBL0gqUmOSnmecAAAAAElFTkSuQmCC diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index f56a289..2f99224 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -301,7 +301,7 @@ Public Class frmMain GridView_Docs.Columns.Item("PROFILE_ID").Visible = False GridView_Docs.Columns.Item("GUID").Visible = False GridView_Docs.Columns.Item("FULL_FILE_PATH").Visible = False - 'GridView_Docs.Columns.Item("DOC_ID").Visible = False + 'GridView_Docs.Columns.Item("DocID").Visible = False GridView_Docs.Columns.Item("TL_STATE").Visible = False GridView_Docs.Columns.Item("ICON").MaxWidth = 24 GridView_Docs.Columns.Item("ICON").MinWidth = 24 @@ -699,7 +699,7 @@ Public Class frmMain GridView_Docs.Columns.Item("PROFILE_ID").Visible = False GridView_Docs.Columns.Item("GUID").Visible = False GridView_Docs.Columns.Item("FULL_FILE_PATH").Visible = False - 'GridView_Docs.Columns.Item("DOC_ID").Visible = False + 'GridView_Docs.Columns.Item("DocID").Visible = False GridView_Docs.Columns.Item("TL_STATE").Visible = False GridView_Docs.Columns.Item("ICON").MaxWidth = 24 GridView_Docs.Columns.Item("ICON").MinWidth = 24 @@ -729,7 +729,7 @@ Public Class frmMain Dim GridDXFieldName = oActGridColumn.FieldName If oViewColumn.Caption = oGridDXFieldName Then If oActGridColumn.Visible = False Then - If oViewColumn.Caption <> "GUID" And oViewColumn.Caption <> "TL_STATE" And oViewColumn.Caption <> "PROFILE_ID" And oViewColumn.Caption <> "DOC_ID" And + If oViewColumn.Caption <> "GUID" And oViewColumn.Caption <> "TL_STATE" And oViewColumn.Caption <> "PROFILE_ID" And oViewColumn.Caption <> "DocID" And oViewColumn.Caption <> "FULL_FILE_PATH" And oViewColumn.Caption <> "GROUP_COLOR" And oViewColumn.Caption <> "GROUP_TEXT" Then Console.WriteLine($"ViewColumn [{oViewColumn.Caption}] is invisible") Else @@ -787,7 +787,7 @@ Public Class frmMain ' sql = sql.Replace("@DATE", Now.ToShortDateString) ' sql = sql.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID) - ' 'String.Format("SELECT '1' TL_STATE,T.PROFIL_ID,T1.TITLE, T.DOC_ID, T.FILE_PATH, T.DMS_ERSTELLT_DATE,[dbo].[FNPM_LAST_WORKUSER_DOC] (T.PROFIL_ID,T.DOC_ID) AS 'Last User',[dbo].[FNPM_LAST_EDITED_DOC] (T.PROFIL_ID,T.DOC_ID) as 'Last edited' FROM TBPM_PROFILE_FILES T, VWPM_PROFILE_USER T1 " & + ' 'String.Format("SELECT '1' TL_STATE,T.PROFIL_ID,T1.TITLE, T.DocID, T.FILE_PATH, T.DMS_ERSTELLT_DATE,[dbo].[FNPM_LAST_WORKUSER_DOC] (T.PROFIL_ID,T.DocID) AS 'Last User',[dbo].[FNPM_LAST_EDITED_DOC] (T.PROFIL_ID,T.DocID) as 'Last edited' FROM TBPM_PROFILE_FILES T, VWPM_PROFILE_USER T1 " & ' ' "WHERE T.PROFIL_ID = T1.PROFIL_ID " & ' ' "AND T1.ACTIVE = 1 And (UPPER(T1.USERNAME) = UPPER('{0}')) Order By T1.PRIORITY", USER_USERNAME) ' CURR_DT_PROFILEGRID = ClassDatabase.Return_Datatable(sql, True) @@ -1106,13 +1106,13 @@ Public Class frmMain ElseIf hitInfo.InDataRow Then Dim DOC_GUID = GridView_Docs.GetFocusedRowCellValue(GridView_Docs.Columns("GUID")) - Dim DOC_ID = GridView_Docs.GetFocusedRowCellValue(GridView_Docs.Columns("DOC_ID")) - If IsNothing(DOC_ID) Then Exit Sub + Dim DocID = GridView_Docs.GetFocusedRowCellValue(GridView_Docs.Columns("DocID")) + If IsNothing(DocID) Then Exit Sub Dim DOC_PATH = GridView_Docs.GetFocusedRowCellValue(GridView_Docs.Columns("FULL_FILE_PATH")) DOC_PATH = DOC_PATH.Replace("W:", "\\windream\objects") DOC_PATH = DOC_PATH.Replace("K:", "\\windream\objects") 'Checking if table really contains one record with profile-id and docid - expression = expression & " AND DOC_ID = " & DOC_ID + expression = expression & " AND DocID = " & DocID Dim TEMP_TABLE = CURR_DT_PROFILEGRID Dim foundRows() As DataRow foundRows = TEMP_TABLE.Select(expression) @@ -1121,7 +1121,7 @@ Public Class frmMain result += 1 Next If result = 1 Then - CURRENT_DOC_ID = DOC_ID + CURRENT_DOC_ID = DocID CURRENT_JUMP_DOC_GUID = DOC_GUID CURRENT_DOC_GUID = CURRENT_JUMP_DOC_GUID CURRENT_DOC_PATH = DOC_PATH @@ -1216,22 +1216,22 @@ Public Class frmMain Dim NewDatatable As New DataTable - NewDatatable.Columns.Add("DOC_ID") + NewDatatable.Columns.Add("DocID") NewDatatable.Columns.Add("DOC_GUID") NewDatatable.Columns.Add("FULL_PATH") For Each oRowHandle As Integer In oSelectedRows - Dim DOC_ID = GridView_Docs.GetRowCellValue(oRowHandle, "DOC_ID") - If IsNothing(DOC_ID) Then + Dim DocID = GridView_Docs.GetRowCellValue(oRowHandle, "DocID") + If IsNothing(DocID) Then Continue For End If Dim R As DataRow = NewDatatable.NewRow - CURRENT_DOC_ID = DOC_ID + CURRENT_DOC_ID = DocID Dim DOC_PATH = GridView_Docs.GetRowCellValue(oRowHandle, "FULL_FILE_PATH") CURRENT_DOC_PATH = DOC_PATH CURRENT_DOC_GUID = GridView_Docs.GetRowCellValue(oRowHandle, "GUID") - R("DOC_ID") = CURRENT_DOC_ID + R("DocID") = CURRENT_DOC_ID R("FULL_PATH") = CURRENT_DOC_PATH R("DOC_GUID") = GridView_Docs.GetRowCellValue(oRowHandle, "GUID") NewDatatable.Rows.Add(R) @@ -1310,7 +1310,7 @@ Public Class frmMain oSQLOverview = oSQLOverview.Replace("@DATE", Now.ToShortDateString) oSQLOverview = oSQLOverview.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID) - 'String.Format("SELECT '1' TL_STATE,T.PROFIL_ID,T1.TITLE, T.DOC_ID, T.FILE_PATH, T.DMS_ERSTELLT_DATE,[dbo].[FNPM_LAST_WORKUSER_DOC] (T.PROFIL_ID,T.DOC_ID) AS 'Last User',[dbo].[FNPM_LAST_EDITED_DOC] (T.PROFIL_ID,T.DOC_ID) as 'Last edited' FROM TBPM_PROFILE_FILES T, VWPM_PROFILE_USER T1 " & + 'String.Format("SELECT '1' TL_STATE,T.PROFIL_ID,T1.TITLE, T.DocID, T.FILE_PATH, T.DMS_ERSTELLT_DATE,[dbo].[FNPM_LAST_WORKUSER_DOC] (T.PROFIL_ID,T.DocID) AS 'Last User',[dbo].[FNPM_LAST_EDITED_DOC] (T.PROFIL_ID,T.DocID) as 'Last edited' FROM TBPM_PROFILE_FILES T, VWPM_PROFILE_USER T1 " & ' "WHERE T.PROFIL_ID = T1.PROFIL_ID " & ' "AND T1.ACTIVE = 1 And (UPPER(T1.USERNAME) = UPPER('{0}')) Order By T1.PRIORITY", USER_USERNAME) CURR_DT_PROFILEGRID = ClassDatabase.Return_Datatable(oSQLOverview, True) @@ -1422,7 +1422,7 @@ Public Class frmMain GridView_Docs.Columns.Item("PROFILE_ID").Visible = False GridView_Docs.Columns.Item("GUID").Visible = False GridView_Docs.Columns.Item("FULL_FILE_PATH").Visible = False - GridView_Docs.Columns.Item("DOC_ID").Visible = False + 'GridView_Docs.Columns.Item("DocID").Visible = False GridView_Docs.Columns.Item("TL_STATE").Visible = False GridView_Docs.Columns.Item("ICON").MaxWidth = 24 GridView_Docs.Columns.Item("ICON").MinWidth = 24 diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index e1ce602..7e4b140 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -439,7 +439,7 @@ Public Class frmValidator Try If TypeOf control Is Label Then Exit Sub - Dim sql As String = $"SELECT NAME, CONNECTION_ID, SQL_UEBERPRUEFUNG FROM TBPM_PROFILE_CONTROLS WHERE GUID = {controlId} AND PROFIL_ID = {CURRENT_ProfilGUID} AND LEN(ISNULL(SQL_UEBERPRUEFUNG,'')) > 0 AND SQL_UEBERPRUEFUNG NOT LIKE '%#WMI#%' AND SQL_UEBERPRUEFUNG NOT LIKE '%#CTRL#%'" + Dim sql As String = $"SELECT NAME, CONNECTION_ID, SQL_UEBERPRUEFUNG FROM TBPM_PROFILE_CONTROLS WHERE GUID = {controlId} AND PROFIL_ID = {CURRENT_ProfilGUID} AND LEN(ISNULL(SQL_UEBERPRUEFUNG,'')) > 0 AND CTRL_TYPE <> 'BUTTON' AND SQL_UEBERPRUEFUNG NOT LIKE '%#WMI#%' AND SQL_UEBERPRUEFUNG NOT LIKE '%#CTRL#%'" Dim dt As DataTable = ClassDatabase.Return_Datatable(sql) If IsNothing(dt) Then Exit Sub @@ -1006,14 +1006,13 @@ Public Class frmValidator If IsNothing(oSQL) Then Exit Sub End If - Dim oSQL2 = ClassControlCreator.GET_CONTROL_PROPERTY(DTCONTROLS, oControlID, "SQL2") - If IsNothing(oSQL2) Then - oSQL2 = "" + Override_SQLCommand = ClassControlCreator.GET_CONTROL_PROPERTY(DTCONTROLS, oControlID, "SQL2") + If IsNothing(Override_SQLCommand) Then + Override_SQLCommand = "" End If ' = $"select SQL_UEBERPRUEFUNG,SQL2 FROM TBPM_PROFILE_CONTROLS WHERE GUID = {oControlID}" oSQL = clsPatterns.ReplaceAllValues(oSQL, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) - LOGGER.Debug($"oSQL after replace {oSQL}") - oSQL2 = clsPatterns.ReplaceAllValues(oSQL2, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + Override_SQLCommand = clsPatterns.ReplaceAllValues(Override_SQLCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) Dim oDT_ACTIONS As DataTable = ClassDatabase.Return_Datatable(oSQL) If IsNothing(oDT_ACTIONS) Then MsgBox("Something went wrong in custom action - Please check Your log!", MsgBoxStyle.Exclamation) @@ -1060,18 +1059,14 @@ Public Class frmValidator oColor = "" End Try Try - OverrideAll = CBool(oDT_ACTIONS?.Rows(0).Item("OverrideAll")) + OverrideAll = oDT_ACTIONS?.Rows(0).Item("OverrideAll") Catch ex As Exception + LOGGER.Warn($"Could not set OverrideAll {ex.Message}") OverrideAll = False End Try - Try - Override_SQLCommand = oSQL2 - Override_SQLCommand = clsPatterns.ReplaceAllValues(Override_SQLCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) - LOGGER.Debug($"Override_SQLCommand after replace {Override_SQLCommand}") - - Catch ex As Exception - Override_SQLCommand = "" - End Try + If OverrideAll = True Then + LOGGER.Warn($"OverrideAll will be in Action!") + End If Select Case oAction Case "SetButton" @@ -2312,6 +2307,7 @@ Public Class frmValidator Dim SpaltenWerte As String() LOGGER.Debug($"{dt.Rows.Count} Columns configured for control {oControlId}.") If dt.Rows.Count > 1 Then + For Each Zeile As Object In wertWD LOGGER.Debug($"vektorrow Value {Zeile.ToString}...") SpaltenWerte = Split(Zeile, Delimiter) @@ -2380,60 +2376,60 @@ Public Class frmValidator If oValueFromSource Is Nothing = False Then Dim omytype = oValueFromSource.GetType.ToString + LOGGER.Debug($"omytype is [{omytype}]!") 'Es wird gegen ein Vektorfeld nachindexiert If omytype.Contains("System.Object") Or omytype = "System.Data.DataTable" Or omytype = "System.String" Then Select Case oTyp 'Tabellendarstellung Case "TABLE" Dim dt As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = " & oControlId) - - Dim SpaltenWerte As String() - LOGGER.Debug($"{dt.Rows.Count} Columns configured for control {oControlId}.") - If dt.Rows.Count >= 1 Then + Dim oColCount = dt.Rows.Count + Dim oColValuesfromSource As String() + LOGGER.Debug($"DevExpressGrid: {oColCount} Columns configured for control {oControlId}.") + If oColCount >= 1 Then Dim oDataSource As DataTable = oMyGridControl.DataSource oDataSource.Rows.Clear() - If IDB_ACTIVE = False Then For Each Zeile As Object In oValueFromSource LOGGER.Debug($"vektorrow Value {Zeile.ToString}...") - SpaltenWerte = Split(Zeile, Delimiter) - Dim oColCount = dt.Rows.Count + oColValuesfromSource = Split(Zeile, Delimiter) + Select Case oColCount Case 1 oDataSource.Rows.Add(New String() {Zeile.ToString}) 'dgv.Rows.Add(New String() {Zeile.ToString}) Case 2 - If SpaltenWerte.Length = 2 Then - oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1)}) + If oColValuesfromSource.Length = 2 Then + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1)}) 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1)}) Else - oDataSource.Rows.Add(New String() {SpaltenWerte(0), ""}) + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), ""}) 'dgv.Rows.Add(New String() {SpaltenWerte(0), ""}) End If Case 3 - If SpaltenWerte.Length = 3 Then - oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2)}) + If oColValuesfromSource.Length = 3 Then + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)}) 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2)}) - ElseIf SpaltenWerte.Length = 2 Then - oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), ""}) + ElseIf oColValuesfromSource.Length = 2 Then + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), ""}) 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), ""}) Else - oDataSource.Rows.Add(New String() {SpaltenWerte(0), "", ""}) + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), "", ""}) 'dgv.Rows.Add(New String() {SpaltenWerte(0), "", ""}) End If Case 4 - If SpaltenWerte.Length = 4 Then - oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), SpaltenWerte(3)}) + If oColValuesfromSource.Length = 4 Then + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)}) 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), SpaltenWerte(3)}) - ElseIf SpaltenWerte.Length = 3 Then - oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), ""}) + ElseIf oColValuesfromSource.Length = 3 Then + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), ""}) 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), ""}) - ElseIf SpaltenWerte.Length = 2 Then - oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), "", ""}) + ElseIf oColValuesfromSource.Length = 2 Then + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), "", ""}) 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), "", ""}) Else - oDataSource.Rows.Add(New String() {SpaltenWerte(0), "", "", ""}) + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), "", "", ""}) 'dgv.Rows.Add(New String() {SpaltenWerte(0), "", "", ""}) End If @@ -2441,28 +2437,28 @@ Public Class frmValidator Next Else If omytype = "System.String" Then - SpaltenWerte = Split(oValueFromSource.ToString, Delimiter) - Select Case SpaltenWerte.Length + oColValuesfromSource = Split(oValueFromSource.ToString, Delimiter) + Select Case oColValuesfromSource.Length Case 2 - oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1)}) + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1)}) Case 3 - oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2)}) + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)}) Case 4 - oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), SpaltenWerte(3)}) + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)}) End Select ElseIf omytype = "System.Data.DataTable" Then Dim oMyDatatable As DataTable = oValueFromSource For Each oRow As DataRow In oMyDatatable.Rows LOGGER.Debug($"IDB ROW Vector {oRow.Item(0).ToString}...") - SpaltenWerte = Split(oRow.Item(0).ToString, Delimiter) + oColValuesfromSource = Split(oRow.Item(0).ToString, Delimiter) - Select Case SpaltenWerte.Length + Select Case oColValuesfromSource.Length Case 2 - oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1)}) + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1)}) Case 3 - oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2)}) + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)}) Case 4 - oDataSource.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), SpaltenWerte(3)}) + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)}) End Select 'Select Case oMyDatatable.Rows.Count ' Case 1 @@ -2522,7 +2518,8 @@ Public Class frmValidator Next End Select - + Else + LOGGER.Warn($"Could not load Devexpress.Grid [{oControl.Name }] as omytype is [{omytype}]!") End If @@ -2779,7 +2776,6 @@ Public Class frmValidator ItemWorked = True Dim oErrorOcurred As Boolean = False If OverrideAll = False Then - 'Eingaben auf Form überprüfen If Check_UpdateIndexe() = False Then @@ -2799,7 +2795,7 @@ Public Class frmValidator If oValue.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ### LOGGER.Debug("Indexing wih dynamic sql...") Dim oSQLCommand = oFinalIndexRow.Item("SQL_COMMAND") - s + oSQLCommand = clsPatterns.ReplaceAllValues(oSQLCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) If IsNothing(oSQLCommand) Then errormessage = "Error while replacing Values in final indexing - Check the log" @@ -3066,7 +3062,7 @@ Public Class frmValidator Exit Sub End If Else - LOGGER.Info("Overriding all in action") + LOGGER.Info($"Overriding all in action for DocID: {CURRENT_DOC_ID} - ProfileID: {CURRENT_ProfilGUID}") If Override_SQLCommand <> "" Then If ClassDatabase.Execute_non_Query(Override_SQLCommand) = False Then oErrorOcurred = True