From 343fffe9caccfd72e33c2d33e20d88b8698266ad Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Wed, 16 Dec 2015 16:50:52 +0100 Subject: [PATCH] MS_16.12 --- app/DD-Record-Organiser/frmConfig_Basic.vb | 2 +- .../frmForm_Constructor_Main_2.Designer.vb | 29 +++++++------- .../frmForm_Constructor_Main_2.vb | 39 +++++++++++-------- app/DD-Record-Organiser/frmWD_Index_Dokart.vb | 4 ++ 4 files changed, 42 insertions(+), 32 deletions(-) diff --git a/app/DD-Record-Organiser/frmConfig_Basic.vb b/app/DD-Record-Organiser/frmConfig_Basic.vb index 6938c8d..00c60ed 100644 --- a/app/DD-Record-Organiser/frmConfig_Basic.vb +++ b/app/DD-Record-Organiser/frmConfig_Basic.vb @@ -143,7 +143,7 @@ End Sub Private Sub btnApplicationFolder_Click(sender As Object, e As EventArgs) Handles btnApplicationFolder.Click - Process.Start(ClassLogger.DateiSpeicherort) + Process.Start(Application.UserAppDataPath()) End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb index 242095e..8d6a5b1 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.Designer.vb @@ -185,6 +185,7 @@ Partial Class frmForm_Constructor_Main_2 Me.grvwGrid.OptionsBehavior.CopyToClipboardWithColumnHeaders = False Me.grvwGrid.OptionsBehavior.Editable = False Me.grvwGrid.OptionsBehavior.ReadOnly = True + Me.grvwGrid.OptionsView.ColumnAutoWidth = False Me.grvwGrid.OptionsView.EnableAppearanceEvenRow = True Me.grvwGrid.OptionsView.EnableAppearanceOddRow = True Me.grvwGrid.OptionsView.ShowAutoFilterRow = True @@ -204,7 +205,7 @@ Partial Class frmForm_Constructor_Main_2 Me.GridControlMain.Location = New System.Drawing.Point(0, 0) Me.GridControlMain.MainView = Me.grvwTiles Me.GridControlMain.Name = "GridControlMain" - Me.GridControlMain.Size = New System.Drawing.Size(788, 270) + Me.GridControlMain.Size = New System.Drawing.Size(795, 270) Me.GridControlMain.TabIndex = 0 Me.GridControlMain.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwCarousel, Me.grvwTiles, Me.grvwGrid}) ' @@ -459,7 +460,7 @@ Partial Class frmForm_Constructor_Main_2 Me.SplitContainerBottom.Panel1.Text = "Panel1" Me.SplitContainerBottom.Panel2.Controls.Add(Me.Panel2) Me.SplitContainerBottom.Panel2.Text = "Panel2" - Me.SplitContainerBottom.Size = New System.Drawing.Size(1083, 365) + Me.SplitContainerBottom.Size = New System.Drawing.Size(1083, 372) Me.SplitContainerBottom.SplitterPosition = 576 Me.SplitContainerBottom.TabIndex = 0 Me.SplitContainerBottom.Text = "SplitContainerControl1" @@ -475,7 +476,7 @@ Partial Class frmForm_Constructor_Main_2 Me.TCDetails.Location = New System.Drawing.Point(0, 25) Me.TCDetails.Name = "TCDetails" Me.TCDetails.SelectedTabPage = Me.TabDetails - Me.TCDetails.Size = New System.Drawing.Size(1071, 340) + Me.TCDetails.Size = New System.Drawing.Size(1078, 347) Me.TCDetails.TabIndex = 1 Me.TCDetails.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabDetails, Me.TabWindream, Me.TabFollowUp, Me.TabPos}) ' @@ -484,7 +485,7 @@ Partial Class frmForm_Constructor_Main_2 Me.TabDetails.Controls.Add(Me.pnlDetails) Me.TabDetails.Image = Global.DD_Record_Organiser.My.Resources.Resources.grid_Data_16xMD Me.TabDetails.Name = "TabDetails" - Me.TabDetails.Size = New System.Drawing.Size(1069, 312) + Me.TabDetails.Size = New System.Drawing.Size(1072, 316) Me.TabDetails.Text = "Detailansicht" ' 'pnlDetails @@ -493,7 +494,7 @@ Partial Class frmForm_Constructor_Main_2 Me.pnlDetails.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlDetails.Location = New System.Drawing.Point(0, 0) Me.pnlDetails.Name = "pnlDetails" - Me.pnlDetails.Size = New System.Drawing.Size(1069, 312) + Me.pnlDetails.Size = New System.Drawing.Size(1072, 316) Me.pnlDetails.TabIndex = 0 ' 'TabWindream @@ -502,7 +503,7 @@ Partial Class frmForm_Constructor_Main_2 Me.TabWindream.Controls.Add(Me.ToolStripDokumente) Me.TabWindream.Image = Global.DD_Record_Organiser.My.Resources.Resources.Files_7954 Me.TabWindream.Name = "TabWindream" - Me.TabWindream.Size = New System.Drawing.Size(1069, 312) + Me.TabWindream.Size = New System.Drawing.Size(1072, 316) Me.TabWindream.Text = "windream-Dateien" ' 'AxObjectListControl @@ -513,7 +514,7 @@ Partial Class frmForm_Constructor_Main_2 Me.AxObjectListControl.Location = New System.Drawing.Point(0, 25) Me.AxObjectListControl.Name = "AxObjectListControl" Me.AxObjectListControl.OcxState = CType(resources.GetObject("AxObjectListControl.OcxState"), System.Windows.Forms.AxHost.State) - Me.AxObjectListControl.Size = New System.Drawing.Size(1069, 287) + Me.AxObjectListControl.Size = New System.Drawing.Size(1072, 291) Me.AxObjectListControl.TabIndex = 6 Me.AxObjectListControl.TabStop = False ' @@ -523,7 +524,7 @@ Partial Class frmForm_Constructor_Main_2 Me.ToolStripDokumente.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblWindreamView, Me.ToolStripDropDownButton2}) Me.ToolStripDokumente.Location = New System.Drawing.Point(0, 0) Me.ToolStripDokumente.Name = "ToolStripDokumente" - Me.ToolStripDokumente.Size = New System.Drawing.Size(1069, 25) + Me.ToolStripDokumente.Size = New System.Drawing.Size(1072, 25) Me.ToolStripDokumente.TabIndex = 2 Me.ToolStripDokumente.Text = "ToolStrip2" ' @@ -557,7 +558,7 @@ Partial Class frmForm_Constructor_Main_2 Me.TabFollowUp.Controls.Add(Me.Label5) Me.TabFollowUp.Image = Global.DD_Record_Organiser.My.Resources.Resources.Task_16xMD Me.TabFollowUp.Name = "TabFollowUp" - Me.TabFollowUp.Size = New System.Drawing.Size(1069, 312) + Me.TabFollowUp.Size = New System.Drawing.Size(1072, 316) Me.TabFollowUp.Text = "Wiedervorlage" ' 'ListViewFollowUps @@ -736,7 +737,7 @@ Partial Class frmForm_Constructor_Main_2 Me.TabPos.Image = CType(resources.GetObject("TabPos.Image"), System.Drawing.Image) Me.TabPos.Name = "TabPos" Me.TabPos.PageVisible = False - Me.TabPos.Size = New System.Drawing.Size(1069, 312) + Me.TabPos.Size = New System.Drawing.Size(1072, 316) Me.TabPos.Text = "Positionen" ' 'Panel1 @@ -745,7 +746,7 @@ Partial Class frmForm_Constructor_Main_2 Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel1.Location = New System.Drawing.Point(0, 25) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1069, 287) + Me.Panel1.Size = New System.Drawing.Size(1072, 291) Me.Panel1.TabIndex = 2 ' 'GridControlPos @@ -754,7 +755,7 @@ Partial Class frmForm_Constructor_Main_2 Me.GridControlPos.Location = New System.Drawing.Point(0, 0) Me.GridControlPos.MainView = Me.grvwGridPos Me.GridControlPos.Name = "GridControlPos" - Me.GridControlPos.Size = New System.Drawing.Size(1069, 287) + Me.GridControlPos.Size = New System.Drawing.Size(1072, 291) Me.GridControlPos.TabIndex = 0 Me.GridControlPos.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.grvwGridPos}) ' @@ -781,7 +782,7 @@ Partial Class frmForm_Constructor_Main_2 Me.BindingNavigatorPOS.MovePreviousItem = Me.BindingNavigatorMovePreviousItem Me.BindingNavigatorPOS.Name = "BindingNavigatorPOS" Me.BindingNavigatorPOS.PositionItem = Me.BindingNavigatorPositionItem - Me.BindingNavigatorPOS.Size = New System.Drawing.Size(1069, 25) + Me.BindingNavigatorPOS.Size = New System.Drawing.Size(1072, 25) Me.BindingNavigatorPOS.TabIndex = 1 Me.BindingNavigatorPOS.Text = "BindingNavigator1" ' @@ -876,7 +877,7 @@ Partial Class frmForm_Constructor_Main_2 Me.ToolStripEdit.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsButtonAdd, Me.tsButtonSave, Me.tsButtonDelete, Me.tsButtonEditMode, Me.ToolStripDropDownButton1, Me.tsButtonShowTaskOverview, Me.tsButtonShowWorkflowTasks}) Me.ToolStripEdit.Location = New System.Drawing.Point(0, 0) Me.ToolStripEdit.Name = "ToolStripEdit" - Me.ToolStripEdit.Size = New System.Drawing.Size(1071, 25) + Me.ToolStripEdit.Size = New System.Drawing.Size(1078, 25) Me.ToolStripEdit.TabIndex = 0 Me.ToolStripEdit.Text = "ToolStrip1" ' diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb index 2be7b41..118fe48 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main_2.vb @@ -942,11 +942,15 @@ Public Class frmForm_Constructor_Main_2 CtrlCommandUI.LoadControls(CURRENT_FORM_ID) Lock_RecordControls(True) ' pnlDetails.Enabled = False + AddHandler CtrlBuilder.OnRecordChanged, AddressOf OnRecordChanged End Sub Private Sub OnRecordChanged(sender As Object, e As System.EventArgs) - RECORD_CHANGED = True + If ENTITY_LOADED Then + RECORD_CHANGED = True + End If + End Sub Sub OpenFormData(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) @@ -1253,6 +1257,7 @@ Public Class frmForm_Constructor_Main_2 Sub Load_Entity_Data(ClickedLevel As Integer) Try Me.Cursor = Cursors.WaitCursor + RECORD_CHANGED = False CURRENT_RECORD_ID = 0 VerknüpfungenAnzeigenToolStripMenuItem.Enabled = True 'VerknüpfungenToolStripMenuItem.Enabled = False @@ -1440,7 +1445,7 @@ Public Class frmForm_Constructor_Main_2 If CURRENT_FORM_TYPE = 5 Or IS_SINGLE_RECORD = True Then If GET_GROUP_OR_SINGLE_RECORD(PARENT_RECORDID, True) = True Then ' Laden der Daten bedeutet nicht dass Daten vom Benutzer geändert wurden! - RECORD_CHANGED = False + If IS_SINGLE_RECORD Then Show_Selected_Record_Data(CURRENT_RECORD_ID, True) Else @@ -1449,7 +1454,7 @@ Public Class frmForm_Constructor_Main_2 End If Get_RecordCounts_Nodes() End If - + ' Hide_Grid_Columns() If CURRENT_FORM_TYPE = 5 Then TabDetails.PageVisible = False @@ -1522,7 +1527,7 @@ Public Class frmForm_Constructor_Main_2 'Zurücksetzen ENTITY_LOADED = True - + Catch ex As Exception MsgBox("Error in Load_Entity_Data:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) @@ -1530,7 +1535,7 @@ Public Class frmForm_Constructor_Main_2 Finally Me.Cursor = Cursors.Default End Try - + End Sub Sub Load_Record_Direct() @@ -1892,18 +1897,18 @@ Public Class frmForm_Constructor_Main_2 Next 'grvwGrid.Columns("Record-ID").OptionsColumn.AllowShowHide = False - End If + End If - HideColumns() - Dim selnode As TreeNode = TreeViewMain.SelectedNode - Dim origtext As String = selnode.Text - If origtext.Contains(" (") Then - Dim existingstring = origtext.Substring(0, origtext.IndexOf("(") - 1) - selnode.Text = String.Format("{0} ({1})", existingstring, Get_Grid_Row_Count()) - Else - selnode.Text = String.Format("{0} ({1})", selnode.Text, Get_Grid_Row_Count()) - End If + HideColumns() + Dim selnode As TreeNode = TreeViewMain.SelectedNode + Dim origtext As String = selnode.Text + If origtext.Contains(" (") Then + Dim existingstring = origtext.Substring(0, origtext.IndexOf("(") - 1) + selnode.Text = String.Format("{0} ({1})", existingstring, Get_Grid_Row_Count()) + Else + selnode.Text = String.Format("{0} ({1})", selnode.Text, Get_Grid_Row_Count()) + End If Catch ex As Exception MsgBox("Error in LoadGrid_Selection:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) Return False @@ -2157,7 +2162,7 @@ Public Class frmForm_Constructor_Main_2 Catch ex As Exception MsgBox("Error in Create_Grid_Editor:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try - + End Sub Sub Load_Pos_Data() @@ -3306,7 +3311,7 @@ Public Class frmForm_Constructor_Main_2 End If End Sub - + Private Sub grvwGrid_SelectionChanged(sender As Object, e As DevExpress.Data.SelectionChangedEventArgs) Handles grvwGrid.SelectionChanged diff --git a/app/DD-Record-Organiser/frmWD_Index_Dokart.vb b/app/DD-Record-Organiser/frmWD_Index_Dokart.vb index d93bcc2..656b15d 100644 --- a/app/DD-Record-Organiser/frmWD_Index_Dokart.vb +++ b/app/DD-Record-Organiser/frmWD_Index_Dokart.vb @@ -372,6 +372,10 @@ Public Class frmWD_Index_Dokart TBPMO_FILES_USERTableAdapter.Connection.ConnectionString = MyConnectionString VWPMO_DOKUMENTTYPESTableAdapter.Connection.ConnectionString = MyConnectionString Me.VWPMO_DOKUMENTTYPESTableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_DOKUMENTTYPES, CURRENT_FORMVIEW_ID) + If cmbDokumentart.Items.Count = 0 Then + MsgBox("No dcumenttypes for this entity configured! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation) + Exit Sub + End If Catch ex As Exception MsgBox("Error in frmWD_Index_Dokart_Load:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try