diff --git a/app/DD-Record-Organizer/Classes/ClassDocGrid.vb b/app/DD-Record-Organizer/Classes/ClassDocGrid.vb index ad4903c..bccd156 100644 --- a/app/DD-Record-Organizer/Classes/ClassDocGrid.vb +++ b/app/DD-Record-Organizer/Classes/ClassDocGrid.vb @@ -16,6 +16,8 @@ Public Class ClassDocGrid Public Property Filename As String Public Property DisplayName As String Public Property DocType As String + Public Property InWork As Boolean + Public Property InWorkUser As String End Class Private ReadOnly GridView As GridView @@ -109,13 +111,16 @@ Public Class ClassDocGrid Dim oDocPath = pGridView.GetRowCellValue(oRowHandle, "FULLPATH") Dim oObjecttype = pGridView.GetRowCellValue(oRowHandle, "OBJECTTYPE") Dim oFilename = pGridView.GetRowCellValue(oRowHandle, "Dateiname") - + Dim oInWork = pGridView.GetRowCellValue(oRowHandle, "in work?") + Dim oInWorkUser = pGridView.GetRowCellValue(oRowHandle, "in work User") oDocuments.Add(New clsWMDoc With { .DocId = oDocId, .DocPath = oDocPath, .DocType = oObjecttype, .DisplayName = oDisplayName, - .Filename = oFilename + .Filename = oFilename, + .InWork = oInWork, + .InWorkUser = oInWorkUser }) Next diff --git a/app/DD-Record-Organizer/Classes/ClassFileResult.vb b/app/DD-Record-Organizer/Classes/ClassFileResult.vb index 7bc8188..94d7f80 100644 --- a/app/DD-Record-Organizer/Classes/ClassFileResult.vb +++ b/app/DD-Record-Organizer/Classes/ClassFileResult.vb @@ -14,9 +14,6 @@ Public Class ClassFileResult 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 InWork = True Return True Else @@ -32,9 +29,6 @@ Public Class ClassFileResult 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 Return True Else Return False diff --git a/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb b/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb index 4e87350..631f8b5 100644 --- a/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb +++ b/app/DD-Record-Organizer/Classes/ClassImport_Windream.vb @@ -108,7 +108,7 @@ Public Class ClassImport_Windream myLogger = LOGCONFIG.GetLogger() Dim FILE_DELIMITER, VERSION_DELIMITER, _WDOBJECTTYPE, _NewFileString As String - Dim sql As String = "select VERSION_DELIMITER, FILE_DELIMITER FROM TBDD_MODULES where NAME = 'Global-Indexer'" + Dim sql As String = "select TOP 1 VERSION_DELIMITER, FILE_DELIMITER FROM TBDD_MODULES where NAME In ('fileFLOW', 'Global-Indexer')" Dim DT1 As DataTable = MYDB_ECM.GetDatatable(sql) FILE_DELIMITER = DT1.Rows(0).Item("FILE_DELIMITER") VERSION_DELIMITER = DT1.Rows(0).Item("VERSION_DELIMITER") diff --git a/app/DD-Record-Organizer/Classes/ClassInit.vb b/app/DD-Record-Organizer/Classes/ClassInit.vb index 7903fc2..d735511 100644 --- a/app/DD-Record-Organizer/Classes/ClassInit.vb +++ b/app/DD-Record-Organizer/Classes/ClassInit.vb @@ -315,6 +315,7 @@ Public Class ClassInit Try USERID_FK_INT_ECM = USER_DT.Rows(0).Item("USERID_FK_INT_ECM") Catch ex As Exception + LOGGER.Warn("ACHTUNG - Spalte USERID_FK_INT_ECM nicht in FNDD_LOGIN_USER_MODULE enthalten ") USERID_FK_INT_ECM = 0 End Try LOGGER.Debug($"USERID_FK_INT_ECM: {USERID_FK_INT_ECM}") diff --git a/app/DD-Record-Organizer/Classes/Controls/ClassControlCommandsUI.vb b/app/DD-Record-Organizer/Classes/Controls/ClassControlCommandsUI.vb index a1cded5..a2f1377 100644 --- a/app/DD-Record-Organizer/Classes/Controls/ClassControlCommandsUI.vb +++ b/app/DD-Record-Organizer/Classes/Controls/ClassControlCommandsUI.vb @@ -393,10 +393,10 @@ Public Class ClassControlCommandsUI End Sub Private Sub UpsertImage(ControlID As Integer, RecordID As Integer, image As Bitmap) - Dim existsSQL As String = "SELECT GUID FROM TBPMO_CONTROL_IMAGE WHERE CONTROL_ID = " & ControlID & " AND RECORD_ID = " & RecordID - Dim exists = MYDB_ECM.ExecuteNonQuery(existsSQL) + Dim existsSQL As String = "SELECT COALESCE(MAX(GUID),0) FROM TBPMO_CONTROL_IMAGE WHERE CONTROL_ID = " & ControlID & " AND RECORD_ID = " & RecordID + Dim exists = MYDB_ECM.GetScalarValue(existsSQL) - If IsNothing(exists) Then + If exists = 0 Then InsertImage(ControlID, RecordID, image) Else UpdateImage(ControlID, RecordID, image) diff --git a/app/DD-Record-Organizer/OrgFlow.vbproj b/app/DD-Record-Organizer/OrgFlow.vbproj index 65c9465..7485210 100644 --- a/app/DD-Record-Organizer/OrgFlow.vbproj +++ b/app/DD-Record-Organizer/OrgFlow.vbproj @@ -1018,6 +1018,7 @@ frmStructureNodeConfig.vb + Designer frmTreeSearchResult.vb diff --git a/app/DD-Record-Organizer/frmConstructorDesigner.vb b/app/DD-Record-Organizer/frmConstructorDesigner.vb index 43b6e5a..279de13 100644 --- a/app/DD-Record-Organizer/frmConstructorDesigner.vb +++ b/app/DD-Record-Organizer/frmConstructorDesigner.vb @@ -215,7 +215,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.GUID NOT IN (SELECT USER_ID FROM TBPMO_CONSTR Dim CONSTR_ID As Integer = CONSTRUCTOR_IDTextBox.Text Dim sel_sql = String.Format("SELECT *, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), {1}) AS 'CAPTION' " & - "from VWPMO_CONSTRUCTOR_FORMS WHERE FORM_TYPE_ID IN (1,4) AND PARENT_ID = 0 AND CONSTRUCT_ID = {2} AND SCREEN_ID = {3} ORDER BY SEQUENCE", USER_LANGUAGE, CURRENT_SCREEN_ID, CONSTR_ID, CURRENT_SCREEN_ID) + "from VWPMO_CONSTRUCTOR_FORMS WHERE (FORM_TYPE_ID IN (1,4) OR FORM_TYPE = 'Personal file') AND PARENT_ID = 0 AND CONSTRUCT_ID = {2} AND SCREEN_ID = {3} ORDER BY SEQUENCE", USER_LANGUAGE, CURRENT_SCREEN_ID, CONSTR_ID, CURRENT_SCREEN_ID) Dim DT As DataTable = MYDB_ECM.GetDatatable(sel_sql) If DT.Rows.Count >= 1 Then diff --git a/app/DD-Record-Organizer/frmDocRecordLink.vb b/app/DD-Record-Organizer/frmDocRecordLink.vb index 2ad942a..dd42ed3 100644 --- a/app/DD-Record-Organizer/frmDocRecordLink.vb +++ b/app/DD-Record-Organizer/frmDocRecordLink.vb @@ -303,12 +303,12 @@ Public Class frmDocRecordLink Continue For End If Try - For Each row As DataRow In CURRENT_DT_SELECTED_FILES.Rows + For Each oRow As DataRow In CURRENT_DT_SELECTED_FILES.Rows - CURRENT_DOC_ID = row.Item("DOC_ID") + CURRENT_DOC_ID = oRow.Item("DOC_ID") LOGGER.Info("DocID {0} will be linked with Record {1} ", CURRENT_DOC_ID.ToString, oSelectedRecordID.ToString) - Dim DOC_PATH = row.Item("FILEPATH") - Dim _objecttype = row.Item("OBJECTTYPE") + Dim DOC_PATH = oRow.Item("FILEPATH") + Dim _objecttype = oRow.Item("OBJECTTYPE") WMOBJECTTYPE = _objecttype Dim sql_Exec = String.Format("EXEC PRPMO_CHECK_DOC_RECORD_LINK {0},{1},'{2}','{3}'", oSelectedRecordID, CURRENT_DOC_ID, "MANUAL RECORD-LINK", USER_USERNAME) If MYDB_ECM.ExecuteNonQuery(sql_Exec) = False Then diff --git a/app/DD-Record-Organizer/frmEntities.Designer.vb b/app/DD-Record-Organizer/frmEntities.Designer.vb index 5010509..0cf262e 100644 --- a/app/DD-Record-Organizer/frmEntities.Designer.vb +++ b/app/DD-Record-Organizer/frmEntities.Designer.vb @@ -37,7 +37,6 @@ Partial Class frmEntities Me.TBPMO_FORMBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DD_DMSDataSet = New DD_Record_Organizer.DD_DMSDataSet() Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() - Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton() Me.DESCRIPTIONTextBox = New System.Windows.Forms.TextBox() Me.TBPMO_FORM_VIEWBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.FORM_TITLETextBox = New System.Windows.Forms.TextBox() @@ -53,7 +52,7 @@ Partial Class frmEntities Me.SINGLE_RECORDCheckBox = New System.Windows.Forms.CheckBox() Me.NumericUpDown1 = New System.Windows.Forms.NumericUpDown() Me.ENTITY_IDTextBox = New System.Windows.Forms.TextBox() - Me.ComboBox1 = New System.Windows.Forms.ComboBox() + Me.cmbEntityType = New System.Windows.Forms.ComboBox() Me.TBPMO_FORM_TYPEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.SHOW_FORM_CONSTRUCTCheckBox = New System.Windows.Forms.CheckBox() Me.TreeViewEntity = New System.Windows.Forms.TreeView() @@ -65,7 +64,7 @@ Partial Class frmEntities Me.btncopy = New System.Windows.Forms.Button() Me.lblStatus = New System.Windows.Forms.Label() Me.btnGenerate = New System.Windows.Forms.Button() - Me.Label3 = New System.Windows.Forms.Label() + Me.lblCreateConstrForm = New System.Windows.Forms.Label() Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.btncancel = New System.Windows.Forms.Button() Me.ProgressPanel1 = New DevExpress.XtraWaitForm.ProgressPanel() @@ -143,7 +142,7 @@ Partial Class frmEntities Me.TBPMO_FORMBindingNavigator.BindingSource = Me.TBPMO_FORMBindingSource Me.TBPMO_FORMBindingNavigator.CountItem = Nothing Me.TBPMO_FORMBindingNavigator.DeleteItem = Nothing - Me.TBPMO_FORMBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton1, Me.ToolStripButton2}) + Me.TBPMO_FORMBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton1}) resources.ApplyResources(Me.TBPMO_FORMBindingNavigator, "TBPMO_FORMBindingNavigator") Me.TBPMO_FORMBindingNavigator.MoveFirstItem = Nothing Me.TBPMO_FORMBindingNavigator.MoveLastItem = Nothing @@ -168,12 +167,6 @@ Partial Class frmEntities resources.ApplyResources(Me.ToolStripButton1, "ToolStripButton1") Me.ToolStripButton1.Name = "ToolStripButton1" ' - 'ToolStripButton2 - ' - Me.ToolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - resources.ApplyResources(Me.ToolStripButton2, "ToolStripButton2") - Me.ToolStripButton2.Name = "ToolStripButton2" - ' 'DESCRIPTIONTextBox ' Me.DESCRIPTIONTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_VIEWBindingSource, "DESCRIPTION", True)) @@ -279,7 +272,7 @@ Partial Class frmEntities Me.GroupBox2.Controls.Add(Me.ENTITY_IDTextBox) Me.GroupBox2.Controls.Add(GUIDLabel) Me.GroupBox2.Controls.Add(Label1) - Me.GroupBox2.Controls.Add(Me.ComboBox1) + Me.GroupBox2.Controls.Add(Me.cmbEntityType) Me.GroupBox2.Controls.Add(Me.SHOW_FORM_CONSTRUCTCheckBox) Me.GroupBox2.Controls.Add(PARENT_IDLabel) Me.GroupBox2.Controls.Add(Me.ADDED_WHOTextBox) @@ -319,15 +312,15 @@ Partial Class frmEntities Me.ENTITY_IDTextBox.Name = "ENTITY_IDTextBox" Me.ENTITY_IDTextBox.ReadOnly = True ' - 'ComboBox1 + 'cmbEntityType ' - Me.ComboBox1.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBPMO_FORMBindingSource, "FORM_TYPE_ID", True)) - Me.ComboBox1.DataSource = Me.TBPMO_FORM_TYPEBindingSource - Me.ComboBox1.DisplayMember = "FORM_TYPE" - resources.ApplyResources(Me.ComboBox1, "ComboBox1") - Me.ComboBox1.FormattingEnabled = True - Me.ComboBox1.Name = "ComboBox1" - Me.ComboBox1.ValueMember = "GUID" + Me.cmbEntityType.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBPMO_FORMBindingSource, "FORM_TYPE_ID", True)) + Me.cmbEntityType.DataSource = Me.TBPMO_FORM_TYPEBindingSource + Me.cmbEntityType.DisplayMember = "FORM_TYPE" + resources.ApplyResources(Me.cmbEntityType, "cmbEntityType") + Me.cmbEntityType.FormattingEnabled = True + Me.cmbEntityType.Name = "cmbEntityType" + Me.cmbEntityType.ValueMember = "GUID" ' 'TBPMO_FORM_TYPEBindingSource ' @@ -391,10 +384,10 @@ Partial Class frmEntities Me.btnGenerate.Name = "btnGenerate" Me.btnGenerate.UseVisualStyleBackColor = True ' - 'Label3 + 'lblCreateConstrForm ' - resources.ApplyResources(Me.Label3, "Label3") - Me.Label3.Name = "Label3" + resources.ApplyResources(Me.lblCreateConstrForm, "lblCreateConstrForm") + Me.lblCreateConstrForm.Name = "lblCreateConstrForm" ' 'GroupBox1 ' @@ -441,7 +434,7 @@ Partial Class frmEntities resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.GroupBox1) - Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.lblCreateConstrForm) Me.Controls.Add(Me.btnGenerate) Me.Controls.Add(Me.lblStatus) Me.Controls.Add(Me.btncopy) @@ -477,14 +470,13 @@ Partial Class frmEntities Friend WithEvents PARENT_IDTextBox As System.Windows.Forms.TextBox Friend WithEvents NAMETextBox As System.Windows.Forms.TextBox Friend WithEvents ADDED_WHOTextBox As System.Windows.Forms.TextBox - Friend WithEvents ToolStripButton2 As System.Windows.Forms.ToolStripButton Friend WithEvents TBPMO_FORM_VIEWBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBPMO_FORM_VIEWTableAdapter As DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_FORM_VIEWTableAdapter Friend WithEvents CHANGED_WHOTextBoxPMOForm As System.Windows.Forms.TextBox Friend WithEvents DESCRIPTIONTextBox As System.Windows.Forms.TextBox Friend WithEvents FORM_TITLETextBox As System.Windows.Forms.TextBox Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox - Friend WithEvents ComboBox1 As System.Windows.Forms.ComboBox + Friend WithEvents cmbEntityType As System.Windows.Forms.ComboBox Friend WithEvents SHOW_FORM_CONSTRUCTCheckBox As System.Windows.Forms.CheckBox Friend WithEvents TBPMO_FORM_TYPEBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBPMO_FORM_TYPETableAdapter As DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_FORM_TYPETableAdapter @@ -497,7 +489,7 @@ Partial Class frmEntities Friend WithEvents btncopy As System.Windows.Forms.Button Friend WithEvents lblStatus As System.Windows.Forms.Label Friend WithEvents btnGenerate As System.Windows.Forms.Button - Friend WithEvents Label3 As System.Windows.Forms.Label + Friend WithEvents lblCreateConstrForm As System.Windows.Forms.Label Friend WithEvents NumericUpDown1 As System.Windows.Forms.NumericUpDown Friend WithEvents Label4 As System.Windows.Forms.Label Friend WithEvents SINGLE_RECORDCheckBox As System.Windows.Forms.CheckBox diff --git a/app/DD-Record-Organizer/frmEntities.resx b/app/DD-Record-Organizer/frmEntities.resx index b8ca5ad..9c2a77f 100644 --- a/app/DD-Record-Organizer/frmEntities.resx +++ b/app/DD-Record-Organizer/frmEntities.resx @@ -449,15 +449,6 @@ Im Form Designer öffnen - - Magenta - - - 97, 22 - - - Vorschau öffnen - 0, 0 @@ -482,6 +473,9 @@ 11 + + 17, 17 + 1104, 17 @@ -509,6 +503,9 @@ 2 + + 1104, 17 + Segoe UI, 9.75pt @@ -644,6 +641,105 @@ 17, 56 + + Label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 3 + + + SINGLE_RECORDCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 4 + + + NumericUpDown1 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 5 + + + ENTITY_IDTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 7 + + + cmbEntityType + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 10 + + + SHOW_FORM_CONSTRUCTCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox2 + + + 11 + + + Segoe UI, 9.75pt, style=Bold + + + 328, 53 + + + 424, 368 + + + 23 + + + Entity Properties: + + + GroupBox2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + True @@ -753,30 +849,33 @@ diese Entität angelegt werden. 255, 56 - + Segoe UI, 9.75pt - + 147, 295 - + 220, 25 - + 17 - - ComboBox1 + + cmbEntityType - + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + GroupBox2 - + 10 + + 255, 56 + Segoe UI, 9.75pt @@ -804,33 +903,6 @@ diese Entität angelegt werden. 11 - - Segoe UI, 9.75pt, style=Bold - - - 328, 53 - - - 424, 368 - - - 23 - - - Entity Properties: - - - GroupBox2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 9 - Top, Bottom, Left @@ -1110,7 +1182,7 @@ diese Entität angelegt werden. iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAALhJREFUOE+tk8ENhCAQRSnFWqiEOiiAO42sJXjmRCnsXriy83VIZCQE153kJcKf + vwAADr8BOAVTJAAAALhJREFUOE+tk8ENhCAQRSnFWqiEOiiAO42sJXjmRCnsXriy83VIZCQE153kJcKf /yM6KFk5Z0NsRBFgz3DbtUhciBhCKNbaorVuwB409KCXbUexOTnnLkaJ9x4hqQmhRYTQM/TgkFjNBq8m m9bXWt7ps4NnqfNxDAK23pnBKAQeeBHQCJJRCLxNQG0ccQ75f0CPmSM8/ojPfiPPQpyZwkozSCha7KM8 M43dUUZxyG+X6Vwk3rjOSn0Bs2pSjcG3D98AAAAASUVORK5CYII= @@ -1149,44 +1221,116 @@ diese Entität angelegt werden. 2 - + True - + Segoe UI, 8.25pt, style=Italic - + 755, 280 - + 268, 26 - + 31 - + Mit dieser Funktion wird die Sicht erzeugt, welche die links dargestellte TreeView-Struktur umsetzt. - + False - - Label3 + + lblCreateConstrForm - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 1 + + btncancel + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 0 + + + ProgressPanel1 + + + DevExpress.XtraWaitForm.ProgressPanel, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + GroupBox1 + + + 1 + + + btnRefreshEntityTable + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 2 + + + btnCreateEntityTable + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + + + 3 + + + 328, 427 + + + 424, 125 + + + 32 + + + Erzeugung Tabellenstruktur: + + + GroupBox1 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAQdJREFUOE+lkTEOgkAURD0CR/AIHMHQk9jSWXAAaiorWsMJOAIFPSUtCaEkSEUI + vwAADr8BOAVTJAAAAQdJREFUOE+lkTEOgkAURD0CR/AIHMHQk9jSWXAAaiorWsMJOAIFPSUtCaEkSEUI FHS03z8bVllcEsFJJq7z/7xFORHRX9aGe/w5sKZpMtlPNrEjES7E2WU51wFi3/fJsixK0xRL1zk/t20b h2FIQRC84TpAJAG2bVNVVbjtnmXZ6DiOUoZ0AKPrutx1XQHBJ27FeV2GvgDQGrJVhrYA5mEAL3lFUYzL n4AyzkmSAOKJxVkKADeUZSn+PFnGkyCXEMz5u3gzkAJomkYp930/8rKJRUDwBJgvcwVQ1/WIMpYA46Ub @@ -1259,7 +1403,7 @@ welche die links dargestellte TreeView-Struktur umsetzt. iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAGxJREFUOE/NjNEJgDAMBTNbVnA3v1zDQZxE/cmv8oqBECm+VgQDR9PAnWDM7Oih + vgAADr4B6kKxwAAAAGxJREFUOE/NjNEJgDAMBTNbVnA3v1zDQZxE/cmv8oqBECm+VgQDR9PAnWDM7Oih yBh8VLWJnwa2daegAzJMhXz/PjDOS3ljwG/gMQAJggd8pwNRjhE6kCNRBlQAQMwyoAM1qoEWboEeLv3N iJxnTngNYdMDJwAAAABJRU5ErkJggg== @@ -1300,7 +1444,7 @@ welche die links dargestellte TreeView-Struktur umsetzt. iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAE1JREFUOE9j+P//P8O3b9/+k4vhBjg5OZGMB6EBH95/hGNi+NQ3gFRMfRegKyDE + vwAADr8BOAVTJAAAAE1JREFUOE9j+P//P8O3b9/+k4vhBjg5OZGMB6EBH95/hGNi+NQ3gFRMfRegKyDE xzCAVEx9F6ArIMTHMIBUjGIAuRhsACUYqyDx+D8DAGWb3TPY4bxVAAAAAElFTkSuQmCC @@ -1334,30 +1478,6 @@ welche die links dargestellte TreeView-Struktur umsetzt. 3 - - 328, 427 - - - 424, 125 - - - 32 - - - Erzeugung Tabellenstruktur: - - - GroupBox1 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - 733, 56 @@ -1846,12 +1966,6 @@ welche die links dargestellte TreeView-Struktur umsetzt. System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ToolStripButton2 - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TBPMO_FORM_VIEWBindingSource diff --git a/app/DD-Record-Organizer/frmEntities.vb b/app/DD-Record-Organizer/frmEntities.vb index 821644c..fb41c7a 100644 --- a/app/DD-Record-Organizer/frmEntities.vb +++ b/app/DD-Record-Organizer/frmEntities.vb @@ -71,7 +71,7 @@ Public Class frmEntities Dim Node1 As TreeNode Node1 = Node.Nodes.Add(row1.Item("CAPTION").ToString) Node1.Tag = row1.Item("GUID") - DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' FROM " & _ + DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' FROM " & "TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID in (3,5) AND T.PARENT_ID = {2} AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {3})) ORDER BY LEVEL", USER_LANGUAGE, CURRENT_SCREEN_ID, row1.Item("GUID"), USER_GUID) LOGGER.Debug(Now.ToString & "Level 2 >>" & DT_SQL, False) ' Dim sql1 As String = "SELECT T.GUID, T1.FORM_TITLE FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID in (3,5) AND T.PARENT_ID = " & row1.Item("GUID") & " ORDER BY LEVEL" @@ -89,7 +89,7 @@ Public Class frmEntities End If Next - DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' " & _ + DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' " & "FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID = 4 AND T.PARENT_ID = 0 AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {2})) ORDER BY CAPTION", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID) 'Dim sql2 As String = "SELECT T.GUID, T1.FORM_TITLE FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID = 4 AND T.PARENT_ID = 0 ORDER BY T1.FORM_TITLE" Dim DT3 As DataTable = MYDB_ECM.GetDatatable(DT_SQL) @@ -126,10 +126,12 @@ Public Class frmEntities Me.btnGenerate.Visible = True - If PARENT_IDTextBox.Text = 0 And (ComboBox1.SelectedValue = 1 Or ComboBox1.SelectedValue = 4) Then + If PARENT_IDTextBox.Text = 0 And (cmbEntityType.SelectedValue = 1 Or cmbEntityType.Text = "Personal file") Then Me.btnGenerate.Visible = True + lblCreateConstrForm.Visible = True Else Me.btnGenerate.Visible = False + lblCreateConstrForm.Visible = False End If Catch ex As Exception MsgBox("Error in Load_Forms:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -248,7 +250,7 @@ Public Class frmEntities ' Save FORM_VIEW Properties If insert = True Then Dim sql = "SELECT (MAX(GUID)) FROM TBPMO_FORM" - Dim FORM_ID = MYDB_ECM.GetScalarValue(SQL) + Dim FORM_ID = MYDB_ECM.GetScalarValue(sql) Dim ADDED_WHO As String = USER_USERNAME @@ -257,7 +259,7 @@ Public Class frmEntities 'ggg() If FORM_ID Is Nothing = False Then sql = String.Format("INSERT INTO TBPMO_FORM_VIEW (FORM_ID, SCREEN_ID, FORM_TITLE, DESCRIPTION, ADDED_WHO,LANGUAGE) VALUES ({0}, {1},'{2}','{3}','{4}','{5}')", FORM_ID, CURRENT_SCREEN_ID, FORM_TITLE, DESCRIPTION, ADDED_WHO, USER_LANGUAGE) - MYDB_ECM.ExecuteNonQuery(Sql) + MYDB_ECM.ExecuteNonQuery(sql) End If Load_TreeView() Else @@ -294,7 +296,7 @@ Public Class frmEntities Try Dim CurrentID = GetCurrentGUID() Dim sql = "EXEC PRPMO_DELETE_ENTITY " & CurrentID - If MYDB_ECM.ExecuteNonQuery(Sql) = True Then + If MYDB_ECM.ExecuteNonQuery(sql) = True Then MsgBox("Entity was deleted!", MsgBoxStyle.Information) Load_TreeView() Load_Forms(999999999) @@ -350,7 +352,7 @@ Public Class frmEntities Try Dim CurrentID = GetCurrentGUID() Dim sql As String = "EXEC PRPMO_COPY_ENTITY " & CurrentID.ToString & ", '" & USER_USERNAME & "'" - If MYDB_ECM.ExecuteNonQuery(Sql) = True Then + If MYDB_ECM.ExecuteNonQuery(sql) = True Then 'MsgBox("Die Entität wurde erfolgreich kopiert!", MsgBoxStyle.Information) Load_TreeView() Load_Forms(999999999) @@ -392,13 +394,13 @@ Public Class frmEntities End Try End Sub - Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged - If ComboBox1.SelectedIndex <> -1 Then - If ComboBox1.SelectedValue = 5 Then - ToolStripButton2.Enabled = False + Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbEntityType.SelectedIndexChanged + If cmbEntityType.SelectedIndex <> -1 Then + If cmbEntityType.SelectedValue = 5 Then + ToolStripButton1.Enabled = False Else - ToolStripButton2.Enabled = True + ToolStripButton1.Enabled = True End If End If @@ -447,8 +449,8 @@ Public Class frmEntities Private Sub btnRefreshEntityTable_Click(sender As Object, e As EventArgs) Handles btnRefreshEntityTable.Click Dim CurrentID = GetCurrentGUID() - EXECUTE_STATEMENT = String.Format("DECLARE @return_value int " & vbNewLine & _ - "EXEC @return_value = dbo.PRPMO_ENTITY_TABLE_IMPORT_RECORDS {0}" & vbNewLine & _ + EXECUTE_STATEMENT = String.Format("DECLARE @return_value int " & vbNewLine & + "EXEC @return_value = dbo.PRPMO_ENTITY_TABLE_IMPORT_RECORDS {0}" & vbNewLine & "SELECT 'Return Value' = @return_value", CurrentID) ProgressPanel1.Description = "Inserting Records...." ProgressPanel1.Visible = True @@ -463,4 +465,5 @@ Public Class frmEntities End If End Sub + End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmFileInWork.vb b/app/DD-Record-Organizer/frmFileInWork.vb index 0175da6..72b0aa0 100644 --- a/app/DD-Record-Organizer/frmFileInWork.vb +++ b/app/DD-Record-Organizer/frmFileInWork.vb @@ -1,23 +1,27 @@ Public Class frmFileInWork - + Public Property myDocuments As New List(Of ClassDocGrid.clsWMDoc) Private Sub btnInWork_Click(sender As Object, e As EventArgs) Handles btnInWork.Click Try - If ClassFileResult.Set_InWork(1, txtComment.Text) = True Then - Dim expression As String - expression = "DocID = " & ClassFileResult.DocID - Dim foundRowsLevel0() As DataRow - ' Use the Select method to find all rows matching the filter. - foundRowsLevel0 = CURRENT_DOC_RESULTS.Select(expression) - Try - foundRowsLevel0(0)(13) = True - Catch ex As Exception - - End Try + For Each oDoc As ClassDocGrid.clsWMDoc In myDocuments + ClassFileResult.DocID = oDoc.DocId + If ClassFileResult.Set_InWork(1, txtComment.Text) = True Then + Dim expression As String + expression = "DocID = " & ClassFileResult.DocID + Dim foundRowsLevel0() As DataRow + ' Use the Select method to find all rows matching the filter. + foundRowsLevel0 = CURRENT_DOC_RESULTS.Select(expression) + Try + foundRowsLevel0(0)(13) = True + Catch ex As Exception - Me.Close() - Else - MsgBox("Unexpected Error 1 in Setting to work - Check logfile", MsgBoxStyle.Exclamation) - End If + End Try + + + Else + MsgBox("Unexpected Error 1 in Setting to work - Check logfile", MsgBoxStyle.Exclamation) + End If + Next + Me.Close() Catch ex As Exception MsgBox("Unexpected Error 2 in Setting to work - Check logfile", MsgBoxStyle.Exclamation) End Try diff --git a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb index 569d04c..9133d3b 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb @@ -121,6 +121,8 @@ Partial Class frmNodeNavigation Me.PopupMenu3 = New DevExpress.XtraBars.PopupMenu(Me.components) Me.PopupMenu4 = New DevExpress.XtraBars.PopupMenu(Me.components) Me.PopupMenu5 = New DevExpress.XtraBars.PopupMenu(Me.components) + Me.tsmiFileInWorkMultiple_Free = New System.Windows.Forms.ToolStripMenuItem() + Me.tsmiFileInWorkMultiple_Lock = New System.Windows.Forms.ToolStripMenuItem() CType(Me.ribbonNodeNavigation, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerTreeList, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerTreeList.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -169,7 +171,7 @@ Partial Class frmNodeNavigation Me.ribbonNodeNavigation.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.[True] Me.ribbonNodeNavigation.ShowMoreCommandsButton = DevExpress.Utils.DefaultBoolean.[False] Me.ribbonNodeNavigation.ShowToolbarCustomizeItem = False - Me.ribbonNodeNavigation.Size = New System.Drawing.Size(966, 147) + Me.ribbonNodeNavigation.Size = New System.Drawing.Size(966, 158) Me.ribbonNodeNavigation.StatusBar = Me.RibbonStatusBar1 Me.ribbonNodeNavigation.Toolbar.ShowCustomizeItem = False ' @@ -365,10 +367,10 @@ Partial Class frmNodeNavigation Me.RibbonStatusBar1.ItemLinks.Add(Me.tsitmDMSReadOnly) Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItemLocked) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmtInfoDoc) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 787) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 788) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.ribbonNodeNavigation - Me.RibbonStatusBar1.Size = New System.Drawing.Size(966, 23) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(966, 22) ' 'RibbonPage2 ' @@ -390,7 +392,7 @@ Partial Class frmNodeNavigation ' Me.SplitContainerTreeList.Panel2.Controls.Add(Me.SplitContainerDocumentSearch) Me.SplitContainerTreeList.Panel2.Text = "Panel2" - Me.SplitContainerTreeList.Size = New System.Drawing.Size(799, 640) + Me.SplitContainerTreeList.Size = New System.Drawing.Size(799, 630) Me.SplitContainerTreeList.SplitterPosition = 229 Me.SplitContainerTreeList.TabIndex = 2 ' @@ -432,7 +434,7 @@ Partial Class frmNodeNavigation Me.TreeListDevexpress.OptionsView.ShowVertLines = False Me.TreeListDevexpress.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Dark Me.TreeListDevexpress.ParentFieldName = "PARENT_GUID" - Me.TreeListDevexpress.Size = New System.Drawing.Size(229, 640) + Me.TreeListDevexpress.Size = New System.Drawing.Size(229, 630) Me.TreeListDevexpress.StateImageList = Me.ImageCollection1 Me.TreeListDevexpress.TabIndex = 1 ' @@ -456,7 +458,7 @@ Partial Class frmNodeNavigation ' Me.SplitContainerDocumentSearch.Panel2.Controls.Add(Me.GridControlDocSearch) Me.SplitContainerDocumentSearch.Panel2.Text = "Panel2" - Me.SplitContainerDocumentSearch.Size = New System.Drawing.Size(558, 640) + Me.SplitContainerDocumentSearch.Size = New System.Drawing.Size(560, 630) Me.SplitContainerDocumentSearch.SplitterPosition = 246 Me.SplitContainerDocumentSearch.TabIndex = 1 ' @@ -467,7 +469,7 @@ Partial Class frmNodeNavigation Me.pnlControls.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlControls.Location = New System.Drawing.Point(0, 0) Me.pnlControls.Name = "pnlControls" - Me.pnlControls.Size = New System.Drawing.Size(558, 246) + Me.pnlControls.Size = New System.Drawing.Size(560, 246) Me.pnlControls.TabIndex = 0 ' 'GridControlDocSearch @@ -481,7 +483,7 @@ Partial Class frmNodeNavigation Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 0) Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search Me.GridControlDocSearch.Name = "GridControlDocSearch" - Me.GridControlDocSearch.Size = New System.Drawing.Size(558, 382) + Me.GridControlDocSearch.Size = New System.Drawing.Size(560, 374) Me.GridControlDocSearch.TabIndex = 8 Me.GridControlDocSearch.TabStop = False Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search}) @@ -489,92 +491,92 @@ Partial Class frmNodeNavigation 'cmsResultFileDetail ' Me.cmsResultFileDetail.ImageScalingSize = New System.Drawing.Size(18, 18) - Me.cmsResultFileDetail.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiFileProperties, Me.ToolStripSeparator5, Me.tsmiFileOpen, Me.tsmiFileFolderOpen, Me.ToolStripSeparator1, Me.tsmiFileInWork, Me.ToolStripSeparator3, Me.tsmiFileLink_Add, Me.tsmiFileLinkRemove, Me.tsmiFileLink_ShowAll, Me.LinkPerMailVersendenToolStripMenuItem, Me.ToolStripSeparator2, Me.tsmiFileRename, Me.DokumentartÄndernToolStripMenuItem, Me.tsmiFileVersion, Me.tsmiFileRightsShow, Me.ToolStripSeparator4, Me.tsmiFileDelete}) + Me.cmsResultFileDetail.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiFileProperties, Me.ToolStripSeparator5, Me.tsmiFileOpen, Me.tsmiFileFolderOpen, Me.ToolStripSeparator1, Me.tsmiFileInWorkMultiple_Lock, Me.tsmiFileInWorkMultiple_Free, Me.tsmiFileInWork, Me.ToolStripSeparator3, Me.tsmiFileLink_Add, Me.tsmiFileLinkRemove, Me.tsmiFileLink_ShowAll, Me.LinkPerMailVersendenToolStripMenuItem, Me.ToolStripSeparator2, Me.tsmiFileRename, Me.DokumentartÄndernToolStripMenuItem, Me.tsmiFileVersion, Me.tsmiFileRightsShow, Me.ToolStripSeparator4, Me.tsmiFileDelete}) Me.cmsResultFileDetail.Name = "ContextMenuStripResultFiles" - Me.cmsResultFileDetail.Size = New System.Drawing.Size(242, 346) + Me.cmsResultFileDetail.Size = New System.Drawing.Size(315, 416) ' 'tsmiFileProperties ' Me.tsmiFileProperties.Image = CType(resources.GetObject("tsmiFileProperties.Image"), System.Drawing.Image) Me.tsmiFileProperties.Name = "tsmiFileProperties" - Me.tsmiFileProperties.Size = New System.Drawing.Size(241, 24) + Me.tsmiFileProperties.Size = New System.Drawing.Size(314, 24) Me.tsmiFileProperties.Text = "Eigenschaften" ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(238, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(311, 6) ' 'tsmiFileOpen ' Me.tsmiFileOpen.Image = CType(resources.GetObject("tsmiFileOpen.Image"), System.Drawing.Image) Me.tsmiFileOpen.Name = "tsmiFileOpen" - Me.tsmiFileOpen.Size = New System.Drawing.Size(241, 24) + Me.tsmiFileOpen.Size = New System.Drawing.Size(314, 24) Me.tsmiFileOpen.Text = "Datei öffnen" ' 'tsmiFileFolderOpen ' Me.tsmiFileFolderOpen.Image = CType(resources.GetObject("tsmiFileFolderOpen.Image"), System.Drawing.Image) Me.tsmiFileFolderOpen.Name = "tsmiFileFolderOpen" - Me.tsmiFileFolderOpen.Size = New System.Drawing.Size(241, 24) + Me.tsmiFileFolderOpen.Size = New System.Drawing.Size(314, 24) Me.tsmiFileFolderOpen.Text = "Ordner öffnen" ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(238, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(311, 6) ' 'tsmiFileInWork ' Me.tsmiFileInWork.Image = CType(resources.GetObject("tsmiFileInWork.Image"), System.Drawing.Image) Me.tsmiFileInWork.Name = "tsmiFileInWork" - Me.tsmiFileInWork.Size = New System.Drawing.Size(241, 24) + Me.tsmiFileInWork.Size = New System.Drawing.Size(314, 24) Me.tsmiFileInWork.Text = "Datei in Bearbeitung nehmen" ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(238, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(311, 6) ' 'tsmiFileLink_Add ' Me.tsmiFileLink_Add.Image = CType(resources.GetObject("tsmiFileLink_Add.Image"), System.Drawing.Image) Me.tsmiFileLink_Add.Name = "tsmiFileLink_Add" - Me.tsmiFileLink_Add.Size = New System.Drawing.Size(241, 24) + Me.tsmiFileLink_Add.Size = New System.Drawing.Size(314, 24) Me.tsmiFileLink_Add.Text = "Datei mit Datensatz verknüpfen" ' 'tsmiFileLinkRemove ' Me.tsmiFileLinkRemove.Image = CType(resources.GetObject("tsmiFileLinkRemove.Image"), System.Drawing.Image) Me.tsmiFileLinkRemove.Name = "tsmiFileLinkRemove" - Me.tsmiFileLinkRemove.Size = New System.Drawing.Size(241, 24) + Me.tsmiFileLinkRemove.Size = New System.Drawing.Size(314, 24) Me.tsmiFileLinkRemove.Text = "Entferne Dateilink" ' 'tsmiFileLink_ShowAll ' Me.tsmiFileLink_ShowAll.Image = CType(resources.GetObject("tsmiFileLink_ShowAll.Image"), System.Drawing.Image) Me.tsmiFileLink_ShowAll.Name = "tsmiFileLink_ShowAll" - Me.tsmiFileLink_ShowAll.Size = New System.Drawing.Size(241, 24) + Me.tsmiFileLink_ShowAll.Size = New System.Drawing.Size(314, 24) Me.tsmiFileLink_ShowAll.Text = "Verknüpfungen anzeigen" ' 'LinkPerMailVersendenToolStripMenuItem ' Me.LinkPerMailVersendenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.email_go Me.LinkPerMailVersendenToolStripMenuItem.Name = "LinkPerMailVersendenToolStripMenuItem" - Me.LinkPerMailVersendenToolStripMenuItem.Size = New System.Drawing.Size(241, 24) + Me.LinkPerMailVersendenToolStripMenuItem.Size = New System.Drawing.Size(314, 24) Me.LinkPerMailVersendenToolStripMenuItem.Text = "Link per Mail versenden" Me.LinkPerMailVersendenToolStripMenuItem.Visible = False ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(238, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(311, 6) ' 'tsmiFileRename ' Me.tsmiFileRename.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiFileRenameFilename, Me.tsmiFileRenameDisplayname}) Me.tsmiFileRename.Name = "tsmiFileRename" - Me.tsmiFileRename.Size = New System.Drawing.Size(241, 24) + Me.tsmiFileRename.Size = New System.Drawing.Size(314, 24) Me.tsmiFileRename.Text = "Umbenennen" ' 'tsmiFileRenameFilename @@ -592,33 +594,33 @@ Partial Class frmNodeNavigation 'DokumentartÄndernToolStripMenuItem ' Me.DokumentartÄndernToolStripMenuItem.Name = "DokumentartÄndernToolStripMenuItem" - Me.DokumentartÄndernToolStripMenuItem.Size = New System.Drawing.Size(241, 24) + Me.DokumentartÄndernToolStripMenuItem.Size = New System.Drawing.Size(314, 24) Me.DokumentartÄndernToolStripMenuItem.Text = "Dokumentart ändern" ' 'tsmiFileVersion ' Me.tsmiFileVersion.Image = CType(resources.GetObject("tsmiFileVersion.Image"), System.Drawing.Image) Me.tsmiFileVersion.Name = "tsmiFileVersion" - Me.tsmiFileVersion.Size = New System.Drawing.Size(241, 24) + Me.tsmiFileVersion.Size = New System.Drawing.Size(314, 24) Me.tsmiFileVersion.Text = "Datei versionieren" ' 'tsmiFileRightsShow ' Me.tsmiFileRightsShow.Image = CType(resources.GetObject("tsmiFileRightsShow.Image"), System.Drawing.Image) Me.tsmiFileRightsShow.Name = "tsmiFileRightsShow" - Me.tsmiFileRightsShow.Size = New System.Drawing.Size(241, 24) + Me.tsmiFileRightsShow.Size = New System.Drawing.Size(314, 24) Me.tsmiFileRightsShow.Text = "Dateirechte für User anzeigen" ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(238, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(311, 6) ' 'tsmiFileDelete ' Me.tsmiFileDelete.Image = CType(resources.GetObject("tsmiFileDelete.Image"), System.Drawing.Image) Me.tsmiFileDelete.Name = "tsmiFileDelete" - Me.tsmiFileDelete.Size = New System.Drawing.Size(241, 24) + Me.tsmiFileDelete.Size = New System.Drawing.Size(314, 24) Me.tsmiFileDelete.Text = "Datei löschen" ' 'GridViewDoc_Search @@ -685,7 +687,7 @@ Partial Class frmNodeNavigation ' Me.SplitContainerDocView.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 Me.SplitContainerDocView.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerDocView.Location = New System.Drawing.Point(0, 147) + Me.SplitContainerDocView.Location = New System.Drawing.Point(0, 158) Me.SplitContainerDocView.Name = "SplitContainerDocView" ' 'SplitContainerDocView.Panel1 @@ -697,7 +699,7 @@ Partial Class frmNodeNavigation ' Me.SplitContainerDocView.Panel2.Controls.Add(Me.DocumentViewer) Me.SplitContainerDocView.Panel2.Text = "Panel2" - Me.SplitContainerDocView.Size = New System.Drawing.Size(966, 640) + Me.SplitContainerDocView.Size = New System.Drawing.Size(966, 630) Me.SplitContainerDocView.SplitterPosition = 799 Me.SplitContainerDocView.TabIndex = 0 ' @@ -707,7 +709,7 @@ Partial Class frmNodeNavigation Me.DocumentViewer.FileLoaded = False Me.DocumentViewer.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer.Name = "DocumentViewer" - Me.DocumentViewer.Size = New System.Drawing.Size(155, 640) + Me.DocumentViewer.Size = New System.Drawing.Size(157, 630) Me.DocumentViewer.TabIndex = 0 ' 'XtraSaveFileDialog1 @@ -1009,6 +1011,20 @@ Partial Class frmNodeNavigation Me.PopupMenu5.Manager = Me.BarManager1 Me.PopupMenu5.Name = "PopupMenu5" ' + 'tsmiFileInWorkMultiple_Free + ' + Me.tsmiFileInWorkMultiple_Free.Image = CType(resources.GetObject("tsmiFileInWorkMultiple_Free.Image"), System.Drawing.Image) + Me.tsmiFileInWorkMultiple_Free.Name = "tsmiFileInWorkMultiple_Free" + Me.tsmiFileInWorkMultiple_Free.Size = New System.Drawing.Size(314, 24) + Me.tsmiFileInWorkMultiple_Free.Text = "Ausgewählte Dateien wieder freigeben" + ' + 'tsmiFileInWorkMultiple_Lock + ' + Me.tsmiFileInWorkMultiple_Lock.Image = CType(resources.GetObject("tsmiFileInWorkMultiple_Lock.Image"), System.Drawing.Image) + Me.tsmiFileInWorkMultiple_Lock.Name = "tsmiFileInWorkMultiple_Lock" + Me.tsmiFileInWorkMultiple_Lock.Size = New System.Drawing.Size(314, 24) + Me.tsmiFileInWorkMultiple_Lock.Text = "Ausgewählte Dateien in Bearbeitung nehmen" + ' 'frmNodeNavigation ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1159,4 +1175,6 @@ Partial Class frmNodeNavigation Friend WithEvents PopupMenu5 As DevExpress.XtraBars.PopupMenu Friend WithEvents bsiNotification As DevExpress.XtraBars.BarStaticItem Friend WithEvents LinkPerMailVersendenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents tsmiFileInWorkMultiple_Free As ToolStripMenuItem + Friend WithEvents tsmiFileInWorkMultiple_Lock As ToolStripMenuItem End Class diff --git a/app/DD-Record-Organizer/frmNodeNavigation.resx b/app/DD-Record-Organizer/frmNodeNavigation.resx index 8bbbe86..9431a55 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.resx +++ b/app/DD-Record-Organizer/frmNodeNavigation.resx @@ -565,6 +565,36 @@ zS3/P7z/iIKxGoBuAwgja4aJ4TUAppgQpp4BIAKGyTYAxCEWYzPgfH5+PoZCXPjokaMYBjQsX74cQyEu 3NfXj2GAwZUrVzAU4sLJScmoBkBj4H1kZCSGYlz41s3bYBrZgPm4kis2vH7dejCNbEDCvn37MBQSwsgG CIA45GCG//8pwf8ZANa5gGyReLItAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAhlJREFUWEfFlTFuAjEURDkCR+EIiB6Jli4Fp+AAtIgT5CakpkpDDz1FOlpnZvK9 + Mt8OtlG0GWkKZnf/m1283kkI4V9dDMd0MRzT5fBF3e/3d9p+ViWWhyt8QQYP5qYSYnm4wk4BuErgzSXE + 8nCFnQLsQujhcAi73a65hFgerrBDgMwIu16vYbFYyK0lxPJwhR0CYE7Q6XQaCrSWEMvDFTYKg6fwJyHH + 4/GhQEsJsTxcYYMwcICfz+ewXC6zArUSYnm4woowqAkevd1uw+12y0qI5eEKTQbaw1rl3i3w6M1mk5UQ + y8MV/sC5ur/sgsw98GhfQiwPp3FwgHNx8UI/qBdOc59oLfBhJ70Eiua1vAG+otwn4kz4+V+AE7oWWcm8 + htcaMJpraaX/GCIrgyuEcOLLJRycM7hZzTQ4kVgertCEi7pLFOBTG5dJLA9XmIgDbFC23Xr3wCmxPFxh + Ig6Bh69dCRzNt4PnmZ/CKbE8XGEiDOJGVL376FjALn8qsTxcoQmD9KXju7terwcInwQLldbEnxXAkOzR + swTBEVJamPGYhlQklocrhDDk4dG7XYzFsrcjWQMXDalILA9XCGHIG4fxS5beNcxifDrZK8pdj7/hvYZU + JJaHKzRhkEqYeddzOyTh91AiMb8h1TeAEsvDFSbCMJbQXVv0IOZwLEF4tuP9JrE8XGGnrAQ/YM1wSiwP + H9vFcEwXw/EcJt8cwSA5CJ+s6wAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAAhlJREFUWEfFlTFuAjEURDkCR+EIiB6Jli4Fp+AAtIgT5CakpkpDDz1FOlpnZvK9 + Mt8OtlG0GWkKZnf/m1283kkI4V9dDMd0MRzT5fBF3e/3d9p+ViWWhyt8QQYP5qYSYnm4wk4BuErgzSXE + 8nCFnQLsQujhcAi73a65hFgerrBDgMwIu16vYbFYyK0lxPJwhR0CYE7Q6XQaCrSWEMvDFTYKg6fwJyHH + 4/GhQEsJsTxcYYMwcICfz+ewXC6zArUSYnm4woowqAkevd1uw+12y0qI5eEKTQbaw1rl3i3w6M1mk5UQ + y8MV/sC5ur/sgsw98GhfQiwPp3FwgHNx8UI/qBdOc59oLfBhJ70Eiua1vAG+otwn4kz4+V+AE7oWWcm8 + htcaMJpraaX/GCIrgyuEcOLLJRycM7hZzTQ4kVgertCEi7pLFOBTG5dJLA9XmIgDbFC23Xr3wCmxPFxh + Ig6Bh69dCRzNt4PnmZ/CKbE8XGEiDOJGVL376FjALn8qsTxcoQmD9KXju7terwcInwQLldbEnxXAkOzR + swTBEVJamPGYhlQklocrhDDk4dG7XYzFsrcjWQMXDalILA9XCGHIG4fxS5beNcxifDrZK8pdj7/hvYZU + JJaHKzRhkEqYeddzOyTh91AiMb8h1TeAEsvDFSbCMJbQXVv0IOZwLEF4tuP9JrE8XGGnrAQ/YM1wSiwP + H9vFcEwXw/EcJt8cwSA5CJ+s6wAAAABJRU5ErkJggg== diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb index 562f833..857e0c6 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.vb @@ -1,6 +1,7 @@ Imports System.IO Imports System.Text Imports System.Threading +Imports DD_Record_Organizer.ClassDocGrid Imports DevExpress.Data Imports DevExpress.Data.Filtering Imports DevExpress.Utils @@ -21,6 +22,7 @@ Imports DigitalData.Modules.Logging Public Class frmNodeNavigation #Region "Laufzeitvariablen & Konstanten" + Private NNLogger As Logger Private Property DT_STRUCTURE_NODES As DataTable Private Property DT_ADDING_USERS As DataTable Private Property DT_VWPMO_CONSTRUCTOR_FORMS As DataTable @@ -60,6 +62,7 @@ Public Class frmNodeNavigation Private Property IW_USER As String Private Property IW_COMMENT As String Private Property INWORK_FILE As Boolean + Private Property INWORK_MULTIPLE_FILES_SET_FREE As Boolean Private Property CONTROL_DOCTYPE_MATCH As Integer = 0 Private Property MyFocusedNode As TreeListNode Private Property oCollapseInAction As Boolean = False @@ -68,6 +71,7 @@ Public Class frmNodeNavigation Private Property AvailableConfigNodes As New List(Of frmNewNode.NodeConfig) Private Property CurrentNodeConfigId As Integer = 0 + Private Property mySelectedDocs As List(Of clsWMDoc) Private Property Current_DocList As ClassDocGrid Public CtrlBuilder As ClassControlBuilder @@ -80,7 +84,7 @@ Public Class frmNodeNavigation Private Property ViewerInit As Boolean = False Private PA_NODE_GUID_STAMM As Integer = 0 - + Private PA_NODE_CONFIG_USER_STAMM As Integer = 0 Private Debug As Boolean = False Public Enum EditState @@ -96,11 +100,14 @@ Public Class frmNodeNavigation ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - - LOGGER.Debug("Loading NodeNavigation for Entity [{0}]", pEntityID) - _EntityId = pEntityID oConstructID = pConstructID + Dim oMyClassName = $"frmNodeNavigation_Entity{_EntityId}" + NNLogger = LOGCONFIG.GetLogger(oMyClassName) + + NNLogger.Debug("Loading NodeNavigation for Entity [{0}]", pEntityID) + + Current_DocList = New ClassDocGrid(GridViewDoc_Search) WindowsEx = New WindowsEx(LOGCONFIG) @@ -117,7 +124,7 @@ Public Class frmNodeNavigation CONFIG.Config.DocumentViewerShown = Not SplitContainerDocView.Collapsed Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub @@ -144,12 +151,12 @@ Public Class frmNodeNavigation checkShowPreview.Checked = CONFIG.Config.DocumentViewerShown Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub Private Async Function frmNodeNavigation_Load(sender As Object, e As EventArgs) As Task Handles Me.Load - LOGGER.Debug("Loading NodeNavigation") + NNLogger.Debug("Loading NodeNavigation") CONSTRUCTORID = CURRENT_CONSTRUCTOR_ID @@ -174,7 +181,7 @@ Public Class frmNodeNavigation ViewerInit = True End If Catch ex As Exception - LOGGER.Warn($"Error while init DocumentViewer: {ex.Message}") + NNLogger.Warn($"Error while init DocumentViewer: {ex.Message}") End Try If USER_IS_ADMIN Then @@ -213,7 +220,7 @@ Public Class frmNodeNavigation End If FORM_LOADED = True Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Loading Form part 4") End Try @@ -221,7 +228,7 @@ Public Class frmNodeNavigation End Function Private Async Function Load_nodes() As Task Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) - LOGGER.Debug("Loading nodes for entity [{0}]", CURRENT_ENTITY_ID) + NNLogger.Debug("Loading nodes for entity [{0}]", CURRENT_ENTITY_ID) Try Dim oTable = Await ClassNodeCommands.LoadNodes(CURRENT_ENTITY_ID) @@ -239,7 +246,7 @@ Public Class frmNodeNavigation Dim oNodeImage = ByteArrayToBitmap(bimage) ImageCollection1.AddImage(oNodeImage, row.Item("GUID")) Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) End Try Next @@ -258,7 +265,7 @@ Public Class frmNodeNavigation Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) Finally SplashScreenManager.CloseOverlayForm(oHandle) End Try @@ -358,6 +365,12 @@ Public Class frmNodeNavigation Dim oHasRecordId = (oRecordId > 0) Dim oIsConfigNode = (oNodeConfigId = 1000) Dim oParentNode = e.Node.ParentNode + Dim oLoadRecordData As Boolean = True + + If ENTITY_TYPE = "Personal file" And oNodeConfigId <> PA_NODE_CONFIG_USER_STAMM Then + oLoadRecordData = False + End If + CURRENT_NODE_GUID = oNodeId CURRENT_RECORD_ID = oRecordId @@ -393,7 +406,7 @@ Public Class frmNodeNavigation ' END NEW NODE CURRENT_NODEID = oGuid If oHasRecordId Then - Update_Status_Label(True, $"NodeGUID {oGuid} - RecordID {oRecordId}", EditState.None) + Update_Status_Label(True, $"NodeGUID {oGuid} - RecordID {CURRENT_RECORD_ID}", EditState.None) Node_AfterSelect = True @@ -407,8 +420,11 @@ Public Class frmNodeNavigation CtrlBuilder.WatchRecordChanges = False ClassControlValues.LoadControlValuesListWithPlaceholders(_EntityId, CURRENT_RECORD_ID, 0, CtrlBuilder.AllControls, _EntityId) CtrlBuilder.WatchRecordChanges = True - Await Show_Selected_Record_Data(CURRENT_RECORD_ID) - Show_SelectedDoc(True) + + Await Show_Selected_Record_Data(CURRENT_RECORD_ID, oLoadRecordData) + + + Show_SelectedDoc(True) ClassRightManagement.Check_Set_Rights(CURRENT_RECORD_ID, _EntityId) CONTROL_HANDLING() @@ -423,7 +439,7 @@ Public Class frmNodeNavigation End If - If RIGHT_RECORD_AND_FILE_READ_ONLY = True Then + If RIGHT_RECORD_AND_FILE_READ_ONLY = True Or oLoadRecordData = False Then bbtnitmRecEdit.Enabled = False bbtnitmRecSave.Enabled = False btnCreateNewNode.Enabled = False @@ -452,7 +468,7 @@ Public Class frmNodeNavigation ClassControlValues.ClearControlValues(pnlControls.Controls) - Await Show_Selected_Record_Data(0) + Await Show_Selected_Record_Data(0, oLoadRecordData) End If If ParentNodeChangeinAction = True And CURRENT_NODEID <> 0 Then Dim result As DialogResult = Await ShowDialogAsync() @@ -622,7 +638,7 @@ Public Class frmNodeNavigation Dim oSql = String.Format("SELECT * FROM TBPMO_ENTITY_USERRIGHT_ADDING where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", oConstructID) DT_ADDING_USERS = MYDB_ECM.GetDatatable(oSql) Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Load_Adding_users") End Try End Sub @@ -637,18 +653,18 @@ Public Class frmNodeNavigation End If End If Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Error(ex) + NNLogger.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Load_Configurable_Nodes") End Try End Sub Sub Load_Datafor_Entity() - LOGGER.Debug("Loading Data for Entity [{0}]", _EntityId) + NNLogger.Debug("Loading Data for Entity [{0}]", _EntityId) Try If _EntityId <> CURRENT_ENTITY_ID Then - LOGGER.Info("Entity-Data needs to be reloaded...") + NNLogger.Info("Entity-Data needs to be reloaded...") CURRENT_ENTITY_ID = _EntityId CURRENT_CONSTRUCTOR_ID = oConstructID @@ -697,8 +713,8 @@ Public Class frmNodeNavigation Try PWplainText = wrapper.DecryptData(_row.Item("AD_USER_PW").ToString()) Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Warn("- the Password for FileAddingUser '" & FAU_AD_USER & "' could not be decrypted") + NNLogger.Error(ex) + NNLogger.Warn("- the Password for FileAddingUser '" & FAU_AD_USER & "' could not be decrypted") PWplainText = "" End Try FAU_AD_USER_PW = PWplainText @@ -708,14 +724,14 @@ Public Class frmNodeNavigation Load_Entity_Data_CONTROLS_RECORDS() Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Load_Datafor_Entity: " & ex.StackTrace) End Try End Sub Sub Load_Entity_Data_CONTROLS_RECORDS() Try - LOGGER.Debug("START Load_Entity_Data") + NNLogger.Debug("START Load_Entity_Data") Dim sw As New SW("Load_Entity_Data") ' Me.Cursor = Cursors.WaitCursor RECORD_CHANGED = False @@ -757,12 +773,14 @@ Public Class frmNodeNavigation Try ADD_RECORDS_CONSTR = oRow.Item("ADD_RECORDS") Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ADD_RECORDS_CONSTR = True End Try If ENTITY_TYPE = "Personal file" Then Dim oSQL = "SELECT CAT_STRING FROM TBDD_CATALOG WHERE CAT_TITLE = 'PA_NODE_GUID_STAMM'" PA_NODE_GUID_STAMM = MYDB_ECM.GetScalarValue(oSQL) + oSQL = "SELECT CAT_STRING FROM TBDD_CATALOG WHERE CAT_TITLE = 'PA_NODE_CONFIG_USER_STAMM'" + PA_NODE_CONFIG_USER_STAMM = MYDB_ECM.GetScalarValue(oSQL) End If @@ -770,7 +788,7 @@ Public Class frmNodeNavigation DT_COLUMNS_GRID_ENTITY = ClassHelper.FILTER_DATATABLE(DT_DOCSEARCH_RESULTLIST_CONFIG, expression, "SEQUENCE") expression = String.Format("ENTITY_ID = {0} AND TYPE_ID = 10 AND LANGUAGE = '{1}'", _EntityId, USER_LANGUAGE) DT_DOCRESULT_DROPDOWN_ITEMS = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS, expression, "SEQUENCE") - LOGGER.Debug($"Found {DT_DOCRESULT_DROPDOWN_ITEMS.Rows.Count} DT_DOCRESULT_DROPDOWN_ITEMS!") + NNLogger.Debug($"Found {DT_DOCRESULT_DROPDOWN_ITEMS.Rows.Count} DT_DOCRESULT_DROPDOWN_ITEMS!") DT_RESULTLIST_OPTIONS = ClassHelper.FILTER_DATATABLE(CURRENT_VARIABLE_CONTROLS, "ENTITY_ID = " & _EntityId, "") expression = String.Format("ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%'", _EntityId, USER_LANGUAGE) DT_RESULTLIST_VARIABLE_VALUE = ClassHelper.FILTER_DATATABLE(DT_DOCSEARCH_RESULTLIST_CONFIG, expression, "SEQUENCE") @@ -822,7 +840,7 @@ Public Class frmNodeNavigation End While CURRENT_DT_ENTITY_RECORDS = async.dt Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error Async EntitySQL", ex.Message, ex.StackTrace) End Try @@ -843,8 +861,8 @@ Public Class frmNodeNavigation primaryKey(0) = CURRENT_DT_ENTITY_RECORDS.Columns("Record-ID") CURRENT_DT_ENTITY_RECORDS.PrimaryKey = primaryKey Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Warn("Could not set the primary Key(Record-ID): " & ex.Message) + NNLogger.Error(ex) + NNLogger.Warn("Could not set the primary Key(Record-ID): " & ex.Message) End Try CtrlBuilder.WatchRecordChanges = False @@ -860,7 +878,7 @@ Public Class frmNodeNavigation sw.Done() Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Load_Entity_Data", ex.Message, ex.StackTrace) Finally 'Me.Cursor = Cursors.Default @@ -908,22 +926,22 @@ Public Class frmNodeNavigation End If Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub - Private Async Function Show_Selected_Record_Data(pRecordId As Integer) As Task + Private Async Function Show_Selected_Record_Data(pRecordId As Integer, pLoadRecordData As Boolean) As Task Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) Try - LOGGER.Debug("Show_Selected_Record_Data: " & pRecordId.ToString) + NNLogger.Debug("Show_Selected_Record_Data: " & pRecordId.ToString) Dim ENTITY_ROW = (From form In DT_ENTITY_DATA.AsEnumerable() Select form Where form.Item("GUID") = _EntityId).Single() 'Update_Status_Label(False, "") - LOGGER.Debug("RECORD ID: " & pRecordId.ToString) + NNLogger.Debug("RECORD ID: " & pRecordId.ToString) 'Me.pnlControls.Visible = True SELECTED_NODE_RECORD_ID = pRecordId @@ -934,8 +952,11 @@ Public Class frmNodeNavigation ENTITY_RELOAD_AFT_CONTROL_LOAD = False CtrlBuilder.WatchRecordChanges = False If pnlControls.Enabled = False Then pnlControls.Enabled = True - ClassControlValues.LoadControlValues(SELECTED_NODE_RECORD_ID, 0, _EntityId, CtrlBuilder.AllControls, _EntityId) - CtrlBuilder.WatchRecordChanges = True + If pLoadRecordData = True Then + ClassControlValues.LoadControlValues(SELECTED_NODE_RECORD_ID, 0, _EntityId, CtrlBuilder.AllControls, _EntityId) + CtrlBuilder.WatchRecordChanges = True + End If + Dim sw As New SW("Show Selected RecordData 2") ' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden! @@ -963,7 +984,7 @@ Public Class frmNodeNavigation sw.Done() Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in SelectedRecord_ShowData: ", ex.Message) Finally SplashScreenManager.CloseOverlayForm(oHandle) @@ -1041,7 +1062,7 @@ Public Class frmNodeNavigation Return state Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) Return state End Try End Function @@ -1110,7 +1131,7 @@ Public Class frmNodeNavigation Dim ctrl As Windows.Forms.Control = sender ClassFunctionCommandsUI.NewEditAppointment(ctrl.Name, _EntityId, SELECTED_NODE_RECORD_ID, pnlControls.Controls) Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub @@ -1127,7 +1148,7 @@ Public Class frmNodeNavigation End If Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub @@ -1279,7 +1300,7 @@ Public Class frmNodeNavigation ' Catch ex As Exception - 'LOGGER.Error(ex) + 'NNLogger.Error(ex) ' ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error:", ex.Message & vbNewLine & ex.StackTrace) ' End Try 'End Sub @@ -1304,7 +1325,7 @@ Public Class frmNodeNavigation Try CURRENT_DOCVIEW.CloseView(CURRENT_DOCVIEW_PATH, 0) Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) End Try End If End Sub @@ -1535,7 +1556,7 @@ Public Class frmNodeNavigation Return False End If Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) MessageBox.Show("Error in TrySave_User: " & vbNewLine & ex.Message) Return False End Try @@ -1630,7 +1651,7 @@ Public Class frmNodeNavigation Return True End If Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) MessageBox.Show("Error in TrySave_Automatic: " & vbNewLine & ex.Message) Return False End Try @@ -1649,7 +1670,7 @@ Public Class frmNodeNavigation Next End If Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Customer_Run_Procedures: ", ex.Message) End Try End Sub @@ -1702,7 +1723,7 @@ Public Class frmNodeNavigation End If If Not IsNothing(DT_DOCRESULT_DROPDOWN_ITEMS) Then If DT_DOCRESULT_DROPDOWN_ITEMS.Rows.Count > 0 Then - LOGGER.Info($"RUN_WDSEARCH_GRID - DT_DOCRESULT_DROPDOWN_ITEMS [{DT_DOCRESULT_DROPDOWN_ITEMS.Rows.Count}]!") + NNLogger.Info($"RUN_WDSEARCH_GRID - DT_DOCRESULT_DROPDOWN_ITEMS [{DT_DOCRESULT_DROPDOWN_ITEMS.Rows.Count}]!") End If End If @@ -1730,7 +1751,7 @@ Public Class frmNodeNavigation End If Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Run WD-Search Database: ", ex.Message) Finally sw.Done() @@ -1782,7 +1803,7 @@ Public Class frmNodeNavigation Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error RUN_ENTITY_DOC_SEARCH", ex.Message, ex.StackTrace) End Try sw.Done() @@ -1816,7 +1837,7 @@ Public Class frmNodeNavigation End If Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnCBSelectedValueChanged: ", ex.Message) End Try End Sub @@ -1833,7 +1854,7 @@ Public Class frmNodeNavigation Try validDate = Date.TryParse(DatePicker.OldEditValue, oldValue) Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) oldValue = Date.MinValue End Try @@ -1865,7 +1886,7 @@ Public Class frmNodeNavigation ClassHelper.MSGBOX_Handler("ERROR", "UnexpectedError:", "Error updating doc-metadata (date): " & vbNewLine & "Check the log for further information!") End If Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnDateSelectedValueChanged: ", ex.Message) End Try End Sub @@ -1881,7 +1902,7 @@ Public Class frmNodeNavigation Try Dim oDocID As Integer = oDocuments.First.DocId Catch ex As Exception - LOGGER.Info($"Error while gettin oDocuments.First.DocId - OnTextSelectedValueChanged: {ex.Message}") + NNLogger.Info($"Error while gettin oDocuments.First.DocId - OnTextSelectedValueChanged: {ex.Message}") Exit Sub End Try If value.ToUpper = "Not displayable in Group-Search".ToUpper Or IsNothing(oDocuments) Then @@ -1904,7 +1925,7 @@ Public Class frmNodeNavigation Exit Sub End If Catch ex As Exception - LOGGER.Debug($"Error while gettin oDocuments.First.DocId - OnTextSelectedValueChanged: {ex.Message}") + NNLogger.Debug($"Error while gettin oDocuments.First.DocId - OnTextSelectedValueChanged: {ex.Message}") Exit Sub End Try @@ -1917,7 +1938,7 @@ Public Class frmNodeNavigation End If Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnTextSelectedValueChanged: ", ex.Message) End Try End Sub @@ -1947,7 +1968,7 @@ Public Class frmNodeNavigation ClassHelper.MSGBOX_Handler("ERROR", "UnexpectedError:", "Error updating doc-metadata (checkbox): " & vbNewLine & "Check the log for further information!") End If Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnCheckboxValueChanged: ", ex.Message) End Try End Sub @@ -2001,7 +2022,7 @@ Public Class frmNodeNavigation End If Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub @@ -2018,7 +2039,7 @@ Public Class frmNodeNavigation End If Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace) End Try End Sub @@ -2113,7 +2134,7 @@ Public Class frmNodeNavigation CURRENT_CONTROL_DOCTYPE_MATCH = "" CURRENT_CONTROL_DOCTYPE_MATCH = ClassControlValues.GetControlValuesREC_CONTROL(CURRENT_RECORD_ID, CONTROL_DOCTYPE_MATCH) Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) CURRENT_CONTROL_DOCTYPE_MATCH = 0 CURRENT_CONTROL_DOCTYPE_MATCH = "" End Try @@ -2161,23 +2182,23 @@ Public Class frmNodeNavigation ClassHelper.GetDocrecordLinks(CURRENT_RECORD_ID) TimerClearResultfiles.Start() Else - LOGGER.Debug("No new files were added or windream tab is not focused!") + NNLogger.Debug("No new files were added or windream tab is not focused!") End If Me.Cursor = Cursors.Default Else 'If RIGHT_RECORD_AND_FILE_READ_ONLY = True Then - ' LOGGER.Warn("RIGHT_RECORD_AND_FILE_READ_ONLY is set! No DragDrop allowed") + ' NNLogger.Warn("RIGHT_RECORD_AND_FILE_READ_ONLY is set! No DragDrop allowed") 'End If If RIGHT_READ_ONLY_DOC = True Then - LOGGER.Warn("RIGHT_WD_FORBIDDEN is set! No DragDrop allowed") + NNLogger.Warn("RIGHT_WD_FORBIDDEN is set! No DragDrop allowed") Else - LOGGER.Warn("No DragDrop allowed - ELSE") + NNLogger.Warn("No DragDrop allowed - ELSE") End If End If Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Warn("Unexpected Error in Drag_Drop: " & ex.Message) + NNLogger.Error(ex) + NNLogger.Warn("Unexpected Error in Drag_Drop: " & ex.Message) MsgBox("Unexpected Error in DragDrop - Please check the log for further information!", MsgBoxStyle.Exclamation) Finally @@ -2201,7 +2222,7 @@ Public Class frmNodeNavigation If Not IsNothing(Str) Then Dim DropType = Str.Substring(0, Str.LastIndexOf("@") + 1) If DropType.ToString.Contains("SCAN") = False Then - LOGGER.Info("Check_Dropped_Files:" & Str.ToString) + NNLogger.Info("Check_Dropped_Files:" & Str.ToString) Dim CURRENT_WORKFILE = Str.Substring(Str.LastIndexOf("@") + 1) If CURRENT_WORKFILE.ToString.Contains("@") Then MsgBox("File contains invalid operator @!" & vbNewLine & "Please rename file and try again!", MsgBoxStyle.Exclamation) @@ -2254,7 +2275,7 @@ Public Class frmNodeNavigation End If Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Check_Dropped_Files: ", ex.Message) End Try @@ -2354,7 +2375,7 @@ Public Class frmNodeNavigation Update_Record_Label(CURRENT_RECORD_ID) Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error Saving Record", ex.Message, ex.StackTrace) Return False End Try @@ -2393,7 +2414,7 @@ Public Class frmNodeNavigation End If Me.Cursor = Cursors.WaitCursor - Dim oSelectedDocs = ClassDocGrid.GetSelectedDocuments(GridViewDoc_Search) + mySelectedDocs = ClassDocGrid.GetSelectedDocuments(GridViewDoc_Search) 'Refresh_DocID() @@ -2402,21 +2423,34 @@ Public Class frmNodeNavigation Exit Sub End If - If oSelectedDocs.First.DocId = 0 Then + If mySelectedDocs.First.DocId = 0 Then e.Cancel = True Exit Sub End If - - If oSelectedDocs.Count > 1 Then + tsmiFileInWorkMultiple_Free.Visible = False + tsmiFileInWorkMultiple_Lock.Visible = False + INWORK_MULTIPLE_FILES_SET_FREE = False + If mySelectedDocs.Count > 1 Then ContextMenu_Multiplefiles() - ElseIf oSelectedDocs.Count = 1 Then + For Each oDoc As ClassDocGrid.clsWMDoc In mySelectedDocs + If oDoc.InWork = True Then + If oDoc.InWorkUser = USER_USERNAME.ToUpper Or USER_IS_ADMIN Or USER_IS_SUPERVISOR Then + INWORK_MULTIPLE_FILES_SET_FREE = True + End If + End If + Next + End If + If INWORK_MULTIPLE_FILES_SET_FREE = True Then + tsmiFileInWorkMultiple_Free.Visible = True + End If + If mySelectedDocs.Count = 1 Then File_in_Work() If WM_READ_ONLY Then ContextMenu_Read() ElseIf WM_ADD_NO_DELETE Then ContextMenu_ADD() Else - Dim oSelectedDocument = oSelectedDocs.First + Dim oSelectedDocument = mySelectedDocs.First Dim Result = ClassDOC_SEARCH.Get_File_Rights(oSelectedDocument.DocId) If Not IsNothing(Result) Then _RowReadOnly = False @@ -2431,7 +2465,7 @@ Public Class frmNodeNavigation If USER_IS_ADMIN = False Then ContextMenu_Read() Else - LOGGER.Warn("FileRight is '' but User is Admin!! - Check the configuration!") + NNLogger.Warn("FileRight is '' but User is Admin!! - Check the configuration!") End If _RowReadOnly = True End Select @@ -2446,13 +2480,13 @@ Public Class frmNodeNavigation If USER_IS_ADMIN = False Then ContextMenu_Read() Else - LOGGER.Warn("RIGHT_READ_ONLY_DOC = True but User is Admin!! - Check the configuration!") + NNLogger.Warn("RIGHT_READ_ONLY_DOC = True but User is Admin!! - Check the configuration!") End If End If End If End If - If oSelectedDocs.First.DisplayName <> "" Then + If mySelectedDocs.First.DisplayName <> "" Then tsmiFileRenameDisplayname.Visible = True Else tsmiFileRenameDisplayname.Visible = False @@ -2462,7 +2496,7 @@ Public Class frmNodeNavigation End If Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Opening DocContextMenu: ", ex.Message) e.Cancel = True Finally @@ -2484,6 +2518,7 @@ Public Class frmNodeNavigation tsmiFileRightsShow.Enabled = False tsmiFileDelete.Enabled = False + tsmiFileInWorkMultiple_Lock.Visible = True End Sub Sub ContextMenu_Read() @@ -2616,7 +2651,7 @@ Public Class frmNodeNavigation End If End If Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) IW_USER = "" IW_COMMENT = "" End Try @@ -2647,8 +2682,8 @@ Public Class frmNodeNavigation End If Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Warn("Unexpected Error in File-Work Info: " & ex.Message) + NNLogger.Error(ex) + NNLogger.Warn("Unexpected Error in File-Work Info: " & ex.Message) tsmiFileInWork.Enabled = False End Try End Sub @@ -2659,7 +2694,8 @@ Public Class frmNodeNavigation Exit Sub End If Dim oDocuments = Current_DocList.SelectedDocuments - If oDocuments.Count = 1 Then + + If oDocuments.Count >= 1 Then ClassFileResult.DocID = oDocuments.First.DocId If INWORK_FILE = True Then ' Datei ist in Bearbeitung Dim msglbl As String @@ -2677,6 +2713,7 @@ Public Class frmNodeNavigation ClassHelper.MSGBOX_Handler("INFO", "Information file", msglbl, msg1) End If Else + frmFileInWork.myDocuments = mySelectedDocs frmFileInWork.ShowDialog() ClassDocGrid.SELECTED_INWORK = ClassFileResult.InWork Await RUN_WDSEARCH_GRID(True) @@ -2721,7 +2758,7 @@ Public Class frmNodeNavigation Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Unexpected Error in getting the Displayname: ", ex.Message) End Try End Sub @@ -2732,8 +2769,8 @@ Public Class frmNodeNavigation Try RENAME_DOC_PATH = GridViewDoc_Search.GetFocusedRowCellValue(GridViewDoc_Search.Columns("FULLPATH")) Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Warn("Attention: Could not set DocVariable RENAME_DOC_PATH: " & ex.Message) + NNLogger.Error(ex) + NNLogger.Warn("Attention: Could not set DocVariable RENAME_DOC_PATH: " & ex.Message) RENAME_DOC_PATH = Nothing End Try If ClassDocGrid.HasNoSelectedDocuments(GridViewDoc_Search) Then @@ -2760,7 +2797,7 @@ Public Class frmNodeNavigation End If End If Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) MsgBox("Unexpected Error in getting the filename: " & ex.Message, MsgBoxStyle.Critical) End Try End Sub @@ -2807,8 +2844,8 @@ Public Class frmNodeNavigation oForm.Show() Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Error(ex) + NNLogger.Error(ex) + NNLogger.Error(ex) MsgBox("Unexpected Error in Linking Record: " & ex.Message, MsgBoxStyle.Critical) End Try End Sub @@ -2854,7 +2891,7 @@ Public Class frmNodeNavigation oForm.Show() oForm.BringToFront() Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) MsgBox("Unexpected Error in Showing DocLinks: " & ex.Message, MsgBoxStyle.Critical) End Try End Sub @@ -2887,7 +2924,7 @@ Public Class frmNodeNavigation Next Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Removing links from file:", ex.Message) End Try End If @@ -2944,8 +2981,8 @@ Public Class frmNodeNavigation ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Open file propertys:", ex.Message) End If Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Error(ex) + NNLogger.Error(ex) + NNLogger.Error(ex) End Try End If Next @@ -3044,7 +3081,7 @@ Public Class frmNodeNavigation End If End If Catch ex As Exception - LOGGER.Warn("Unexpected Error in Checking Value In Work: " & ex.Message) + NNLogger.Warn("Unexpected Error in Checking Value In Work: " & ex.Message) End Try Try @@ -3091,8 +3128,8 @@ Public Class frmNodeNavigation End If Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Warn("Unexpected Error in RowStyle-Color Dropdown: " & ex.Message) + NNLogger.Error(ex) + NNLogger.Warn("Unexpected Error in RowStyle-Color Dropdown: " & ex.Message) End Try End If @@ -3177,14 +3214,14 @@ Public Class frmNodeNavigation DocumentViewer.LoadFile(oPath) Else - LOGGER.Debug("Show_SelectedDoc - oSelectedDocs.Count not >= 1 ") + NNLogger.Debug("Show_SelectedDoc - oSelectedDocs.Count not >= 1 ") Close_Document_Viewer() End If Else - LOGGER.Info("DocumentViewer not inited. No Show_SelectedDoc") + NNLogger.Info("DocumentViewer not inited. No Show_SelectedDoc") End If Else - LOGGER.Debug("Show_SelectedDoc - oSelectedDocs is nothing") + NNLogger.Debug("Show_SelectedDoc - oSelectedDocs is nothing") End If @@ -3193,7 +3230,7 @@ Public Class frmNodeNavigation Try DocumentViewer.CloseDocument() Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) End Try End Sub Private Async Sub btnCreateNewNode_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnCreateNewNode.ItemClick @@ -3259,7 +3296,7 @@ Public Class frmNodeNavigation If oDoc.DocPath <> "" Then Dim oWMObject As WINDREAMLib.WMObject Dim oReldocpath = ClassHelper.GetRelPath(oDoc.DocPath) - LOGGER.Info("oReldocpath: " & oReldocpath) + NNLogger.Info("oReldocpath: " & oReldocpath) oWMObject = WMMOD.GetFileByPath(oReldocpath) If Not IsNothing(oWMObject) Then WMMOD.SetFileIndex(oReldocpath, WMINDEX_DOCTYPE, oForm.SelectedDocType.ToString, WMOBJECTTYPE) @@ -3276,7 +3313,7 @@ Public Class frmNodeNavigation End If End If Catch ex As Exception - LOGGER.Error(ex) + NNLogger.Error(ex) End Try End Sub @@ -3310,7 +3347,7 @@ Public Class frmNodeNavigation For Each oDoc As ClassDocGrid.clsWMDoc In ClassDocGrid.GetSelectedDocuments(GridViewDoc_Search) If oDoc.DocPath <> "" Then Try - LOGGER.Info($"DocID {oDoc.DocPath} shall be deleted. User committed Delete-Start...") + NNLogger.Info($"DocID {oDoc.DocPath} shall be deleted. User committed Delete-Start...") Dim oDElWMFile As Boolean = False Dim oCountLinks As Integer If Not IsNothing(oDoc.DocId) Then @@ -3324,11 +3361,11 @@ Public Class frmNodeNavigation result2 = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result2 = MsgBoxResult.Yes Then - LOGGER.Info($">> File has other Record-Links. User committed to delete all!") + NNLogger.Info($">> File has other Record-Links. User committed to delete all!") oDElWMFile = True Else oDElWMFile = False - LOGGER.Info($">> File has other Record-Links. links shall be kept!") + NNLogger.Info($">> File has other Record-Links. links shall be kept!") End If Else oDElWMFile = True @@ -3382,7 +3419,7 @@ Public Class frmNodeNavigation Catch ex As Exception - LOGGER.Warn($"Unexpected error in TimerFileHandleTick [{ex.Message}]!!") + NNLogger.Warn($"Unexpected error in TimerFileHandleTick [{ex.Message}]!!") End Try End Sub Private Function GetActiveGridControl() As GridControl @@ -3445,5 +3482,22 @@ Public Class frmNodeNavigation End Sub + Private Async Sub tsmiFileInWorkMultiple_Free_Click(sender As Object, e As EventArgs) Handles tsmiFileInWorkMultiple_Free.Click + For Each oDoc As ClassDocGrid.clsWMDoc In mySelectedDocs + If oDoc.InWork = True Then + If oDoc.InWorkUser = USER_USERNAME.ToUpper Or USER_IS_ADMIN Or USER_IS_SUPERVISOR Then + ClassFileResult.DocID = oDoc.DocId + ClassFileResult.Set_InWork(0, "") + End If + End If + Next + Await RUN_WDSEARCH_GRID(True) + End Sub + + Private Async Sub tsmiFileInWorkMultiple_Lock_Click(sender As Object, e As EventArgs) Handles tsmiFileInWorkMultiple_Lock.Click + frmFileInWork.myDocuments = mySelectedDocs + frmFileInWork.ShowDialog() + Await RUN_WDSEARCH_GRID(True) + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmRight_Management.resx b/app/DD-Record-Organizer/frmRight_Management.resx index 626ca40..1597599 100644 --- a/app/DD-Record-Organizer/frmRight_Management.resx +++ b/app/DD-Record-Organizer/frmRight_Management.resx @@ -126,7 +126,7 @@ - 9, 44 + 9, 43 21, 13 @@ -156,10 +156,10 @@ True - 9, 73 + 9, 72 - 32, 13 + 33, 13 24 @@ -186,7 +186,7 @@ True - 9, 99 + 9, 98 46, 13 @@ -216,7 +216,7 @@ True - 568, 44 + 567, 43 64, 13 @@ -246,10 +246,10 @@ True - 828, 44 + 827, 43 - 77, 13 + 78, 13 34 @@ -276,7 +276,7 @@ True - 568, 73 + 567, 72 74, 13 @@ -306,10 +306,10 @@ True - 828, 73 + 827, 72 - 87, 13 + 88, 13 36 @@ -490,10 +490,10 @@ ToolStripButton1 - 3, 3 + 2, 2 - 1155, 25 + 1293, 25 4 @@ -707,10 +707,10 @@ Segoe UI, 8.25pt, style=Bold, Italic - 12, 133 + 15, 166 - 731, 57 + 914, 71 43 @@ -731,10 +731,10 @@ 0 - 921, 68 + 1151, 85 - 118, 22 + 148, 28 37 @@ -752,10 +752,10 @@ 2 - 673, 70 + 841, 87 - 149, 22 + 186, 28 36 @@ -773,10 +773,10 @@ 4 - 921, 39 + 1151, 48 - 118, 22 + 148, 28 35 @@ -794,10 +794,10 @@ 6 - 673, 41 + 841, 51 - 149, 22 + 186, 28 33 @@ -815,10 +815,10 @@ 8 - 458, 94 + 572, 117 - 104, 24 + 130, 30 32 @@ -839,10 +839,10 @@ 9 - 458, 68 + 572, 85 - 104, 24 + 130, 30 31 @@ -863,10 +863,10 @@ 10 - 458, 39 + 572, 48 - 104, 24 + 130, 30 30 @@ -887,10 +887,10 @@ 11 - 334, 94 + 417, 117 - 104, 24 + 130, 30 29 @@ -911,10 +911,10 @@ 12 - 334, 68 + 417, 85 - 104, 24 + 130, 30 28 @@ -935,10 +935,10 @@ 13 - 334, 39 + 417, 48 - 104, 24 + 130, 30 27 @@ -959,10 +959,10 @@ 14 - 72, 96 + 90, 120 - 231, 22 + 289, 28 26 @@ -980,10 +980,10 @@ 16 - 72, 70 + 90, 87 - 231, 22 + 289, 28 25 @@ -1001,10 +1001,10 @@ 18 - 72, 44 + 90, 55 - 100, 22 + 125, 28 24 @@ -1082,7 +1082,7 @@ 12, 196 - 1121, 196 + 1259, 179 23 diff --git a/app/DD-Record-Organizer/frmRight_Management.vb b/app/DD-Record-Organizer/frmRight_Management.vb index dd43b9c..b2a6a8e 100644 --- a/app/DD-Record-Organizer/frmRight_Management.vb +++ b/app/DD-Record-Organizer/frmRight_Management.vb @@ -38,8 +38,8 @@ Public Class frmRight_Management Try Me.TBWH_USER_GROUPSTableAdapter.Connection.ConnectionString = MYDB_ECM.CurrentConnectionString Me.TBWH_USER_GROUPSTableAdapter.Fill(Me.DD_ECMAdmin.TBWH_USER_GROUPS) - Me.TBDD_USER_GROUPSTableAdapter.Connection.ConnectionString = MYDB_ECM.CurrentConnectionString - Me.TBDD_USER_GROUPSTableAdapter.Fill(Me.DD_DMSDataSet.TBDD_USER_GROUPS) + 'Me.TBDD_USER_GROUPSTableAdapter.Connection.ConnectionString = MYDB_ECM.CurrentConnectionString + 'Me.TBDD_USER_GROUPSTableAdapter.Fill(Me.DD_DMSDataSet.TBDD_USER_GROUPS) Me.TBDD_GROUPSTableAdapter.Connection.ConnectionString = MYDB_ECM.CurrentConnectionString Me.TBDD_GROUPSTableAdapter.Fill(Me.DD_ECMAdmin.TBDD_GROUPS) Me.TBDD_USERTableAdapter.Connection.ConnectionString = MYDB_ECM.CurrentConnectionString diff --git a/app/DD-Record-Organizer/frmStructureNodeConfig.resx b/app/DD-Record-Organizer/frmStructureNodeConfig.resx index 9dac32a..a33a259 100644 --- a/app/DD-Record-Organizer/frmStructureNodeConfig.resx +++ b/app/DD-Record-Organizer/frmStructureNodeConfig.resx @@ -263,7 +263,7 @@ Ein hier definierter Knoten dient "lediglich" zur Layoutstruktur und stellt noch keinen Knoten in der Sichtnavigation dar. -Knoten entstehen entweder durch eine hinterlegte Businesslogik oder durch manuelle Anlage durch den benutzer, wenn der Knoten ein manueller Knoten (Leel = 1000) ist. +Knoten entstehen entweder durch eine hinterlegte Businesslogik oder durch manuelle Anlage durch den benutzer, wenn der Knoten ein manueller Knoten (Level = 1000) ist. 192