diff --git a/app/DD-Record-Organizer/ClassWorkflow.vb b/app/DD-Record-Organizer/ClassWorkflow.vb new file mode 100644 index 0000000..b988d9e --- /dev/null +++ b/app/DD-Record-Organizer/ClassWorkflow.vb @@ -0,0 +1,11 @@ +Public Class ClassWorkflow + Public Shared Sub Refresh_Workflows_Entity() + Dim sql = String.Format("SELECT WF_TASK_ID, WF_ID, dbo.FNPMO_GETOBJECTCAPTION('{0}', 'TASK_TITLE' + CONVERT(VARCHAR(5), WF_ID), 1) AS WF_TITLE, RECORD_ID, STATE_ID, " & _ + "dbo.FNPMO_GETOBJECTCAPTION('{0}', 'WF_STATE_TITLE' + CONVERT(VARCHAR(5), STATE_ID), 1) AS STATE_TITLE, FORM_VIEW_ID, ENTITY_ID, " & _ + "dbo.FNPMO_GETOBJECTCAPTION('{0}', 'FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), 1) AS 'ENTITY_TITLE', COMMENT, DUE_DATE, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, TASK_DATE, FINAL, COLOR, " & _ + "'{1}' AS USERNAME, dbo.FNPMO_GET_ENTITY_COLUMN_CONTENT(RECORD_ID) AS RECORD_DESCRIPTION, DESCRIPTION, RECORD_DESCRIPTION AS Expr1, FINISHED, MANUALLY, " & _ + "CREATE_ON_REC_CREATE, CREATE_ON_FOLL_UP FROM VWPMO_WF_ACTIVE AS T", USER_LANGUAGE, USER_USERNAME) + CURRENT_VWPMO_WF_ACTIVE = ClassDatabase.Return_Datatable(sql, True) + End Sub + +End Class diff --git a/app/DD-Record-Organizer/DD-Record-Organizer.vbproj b/app/DD-Record-Organizer/DD-Record-Organizer.vbproj index e3d3b1e..1bb0835 100644 --- a/app/DD-Record-Organizer/DD-Record-Organizer.vbproj +++ b/app/DD-Record-Organizer/DD-Record-Organizer.vbproj @@ -275,6 +275,7 @@ + True True diff --git a/app/DD-Record-Organizer/DD_DMSDataSet.xss b/app/DD-Record-Organizer/DD_DMSDataSet.xss index f2bef71..aee2373 100644 --- a/app/DD-Record-Organizer/DD_DMSDataSet.xss +++ b/app/DD-Record-Organizer/DD_DMSDataSet.xss @@ -4,16 +4,16 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - + + - + - + @@ -22,14 +22,14 @@ - + - + - - + + @@ -42,21 +42,21 @@ - + - - - - - - - - - - + + + + + + + + + + @@ -67,11 +67,11 @@ 437 - 340 + 341 492 - 340 + 341 @@ -291,7 +291,7 @@ - + 22 @@ -311,7 +311,7 @@ - + 14 @@ -331,7 +331,7 @@ - + 389 @@ -347,7 +347,7 @@ - + 158 @@ -367,7 +367,7 @@ - + 961 diff --git a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb index b6f6872..a020937 100644 --- a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb +++ b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb @@ -108,6 +108,8 @@ Public CURRENT_DOC_DROPDOWN As DataTable Public CURRENT_PARENT_DT As DataTable + Public CURRENT_VWPMO_WF_ACTIVE As DataTable + Public CURRENT_TBPMO_FILES_USER As DataTable Public CURRENT_SEARCH_TYPE As String = "RECORD" diff --git a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb index 30e11a7..5e94d7b 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb @@ -219,10 +219,7 @@ Partial Class frmConstructor_Main Me.cmsrpContainer = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ChangeHidepanelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.VWPMO_WF_USER_ACTIVETableAdapter = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter() Me.TableAdapterManager = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager() - Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter() Me.ToolTipController = New DevExpress.Utils.ToolTipController(Me.components) Me.TBPMO_RECORD_VARIANTTableAdapter = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_RECORD_VARIANTTableAdapter() Me.TimerClearResultfiles = New System.Windows.Forms.Timer(Me.components) @@ -272,7 +269,6 @@ Partial Class frmConstructor_Main CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() Me.cmsrpContainer.SuspendLayout() CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SplitContainerMain @@ -1526,10 +1522,6 @@ Partial Class frmConstructor_Main Me.ChangeHidepanelToolStripMenuItem.Name = "ChangeHidepanelToolStripMenuItem" resources.ApplyResources(Me.ChangeHidepanelToolStripMenuItem, "ChangeHidepanelToolStripMenuItem") ' - 'VWPMO_WF_USER_ACTIVETableAdapter - ' - Me.VWPMO_WF_USER_ACTIVETableAdapter.ClearBeforeFill = True - ' 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False @@ -1572,15 +1564,6 @@ Partial Class frmConstructor_Main Me.TableAdapterManager.TBPMO_WORKFLOWTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' - 'VWPMO_WF_ACTIVEBindingSource - ' - Me.VWPMO_WF_ACTIVEBindingSource.DataMember = "VWPMO_WF_ACTIVE" - Me.VWPMO_WF_ACTIVEBindingSource.DataSource = Me.DD_DMSDataSet - ' - 'VWPMO_WF_ACTIVETableAdapter - ' - Me.VWPMO_WF_ACTIVETableAdapter.ClearBeforeFill = True - ' 'TBPMO_RECORD_VARIANTTableAdapter ' Me.TBPMO_RECORD_VARIANTTableAdapter.ClearBeforeFill = True @@ -1658,7 +1641,6 @@ Partial Class frmConstructor_Main CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() Me.cmsrpContainer.ResumeLayout(False) CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -1715,10 +1697,7 @@ Partial Class frmConstructor_Main Friend WithEvents ContextMenuDetails As System.Windows.Forms.ContextMenuStrip Friend WithEvents DD_DMSDataSet As DD_Record_Organizer.DD_DMSDataSet Friend WithEvents VWPMO_WF_USER_ACTIVEBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents VWPMO_WF_USER_ACTIVETableAdapter As DD_Record_Organizer.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter Friend WithEvents TableAdapterManager As DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager - Friend WithEvents VWPMO_WF_ACTIVEBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents VWPMO_WF_ACTIVETableAdapter As DD_Record_Organizer.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter Friend WithEvents cmsTreeView As System.Windows.Forms.ContextMenuStrip Friend WithEvents ResetEbenenAuswahlToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents tsslblWorkflowstate As System.Windows.Forms.ToolStripStatusLabel diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx index 43618d5..bf0ea34 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.resx +++ b/app/DD-Record-Organizer/frmConstructor_Main.resx @@ -501,7 +501,7 @@ Detail-Ansicht Datensatz - 252, 270 + 252, 292 ContextMenuGrid @@ -525,7 +525,7 @@ 0, 25 - 1067, 212 + 1074, 212 0 @@ -665,7 +665,7 @@ 0, 0 - 1067, 25 + 1074, 25 0 @@ -749,7 +749,7 @@ 0, 0 - 786, 336 + 786, 343 0 @@ -779,7 +779,7 @@ 0, 26 - 554, 286 + 561, 293 1 @@ -826,10 +826,10 @@ Ansicht eingeschränkt - Klick Bearbeiten für Entsperren - 0, 312 + 0, 319 - 554, 24 + 561, 24 0 @@ -856,7 +856,7 @@ 0, 0 - 554, 26 + 561, 26 0 @@ -877,7 +877,7 @@ Panel2 - 1356, 340 + 1356, 347 1 @@ -1050,7 +1050,7 @@ 1 - 1356, 365 + 1356, 372 Detailansicht @@ -1068,7 +1068,7 @@ 0 - 1362, 396 + 1362, 403 1 @@ -1083,7 +1083,7 @@ Cyan - 1356, 340 + 1356, 347 0 @@ -1107,7 +1107,7 @@ 0, 25 - 1356, 340 + 1356, 347 2 @@ -1361,7 +1361,7 @@ - 1356, 365 + 1356, 372 Positionen @@ -1423,7 +1423,7 @@ Aqua - 1356, 340 + 1356, 347 7 @@ -1525,7 +1525,7 @@ 1 - 1356, 365 + 1356, 372 Dateien @@ -1956,7 +1956,7 @@ 2 - 1356, 365 + 1356, 372 Wiedervorlage @@ -2067,7 +2067,7 @@ 5 - 1356, 340 + 1356, 347 90 @@ -2139,7 +2139,7 @@ 1 - 1356, 365 + 1356, 372 Vorgängervarianten @@ -2611,18 +2611,9 @@ 17, 56 - - 295, 56 - 567, 56 - - 740, 56 - - - 984, 56 - 1283, 17 @@ -3975,30 +3966,12 @@ System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - VWPMO_WF_USER_ACTIVETableAdapter - - - DD_Record_Organizer.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - TableAdapterManager DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - VWPMO_WF_ACTIVEBindingSource - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - VWPMO_WF_ACTIVETableAdapter - - - DD_Record_Organizer.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - ToolTipController diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index 47ad3ba..d9fdea3 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -279,8 +279,7 @@ Public Class frmConstructor_Main ClassWindowLocation.LoadFormLocationSize(Me, CONSTRUCTORID, CURRENT_SCREEN_ID, "CONSTRUCTOR_MAIN") ' VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString - 'Me.VWPMO_WF_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString - 'VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, USER_USERNAME) + ClassWorkflow.Refresh_Workflows_Entity() SQL = String.Format("SELECT *, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), {1}) AS 'CAPTION' " & _ "FROM VWPMO_CONSTRUCTOR_FORMS WHERE SCREEN_ID = {2} AND CONSTRUCT_ID = {3} ORDER BY SEQUENCE", USER_LANGUAGE, CURRENT_SCREEN_ID, CURRENT_SCREEN_ID, CONSTRUCTORID) @@ -4408,23 +4407,22 @@ Public Class frmConstructor_Main End Sub Sub Show_act_WFTask() Try - Dim query = From table In DD_DMSDataSet.VWPMO_WF_ACTIVE.AsEnumerable() + Dim query = From table In CURRENT_VWPMO_WF_ACTIVE.AsEnumerable() Select table Where table.Item("ENTITY_ID") = ENTITY_ID Dim Entity_rows = query.ToList() If Entity_rows.Count > 0 Then - tsButtonShowTaskOverview.Visible = True - tsButtonShowTaskOverview.Enabled = True If _MANUAL_WORKFLOW = True Then CreateWorkflowtaskstsmi.Enabled = True End If tsslblWorkflowstate.Visible = True Else - tsButtonShowTaskOverview.Visible = False CreateWorkflowtaskstsmi.Enabled = False tsslblWorkflowstate.Visible = False End If + tsButtonShowTaskOverview.Visible = False For Each _row In Entity_rows If _row.Item("RECORD_ID") = RECORD_ID Then + tsButtonShowTaskOverview.Visible = True CURRENT_TASK_ID = _row.Item("WF_TASK_ID") Dim text = "Task: " & _row.Item("WF_TITLE") text += " - " & _row.Item("STATE_TITLE") @@ -5903,7 +5901,7 @@ Public Class frmConstructor_Main CURRENT_ENTITY_ID = ENTITY_ID Dim sql = "EXEC PRPMO_CREATE_WF_TASKS " & CURRENT_ENTITY_ID & ", " & RECORD_ID If ClassDatabase.Execute_non_Query(sql) = True Then - ' VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, USER_USERNAME) + ClassWorkflow.Refresh_Workflows_Entity() Show_act_WFTask() If USER_LANGUAGE = "de-DE" Then stg = "Workflows erzeugt! Wollen Sie die Workflowübersicht nun anzeigen?" @@ -5915,6 +5913,7 @@ Public Class frmConstructor_Main result = MessageBox.Show(stg, caption, MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = MsgBoxResult.Yes Then ClassJumpRecord.JumpToRecord(2, RECORD_ID) + ClassWorkflow.Refresh_Workflows_Entity() JUMP_RECORD_ID = 0 End If Else diff --git a/app/DD-Record-Organizer/frmRecordView.Designer.vb b/app/DD-Record-Organizer/frmRecordView.Designer.vb index 0f71474..98b9da8 100644 --- a/app/DD-Record-Organizer/frmRecordView.Designer.vb +++ b/app/DD-Record-Organizer/frmRecordView.Designer.vb @@ -82,8 +82,6 @@ Partial Class frmRecordView Me.tslblWindreamView = New System.Windows.Forms.ToolStripLabel() Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() Me.txtStateActual = New System.Windows.Forms.TextBox() - Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.DD_DMSDataSet = New DD_Record_Organizer.DD_DMSDataSet() Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPage3 = New DevExpress.XtraTab.XtraTabPage() Me.GridControlUsersSelection = New DevExpress.XtraGrid.GridControl() @@ -104,6 +102,7 @@ Partial Class frmRecordView Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() Me.TBPMO_WORKFLOW_TASK_HISTORYBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.DD_DMSDataSet = New DD_Record_Organizer.DD_DMSDataSet() Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colGUID = New DevExpress.XtraGrid.Columns.GridColumn() Me.colSTATE_DESC = New DevExpress.XtraGrid.Columns.GridColumn() @@ -124,7 +123,6 @@ Partial Class frmRecordView Me.STATE_IDComboBox = New System.Windows.Forms.ComboBox() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter() Me.TableAdapterManager = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager() Me.TBPMO_WORKFLOW_TASK_HISTORYTableAdapter = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_WORKFLOW_TASK_HISTORYTableAdapter() Label1 = New System.Windows.Forms.Label() @@ -161,8 +159,6 @@ Partial Class frmRecordView CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit() Me.ToolStrip2.SuspendLayout() Me.XtraTabPage1.SuspendLayout() - CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() Me.XtraTabPage3.SuspendLayout() @@ -173,6 +169,7 @@ Partial Class frmRecordView Me.XtraTabPage4.SuspendLayout() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPMO_WORKFLOW_TASK_HISTORYBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -226,6 +223,7 @@ Partial Class frmRecordView 'STATE_IDLabel ' resources.ApplyResources(STATE_IDLabel, "STATE_IDLabel") + STATE_IDLabel.ForeColor = System.Drawing.Color.DodgerBlue STATE_IDLabel.Name = "STATE_IDLabel" ' 'SplitContainerMain @@ -595,22 +593,11 @@ Partial Class frmRecordView ' 'txtStateActual ' - Me.txtStateActual.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.VWPMO_WF_ACTIVEBindingSource, "STATE_TITLE", True)) resources.ApplyResources(Me.txtStateActual, "txtStateActual") Me.txtStateActual.ForeColor = System.Drawing.Color.OrangeRed Me.txtStateActual.Name = "txtStateActual" Me.txtStateActual.ReadOnly = True ' - 'VWPMO_WF_ACTIVEBindingSource - ' - Me.VWPMO_WF_ACTIVEBindingSource.DataMember = "VWPMO_WF_ACTIVE" - Me.VWPMO_WF_ACTIVEBindingSource.DataSource = Me.DD_DMSDataSet - ' - 'DD_DMSDataSet - ' - Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet" - Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema - ' 'XtraTabControl1 ' resources.ApplyResources(Me.XtraTabControl1, "XtraTabControl1") @@ -755,6 +742,11 @@ Partial Class frmRecordView Me.TBPMO_WORKFLOW_TASK_HISTORYBindingSource.DataMember = "TBPMO_WORKFLOW_TASK_HISTORY" Me.TBPMO_WORKFLOW_TASK_HISTORYBindingSource.DataSource = Me.DD_DMSDataSet ' + 'DD_DMSDataSet + ' + Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet" + Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema + ' 'GridView2 ' Me.GridView2.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView2.Appearance.EvenRow.BackColor"), System.Drawing.Color) @@ -813,25 +805,21 @@ Partial Class frmRecordView ' 'WF_IDTextBox ' - Me.WF_IDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.VWPMO_WF_ACTIVEBindingSource, "WF_ID", True)) resources.ApplyResources(Me.WF_IDTextBox, "WF_IDTextBox") Me.WF_IDTextBox.Name = "WF_IDTextBox" ' 'CHANGED_WHENTextBox ' - Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.VWPMO_WF_ACTIVEBindingSource, "CHANGED_WHEN", True)) resources.ApplyResources(Me.CHANGED_WHENTextBox, "CHANGED_WHENTextBox") Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox" ' 'CHANGED_WHOTextBox ' - Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.VWPMO_WF_ACTIVEBindingSource, "CHANGED_WHO", True)) resources.ApplyResources(Me.CHANGED_WHOTextBox, "CHANGED_WHOTextBox") Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox" ' 'WF_TASK_IDTextBox ' - Me.WF_TASK_IDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.VWPMO_WF_ACTIVEBindingSource, "WF_TASK_ID", True)) resources.ApplyResources(Me.WF_TASK_IDTextBox, "WF_TASK_IDTextBox") Me.WF_TASK_IDTextBox.Name = "WF_TASK_IDTextBox" ' @@ -850,27 +838,23 @@ Partial Class frmRecordView ' 'TITLETextBox ' - Me.TITLETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.VWPMO_WF_ACTIVEBindingSource, "WF_TITLE", True)) resources.ApplyResources(Me.TITLETextBox, "TITLETextBox") Me.TITLETextBox.Name = "TITLETextBox" Me.TITLETextBox.ReadOnly = True ' 'DateTimePickerTASK_DATE ' - Me.DateTimePickerTASK_DATE.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.VWPMO_WF_ACTIVEBindingSource, "TASK_DATE", True)) Me.DateTimePickerTASK_DATE.Format = System.Windows.Forms.DateTimePickerFormat.[Short] resources.ApplyResources(Me.DateTimePickerTASK_DATE, "DateTimePickerTASK_DATE") Me.DateTimePickerTASK_DATE.Name = "DateTimePickerTASK_DATE" ' 'COMMENTTextBox ' - Me.COMMENTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.VWPMO_WF_ACTIVEBindingSource, "COMMENT", True)) resources.ApplyResources(Me.COMMENTTextBox, "COMMENTTextBox") Me.COMMENTTextBox.Name = "COMMENTTextBox" ' 'DUE_DATEDateTimePicker ' - Me.DUE_DATEDateTimePicker.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.VWPMO_WF_ACTIVEBindingSource, "DUE_DATE", True)) Me.DUE_DATEDateTimePicker.Format = System.Windows.Forms.DateTimePickerFormat.[Short] resources.ApplyResources(Me.DUE_DATEDateTimePicker, "DUE_DATEDateTimePicker") Me.DUE_DATEDateTimePicker.Name = "DUE_DATEDateTimePicker" @@ -878,6 +862,7 @@ Partial Class frmRecordView 'STATE_IDComboBox ' resources.ApplyResources(Me.STATE_IDComboBox, "STATE_IDComboBox") + Me.STATE_IDComboBox.ForeColor = System.Drawing.Color.DodgerBlue Me.STATE_IDComboBox.FormattingEnabled = True Me.STATE_IDComboBox.Name = "STATE_IDComboBox" ' @@ -890,10 +875,6 @@ Partial Class frmRecordView ' Me.GridView1.Name = "GridView1" ' - 'VWPMO_WF_ACTIVETableAdapter - ' - Me.VWPMO_WF_ACTIVETableAdapter.ClearBeforeFill = True - ' 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False @@ -907,6 +888,7 @@ Partial Class frmRecordView Me.TableAdapterManager.TBDD_INDEX_AUTOMTableAdapter = Nothing Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_APPOINTMENTSTableAdapter = Nothing Me.TableAdapterManager.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing @@ -978,8 +960,6 @@ Partial Class frmRecordView Me.ToolStrip2.PerformLayout() Me.XtraTabPage1.ResumeLayout(False) Me.XtraTabPage1.PerformLayout() - CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl1.ResumeLayout(False) Me.XtraTabPage3.ResumeLayout(False) @@ -991,6 +971,7 @@ Partial Class frmRecordView Me.XtraTabPage4.ResumeLayout(False) CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPMO_WORKFLOW_TASK_HISTORYBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) @@ -1074,8 +1055,6 @@ Partial Class frmRecordView Friend WithEvents lblWiedervorlage_Control As System.Windows.Forms.Label Friend WithEvents Label5 As System.Windows.Forms.Label Friend WithEvents DD_DMSDataSet As DD_Record_Organizer.DD_DMSDataSet - Friend WithEvents VWPMO_WF_ACTIVEBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents VWPMO_WF_ACTIVETableAdapter As DD_Record_Organizer.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter Friend WithEvents TableAdapterManager As DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager Friend WithEvents DD_ECMAdmin As DD_Record_Organizer.DD_ECMAdmin Friend WithEvents TBAD_UsersBindingSource As System.Windows.Forms.BindingSource diff --git a/app/DD-Record-Organizer/frmRecordView.resx b/app/DD-Record-Organizer/frmRecordView.resx index 8b196af..f694508 100644 --- a/app/DD-Record-Organizer/frmRecordView.resx +++ b/app/DD-Record-Organizer/frmRecordView.resx @@ -166,7 +166,7 @@ Tahoma, 8.25pt, style=Italic - 556, 85 + 481, 55 41, 13 @@ -199,7 +199,7 @@ Tahoma, 8.25pt, style=Italic - 125, 235 + 128, 273 83, 13 @@ -232,7 +232,7 @@ Tahoma, 8.25pt, style=Italic - 8, 235 + 11, 273 77, 13 @@ -367,7 +367,7 @@ NoControl - 10, 179 + 11, 203 59, 13 @@ -400,7 +400,7 @@ NoControl - 112, 179 + 112, 203 52, 13 @@ -436,7 +436,7 @@ NoControl - 330, 178 + 330, 203 91, 14 @@ -493,7 +493,7 @@ 0, 0 - 1336, 304 + 1332, 301 0 @@ -511,7 +511,7 @@ 0 - 1336, 304 + 1332, 301 Detailansicht @@ -1314,7 +1314,7 @@ 0, 25 - 1336, 305 + 1332, 302 8 @@ -1347,7 +1347,7 @@ 0, 0 - 1336, 25 + 1332, 25 2 @@ -1368,7 +1368,7 @@ 1 - 1336, 330 + 1332, 327 Dateien @@ -1394,12 +1394,6 @@ True - - 752, 17 - - - 609, 17 - Segoe UI, 9pt, style=Bold, Italic @@ -1482,7 +1476,7 @@ 102 - 284, 223 + 284, 220 88 @@ -1518,7 +1512,7 @@ 16, 24 - 174, 223 + 174, 220 27 @@ -1669,7 +1663,7 @@ zuordnen 5 - 620, 267 + 616, 264 User zuordnen @@ -1698,6 +1692,9 @@ zuordnen 347, 56 + + 609, 17 + 3, 6 @@ -1843,7 +1840,7 @@ zuordnen Tahoma, 8.25pt, style=Italic - 603, 82 + 528, 52 41, 21 @@ -1870,7 +1867,7 @@ zuordnen Tahoma, 8.25pt, style=Italic - 128, 251 + 128, 289 142, 21 @@ -1897,7 +1894,7 @@ zuordnen Tahoma, 8.25pt, style=Italic - 11, 251 + 11, 289 108, 21 @@ -1951,7 +1948,7 @@ zuordnen MiddleLeft - 333, 226 + 333, 264 311, 46 @@ -2035,7 +2032,7 @@ zuordnen 15 - 13, 198 + 13, 223 96, 21 @@ -2062,7 +2059,7 @@ zuordnen True - 631, 69 + 631, 93 36 @@ -2080,7 +2077,7 @@ zuordnen 18 - 115, 198 + 115, 223 96, 21 @@ -2104,7 +2101,7 @@ zuordnen Tahoma, 9pt, style=Bold - 333, 198 + 333, 222 311, 22 @@ -2211,9 +2208,6 @@ zuordnen 2 - - 996, 17 - 1234, 17 @@ -2519,18 +2513,6 @@ zuordnen System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - VWPMO_WF_ACTIVEBindingSource - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DD_DMSDataSet - - - DD_Record_Organizer.DD_DMSDataSet, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - TBAD_UsersBindingSource @@ -2591,6 +2573,12 @@ zuordnen System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + DD_DMSDataSet + + + DD_Record_Organizer.DD_DMSDataSet, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + GridView2 @@ -2633,12 +2621,6 @@ zuordnen DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - VWPMO_WF_ACTIVETableAdapter - - - DD_Record_Organizer.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - TableAdapterManager diff --git a/app/DD-Record-Organizer/frmRecordView.vb b/app/DD-Record-Organizer/frmRecordView.vb index 01c4b26..9eac2b5 100644 --- a/app/DD-Record-Organizer/frmRecordView.vb +++ b/app/DD-Record-Organizer/frmRecordView.vb @@ -5,7 +5,7 @@ Imports DD_LIB_Standards Public Class frmRecordView Private recordView As ClassRecordView - Private ENTITY_ID, FORMVIEW_ID, PARENT_ENTITY_ID, WF_TASK_ID As Integer + Private ENTITY_ID, FORMVIEW_ID, PARENT_ENTITY_ID, WF_TASK_ID, RECORD_ID As Integer Private Const SEE_MASK_INVOKEIDLIST = &HC Private Const SEE_MASK_NOCLOSEPROCESS = &H40 Private Const SEE_MASK_FLAG_NO_UI = &H400 @@ -50,13 +50,15 @@ Public Class frmRecordView Me.Text = "Detailansicht Record" End If recordView = New ClassRecordView(pnlDetails) - recordView.LoadRecord(JUMP_RECORD_ID) + RECORD_ID = JUMP_RECORD_ID + recordView.LoadRecord(RECORD_ID) 'Titel updaten - Me.Text &= " " + JUMP_RECORD_ID.ToString() - Dim sql = "SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = " & JUMP_RECORD_ID + Me.Text &= " " + RECORD_ID.ToString() + Dim sql = "SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = " & RECORD_ID ENTITY_ID = ClassDatabase.Execute_Scalar(sql, True) - ClassRightManagement.Check_Set_Rights(JUMP_RECORD_ID, ENTITY_ID) + ClassRightManagement.Check_Set_Rights(RECORD_ID, ENTITY_ID) + ClassProxy.Refresh_Workflow_Data() sql = String.Format("select * from TBPMO_DOCSEARCH_VARIABLE_CONTROLS WHERE ENTITY_ID = {0}", ENTITY_ID) 'TBPMO_WINDREAM_RESULTLIST_CONFIG" DT_RESULTLIST_OPTIONS = ClassDatabase.Return_Datatable(sql, True) @@ -74,7 +76,7 @@ Public Class frmRecordView End Try RUN_WDSEARCH_GRID() - Load_Tasks() + Load_Task_Data() End Sub Private Sub OnCBSelectedValueChanged(sender As Object, e As EventArgs) @@ -139,7 +141,7 @@ Public Class frmRecordView Dim sw As New Stopwatch sw.Start() Dim elapsed As Double - Dim DT_RESULT As DataTable = ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, JUMP_RECORD_ID) + Dim DT_RESULT As DataTable = ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, RECORD_ID) If IsNothing(DT_RESULT) Then Dim msg = "wrong DocSearch-Configuration - Check logfile and contact Digital Data" tslblWindreamView.Text = msg @@ -147,9 +149,9 @@ Public Class frmRecordView Exit Sub End If If DT_RESULT.Rows.Count > 0 Then 'Es gibt Suchergebnisse - Dim msg = "Windream-Dokumente für Record: " & JUMP_RECORD_ID + Dim msg = "Windream-Dokumente für Record: " & RECORD_ID If USER_LANGUAGE <> "de-DE" Then - msg = "windream-files for record: " & JUMP_RECORD_ID + msg = "windream-files for record: " & RECORD_ID End If tslblWindreamView.Text = msg @@ -164,12 +166,12 @@ Public Class frmRecordView AddressOf OnDateSelectedValueChanged, AddressOf OnTextSelectedValueChanged, AddressOf OnCheckboxValueChanged, - "RECORD", JUMP_RECORD_ID) + "RECORD", RECORD_ID) End If Else - Dim msg = "Keine Windream-Dokumente für Record: " & JUMP_RECORD_ID & " gefunden" + Dim msg = "Keine Windream-Dokumente für Record: " & RECORD_ID & " gefunden" If USER_LANGUAGE <> "de-DE" Then - msg = "No windream-files found for record: " & JUMP_RECORD_ID + msg = "No windream-files found for record: " & RECORD_ID End If @@ -186,14 +188,59 @@ Public Class frmRecordView End Try Cursor = Cursors.Default End Sub - Private Sub Load_Tasks() + Private Sub Load_Task_Data() Try - 'Me.TBPMO_WORKFLOW_TASK_STATETableAdapter.Connection.ConnectionString = MyConnectionString - Me.VWPMO_WF_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString - Me.VWPMO_WF_ACTIVETableAdapter.FillByRecord(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, USER_USERNAME, JUMP_RECORD_ID) - If DD_DMSDataSet.VWPMO_WF_ACTIVE.Rows.Count > 0 Then + Dim query = From table In CURRENT_VWPMO_WF_ACTIVE.AsEnumerable() + Select table Where table.Item("RECORD_ID") = RECORD_ID + Dim RECORD_ROW = query.ToList() + If RECORD_ROW.Count = 1 Then TabControlBottom.TabPages(1).Appearance.Header.BackColor = Color.Red + For Each _row In RECORD_ROW + TITLETextBox.Text = _row.Item("WF_TITLE") + txtStateActual.Text = _row.Item("STATE_TITLE") + WF_IDTextBox.Text = _row.Item("WF_ID") + WF_TASK_IDTextBox.Text = _row.Item("WF_TASK_ID") + If Not IsDBNull(_row.Item("COMMENT")) Then + COMMENTTextBox.Text = _row.Item("COMMENT") + Else + COMMENTTextBox.Text = "" + End If + If Not IsDBNull(_row.Item("COMMENT")) Then + + End If + If Not IsDBNull(_row.Item("CHANGED_WHO")) Then + CHANGED_WHOTextBox.Text = _row.Item("CHANGED_WHO") + End If + + If Not IsDBNull(_row.Item("CHANGED_WHEN")) Then + CHANGED_WHENTextBox.Text = _row.Item("CHANGED_WHEN") + End If + + If Not IsDBNull(_row.Item("TASK_DATE")) Then + DateTimePickerTASK_DATE.Text = _row.Item("TASK_DATE") + End If + + If Not IsDBNull(_row.Item("DUE_DATE")) Then + DUE_DATEDateTimePicker.Text = _row.Item("DUE_DATE") + End If + + + Next Else + TITLETextBox.Text = "" + txtStateActual.Text = "" + WF_IDTextBox.Text = "" + WF_TASK_IDTextBox.Text = "" + COMMENTTextBox.Text = "" + CHANGED_WHOTextBox.Text = "" + CHANGED_WHENTextBox.Text = "" + + COMMENTTextBox.Enabled = False + DUE_DATEDateTimePicker.Enabled = False + DateTimePickerTASK_DATE.Enabled = False + STATE_IDComboBox.Enabled = False + lblTaskState.Visible = True + btnSaveWorkflow.Enabled = False TabControlBottom.TabPages(1).Appearance.Header.BackColor = Nothing End If @@ -201,6 +248,8 @@ Public Class frmRecordView FORMVIEW_ID = ClassDatabase.Execute_Scalar(Sql, True) Sql = "SELECT PARENT_ID FROM TBPMO_FORM WHERE GUID = " & ENTITY_ID PARENT_ENTITY_ID = ClassDatabase.Execute_Scalar(Sql, True) + + Catch ex As Exception MsgBox("Error in Load_Tasks:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try @@ -209,41 +258,29 @@ Public Class frmRecordView Private Sub TabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles TabControlBottom.SelectedPageChanged Try If TabControlBottom.SelectedTabPageIndex = 1 Then - If DD_DMSDataSet.VWPMO_WF_ACTIVE.Rows.Count = 0 Then - COMMENTTextBox.Enabled = False - DUE_DATEDateTimePicker.Enabled = False - DateTimePickerTASK_DATE.Enabled = False - STATE_IDComboBox.Enabled = False - lblTaskState.Visible = True - btnSaveWorkflow.Enabled = False - Else - If WF_TASK_IDTextBox.Text <> "" Then - WF_TASK_ID = WF_TASK_IDTextBox.Text - End If - Try - If WF_IDTextBox.Text <> "" Then - ' Me.TBPMO_WORKFLOW_TASK_STATETableAdapter.FillBy(Me.DD_DMSDataSet.TBPMO_WORKFLOW_TASK_STATE, USER_LANGUAGE, WF_IDTextBox.Text, ENTITY_ID) - Dim sel = ClassDatabase.Execute_Scalar("SELECT USER_SELECT FROM TBPMO_WORKFLOW_TASK WHERE GUID = " & WF_TASK_ID, True) - If Not IsNothing(sel) Then - Load_Selectable_Users(sel) - End If - End If - Catch ex As Exception - MsgBox("Error in load States:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - End Try - COMMENTTextBox.Enabled = True - DUE_DATEDateTimePicker.Enabled = True - DateTimePickerTASK_DATE.Enabled = True - STATE_IDComboBox.Enabled = True - lblTaskState.Text = "No active workflows" - lblTaskState.Visible = False - + Load_Task_Data() + If WF_TASK_IDTextBox.Text <> "" Then + WF_TASK_ID = WF_TASK_IDTextBox.Text btnSaveWorkflow.Enabled = True - Load_TASK_USER() - Load_States() - Check_end() - + Else + WF_TASK_ID = 0 + btnSaveWorkflow.Enabled = False End If + Try + If WF_TASK_ID > 0 Then + lblTaskState.Text = "No active workflows" + lblTaskState.Visible = False + Dim sel = ClassDatabase.Execute_Scalar("SELECT USER_SELECT FROM TBPMO_WORKFLOW_TASK WHERE GUID = " & WF_TASK_ID, True) + If Not IsNothing(sel) Then + Load_Selectable_Users(sel) + End If + End If + Catch ex As Exception + MsgBox("Error in load States:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + Load_TASK_USER() + Load_States() + Check_end() _Changed = False End If Catch ex As Exception @@ -334,18 +371,35 @@ Public Class frmRecordView Exit Sub End If Dim upd - If STATE_IDComboBox.SelectedIndex <> -1 Then + Dim STATE_id As Integer + Try + STATE_id = STATE_IDComboBox.SelectedValue + Catch ex As Exception + STATE_id = 0 + End Try + + If STATE_id > 0 Then + Dim sql = String.Format("SELECT dbo.FNPMO_GETOBJECTCAPTION('{0}', 'WF_STATE_TITLE' + CONVERT(VARCHAR(5), GUID), 1) AS STATE_DESC FROM TBPMO_WORKFLOW_TASK_STATE WHERE GUID = {1}", USER_LANGUAGE, STATE_IDComboBox.SelectedValue) + Dim State_DESC = ClassDatabase.Execute_Scalar(sql, True) + Dim Comment + If COMMENTTextBox.Text <> "" Then + Comment = String.Format(COMMENTTextBox.Text & vbNewLine & ">> " & Now.ToString & ": User {0} changed the state to: {1}", Environment.UserName, State_DESC) + Else + Comment = String.Format(">> " & Now.ToString & ": User {0} Changed the state to: {1}", Environment.UserName, State_DESC) + End If + upd = String.Format("UPDATE TBPMO_WORKFLOW_TASK SET COMMENT = '{0}', DUE_DATE = '{1}', STATE_ID = {2}, ACTIVE = {3}, CHANGED_WHO = '{4}', TASK_DATE = '{5}' " & _ - "WHERE GUID = {6}", COMMENTTextBox.Text, DUE_DATEDateTimePicker.Value, STATE_IDComboBox.SelectedValue, 1, USER_USERNAME, DateTimePickerTASK_DATE.Value, WF_TASK_ID) + "WHERE GUID = {6}", Comment, DUE_DATEDateTimePicker.Value, STATE_id, 1, USER_USERNAME, DateTimePickerTASK_DATE.Value, WF_TASK_ID) STATE_IDComboBox.SelectedIndex = -1 Else - upd = String.Format("UPDATE TBPMO_WORKFLOW_TASK SET COMMENT = '{0}', DUE_DATE = '{1}', ACTIVE = {2}, CHANGED_WHO = '{3}', TASK_DATE = '{4}' " & _ + upd = String.Format("UPDATE TBPMO_WORKFLOW_TASK SET COMMENT = (SELECT )'{0}', DUE_DATE = '{1}', ACTIVE = {2}, CHANGED_WHO = '{3}', TASK_DATE = '{4}' " & _ "WHERE GUID = {5}", COMMENTTextBox.Text, DUE_DATEDateTimePicker.Value, 1, USER_USERNAME, DateTimePickerTASK_DATE.Value, WF_TASK_ID) STATE_IDComboBox.SelectedIndex = -1 End If If ClassDatabase.Execute_non_Query(upd, True) Then + ClassWorkflow.Refresh_Workflows_Entity() ClassProxy.Refresh_Workflow_Data() - Load_Tasks() + Load_Task_Data() Load_States() Check_end() If XtraTabControl1.SelectedTabPageIndex = 1 Then @@ -479,18 +533,18 @@ Public Class frmRecordView ' RUN_WDSEARCH_GRID() 'End If ElseIf (e.Data.GetDataPresent("FileGroupDescriptor")) AndAlso (e.Data.GetDataPresent("FileContents")) Then - CURRENT_RECORD_ID = JUMP_RECORD_ID + CURRENT_RECORD_ID = RECORD_ID If ClassDragDrop.Drop_File(e) = True Then Check_Dropped_Files() End If ElseIf e.Data.GetDataPresent("FileGroupDescriptor") Then - CURRENT_RECORD_ID = JUMP_RECORD_ID + CURRENT_RECORD_ID = RECORD_ID If ClassDragDrop.Drop_File(e) = True Then Check_Dropped_Files() End If End If Else - CURRENT_RECORD_ID = JUMP_RECORD_ID + CURRENT_RECORD_ID = RECORD_ID If ClassDragDrop.Drop_File(e) = True Then Check_Dropped_Files() End If @@ -524,7 +578,7 @@ Public Class frmRecordView 'Dim datei = Str.ToString.Replace("@DROPFROMFSYSTEM@", "") CURRENT_FILEID = Filerow.Item("GUID") CURRENT_PARENT_ENTITY_ID = PARENT_ENTITY_ID - CURRENT_RECORD_ID = JUMP_RECORD_ID + CURRENT_RECORD_ID = RECORD_ID CURRENT_ENTITY_ID = ENTITY_ID CURRENT_FORMVIEW_ID = FORMVIEW_ID If CURRENT_TBPMO_FILES_USER.Rows.Count = 1 Then diff --git a/app/RecordOrganizer_RightManager/frmCheckRightsRecords.Designer.vb b/app/RecordOrganizer_RightManager/frmCheckRightsRecords.Designer.vb index 77919f8..336e732 100644 --- a/app/RecordOrganizer_RightManager/frmCheckRightsRecords.Designer.vb +++ b/app/RecordOrganizer_RightManager/frmCheckRightsRecords.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmCheckRightsRecords 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmCheckRightsRecords)) Me.Label1 = New System.Windows.Forms.Label() Me.cmbentity = New System.Windows.Forms.ComboBox() Me.btnCheckRights = New System.Windows.Forms.Button() @@ -33,6 +34,8 @@ Partial Class frmCheckRightsRecords Me.GridControlMain = New DevExpress.XtraGrid.GridControl() Me.GridViewMain = New DevExpress.XtraGrid.Views.Grid.GridView() Me.Label2 = New System.Windows.Forms.Label() + Me.btnSelectVisiblRows = New System.Windows.Forms.Button() + Me.Button1 = New System.Windows.Forms.Button() CType(Me.GridControlMain, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridViewMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -40,7 +43,7 @@ Partial Class frmCheckRightsRecords 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(25, 9) + Me.Label1.Location = New System.Drawing.Point(5, 9) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(147, 16) Me.Label1.TabIndex = 0 @@ -49,7 +52,7 @@ Partial Class frmCheckRightsRecords 'cmbentity ' Me.cmbentity.FormattingEnabled = True - Me.cmbentity.Location = New System.Drawing.Point(28, 29) + Me.cmbentity.Location = New System.Drawing.Point(8, 29) Me.cmbentity.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.cmbentity.Name = "cmbentity" Me.cmbentity.Size = New System.Drawing.Size(335, 24) @@ -79,7 +82,7 @@ Partial Class frmCheckRightsRecords ' Me.btncancel.Image = Global.RecordOrganizer_RightManager.My.Resources.Resources.cancel1 Me.btncancel.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btncancel.Location = New System.Drawing.Point(881, 25) + Me.btncancel.Location = New System.Drawing.Point(876, 25) Me.btncancel.Name = "btncancel" Me.btncancel.Size = New System.Drawing.Size(75, 31) Me.btncancel.TabIndex = 4 @@ -93,7 +96,7 @@ Partial Class frmCheckRightsRecords Me.chklogging.AutoSize = True Me.chklogging.Checked = True Me.chklogging.CheckState = System.Windows.Forms.CheckState.Checked - Me.chklogging.Location = New System.Drawing.Point(379, 31) + Me.chklogging.Location = New System.Drawing.Point(359, 31) Me.chklogging.Name = "chklogging" Me.chklogging.Size = New System.Drawing.Size(113, 20) Me.chklogging.TabIndex = 5 @@ -113,10 +116,13 @@ Partial Class frmCheckRightsRecords 'GridControlMain ' Me.GridControlMain.AllowDrop = True - Me.GridControlMain.Location = New System.Drawing.Point(28, 105) + Me.GridControlMain.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.GridControlMain.Location = New System.Drawing.Point(8, 105) Me.GridControlMain.MainView = Me.GridViewMain Me.GridControlMain.Name = "GridControlMain" - Me.GridControlMain.Size = New System.Drawing.Size(928, 196) + Me.GridControlMain.Size = New System.Drawing.Size(1291, 488) Me.GridControlMain.TabIndex = 9 Me.GridControlMain.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewMain}) ' @@ -139,17 +145,43 @@ Partial Class frmCheckRightsRecords 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(25, 86) + Me.Label2.Location = New System.Drawing.Point(5, 86) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(318, 16) Me.Label2.TabIndex = 10 Me.Label2.Text = "Please select the records which files shall be checked:" ' + 'btnSelectVisiblRows + ' + Me.btnSelectVisiblRows.Image = CType(resources.GetObject("btnSelectVisiblRows.Image"), System.Drawing.Image) + Me.btnSelectVisiblRows.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnSelectVisiblRows.Location = New System.Drawing.Point(876, 59) + Me.btnSelectVisiblRows.Name = "btnSelectVisiblRows" + Me.btnSelectVisiblRows.Size = New System.Drawing.Size(178, 39) + Me.btnSelectVisiblRows.TabIndex = 11 + Me.btnSelectVisiblRows.Text = "Select all visible Rows" + Me.btnSelectVisiblRows.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnSelectVisiblRows.UseVisualStyleBackColor = True + ' + 'Button1 + ' + Me.Button1.Image = CType(resources.GetObject("Button1.Image"), System.Drawing.Image) + Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button1.Location = New System.Drawing.Point(1060, 59) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(178, 39) + Me.Button1.TabIndex = 12 + Me.Button1.Text = "Unselect all visible Rows" + Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button1.UseVisualStyleBackColor = True + ' 'frmCheckRightsRecords ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(970, 305) + Me.ClientSize = New System.Drawing.Size(1304, 596) + Me.Controls.Add(Me.Button1) + Me.Controls.Add(Me.btnSelectVisiblRows) Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.GridControlMain) Me.Controls.Add(Me.lblstate) @@ -160,7 +192,6 @@ Partial Class frmCheckRightsRecords Me.Controls.Add(Me.cmbentity) Me.Controls.Add(Me.Label1) Me.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.MaximizeBox = False Me.MinimizeBox = False @@ -185,4 +216,6 @@ Partial Class frmCheckRightsRecords Friend WithEvents GridControlMain As DevExpress.XtraGrid.GridControl Friend WithEvents GridViewMain As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents Label2 As System.Windows.Forms.Label + Friend WithEvents btnSelectVisiblRows As System.Windows.Forms.Button + Friend WithEvents Button1 As System.Windows.Forms.Button End Class diff --git a/app/RecordOrganizer_RightManager/frmCheckRightsRecords.resx b/app/RecordOrganizer_RightManager/frmCheckRightsRecords.resx index 91c7d6d..83e707c 100644 --- a/app/RecordOrganizer_RightManager/frmCheckRightsRecords.resx +++ b/app/RecordOrganizer_RightManager/frmCheckRightsRecords.resx @@ -120,4 +120,21 @@ 17, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAB0SURBVDhPpY27DYAwFAOZjalCHZYEhgCa1ByyhB5RvmC5 + iJ7unCF05hbG5vwTjv0sVExFWJeNu/czbzEVAZQ7Gm8xJcHOUzElwc5TMbHg3MQDKJrPCg8XzWcFKpTY + eapjQtAnxM5THRNCrmJeQku+Ch0J4QLYS+ifBfoIBAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + xAAADsQBlSsOGwAAAHRJREFUOE+ljbsNgDAUA5mNqUIdlgSGAJrUHLKEHlG+YLmInu6cIXTmFsbm/BOO + /SxUTEVYl4279zNvMRUBlDsabzElwc5TMSXBzlMxseDcxAMoms8KDxfNZwUqlNh5qmNC0CfEzlMdE0Ku + Yl5CS74KHQnhAthL6J8F+ggEAAAAAElFTkSuQmCC + + \ No newline at end of file diff --git a/app/RecordOrganizer_RightManager/frmCheckRightsRecords.vb b/app/RecordOrganizer_RightManager/frmCheckRightsRecords.vb index 69b0215..a1110d6 100644 --- a/app/RecordOrganizer_RightManager/frmCheckRightsRecords.vb +++ b/app/RecordOrganizer_RightManager/frmCheckRightsRecords.vb @@ -204,4 +204,23 @@ Public Class frmCheckRightsRecords Private Sub frmCheckRightsRecords_Shown(sender As Object, e As EventArgs) Handles Me.Shown _formloaded = True End Sub + + Private Sub btnSelectVisiblRows_Click(sender As Object, e As EventArgs) Handles btnSelectVisiblRows.Click + Dim listRecords As New ArrayList + Dim collist As New ArrayList + For i = 0 To GridViewMain.RowCount + Dim recid = GridViewMain.GetRowCellValue(i, "Record-ID") + If Not IsNothing(recid) Then + listRecords.Add(recid) + End If + Next + For Each row As DataRow In DT_DATA.Rows + For Each Record As String In listRecords + If Record = row.Item("Record-ID") Then + row.Item("Selection") = True + Exit For + End If + Next + Next + End Sub End Class \ No newline at end of file diff --git a/app/SetupWiX/Product.wxs b/app/SetupWiX/Product.wxs index cf24bfa..a78ab7e 100644 --- a/app/SetupWiX/Product.wxs +++ b/app/SetupWiX/Product.wxs @@ -190,6 +190,7 @@ + diff --git a/app/VERSION_CHECKER/frmVersionCheck.vb b/app/VERSION_CHECKER/frmVersionCheck.vb index 6414d56..92f82d7 100644 --- a/app/VERSION_CHECKER/frmVersionCheck.vb +++ b/app/VERSION_CHECKER/frmVersionCheck.vb @@ -45,7 +45,7 @@ Public Class frmVersionCheck Else VERSION_USER = CInt(VERSION_USER.ToString.Replace(".", "")) VERSION_SERVER = CInt(VERSION_SERVER.ToString.Replace(".", "")) - If VERSION_USER = VERSION_SERVER Then + If (VERSION_USER = VERSION_SERVER) Or VERSION_SERVER = 1000 Or VERSION_USER = 1000 Then Exit Sub End If UPDATE_NECESSARY = True