diff --git a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb index f332cf8..4cce9f4 100644 --- a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb +++ b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb @@ -45,7 +45,9 @@ Public Class ClassWindreamDocGrid End Function Public Shared Sub GetDocItems(gridView As GridView) + SELECTED_DOC_ID = 0 If Init_Table() = True Then + SELECTED_DOC_ID = 0 Console.WriteLine("gridView.SelectedRowsCount: " & gridView.SelectedRowsCount.ToString) If gridView.SelectedRowsCount > 1 Then DT_RESULTFILES.Clear() @@ -417,7 +419,12 @@ Public Class ClassWindreamDocGrid End Sub Public Shared Sub gridView_MasterRowExpanded(sender As GridView, e As DevExpress.XtraGrid.Views.Grid.CustomMasterRowEventArgs) + ClassWindreamDocGrid.GetDocItems(sender) Dim GW As GridView = sender + If SELECTED_DOC_ID = 0 Then + MsgBox("Sorry no document was selected! Please try again!", MsgBoxStyle.Exclamation) + Exit Sub + End If Dim detailView As GridView = sender.GetDetailView(e.RowHandle, e.RelationIndex) With detailView.Columns diff --git a/app/DD-Record-Organizer/DD-Record-Organizer.vbproj b/app/DD-Record-Organizer/DD-Record-Organizer.vbproj index 64ca7c7..ff7ce85 100644 --- a/app/DD-Record-Organizer/DD-Record-Organizer.vbproj +++ b/app/DD-Record-Organizer/DD-Record-Organizer.vbproj @@ -88,9 +88,6 @@ False ..\..\..\DDLibraries\app\DD_Libraries\bin\Debug\DD_Rights.dll - - False - False D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Charts.v15.2.Core.dll @@ -98,10 +95,6 @@ False - - False - D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Images.v15.2.dll - False D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Map.v15.2.Core.dll @@ -109,8 +102,9 @@ False - + False + D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll False @@ -166,9 +160,6 @@ False - - False - False @@ -184,9 +175,6 @@ False - - False - False diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index 72c30cc..b7264d1 100644 --- a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index 2421543..ddef23c 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -3668,6 +3668,12 @@ Public Class frmConstructor_Main End Sub Private Sub OnCBSelectedValueChanged(sender As Object, e As EventArgs) Try + Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID + If docId = 0 Then + MsgBox("Sorry no document was selected! Please try again!", MsgBoxStyle.Exclamation) + Exit Sub + End If + Dim ComboBox As ComboBoxEdit = sender 'Dim ItemComboBox As RepositoryItemComboBox 'ItemComboBox = sender @@ -3677,7 +3683,7 @@ Public Class frmConstructor_Main Exit Sub End If Dim configId As Integer = item.ConfigID - Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID + Dim user As String = USER_USERNAME Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE_UPD_INS {0}, {1}, {2}, '{3}', '{4}'", docId, RECORD_ID, configId, value, user) @@ -3722,6 +3728,10 @@ Public Class frmConstructor_Main Dim configid = detailRow.Item("CONFIG_ID") Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID + If docId = 0 Then + MsgBox("Sorry no document was selected! Please try again!", MsgBoxStyle.Exclamation) + Exit Sub + End If Dim user As String = USER_USERNAME Dim dateString = value.ToString("yyyy-MM-dd") 'hh:mm:ss.fff Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE_UPD_INS {0}, {1}, {2}, '{3}', '{4}'", docId, RECORD_ID, configid, dateString, user) @@ -3753,6 +3763,10 @@ Public Class frmConstructor_Main Dim configid = detailRow.Item("CONFIG_ID") Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID + If docId = 0 Then + MsgBox("Sorry no document was selected! Please try again!", MsgBoxStyle.Exclamation) + Exit Sub + End If Dim user As String = USER_USERNAME Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE_UPD_INS {0}, {1}, {2},'{3}','{4}'", docId, RECORD_ID, configid, value, user) @@ -3779,6 +3793,10 @@ Public Class frmConstructor_Main Dim configid = detailRow.Item("CONFIG_ID") Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID + If docId = 0 Then + MsgBox("Sorry no document was selected! Please try again!", MsgBoxStyle.Exclamation) + Exit Sub + End If Dim user As String = USER_USERNAME Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE_UPD_INS {0}, {1}, {2},'{3}','{4}'", docId, RECORD_ID, configid, value, user) @@ -5074,6 +5092,12 @@ Public Class frmConstructor_Main tslblDocIDTab1.Text = "DocRow not selected" End If End Sub + Private Sub GridViewDoc_Search_MasterRowExpanded(sender As Object, e As CustomMasterRowEventArgs) Handles GridViewDoc_Search.MasterRowExpanded + Refresh_DocID() + End Sub + Private Sub GridViewDoc_Search_MasterRowExpanding(sender As Object, e As MasterRowCanExpandEventArgs) Handles GridViewDoc_Search.MasterRowExpanding + Refresh_DocID() + End Sub Private Sub LöschenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles docCM_RemoveLink.Click If RECORD_ID = 0 Then @@ -6715,4 +6739,6 @@ Public Class frmConstructor_Main Private Sub frmConstructor_Main_HandleDestroyed(sender As Object, e As EventArgs) Handles Me.HandleDestroyed End Sub + + End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmRecordView.resx b/app/DD-Record-Organizer/frmRecordView.resx index 7ac64eb..cd5459d 100644 --- a/app/DD-Record-Organizer/frmRecordView.resx +++ b/app/DD-Record-Organizer/frmRecordView.resx @@ -520,7 +520,7 @@ TabDetails - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TCDetails @@ -981,7 +981,7 @@ TabFollowUp - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TCDetails @@ -1008,7 +1008,7 @@ GridControlPos - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a Panel1 @@ -1236,7 +1236,7 @@ TabPos - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TCDetails @@ -1248,7 +1248,7 @@ TCDetails - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a SplitContainerMain.Panel1 @@ -1323,7 +1323,7 @@ GridControlDocSearch - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TabPageDoc @@ -1377,7 +1377,7 @@ TabPageDoc - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TabControlBottom @@ -1485,7 +1485,7 @@ GridControlUsersSelection - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabPage3 @@ -1672,7 +1672,7 @@ zuordnen XtraTabPage3 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -1768,7 +1768,7 @@ zuordnen GridControl1 - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabPage4 @@ -1786,7 +1786,7 @@ zuordnen XtraTabPage4 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabControl1 @@ -1798,7 +1798,7 @@ zuordnen XtraTabControl1 - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a XtraTabPage1 @@ -2131,7 +2131,7 @@ zuordnen XtraTabPage1 - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TabControlBottom @@ -2143,7 +2143,7 @@ zuordnen TabControlBottom - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a SplitContainerMain.Panel2 @@ -2421,7 +2421,7 @@ zuordnen grvwGridPos - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a BindingNavigatorAddNewItem @@ -2505,7 +2505,7 @@ zuordnen GridViewDoc_Search - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a tslblWindreamView @@ -2529,31 +2529,31 @@ zuordnen GridViewlUsers2Group - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colSelect - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn1 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn2 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colID - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ColumnHeader3 @@ -2583,43 +2583,43 @@ zuordnen GridView2 - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colGUID - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colSTATE_DESC - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colCOMMENT - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colADDED_WHO - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colADDED_WHEN - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridView1 - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TableAdapterManager diff --git a/app/DD-Record-Organizer/frmRecordView.vb b/app/DD-Record-Organizer/frmRecordView.vb index 2e5f3de..9781c72 100644 --- a/app/DD-Record-Organizer/frmRecordView.vb +++ b/app/DD-Record-Organizer/frmRecordView.vb @@ -380,9 +380,9 @@ Public Class frmRecordView Private Sub btnSaveWorkflow_Click(sender As Object, e As EventArgs) Handles btnSaveWorkflow.Click Try - If _Changed = False Then - Exit Sub - End If + 'If _Changed = False Then + ' Exit Sub + 'End If Dim upd Dim ins = "" Dim STATE_id As Integer @@ -411,11 +411,11 @@ Public Class frmRecordView End If If STATE_id > 0 Then - upd = String.Format("UPDATE TBPMO_WORKFLOW_TASK SET STATE_ID= {5}, COMMENT = '{0}', DUE_DATE = '{1}',CHANGED_WHO = '{2}', TASK_DATE = '{3}' " & - "WHERE GUID = {4}", Comment, DUE_DATEDateTimePicker.Value, USER_USERNAME, DateTimePickerTASK_DATE.Value, WF_TASK_ID, STATE_id) + upd = String.Format("UPDATE TBPMO_WORKFLOW_TASK SET STATE_ID = {5}, COMMENT = '{0}', DUE_DATE = '{1}',CHANGED_WHO = '{2}', TASK_DATE = '{3}' " & + "WHERE GUID = {4}", COMMENTTextBox.Text, DUE_DATEDateTimePicker.Value, USER_USERNAME, DateTimePickerTASK_DATE.Value, WF_TASK_ID, STATE_id) Else upd = String.Format("UPDATE TBPMO_WORKFLOW_TASK SET COMMENT = '{0}', DUE_DATE = '{1}',CHANGED_WHO = '{2}', TASK_DATE = '{3}' " & - "WHERE GUID = {4}", Comment, DUE_DATEDateTimePicker.Value, USER_USERNAME, DateTimePickerTASK_DATE.Value, WF_TASK_ID) + "WHERE GUID = {4}", COMMENTTextBox.Text, DUE_DATEDateTimePicker.Value, USER_USERNAME, DateTimePickerTASK_DATE.Value, WF_TASK_ID) End If If ClassDatabase.Execute_non_Query(upd) Then If clsDatabase.DB_PROXY_INITIALIZED = True Then @@ -430,10 +430,10 @@ Public Class frmRecordView Load_Task_Data() Load_States() Check_end() - If XtraTabControl1.SelectedTabPageIndex = 1 Then - Load_History() - End If - _Changed = False + If XtraTabControl1.SelectedTabPageIndex = 1 Then + Load_History() + End If + _Changed = False ' Me.TBPMO_WORKFLOW_TASKTableAdapter.cmdUpdate(COMMENTTextBox.Text, DUE_DATEDateTimePicker.Value, STATE_IDComboBox.SelectedValue, 1, USER_USERNAME, DateTimePicker1.Value, Me.GUIDTextBox.Text) Catch ex As Exception @@ -443,6 +443,7 @@ Public Class frmRecordView Private Sub frmRecordView_Shown(sender As Object, e As EventArgs) Handles Me.Shown Try + STATE_IDComboBox.SelectedValue = 0 Select Case JUMP_STATE Case 2 TabControlBottom.SelectedTabPageIndex = 1 diff --git a/app/SetupWiX/Product.wxs b/app/SetupWiX/Product.wxs index 142fdb6..75a37e0 100644 --- a/app/SetupWiX/Product.wxs +++ b/app/SetupWiX/Product.wxs @@ -171,7 +171,7 @@ - + @@ -182,7 +182,7 @@ - +