diff --git a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb index fb612ad..1dac7be 100644 --- a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb +++ b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb @@ -2,6 +2,7 @@ Public Class ClassDOC_SEARCH Private Shared DT_RESULTLIST_OPTIONS As DataTable + Private Shared DT_RESULTLIST_SEL_VALUES As DataTable Private Shared ENTITY_ID As Integer Private Shared RECORD_ID As Integer Private Shared Function GET_DOCSEARCH_DATATABLE(Type As String) @@ -11,6 +12,11 @@ Public Class ClassDOC_SEARCH Dim OPTION3 Dim OPTION4 Dim OPTION5 + Dim VALUE_CONF1 + Dim VALUE_CONF2 + Dim VALUE_CONF3 + Dim VALUE_CONF4 + If DT_RESULTLIST_OPTIONS.Rows.Count = 0 Then OPTION1 = 0 OPTION2 = 0 @@ -24,37 +30,34 @@ Public Class ClassDOC_SEARCH OPTION4 = DT_RESULTLIST_OPTIONS.Rows(0).Item("OPTION4_CTRL") OPTION5 = DT_RESULTLIST_OPTIONS.Rows(0).Item("OPTION5_CTRL") End If + If DT_RESULTLIST_SEL_VALUES.Rows.Count = 0 Then + VALUE_CONF1 = 0 + VALUE_CONF2 = 0 + VALUE_CONF3 = 0 + VALUE_CONF4 = 0 + + Else + VALUE_CONF1 = DT_RESULTLIST_SEL_VALUES.Rows(0).Item("GUID") + Try + VALUE_CONF2 = DT_RESULTLIST_SEL_VALUES.Rows(1).Item("GUID") + Catch ex As Exception + VALUE_CONF2 = 0 + End Try + Try + VALUE_CONF3 = DT_RESULTLIST_SEL_VALUES.Rows(2).Item("GUID") + Catch ex As Exception + VALUE_CONF3 = 0 + End Try + Try + VALUE_CONF4 = DT_RESULTLIST_SEL_VALUES.Rows(3).Item("GUID") + Catch ex As Exception + VALUE_CONF4 = 0 + End Try + + End If Dim SQL_DOC_SEARCH If Type = "ENTITY" Then - - '"FROM VWPMO_WD_DOC_SEARCH WHERE ENTITY_ID LIKE '%#{1}%'", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4) - ' SQL_DOC_SEARCH = String.Format("SELECT * ," & _ - ' "CASE " & _ - ' "WHEN [ENTITY_ID] = {1} THEN " & _ - ' " (SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {2} AND RECORD_ID = {0}) " & _ - ' "ELSE '' END AS OPTION1," & _ - ' "CASE " & _ - ' "WHEN [ENTITY_ID] = {1} THEN " & _ - ' " (SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {3} AND RECORD_ID = {0}) " & _ - ' "ELSE '' END AS OPTION2," & _ - ' "CASE " & _ - ' "WHEN [ENTITY_ID] = {1} THEN " & _ - ' " (SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {4} AND RECORD_ID = {0}) " & _ - ' "ELSE '' END AS OPTION3," & _ - ' "CASE " & _ - ' "WHEN [ENTITY_ID] = {1} THEN " & _ - ' " (SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {5} AND RECORD_ID = {0}) " & _ - ' "ELSE '' END AS OPTION4" & _ - ' ",(SELECT [dbo].[FNPMO_DOC_GET_IDX] (DocID,{1},'DOCIDX1')) AS DOCIDX1 " & _ - ' ",(SELECT [dbo].[FNPMO_DOC_GET_IDX] (DocID,{1},'DOCIDX2')) AS DOCIDX2 " & _ - ' ",(SELECT [dbo].[FNPMO_DOC_GET_IDX] (DocID,{1},'DOCIDX3')) AS DOCIDX3 " & _ - ' ",(SELECT [dbo].[FNPMO_DOC_GET_IDX] (DocID,{1},'DOCIDX4')) AS DOCIDX4 " & _ - ' ",(SELECT [dbo].[FNPMO_DOC_GET_DROPDOWN] (DocID,{1},'DROPDOWN1','{7}')) AS DROPDOWN1 " & _ - ' ",(SELECT [dbo].[FNPMO_DOC_GET_DROPDOWN] (DocID,{1},'DROPDOWN2','{7}')) AS DROPDOWN2 " & _ - ' ",(SELECT [dbo].[FNPMO_DOC_GET_DROPDOWN] (DocID,{1},'DROPDOWN3','{7}')) AS DROPDOWN3 " & _ - ' ",(SELECT [dbo].[FNPMO_DOC_GET_DROPDOWN] (DocID,{1},'DROPDOWN4','{7}')) AS DROPDOWN4 " & _ - '"FROM VWPMO_WD_DOC_SEARCH WHERE ENTITY_ID = {1} AND DocID = (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {6} AND dwObjectID = DocID)", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE) SQL_DOC_SEARCH = String.Format("SELECT T.* ," & vbNewLine & _ "ISNULL(T1.VALUE,'') AS OPTION1," & vbNewLine & _ "ISNULL(T2.VALUE,'') AS OPTION2," & vbNewLine & _ @@ -67,14 +70,22 @@ Public Class ClassDOC_SEARCH "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN1','{7}') AS DROPDOWN1," & vbNewLine & _ "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN2','{7}') AS DROPDOWN2," & vbNewLine & _ "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN3','{7}') AS DROPDOWN3," & vbNewLine & _ - "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN4','{7}') AS DROPDOWN4 " & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN4','{7}') AS DROPDOWN4," & vbNewLine & _ + "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC.GUID) AS VALUE1," & vbNewLine & _ + "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC1.GUID) AS VALUE2," & vbNewLine & _ + "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC2.GUID) AS VALUE3," & vbNewLine & _ + "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC3.GUID) AS VALUE4" & vbNewLine & _ "FROM " & vbNewLine & _ "VWPMO_WD_DOC_SEARCH T " & vbNewLine & _ + "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC ON T.ENTITY_ID = TRC.ENTITY_ID AND TRC.LANGUAGE = '{7}' AND TRC.GUID = {8}" & vbNewLine & _ + "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC1 ON T.ENTITY_ID = TRC1.ENTITY_ID AND TRC1.LANGUAGE = '{7}' AND TRC1.GUID = {9}" & vbNewLine & _ + "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC2 ON T.ENTITY_ID = TRC2.ENTITY_ID AND TRC2.LANGUAGE = '{7}' AND TRC2.GUID = {10}" & vbNewLine & _ + "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC3 ON T.ENTITY_ID = TRC3.ENTITY_ID AND TRC3.LANGUAGE = '{7}' AND TRC3.GUID = {11}" & vbNewLine & _ "LEFT JOIN TBPMO_CONTROL_VALUE T1 ON T.RECORD_ID = T1.RECORD_ID AND T1.CONTROL_ID = {2} " & vbNewLine & _ "LEFT JOIN TBPMO_CONTROL_VALUE T2 ON T.RECORD_ID = T2.RECORD_ID AND T2.CONTROL_ID = {3} " & vbNewLine & _ "LEFT JOIN TBPMO_CONTROL_VALUE T3 ON T.RECORD_ID = T3.RECORD_ID AND T3.CONTROL_ID = {4} " & vbNewLine & _ "LEFT JOIN TBPMO_CONTROL_VALUE T4 ON T.RECORD_ID = T4.RECORD_ID AND T4.CONTROL_ID = {5} " & vbNewLine & _ - "WHERE T.ENTITY_ID = {1} AND T.DocID = (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {6} AND dwObjectID = T.DocID)", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE) + "WHERE T.ENTITY_ID = {1} AND T.DocID = (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {6} AND dwObjectID = T.DocID)", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE, VALUE_CONF1, VALUE_CONF2, VALUE_CONF3, VALUE_CONF4) If CURRENT_ENTITYSQL.ToUpper.Contains("WHERE") Then Dim where = CURRENT_ENTITYSQL.ToUpper.Replace("SELECT T.*", "SELECT '#' + CONVERT(VARCHAR(10),T.[Record-ID]) + '#'") @@ -93,14 +104,22 @@ Public Class ClassDOC_SEARCH "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN1','{7}') AS DROPDOWN1," & vbNewLine & _ "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN2','{7}') AS DROPDOWN2," & vbNewLine & _ "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN3','{7}') AS DROPDOWN3," & vbNewLine & _ - "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN4','{7}') AS DROPDOWN4 " & vbNewLine & _ + "[dbo].[FNPMO_DOC_GET_DROPDOWN] (T.DocID,{1},'DROPDOWN4','{7}') AS DROPDOWN4," & vbNewLine & _ + "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC.GUID) AS VALUE1," & vbNewLine & _ + "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC1.GUID) AS VALUE2," & vbNewLine & _ + "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC2.GUID) AS VALUE3," & vbNewLine & _ + "(SELECT VALUE FROM TBPMO_DOC_VALUES WHERE DocID = T.DocID AND CONFIG_ID = TRC3.GUID) AS VALUE4" & vbNewLine & _ "FROM " & vbNewLine & _ "VWPMO_WD_DOC_SEARCH T " & vbNewLine & _ + "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC ON T.ENTITY_ID = TRC.ENTITY_ID AND TRC.LANGUAGE = '{7}' AND TRC.GUID = {8}" & vbNewLine & _ + "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC1 ON T.ENTITY_ID = TRC1.ENTITY_ID AND TRC1.LANGUAGE = '{7}' AND TRC1.GUID = {9}" & vbNewLine & _ + "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC2 ON T.ENTITY_ID = TRC2.ENTITY_ID AND TRC2.LANGUAGE = '{7}' AND TRC2.GUID = {10}" & vbNewLine & _ + "LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC3 ON T.ENTITY_ID = TRC3.ENTITY_ID AND TRC3.LANGUAGE = '{7}' AND TRC3.GUID = {11}" & vbNewLine & _ "LEFT JOIN TBPMO_CONTROL_VALUE T1 ON T.RECORD_ID = T1.RECORD_ID AND T1.CONTROL_ID = {2} " & vbNewLine & _ "LEFT JOIN TBPMO_CONTROL_VALUE T2 ON T.RECORD_ID = T2.RECORD_ID AND T2.CONTROL_ID = {3} " & vbNewLine & _ "LEFT JOIN TBPMO_CONTROL_VALUE T3 ON T.RECORD_ID = T3.RECORD_ID AND T3.CONTROL_ID = {4} " & vbNewLine & _ "LEFT JOIN TBPMO_CONTROL_VALUE T4 ON T.RECORD_ID = T4.RECORD_ID AND T4.CONTROL_ID = {5} " & vbNewLine & _ - "WHERE T.RECORD_ID = {0} AND T.ENTITY_ID = {1} AND T.DocID = (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {6} AND dwObjectID = T.DocID)", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE) + "WHERE T.RECORD_ID = {0} AND T.ENTITY_ID = {1} AND T.DocID = (SELECT dwObjectID FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwUserOrGroupID = {6} AND dwObjectID = T.DocID)", RECORD_ID, ENTITY_ID, OPTION1, OPTION2, OPTION3, OPTION4, USERID_FK_INT_ECM, USER_LANGUAGE, VALUE_CONF1, VALUE_CONF2, VALUE_CONF3, VALUE_CONF4) ' SQL_DOC_SEARCH = String.Format("SELECT * ," & _ ' "(CASE (SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}) " & _ ' "WHEN {1} THEN " & _ @@ -135,10 +154,11 @@ Public Class ClassDOC_SEARCH Return Nothing End Try End Function - Public Shared Function Get_DOC_RESULTTABLE(vDT_RESULTLIST_OPTIONS As DataTable, DT_WINDREAM_RESULTLIST As DataTable, ENT_ID As Integer, REC_ID As Integer, vType As String) + Public Shared Function Get_DOC_RESULTTABLE(vDT_RESULTLIST_OPTIONS As DataTable, vDT_RESULTLIST_SELVALUES As DataTable, DT_WINDREAM_RESULTLIST As DataTable, ENT_ID As Integer, REC_ID As Integer, vType As String) Dim COL_ARRAY_RESULTLIST As List(Of String) ENTITY_ID = ENT_ID DT_RESULTLIST_OPTIONS = vDT_RESULTLIST_OPTIONS + DT_RESULTLIST_SEL_VALUES = vDT_RESULTLIST_SELVALUES RECORD_ID = REC_ID Try Dim sw As New Stopwatch diff --git a/app/DD-Record-Organiser/ClassWindreamDocGrid.vb b/app/DD-Record-Organiser/ClassWindreamDocGrid.vb index 98cb9a2..0471eba 100644 --- a/app/DD-Record-Organiser/ClassWindreamDocGrid.vb +++ b/app/DD-Record-Organiser/ClassWindreamDocGrid.vb @@ -39,16 +39,18 @@ Public Class ClassWindreamDocGrid End Function Public Shared Sub GetDocItems(gridView As GridView) If Init_Table() = True Then - If gridView.SelectedRowsCount > 0 Then + If gridView.SelectedRowsCount > 1 Then DT_RESULTFILES.Clear() For Each row In gridView.GetSelectedRows Dim newRow As DataRow = DT_RESULTFILES.NewRow() Try + Dim DOC_ID = gridView.GetRowCellValue(row, "DocID") SELECTED_DOC_ID = DOC_ID newRow("DOC_ID") = gridView.GetRowCellValue(row, "DocID") Catch ex As Exception newRow("DOC_ID") = 0 + SELECTED_DOC_ID = 0 End Try Try SELECTED_DOC_PATH = gridView.GetRowCellValue(row, "FULLPATH") @@ -86,6 +88,7 @@ Public Class ClassWindreamDocGrid newRow("DOC_ID") = gridView.GetFocusedRowCellValue(gridView.Columns("DocID")) Catch ex As Exception newRow("DOC_ID") = 0 + SELECTED_DOC_ID = 0 End Try Try SELECTED_DOC_PATH = gridView.GetFocusedRowCellValue(gridView.Columns("FULLPATH")) @@ -115,44 +118,7 @@ Public Class ClassWindreamDocGrid DT_RESULTFILES.Rows.Add(newRow) DT_RESULTFILES.AcceptChanges() End If - End If - 'If gridView.SelectedRowsCount = 1 Then - ' Try - ' RESULT_DOC_PATH = gridView.GetFocusedRowCellValue(gridView.Columns("FULLPATH")) - ' Catch ex As Exception - ' ClassLogger.Add(">> Attention: Could not set DocVariable RESULT_DOC_PATH: " & ex.Message, False) - ' RESULT_DOC_PATH = Nothing - ' End Try - ' Try - ' RESULT_OBJECTTYPE = gridView.GetFocusedRowCellValue(gridView.Columns("OBJECTTYPE")) - ' Catch ex As Exception - ' ClassLogger.Add(">> Attention: Could not set DocVariable RESULT_OBJECTTYPE: " & ex.Message, False) - ' RESULT_OBJECTTYPE = "" - ' End Try - ' Try - ' RESULT_INWORK = gridView.GetFocusedRowCellValue(gridView.Columns("in work?")) - ' Catch ex As Exception - ' ClassLogger.Add(">> Attention: Could not set DocVariable RESULT_INWORK: " & ex.Message, False) - ' RESULT_INWORK = "" - ' End Try - ' Try - ' RESULT_DOC_ID = gridView.GetFocusedRowCellValue(gridView.Columns("DocID")) - ' Catch ex As Exception - ' ClassLogger.Add(">> Attention: Could not set DocVariable RESULT_DOC_ID: " & ex.Message, False) - ' RESULT_DOC_ID = Nothing - ' End Try - ' Try - ' RESULT_DISPLAYNAME = gridView.GetFocusedRowCellValue(gridView.Columns("Displayname")) - ' Catch ex As Exception - ' ClassLogger.Add(">> Attention: Could not set DocVariable RESULT_DISPLAYNAME: " & ex.Message, False) - ' RESULT_DISPLAYNAME = "" - ' End Try - 'Else - - - 'End If - End Sub Public Shared Sub FillColumns(gridView As GridView, DT_RESULT As DataTable, DT_WINDREAM_RESULTLIST As DataTable, DT_DOCRESULT_DROPDOWN_ITEMS As DataTable, DropdownValueChangedHandler As EventHandler, DatepickerValueChangedHandler As EventHandler, TextValueChangedHandler As EventHandler) @@ -209,7 +175,6 @@ Public Class ClassWindreamDocGrid gridView.Columns.Item("FULLPATH").Visible = False gridView.Columns.Item("OBJECTTYPE").Visible = False gridView.Columns.Item("DocID").Visible = False - Dim created, changed As String If USER_LANGUAGE <> "de-DE" Then changed = "Changed" @@ -299,7 +264,7 @@ Public Class ClassWindreamDocGrid col.ColumnEdit = dateedit col.OptionsColumn.AllowEdit = True col.DisplayFormat.FormatType = FormatType.DateTime - col.DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss" + col.DisplayFormat.FormatString = CURRENT_DATE_FORMAT '& " HH:MM:ss" End If AddHandler dateedit.EditValueChanged, _datepickerValueChangedHandler diff --git a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb index c23819a..c804dde 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb @@ -148,9 +148,10 @@ Partial Class frmConstructor_Main Me.StatusStrip_Main = New System.Windows.Forms.StatusStrip() Me.tsslblStatus = New System.Windows.Forms.ToolStripStatusLabel() Me.tsslblRecord = New System.Windows.Forms.ToolStripStatusLabel() + Me.tsstlblDocID = New System.Windows.Forms.ToolStripStatusLabel() Me.tsslblWorkflowstate = New System.Windows.Forms.ToolStripStatusLabel() - Me.labelLoadEntity = New System.Windows.Forms.ToolStripStatusLabel() Me.progressLoadEntity = New System.Windows.Forms.ToolStripProgressBar() + Me.labelLoadEntity = New System.Windows.Forms.ToolStripStatusLabel() Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin() Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components) Me.ttToolTip = New System.Windows.Forms.ToolTip(Me.components) @@ -1014,7 +1015,7 @@ Partial Class frmConstructor_Main ' 'StatusStrip_Main ' - Me.StatusStrip_Main.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsslblStatus, Me.tsslblRecord, Me.tsslblWorkflowstate, Me.labelLoadEntity, Me.progressLoadEntity}) + Me.StatusStrip_Main.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsslblStatus, Me.tsslblRecord, Me.tsstlblDocID, Me.tsslblWorkflowstate, Me.progressLoadEntity, Me.labelLoadEntity}) resources.ApplyResources(Me.StatusStrip_Main, "StatusStrip_Main") Me.StatusStrip_Main.Name = "StatusStrip_Main" ' @@ -1029,29 +1030,39 @@ Partial Class frmConstructor_Main ' 'tsslblRecord ' + Me.tsslblRecord.BackColor = System.Drawing.SystemColors.ControlLight Me.tsslblRecord.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _ Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _ Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides) Me.tsslblRecord.Name = "tsslblRecord" resources.ApplyResources(Me.tsslblRecord, "tsslblRecord") ' + 'tsstlblDocID + ' + Me.tsstlblDocID.BackColor = System.Drawing.SystemColors.GradientInactiveCaption + Me.tsstlblDocID.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _ + Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _ + Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides) + Me.tsstlblDocID.Name = "tsstlblDocID" + resources.ApplyResources(Me.tsstlblDocID, "tsstlblDocID") + ' 'tsslblWorkflowstate ' Me.tsslblWorkflowstate.Image = Global.DD_Record_Organiser.My.Resources.Resources.bricks Me.tsslblWorkflowstate.Name = "tsslblWorkflowstate" resources.ApplyResources(Me.tsslblWorkflowstate, "tsslblWorkflowstate") ' - 'labelLoadEntity - ' - Me.labelLoadEntity.Name = "labelLoadEntity" - resources.ApplyResources(Me.labelLoadEntity, "labelLoadEntity") - ' 'progressLoadEntity ' Me.progressLoadEntity.Name = "progressLoadEntity" resources.ApplyResources(Me.progressLoadEntity, "progressLoadEntity") Me.progressLoadEntity.Style = System.Windows.Forms.ProgressBarStyle.Marquee ' + 'labelLoadEntity + ' + Me.labelLoadEntity.Name = "labelLoadEntity" + resources.ApplyResources(Me.labelLoadEntity, "labelLoadEntity") + ' 'DD_ECMAdmin ' Me.DD_ECMAdmin.DataSetName = "DD_ECMAdmin" @@ -1101,6 +1112,7 @@ Partial Class frmConstructor_Main Me.TableAdapterManager.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing Me.TableAdapterManager.TBPMO_RECORDTableAdapter = Nothing Me.TableAdapterManager.TBPMO_RIGHT_GROUPTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_RIGHT_USERTableAdapter = Nothing Me.TableAdapterManager.TBPMO_STRUCTURE_NODES_CONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing Me.TableAdapterManager.TBPMO_TEMPLATE_PATTERNTableAdapter = Nothing @@ -1329,4 +1341,5 @@ Partial Class frmConstructor_Main Friend WithEvents progressLoadEntity As System.Windows.Forms.ToolStripProgressBar Friend WithEvents labelLoadEntity As System.Windows.Forms.ToolStripStatusLabel Friend WithEvents ToolStripMI_DeleteFile As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents tsstlblDocID As System.Windows.Forms.ToolStripStatusLabel End Class diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index daebff2..eeaedfd 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -1676,6 +1676,9 @@ tssRecord + + 4, 19 + 137, 19 @@ -1685,15 +1688,15 @@ False + + 100, 18 + 123, 19 Loading Record Data.. - - 100, 18 - 0, 685 @@ -2757,24 +2760,30 @@ System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsstlblDocID + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + tsslblWorkflowstate System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - labelLoadEntity - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - progressLoadEntity System.Windows.Forms.ToolStripProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + labelLoadEntity + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + DD_ECMAdmin diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index 1512ac8..57e6087 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -140,6 +140,7 @@ Public Class frmConstructor_Main Private DT_WINDREAM_RESULTLIST As DataTable Private DT_DOCRESULT_DROPDOWN_ITEMS As DataTable Private DT_RESULTLIST_OPTIONS As DataTable + Private DT_RESULTLIST_VARIABLE_VALUE As DataTable Private DT_WORKFLOWS_MANUAL As DataTable Private _MANUAL_WORKFLOW As Boolean = False @@ -2219,13 +2220,13 @@ Public Class frmConstructor_Main Dim sql_ResultList = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE) 'TBPMO_WINDREAM_RESULTLIST_CONFIG" DT_WINDREAM_RESULTLIST = ClassDatabase.Return_Datatable(sql_ResultList, "GETRESULTLIST KONFIG") - sql_ResultList = String.Format("select * from TBPMO_DOCRESULT_DROPDOWN_ITEMS WHERE CONFIG_ID IN (SELECT GUID FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE ENTITY_ID = {0} AND TYPE_ID = 4 AND LANGUAGE = '{1}')", ENTITY_ID, USER_LANGUAGE) + sql_ResultList = String.Format("select T.*, T1.HEADER_CAPTION from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID AND T.CONFIG_ID IN (SELECT GUID FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE ENTITY_ID = {0} AND TYPE_ID = 4 AND LANGUAGE = '{1}')", ENTITY_ID, USER_LANGUAGE) DT_DOCRESULT_DROPDOWN_ITEMS = ClassDatabase.Return_Datatable(sql_ResultList, "GETRESULT_DROPDOWN_ITEMS") sql_ResultList = 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_ResultList, "GETVARIABLE CONTROLS") - - + sql_ResultList = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%'", ENTITY_ID, USER_LANGUAGE) + DT_RESULTLIST_VARIABLE_VALUE = ClassDatabase.Return_Datatable(sql_ResultList, "GETVARIABLE VALUES") Dim ENTITY_ROW = (From form In DT_ENTITY_DATA.AsEnumerable() Select form Where form.Item("GUID") = ENTITY_ID).Single() @@ -3863,7 +3864,7 @@ Public Class frmConstructor_Main Dim elapsed As Double ' Dim Basesearch As String Try - Dim DT_RESULT As DataTable = ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_WINDREAM_RESULTLIST, ENTITY_ID, RECORD_ID, "RECORD") + Dim DT_RESULT As DataTable = ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, RECORD_ID, "RECORD") If IsNothing(DT_RESULT) Then Exit Sub Else @@ -3927,7 +3928,7 @@ Public Class frmConstructor_Main 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_WINDREAM_RESULTLIST, ENTITY_ID, RECORD_ID, Type) + Dim DT_RESULT As DataTable = ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, RECORD_ID, Type) If IsNothing(DT_RESULT) Then Dim msg = "wrong DocSearch-Configuration - Check logfile and contact Digital Data" tslblWindreamView.Text = msg @@ -4062,7 +4063,7 @@ Public Class frmConstructor_Main Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID Dim user As String = Environment.UserName - Dim dateString = value.ToString("yyyy-MM-dd hh:mm:ss.fff") + Dim dateString = value.ToString("yyyy-MM-dd") 'hh:mm:ss.fff Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, dateString, user) ClassDatabase.Execute_non_Query(Sql) @@ -4752,7 +4753,7 @@ Public Class frmConstructor_Main exists = True End If Next - tsslblWorkflowstate.BackColor = Color.Black + tsslblWorkflowstate.BackColor = Color.Transparent If exists = False Then 'Keine Workflows....also auch keinen Zugriff geben tsButtonShowTaskOverview.Visible = False @@ -5354,9 +5355,23 @@ Public Class frmConstructor_Main End If End Sub + Private Sub GridViewDoc_Search_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles GridViewDoc_Search.FocusedColumnChanged + ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) + Refresh_DocID + + End Sub + Private Sub GridViewDoc_Search_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDoc_Search.FocusedRowChanged 'Get_Doc_Items() ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) + Refresh_DocID() + End Sub + Sub Refresh_DocID() + If ClassWindreamDocGrid.SELECTED_DOC_ID <> 0 Then + tsstlblDocID.Text = "Doc-ID: " & ClassWindreamDocGrid.SELECTED_DOC_ID.ToString + Else + tsstlblDocID.Text = "" + End If End Sub Private Sub LöschenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TsMI_DocRemoveLink.Click @@ -5816,10 +5831,10 @@ Public Class frmConstructor_Main Try Dim DROPDOWN_VALUE - If Not IsNothing(CURRENT_DOC_DROPDOWN) Then + If Not IsNothing(DT_DOCRESULT_DROPDOWN_ITEMS) Then 'Den ColumnTitle aus ConfigTableholen - If CURRENT_DOC_DROPDOWN.Rows.Count > 0 Then - For Each confrow As DataRow In CURRENT_DOC_DROPDOWN.Rows + If DT_DOCRESULT_DROPDOWN_ITEMS.Rows.Count > 0 Then + For Each confrow As DataRow In DT_DOCRESULT_DROPDOWN_ITEMS.Rows Dim CAPTION = confrow.Item("HEADER_CAPTION") DROPDOWN_VALUE = GridViewDoc_Search.GetRowCellValue(e.RowHandle, CAPTION) If Not IsNothing(DROPDOWN_VALUE) Then @@ -5852,7 +5867,7 @@ Public Class frmConstructor_Main End If End If - + End If Catch ex As Exception ClassLogger.Add(">> Unexpected Error in RowStyle-Color Dropdown: " & ex.Message, False) diff --git a/app/DD-Record-Organiser/frmRecordView.Designer.vb b/app/DD-Record-Organiser/frmRecordView.Designer.vb index 0ec58be..a3657e8 100644 --- a/app/DD-Record-Organiser/frmRecordView.Designer.vb +++ b/app/DD-Record-Organiser/frmRecordView.Designer.vb @@ -953,6 +953,7 @@ Partial Class frmRecordView Me.TableAdapterManager.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing Me.TableAdapterManager.TBPMO_RECORDTableAdapter = Nothing Me.TableAdapterManager.TBPMO_RIGHT_GROUPTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_RIGHT_USERTableAdapter = Nothing Me.TableAdapterManager.TBPMO_STRUCTURE_NODES_CONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing Me.TableAdapterManager.TBPMO_TEMPLATE_PATTERNTableAdapter = Nothing diff --git a/app/DD-Record-Organiser/frmRecordView.resx b/app/DD-Record-Organiser/frmRecordView.resx index 93781c1..fadaf70 100644 --- a/app/DD-Record-Organiser/frmRecordView.resx +++ b/app/DD-Record-Organiser/frmRecordView.resx @@ -483,21 +483,6 @@ 0, 0 - - True - - - Fill - - - 0, 0 - - - 1332, 301 - - - 0 - pnlDetails @@ -511,7 +496,7 @@ 0 - 1332, 301 + 1336, 304 Detailansicht @@ -534,26 +519,505 @@ 2 + + ListViewFollowUps + + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabFollowUp + + + 0 + + + grpbxFU_Profile + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabFollowUp + + + 1 + + + Label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabFollowUp + + + 2 + + + 1336, 304 + + + Wiedervorlage + + + TabFollowUp + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TCDetails + + + 1 + + + 124, 17 + + + Panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPos + + + 0 + + + BindingNavigatorPOS + + + System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPos + + + 1 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAExpc3Q7QnVsbGV0O1FzfzkAAABa + SURBVDhPY/j//z9FGEPAxsaGEYhBNF4MUw/TVADED0A0kkHMQMyCBbOCaHQDQJr/g2gkA0B8nBimDqYY + wwXEYqyCpGCsgqRgMEGxF6CaQYEzGogjMRD/MwAARTWKOO3Nn7MAAAAASUVORK5CYII= + + + + 1336, 304 + + + Positionen + + + TabPos + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TCDetails + + + 2 + + + TCDetails + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerMain.Panel1 + + + 0 + + + SplitContainerMain.Panel1 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainerMain + + + 0 + + + Fuchsia + + + 255, 192, 255 + + + Tahoma, 8.25pt, style=Bold, Italic + + + Fill + + + 0, 0 + + + 294, 17 + + + 149, 110 + + + ContextMenuStripResultFiles + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + 0, 25 + + + 1336, 305 + + + 8 + + + GridControlDocSearch + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TabPageDoc + + + 0 + + + 502, 17 + + + 0, 0 + + + 1336, 25 + + + 2 + + + ToolStrip2 + + + ToolStrip2 + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPageDoc + + + 1 + + + 1336, 330 + + + Dateien + + + TabPageDoc + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TabControlBottom + + + 0 + + + 1338, 358 + + + 4 + + + True + + + txtStateActual + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 0 + + + XtraTabControl1 + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabPage1 + + + 2 + + + txtDescriptionStep + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 3 + + + WF_IDTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 5 + + + CHANGED_WHENTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 7 + + + CHANGED_WHOTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 9 + + + WF_TASK_IDTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 11 + + + btnSaveWorkflow + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 12 + + + lblTaskState + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 13 + + + TITLETextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 15 + + + DateTimePickerTASK_DATE + + + System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 17 + + + COMMENTTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 18 + + + DUE_DATEDateTimePicker + + + System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 20 + + + STATE_IDComboBox + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage1 + + + 23 + + + 1336, 330 + + + Workflows/Tasks + + + XtraTabPage1 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TabControlBottom + + + 1 + + + TabControlBottom + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerMain.Panel2 + + + 0 + + + SplitContainerMain.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainerMain + + + 1 + + + 1338, 694 + + + 4 + + + SplitContainerMain + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + True + + + Fill + + + 0, 0 + + + 1336, 304 + + + 0 + + + pnlDetails + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabDetails + + + 0 + Top, Bottom, Left - - ID - - - 40 - - - Title - - - 200 - 14, 35 - 263, 126 + 263, 129 8 @@ -570,12 +1034,204 @@ 0 + + ID + + + 40 + + + Title + + + 200 + Top, Bottom, Left + + GroupBox4 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxFU_Profile + + + 0 + + + lblFollowUp_save + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxFU_Profile + + + 1 + + + chkFollowUp + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxFU_Profile + + + 2 + + + dtpFollowUp + + + System.Windows.Forms.DateTimePicker, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxFU_Profile + + + 3 + + + lblWiedervorlage_Control + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxFU_Profile + + + 4 + + + 283, 27 + + + 774, 137 + + + 7 + + + grpbxFU_Profile + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabFollowUp + + + 1 + Top, Bottom, Left + + btnRemoveUser_FollowUp + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox4 + + + 0 + + + btnAddUser_FollowUp + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox4 + + + 1 + + + cmbFollowUpUser + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox4 + + + 2 + + + Label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox4 + + + 3 + + + ListBoxUser2Profile + + + System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox4 + + + 4 + + + Label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox4 + + + 5 + + + Segoe UI, 8.25pt, style=Bold + + + 177, 20 + + + 594, 111 + + + 4 + + + Individuelle Empfänger für diesen Datensatz: + + + GroupBox4 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpbxFU_Profile + + + 0 + Segoe UI, 8.25pt @@ -776,33 +1432,6 @@ 5 - - Segoe UI, 8.25pt, style=Bold - - - 177, 20 - - - 594, 108 - - - 4 - - - Individuelle Empfänger für diesen Datensatz: - - - GroupBox4 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - grpbxFU_Profile - - - 0 - True @@ -920,27 +1549,6 @@ 4 - - 283, 27 - - - 774, 134 - - - 7 - - - grpbxFU_Profile - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabFollowUp - - - 1 - True @@ -971,39 +1579,6 @@ 2 - - 1332, 301 - - - Wiedervorlage - - - TabFollowUp - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TCDetails - - - 1 - - - Fill - - - 0, 0 - - - Cyan - - - 1332, 276 - - - 0 - GridControlPos @@ -1023,7 +1598,7 @@ 0, 25 - 1332, 276 + 1336, 279 2 @@ -1040,6 +1615,33 @@ 0 + + Fill + + + 0, 0 + + + Cyan + + + 1336, 279 + + + 0 + + + GridControlPos + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Panel1 + + + 0 + 124, 17 @@ -1198,7 +1800,7 @@ 0, 0 - 1332, 25 + 1336, 25 1 @@ -1218,74 +1820,6 @@ 1 - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAExpc3Q7QnVsbGV0O1FzfzkAAABa - SURBVDhPY/j//z9FGEPAxsaGEYhBNF4MUw/TVADED0A0kkHMQMyCBbOCaHQDQJr/g2gkA0B8nBimDqYY - wwXEYqyCpGCsgqRgMEGxF6CaQYEzGogjMRD/MwAARTWKOO3Nn7MAAAAASUVORK5CYII= - - - - 1332, 301 - - - Positionen - - - TabPos - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TCDetails - - - 2 - - - TCDetails - - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerMain.Panel1 - - - 0 - - - SplitContainerMain.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerMain - - - 0 - - - Fuchsia - - - 255, 192, 255 - - - Tahoma, 8.25pt, style=Bold, Italic - - - Fill - - - 0, 0 - - - 294, 17 - 148, 22 @@ -1319,42 +1853,6 @@ Eigenschaften - - 149, 110 - - - ContextMenuStripResultFiles - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill - - - 0, 25 - - - 1332, 302 - - - 8 - - - GridControlDocSearch - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TabPageDoc - - - 0 - - - 502, 17 - Segoe UI, 8.25pt, style=Bold, Italic @@ -1364,63 +1862,9 @@ Windream-Dokumente - - 0, 0 - - - 1332, 25 - - - 2 - - - ToolStrip2 - - - ToolStrip2 - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TabPageDoc - - - 1 - - - 1332, 327 - - - Dateien - - - TabPageDoc - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TabControlBottom - - - 0 - - - 1338, 358 - - - 4 - - - True - 752, 17 - - 609, 17 - Segoe UI, 9pt, style=Bold, Italic @@ -1445,6 +1889,15 @@ 0 + + 752, 17 + + + 609, 17 + + + 609, 17 + Top, Bottom, Left, Right @@ -1454,6 +1907,144 @@ True + + GridControlUsersSelection + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabPage3 + + + 0 + + + ListViewExclusiveUser + + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage3 + + + 1 + + + btnAddUser + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage3 + + + 2 + + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage3 + + + 3 + + + btndeleteuser + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage3 + + + 4 + + + Label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage3 + + + 5 + + + 620, 267 + + + User zuordnen + + + XtraTabPage3 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 0 + + + 622, 292 + + + 54 + + + GridControl1 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabPage4 + + + 0 + + + 620, 267 + + + Workflow - History + + + XtraTabPage4 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 1 + + + XtraTabControl1 + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabPage1 + + + 2 + Top, Bottom, Left @@ -1503,7 +2094,7 @@ 102 - 284, 220 + 284, 223 88 @@ -1520,26 +2111,17 @@ 0 + + 17, 56 + Top, Bottom, Left - - ID - - - 40 - - - User - - - 120 - 16, 24 - 174, 220 + 174, 223 27 @@ -1556,6 +2138,18 @@ 1 + + ID + + + 40 + + + User + + + 120 + MiddleLeft @@ -1689,30 +2283,6 @@ zuordnen 5 - - 616, 264 - - - User zuordnen - - - XtraTabPage3 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl1 - - - 0 - - - 622, 292 - - - 54 - Top, Bottom, Left @@ -1783,7 +2353,7 @@ zuordnen 4 - 595, 255 + 595, 258 89 @@ -1800,36 +2370,6 @@ zuordnen 0 - - 616, 264 - - - Workflow - History - - - XtraTabPage4 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl1 - - - 1 - - - XtraTabControl1 - - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPage1 - - - 2 - Tahoma, 9pt, style=Italic @@ -2145,66 +2685,6 @@ zuordnen 23 - - 1332, 327 - - - Workflows/Tasks - - - XtraTabPage1 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - TabControlBottom - - - 1 - - - TabControlBottom - - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerMain.Panel2 - - - 0 - - - SplitContainerMain.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerMain - - - 1 - - - 1338, 694 - - - 4 - - - SplitContainerMain - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - 17, 17 diff --git a/app/DD-Record-Organiser/frmRecordView.vb b/app/DD-Record-Organiser/frmRecordView.vb index 4b3be45..6b58ef4 100644 --- a/app/DD-Record-Organiser/frmRecordView.vb +++ b/app/DD-Record-Organiser/frmRecordView.vb @@ -1,5 +1,6 @@ Imports System.IO Imports System.Runtime.InteropServices +Imports DevExpress.XtraEditors Public Class frmRecordView Private recordView As ClassRecordView @@ -9,6 +10,7 @@ Public Class frmRecordView Private Const SEE_MASK_FLAG_NO_UI = &H400 Public Const SW_SHOW As Short = 5 Private DT_RESULTLIST_OPTIONS As DataTable + Private DT_RESULTLIST_VARIABLE_VALUE As DataTable Private DT_WINDREAM_RESULTLIST As DataTable Private DT_DOCRESULT_DROPDOWN_ITEMS As DataTable Private _Changed As Boolean = False @@ -55,6 +57,8 @@ Public Class frmRecordView ENTITY_ID = ClassDatabase.Execute_Scalar(sql) 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, "GETVARIABLE CONTROLS") + sql = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1 AND ENTITY_ID = {0} AND LANGUAGE = '{1}' AND COLUMN_VIEW LIKE 'VALUE%'", ENTITY_ID, USER_LANGUAGE) + DT_RESULTLIST_VARIABLE_VALUE = ClassDatabase.Return_Datatable(sql, "GETVARIABLE VALUES") Dim sql_ResultList = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE ENTITY_ID = {0} AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE) 'TBPMO_WINDREAM_RESULTLIST_CONFIG" DT_WINDREAM_RESULTLIST = ClassDatabase.Return_Datatable(sql_ResultList, "GETRESULTLIST KONFIG") sql_ResultList = String.Format("select * from TBPMO_DOCRESULT_DROPDOWN_ITEMS WHERE CONFIG_ID IN (SELECT GUID FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE ENTITY_ID = {0} AND TYPE_ID = 4 AND LANGUAGE = '{1}')", ENTITY_ID, USER_LANGUAGE) @@ -90,11 +94,37 @@ Public Class frmRecordView End Sub Private Sub OnDateSelectedValueChanged(sender As Object, e As EventArgs) + Try + Dim DatePicker As DateEdit = sender + Dim value As DateTime = DatePicker.EditValue + Dim colTitle = DirectCast(GridControlDocSearch.MainView, DevExpress.XtraGrid.Views.Grid.GridView).FocusedColumn.FieldName + Dim configId As Integer = ClassWindreamDocGrid.RESULT_CONFIG_IDS.Item(colTitle) + Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID + Dim user As String = Environment.UserName + Dim dateString = value.ToString("yyyy-MM-dd") 'hh:mm:ss.fff + + Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, dateString, user) + ClassDatabase.Execute_non_Query(Sql) + Catch ex As Exception + MsgBox("Error in OnDateSelectedValueChanged:" & vbNewLine & ex.Message) + End Try End Sub Private Sub OnTextSelectedValueChanged(sender As Object, e As EventArgs) + Try + Dim TextBox As TextEdit = sender + Dim value = TextBox.EditValue + Dim colTitle = DirectCast(GridControlDocSearch.MainView, DevExpress.XtraGrid.Views.Grid.GridView).FocusedColumn.FieldName + Dim configId As Integer = ClassWindreamDocGrid.RESULT_CONFIG_IDS.Item(colTitle) + Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID + Dim user As String = Environment.UserName + Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE {0}, {1}, '{2}', '{3}'", docId, configId, value, user) + ClassDatabase.Execute_non_Query(Sql) + Catch ex As Exception + MsgBox("Error in OnTextSelectedValueChanged:" & vbNewLine & ex.Message) + End Try End Sub Private Sub RUN_WDSEARCH_GRID() @@ -103,7 +133,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_WINDREAM_RESULTLIST, ENTITY_ID, JUMP_RECORD_ID, "RECORD") + 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, "RECORD") If IsNothing(DT_RESULT) Then Dim msg = "wrong DocSearch-Configuration - Check logfile and contact Digital Data" tslblWindreamView.Text = msg @@ -160,9 +190,9 @@ Public Class frmRecordView End If Dim Sql = "SELECT GUID FROM TBPMO_FORM_VIEW WHERE SCREEN_ID = 1 AND FORM_ID = " & ENTITY_ID - FORMVIEW_ID = ClassDatabase.Execute_Scalar(sql) - sql = "SELECT PARENT_ID FROM TBPMO_FORM WHERE GUID = " & ENTITY_ID - PARENT_ENTITY_ID = ClassDatabase.Execute_Scalar(sql) + FORMVIEW_ID = ClassDatabase.Execute_Scalar(Sql) + Sql = "SELECT PARENT_ID FROM TBPMO_FORM WHERE GUID = " & ENTITY_ID + PARENT_ENTITY_ID = ClassDatabase.Execute_Scalar(Sql) Catch ex As Exception MsgBox("Error in Load_Tasks:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try @@ -397,7 +427,7 @@ Public Class frmRecordView Cursor = Cursors.Default End If Next - + End Sub Private Sub DeleteToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DeleteToolStripMenuItem.Click @@ -428,7 +458,7 @@ Public Class frmRecordView End If End If Next - + End Sub Private Sub PropertiesToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PropertiesToolStripMenuItem.Click @@ -451,7 +481,7 @@ Public Class frmRecordView End If End If Next - + Cursor = Cursors.Default End Sub @@ -699,4 +729,21 @@ Public Class frmRecordView Private Sub GridViewDoc_Search_FocusedRowChanged_1(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles GridViewDoc_Search.FocusedRowChanged ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) End Sub + + Private Sub GridViewDoc_Search_FocusedColumnChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedColumnChangedEventArgs) Handles GridViewDoc_Search.FocusedColumnChanged + ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) + End Sub + + Private Sub GridControlDocSearch_DoubleClick_1(sender As Object, e As EventArgs) Handles GridControlDocSearch.DoubleClick + 'Get_Doc_Items() + ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) + If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then + MsgBox("Could not read File Parameters(5)!", MsgBoxStyle.Exclamation) + Exit Sub + End If + For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows + ClassHelper.File_open(row.Item("DOC_PATH"), row.Item("DOC_ID")) + Next + + End Sub End Class \ No newline at end of file