diff --git a/app/DD-Record-Organiser/ClassControlCommandsUI.vb b/app/DD-Record-Organiser/ClassControlCommandsUI.vb index 0172d7f..7532946 100644 --- a/app/DD-Record-Organiser/ClassControlCommandsUI.vb +++ b/app/DD-Record-Organiser/ClassControlCommandsUI.vb @@ -1007,7 +1007,7 @@ Public Class ClassControlCommandsUI Public Shared Function GetLastRecord() Dim ADDED_WHO As String = Environment.UserName - Dim SQL = "SELECT (MAX(GUID)) FROM TBPMO_RECORD where ADDED_WHO = '" & ADDED_WHO & "'" + Dim SQL = "SELECT (MAX(GUID)) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND ADDED_WHO = '" & ADDED_WHO & "'" Return ClassDatabase.Execute_Scalar(SQL, True) End Function diff --git a/app/DD-Record-Organiser/ClassControlValues.vb b/app/DD-Record-Organiser/ClassControlValues.vb index 3553569..7bec4e0 100644 --- a/app/DD-Record-Organiser/ClassControlValues.vb +++ b/app/DD-Record-Organiser/ClassControlValues.vb @@ -299,9 +299,11 @@ Public Class ClassControlValues Case GetType(DevExpress.XtraGrid.GridControl) Dim gridcontrol As DevExpress.XtraGrid.GridControl = DirectCast(control, DevExpress.XtraGrid.GridControl) ControlLoader.DataGridViewCheckable.LoadValue(gridcontrol, values) - Case Else - ClassLogger.Add(" >> Sub LoadControlValue - Control-Type nicht berücksichtigt: " & GetType(Control).ToString(), False) + If GetType(Control).ToString() <> "System.Windows.Forms.Control" Then + ClassLogger.Add(" >> Sub LoadControlValue - Control-Type nicht berücksichtigt: " & GetType(Control).ToString(), False) + End If + End Select Catch ex As Exception ClassLogger.Add("Unexpected Error in LoadControlValue: " & ex.Message, True) diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index a0acc39..ae5d1e1 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -312,6 +312,12 @@ Form + + frmNewVariant.vb + + + Form + frmRight_Management.vb @@ -716,6 +722,9 @@ frmMass_Change.vb + + frmNewVariant.vb + frmRecordView.vb @@ -1402,6 +1411,8 @@ + + diff --git a/app/DD-Record-Organiser/My Project/Resources.resx b/app/DD-Record-Organiser/My Project/Resources.resx index 5b0a6cc..9f68881 100644 --- a/app/DD-Record-Organiser/My Project/Resources.resx +++ b/app/DD-Record-Organiser/My Project/Resources.resx @@ -175,9 +175,6 @@ ..\Resources\4(four)rows_9716.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\sql.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Arrow_RedoRetry_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -403,8 +400,8 @@ ..\Resources\lock_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\sql.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_lightning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -457,12 +454,12 @@ ..\Resources\view_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\txt.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\f3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Task_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -538,8 +535,8 @@ ..\Resources\brick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\bug_edit1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\txt.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\action_add_16xSM.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -565,6 +562,9 @@ ..\Resources\module_32xSM.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\AddExistingItem_6269.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\cancel1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -598,6 +598,9 @@ ..\Resources\doc_excel_csv.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bug_edit1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Men4.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -691,4 +694,7 @@ ..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\AddExistingItem_62691.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb index c12a02c..eb06e95 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb @@ -63,9 +63,31 @@ Partial Class frmConstructor_Main Me.grvwGrid = New DevExpress.XtraGrid.Views.Grid.GridView() Me.grvwCarousel = New DevExpress.XtraGrid.Views.Layout.LayoutView() Me.grvwTiles = New DevExpress.XtraGrid.Views.Tile.TileView() + Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() + Me.tslbldisplayRecords = New System.Windows.Forms.ToolStripLabel() + Me.ToolStripDropDownButton3 = New System.Windows.Forms.ToolStripDropDownButton() + Me.CopyRecordtsmi = New System.Windows.Forms.ToolStripMenuItem() + Me.NewVarianttsmi = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() + Me.ChangeParentLinktsmi = New System.Windows.Forms.ToolStripMenuItem() + Me.CreateWorkflowtaskstsmi = New System.Windows.Forms.ToolStripMenuItem() + Me.showRecordLogtsmi = New System.Windows.Forms.ToolStripMenuItem() + Me.OfficeVorlagentsmi = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() + Me.AnwendungscacheResettsmi = New System.Windows.Forms.ToolStripMenuItem() Me.TCDetails = New DevExpress.XtraTab.XtraTabControl() Me.TabDetails = New DevExpress.XtraTab.XtraTabPage() Me.pnlDetails = New System.Windows.Forms.Panel() + Me.ToolStripEdit = New System.Windows.Forms.ToolStrip() + Me.tsButtonAdd = New System.Windows.Forms.ToolStripButton() + Me.tsButtonSave = New System.Windows.Forms.ToolStripButton() + Me.tsButtonDelete = New System.Windows.Forms.ToolStripButton() + Me.tsButtonEdit = New System.Windows.Forms.ToolStripButton() + Me.tsButtonShowTaskOverview = New System.Windows.Forms.ToolStripButton() + Me.tsbtnRedo = New System.Windows.Forms.ToolStripButton() + Me.tsButtonCancel = New System.Windows.Forms.ToolStripButton() + Me.tslblLocked = New System.Windows.Forms.ToolStripLabel() + Me.tslblFileslocked = New System.Windows.Forms.ToolStripLabel() Me.TabWindream = New DevExpress.XtraTab.XtraTabPage() Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl() Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -99,6 +121,8 @@ Partial Class frmConstructor_Main Me.ToolStripLabel1 = New System.Windows.Forms.ToolStripLabel() Me.ToolStripSeparator18 = New System.Windows.Forms.ToolStripSeparator() Me.tsbtnEntitySearch = New System.Windows.Forms.ToolStripButton() + Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() + Me.DocSearchRefresh = New System.Windows.Forms.ToolStripButton() Me.TabFollowUp = New DevExpress.XtraTab.XtraTabPage() Me.ListViewFollowUps = New System.Windows.Forms.ListView() Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) @@ -132,27 +156,6 @@ Partial Class frmConstructor_Main Me.BindingNavigatorMoveNextItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() - Me.ToolStripEdit = New System.Windows.Forms.ToolStrip() - Me.tsButtonAdd = New System.Windows.Forms.ToolStripButton() - Me.tsButtonSave = New System.Windows.Forms.ToolStripButton() - Me.tsButtonDelete = New System.Windows.Forms.ToolStripButton() - Me.tsButtonEdit = New System.Windows.Forms.ToolStripButton() - Me.tsButtonShowTaskOverview = New System.Windows.Forms.ToolStripButton() - Me.tsbtnRedo = New System.Windows.Forms.ToolStripButton() - Me.tsButtonCancel = New System.Windows.Forms.ToolStripButton() - Me.tslblLocked = New System.Windows.Forms.ToolStripLabel() - Me.tslblFileslocked = New System.Windows.Forms.ToolStripLabel() - Me.ToolStripDropDownButton1 = New System.Windows.Forms.ToolStripDropDownButton() - Me.WindreamsucheNeuLadenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() - Me.CreateWorkflowTasksToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.OfficeVorlagenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.VerknüpfungenAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() - Me.RecordKopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ZeigeRecordLogsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() - Me.AnwendungscacheFreigebenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SplitContainer1 = New DevExpress.XtraEditors.SplitContainerControl() Me.BindingSource_Entity = New System.Windows.Forms.BindingSource(Me.components) Me.NavPane = New DevExpress.XtraBars.Navigation.TileNavPane() @@ -188,9 +191,11 @@ Partial Class frmConstructor_Main CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.grvwCarousel, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.grvwTiles, System.ComponentModel.ISupportInitialize).BeginInit() + Me.ToolStrip1.SuspendLayout() CType(Me.TCDetails, System.ComponentModel.ISupportInitialize).BeginInit() Me.TCDetails.SuspendLayout() Me.TabDetails.SuspendLayout() + Me.ToolStripEdit.SuspendLayout() Me.TabWindream.SuspendLayout() CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStripResultFiles.SuspendLayout() @@ -205,7 +210,6 @@ Partial Class frmConstructor_Main CType(Me.grvwGridPos, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BindingNavigatorPOS, System.ComponentModel.ISupportInitialize).BeginInit() Me.BindingNavigatorPOS.SuspendLayout() - Me.ToolStripEdit.SuspendLayout() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.SuspendLayout() CType(Me.BindingSource_Entity, System.ComponentModel.ISupportInitialize).BeginInit() @@ -227,7 +231,6 @@ Partial Class frmConstructor_Main Me.SplitContainerMain.Panel1.Controls.Add(Me.SplitContainerTop) resources.ApplyResources(Me.SplitContainerMain.Panel1, "SplitContainerMain.Panel1") Me.SplitContainerMain.Panel2.Controls.Add(Me.TCDetails) - Me.SplitContainerMain.Panel2.Controls.Add(Me.ToolStripEdit) resources.ApplyResources(Me.SplitContainerMain.Panel2, "SplitContainerMain.Panel2") Me.SplitContainerMain.SplitterPosition = 237 ' @@ -239,6 +242,7 @@ Partial Class frmConstructor_Main Me.SplitContainerTop.Panel1.Controls.Add(Me.TreeViewMain) resources.ApplyResources(Me.SplitContainerTop.Panel1, "SplitContainerTop.Panel1") Me.SplitContainerTop.Panel2.Controls.Add(Me.GridControlMain) + Me.SplitContainerTop.Panel2.Controls.Add(Me.ToolStrip1) resources.ApplyResources(Me.SplitContainerTop.Panel2, "SplitContainerTop.Panel2") Me.SplitContainerTop.SplitterPosition = 283 ' @@ -473,6 +477,75 @@ Partial Class frmConstructor_Main Me.grvwTiles.OptionsTiles.ScrollMode = DevExpress.XtraEditors.TileControlScrollMode.ScrollBar Me.grvwTiles.OptionsTiles.VerticalContentAlignment = DevExpress.Utils.VertAlignment.Top ' + 'ToolStrip1 + ' + Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslbldisplayRecords, Me.ToolStripDropDownButton3}) + resources.ApplyResources(Me.ToolStrip1, "ToolStrip1") + Me.ToolStrip1.Name = "ToolStrip1" + ' + 'tslbldisplayRecords + ' + resources.ApplyResources(Me.tslbldisplayRecords, "tslbldisplayRecords") + Me.tslbldisplayRecords.Name = "tslbldisplayRecords" + ' + 'ToolStripDropDownButton3 + ' + Me.ToolStripDropDownButton3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.ToolStripDropDownButton3.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CopyRecordtsmi, Me.NewVarianttsmi, Me.ToolStripSeparator5, Me.ChangeParentLinktsmi, Me.CreateWorkflowtaskstsmi, Me.showRecordLogtsmi, Me.OfficeVorlagentsmi, Me.ToolStripSeparator4, Me.AnwendungscacheResettsmi}) + Me.ToolStripDropDownButton3.Image = Global.DD_Record_Organiser.My.Resources.Resources.PropertyGridEditorPart_6041 + resources.ApplyResources(Me.ToolStripDropDownButton3, "ToolStripDropDownButton3") + Me.ToolStripDropDownButton3.Name = "ToolStripDropDownButton3" + ' + 'CopyRecordtsmi + ' + Me.CopyRecordtsmi.Image = Global.DD_Record_Organiser.My.Resources.Resources.Copy_6524 + Me.CopyRecordtsmi.Name = "CopyRecordtsmi" + resources.ApplyResources(Me.CopyRecordtsmi, "CopyRecordtsmi") + ' + 'NewVarianttsmi + ' + Me.NewVarianttsmi.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xSM + Me.NewVarianttsmi.Name = "NewVarianttsmi" + resources.ApplyResources(Me.NewVarianttsmi, "NewVarianttsmi") + ' + 'ToolStripSeparator5 + ' + Me.ToolStripSeparator5.Name = "ToolStripSeparator5" + resources.ApplyResources(Me.ToolStripSeparator5, "ToolStripSeparator5") + ' + 'ChangeParentLinktsmi + ' + resources.ApplyResources(Me.ChangeParentLinktsmi, "ChangeParentLinktsmi") + Me.ChangeParentLinktsmi.Name = "ChangeParentLinktsmi" + ' + 'CreateWorkflowtaskstsmi + ' + Me.CreateWorkflowtaskstsmi.Image = Global.DD_Record_Organiser.My.Resources.Resources.brick_go + Me.CreateWorkflowtaskstsmi.Name = "CreateWorkflowtaskstsmi" + resources.ApplyResources(Me.CreateWorkflowtaskstsmi, "CreateWorkflowtaskstsmi") + ' + 'showRecordLogtsmi + ' + Me.showRecordLogtsmi.Image = Global.DD_Record_Organiser.My.Resources.Resources.eye + Me.showRecordLogtsmi.Name = "showRecordLogtsmi" + resources.ApplyResources(Me.showRecordLogtsmi, "showRecordLogtsmi") + ' + 'OfficeVorlagentsmi + ' + Me.OfficeVorlagentsmi.Image = Global.DD_Record_Organiser.My.Resources.Resources.page_white_office + Me.OfficeVorlagentsmi.Name = "OfficeVorlagentsmi" + resources.ApplyResources(Me.OfficeVorlagentsmi, "OfficeVorlagentsmi") + ' + 'ToolStripSeparator4 + ' + Me.ToolStripSeparator4.Name = "ToolStripSeparator4" + resources.ApplyResources(Me.ToolStripSeparator4, "ToolStripSeparator4") + ' + 'AnwendungscacheResettsmi + ' + Me.AnwendungscacheResettsmi.Name = "AnwendungscacheResettsmi" + resources.ApplyResources(Me.AnwendungscacheResettsmi, "AnwendungscacheResettsmi") + ' 'TCDetails ' Me.TCDetails.AppearancePage.HeaderHotTracked.BackColor = CType(resources.GetObject("TCDetails.AppearancePage.HeaderHotTracked.BackColor"), System.Drawing.Color) @@ -488,6 +561,7 @@ Partial Class frmConstructor_Main 'TabDetails ' Me.TabDetails.Controls.Add(Me.pnlDetails) + Me.TabDetails.Controls.Add(Me.ToolStripEdit) Me.TabDetails.Image = Global.DD_Record_Organiser.My.Resources.Resources.grid_Data_16xMD Me.TabDetails.Name = "TabDetails" resources.ApplyResources(Me.TabDetails, "TabDetails") @@ -498,6 +572,67 @@ Partial Class frmConstructor_Main resources.ApplyResources(Me.pnlDetails, "pnlDetails") Me.pnlDetails.Name = "pnlDetails" ' + 'ToolStripEdit + ' + Me.ToolStripEdit.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden + Me.ToolStripEdit.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsButtonAdd, Me.tsButtonSave, Me.tsButtonDelete, Me.tsButtonEdit, Me.tsButtonShowTaskOverview, Me.tsbtnRedo, Me.tsButtonCancel, Me.tslblLocked, Me.tslblFileslocked}) + resources.ApplyResources(Me.ToolStripEdit, "ToolStripEdit") + Me.ToolStripEdit.Name = "ToolStripEdit" + ' + 'tsButtonAdd + ' + resources.ApplyResources(Me.tsButtonAdd, "tsButtonAdd") + Me.tsButtonAdd.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xLG + Me.tsButtonAdd.Name = "tsButtonAdd" + ' + 'tsButtonSave + ' + resources.ApplyResources(Me.tsButtonSave, "tsButtonSave") + Me.tsButtonSave.Name = "tsButtonSave" + ' + 'tsButtonDelete + ' + resources.ApplyResources(Me.tsButtonDelete, "tsButtonDelete") + Me.tsButtonDelete.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_Cancel_16xLG + Me.tsButtonDelete.Name = "tsButtonDelete" + ' + 'tsButtonEdit + ' + resources.ApplyResources(Me.tsButtonEdit, "tsButtonEdit") + Me.tsButtonEdit.Image = Global.DD_Record_Organiser.My.Resources.Resources.EditLabel_13239 + Me.tsButtonEdit.Name = "tsButtonEdit" + ' + 'tsButtonShowTaskOverview + ' + Me.tsButtonShowTaskOverview.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + resources.ApplyResources(Me.tsButtonShowTaskOverview, "tsButtonShowTaskOverview") + Me.tsButtonShowTaskOverview.Image = Global.DD_Record_Organiser.My.Resources.Resources.brick + Me.tsButtonShowTaskOverview.Name = "tsButtonShowTaskOverview" + ' + 'tsbtnRedo + ' + Me.tsbtnRedo.Image = Global.DD_Record_Organiser.My.Resources.Resources.Arrow_RedoRetry_16xLG + resources.ApplyResources(Me.tsbtnRedo, "tsbtnRedo") + Me.tsbtnRedo.Name = "tsbtnRedo" + ' + 'tsButtonCancel + ' + Me.tsButtonCancel.Image = Global.DD_Record_Organiser.My.Resources.Resources.cancel + resources.ApplyResources(Me.tsButtonCancel, "tsButtonCancel") + Me.tsButtonCancel.Name = "tsButtonCancel" + ' + 'tslblLocked + ' + resources.ApplyResources(Me.tslblLocked, "tslblLocked") + Me.tslblLocked.Image = Global.DD_Record_Organiser.My.Resources.Resources.lock + Me.tslblLocked.Name = "tslblLocked" + ' + 'tslblFileslocked + ' + Me.tslblFileslocked.Image = Global.DD_Record_Organiser.My.Resources.Resources.lock + Me.tslblFileslocked.Name = "tslblFileslocked" + resources.ApplyResources(Me.tslblFileslocked, "tslblFileslocked") + ' 'TabWindream ' Me.TabWindream.AllowDrop = True @@ -661,7 +796,7 @@ Partial Class frmConstructor_Main ' Me.ToolStripDokumente.AllowDrop = True resources.ApplyResources(Me.ToolStripDokumente, "ToolStripDokumente") - Me.ToolStripDokumente.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblWindreamView, Me.ToolStripDropDownButton2, Me.ToolStripSeparator17, Me.tsTextboxFulltext, Me.ToolStripLabel1, Me.ToolStripSeparator18, Me.tsbtnEntitySearch}) + Me.ToolStripDokumente.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblWindreamView, Me.ToolStripDropDownButton2, Me.ToolStripSeparator17, Me.tsTextboxFulltext, Me.ToolStripLabel1, Me.ToolStripSeparator18, Me.tsbtnEntitySearch, Me.ToolStripSeparator3, Me.DocSearchRefresh}) Me.ToolStripDokumente.Name = "ToolStripDokumente" ' 'tslblWindreamView @@ -713,6 +848,17 @@ Partial Class frmConstructor_Main resources.ApplyResources(Me.tsbtnEntitySearch, "tsbtnEntitySearch") Me.tsbtnEntitySearch.Name = "tsbtnEntitySearch" ' + 'ToolStripSeparator3 + ' + Me.ToolStripSeparator3.Name = "ToolStripSeparator3" + resources.ApplyResources(Me.ToolStripSeparator3, "ToolStripSeparator3") + ' + 'DocSearchRefresh + ' + Me.DocSearchRefresh.Image = Global.DD_Record_Organiser.My.Resources.Resources.refresh_16xLG + resources.ApplyResources(Me.DocSearchRefresh, "DocSearchRefresh") + Me.DocSearchRefresh.Name = "DocSearchRefresh" + ' 'TabFollowUp ' Me.TabFollowUp.Controls.Add(Me.ListViewFollowUps) @@ -933,130 +1079,6 @@ Partial Class frmConstructor_Main Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2" resources.ApplyResources(Me.BindingNavigatorSeparator2, "BindingNavigatorSeparator2") ' - 'ToolStripEdit - ' - Me.ToolStripEdit.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden - Me.ToolStripEdit.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsButtonAdd, Me.tsButtonSave, Me.tsButtonDelete, Me.tsButtonEdit, Me.tsButtonShowTaskOverview, Me.tsbtnRedo, Me.tsButtonCancel, Me.tslblLocked, Me.tslblFileslocked, Me.ToolStripDropDownButton1}) - resources.ApplyResources(Me.ToolStripEdit, "ToolStripEdit") - Me.ToolStripEdit.Name = "ToolStripEdit" - ' - 'tsButtonAdd - ' - resources.ApplyResources(Me.tsButtonAdd, "tsButtonAdd") - Me.tsButtonAdd.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xLG - Me.tsButtonAdd.Name = "tsButtonAdd" - ' - 'tsButtonSave - ' - resources.ApplyResources(Me.tsButtonSave, "tsButtonSave") - Me.tsButtonSave.Name = "tsButtonSave" - ' - 'tsButtonDelete - ' - resources.ApplyResources(Me.tsButtonDelete, "tsButtonDelete") - Me.tsButtonDelete.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_Cancel_16xLG - Me.tsButtonDelete.Name = "tsButtonDelete" - ' - 'tsButtonEdit - ' - resources.ApplyResources(Me.tsButtonEdit, "tsButtonEdit") - Me.tsButtonEdit.Image = Global.DD_Record_Organiser.My.Resources.Resources.EditLabel_13239 - Me.tsButtonEdit.Name = "tsButtonEdit" - ' - 'tsButtonShowTaskOverview - ' - Me.tsButtonShowTaskOverview.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - resources.ApplyResources(Me.tsButtonShowTaskOverview, "tsButtonShowTaskOverview") - Me.tsButtonShowTaskOverview.Image = Global.DD_Record_Organiser.My.Resources.Resources.brick - Me.tsButtonShowTaskOverview.Name = "tsButtonShowTaskOverview" - ' - 'tsbtnRedo - ' - Me.tsbtnRedo.Image = Global.DD_Record_Organiser.My.Resources.Resources.Arrow_RedoRetry_16xLG - resources.ApplyResources(Me.tsbtnRedo, "tsbtnRedo") - Me.tsbtnRedo.Name = "tsbtnRedo" - ' - 'tsButtonCancel - ' - Me.tsButtonCancel.Image = Global.DD_Record_Organiser.My.Resources.Resources.cancel - resources.ApplyResources(Me.tsButtonCancel, "tsButtonCancel") - Me.tsButtonCancel.Name = "tsButtonCancel" - ' - 'tslblLocked - ' - resources.ApplyResources(Me.tslblLocked, "tslblLocked") - Me.tslblLocked.Image = Global.DD_Record_Organiser.My.Resources.Resources.lock - Me.tslblLocked.Name = "tslblLocked" - ' - 'tslblFileslocked - ' - Me.tslblFileslocked.Image = Global.DD_Record_Organiser.My.Resources.Resources.lock - Me.tslblFileslocked.Name = "tslblFileslocked" - resources.ApplyResources(Me.tslblFileslocked, "tslblFileslocked") - ' - 'ToolStripDropDownButton1 - ' - Me.ToolStripDropDownButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripDropDownButton1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.WindreamsucheNeuLadenToolStripMenuItem, Me.ToolStripSeparator3, Me.CreateWorkflowTasksToolStripMenuItem, Me.OfficeVorlagenToolStripMenuItem, Me.VerknüpfungenAnzeigenToolStripMenuItem, Me.ToolStripSeparator4, Me.RecordKopierenToolStripMenuItem, Me.ZeigeRecordLogsToolStripMenuItem, Me.ToolStripSeparator5, Me.AnwendungscacheFreigebenToolStripMenuItem}) - Me.ToolStripDropDownButton1.Image = Global.DD_Record_Organiser.My.Resources.Resources.PropertyGridEditorPart_6041 - resources.ApplyResources(Me.ToolStripDropDownButton1, "ToolStripDropDownButton1") - Me.ToolStripDropDownButton1.Name = "ToolStripDropDownButton1" - ' - 'WindreamsucheNeuLadenToolStripMenuItem - ' - Me.WindreamsucheNeuLadenToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.refresh_16xLG - Me.WindreamsucheNeuLadenToolStripMenuItem.Name = "WindreamsucheNeuLadenToolStripMenuItem" - resources.ApplyResources(Me.WindreamsucheNeuLadenToolStripMenuItem, "WindreamsucheNeuLadenToolStripMenuItem") - ' - 'ToolStripSeparator3 - ' - Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - resources.ApplyResources(Me.ToolStripSeparator3, "ToolStripSeparator3") - ' - 'CreateWorkflowTasksToolStripMenuItem - ' - Me.CreateWorkflowTasksToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.brick_go - Me.CreateWorkflowTasksToolStripMenuItem.Name = "CreateWorkflowTasksToolStripMenuItem" - resources.ApplyResources(Me.CreateWorkflowTasksToolStripMenuItem, "CreateWorkflowTasksToolStripMenuItem") - ' - 'OfficeVorlagenToolStripMenuItem - ' - Me.OfficeVorlagenToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.page_white_office1 - Me.OfficeVorlagenToolStripMenuItem.Name = "OfficeVorlagenToolStripMenuItem" - resources.ApplyResources(Me.OfficeVorlagenToolStripMenuItem, "OfficeVorlagenToolStripMenuItem") - ' - 'VerknüpfungenAnzeigenToolStripMenuItem - ' - resources.ApplyResources(Me.VerknüpfungenAnzeigenToolStripMenuItem, "VerknüpfungenAnzeigenToolStripMenuItem") - Me.VerknüpfungenAnzeigenToolStripMenuItem.Name = "VerknüpfungenAnzeigenToolStripMenuItem" - ' - 'ToolStripSeparator4 - ' - Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - resources.ApplyResources(Me.ToolStripSeparator4, "ToolStripSeparator4") - ' - 'RecordKopierenToolStripMenuItem - ' - Me.RecordKopierenToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.Copy_6524 - Me.RecordKopierenToolStripMenuItem.Name = "RecordKopierenToolStripMenuItem" - resources.ApplyResources(Me.RecordKopierenToolStripMenuItem, "RecordKopierenToolStripMenuItem") - ' - 'ZeigeRecordLogsToolStripMenuItem - ' - Me.ZeigeRecordLogsToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.eye - Me.ZeigeRecordLogsToolStripMenuItem.Name = "ZeigeRecordLogsToolStripMenuItem" - resources.ApplyResources(Me.ZeigeRecordLogsToolStripMenuItem, "ZeigeRecordLogsToolStripMenuItem") - ' - 'ToolStripSeparator5 - ' - Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - resources.ApplyResources(Me.ToolStripSeparator5, "ToolStripSeparator5") - ' - 'AnwendungscacheFreigebenToolStripMenuItem - ' - Me.AnwendungscacheFreigebenToolStripMenuItem.Name = "AnwendungscacheFreigebenToolStripMenuItem" - resources.ApplyResources(Me.AnwendungscacheFreigebenToolStripMenuItem, "AnwendungscacheFreigebenToolStripMenuItem") - ' 'SplitContainer1 ' Me.SplitContainer1.Collapsed = True @@ -1256,9 +1278,14 @@ Partial Class frmConstructor_Main CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.grvwCarousel, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.grvwTiles, System.ComponentModel.ISupportInitialize).EndInit() + Me.ToolStrip1.ResumeLayout(False) + Me.ToolStrip1.PerformLayout() CType(Me.TCDetails, System.ComponentModel.ISupportInitialize).EndInit() Me.TCDetails.ResumeLayout(False) Me.TabDetails.ResumeLayout(False) + Me.TabDetails.PerformLayout() + Me.ToolStripEdit.ResumeLayout(False) + Me.ToolStripEdit.PerformLayout() Me.TabWindream.ResumeLayout(False) Me.TabWindream.PerformLayout() CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).EndInit() @@ -1280,23 +1307,21 @@ Partial Class frmConstructor_Main CType(Me.BindingNavigatorPOS, System.ComponentModel.ISupportInitialize).EndInit() Me.BindingNavigatorPOS.ResumeLayout(False) Me.BindingNavigatorPOS.PerformLayout() - Me.ToolStripEdit.ResumeLayout(False) - Me.ToolStripEdit.PerformLayout() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainer1.ResumeLayout(False) - CType(Me.BindingSource_Entity, System.ComponentModel.ISupportInitialize).EndInit() - Me.StatusStrip_Main.ResumeLayout(False) - Me.StatusStrip_Main.PerformLayout() - CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBPMO_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - Me.PerformLayout() + Me.SplitContainer1.ResumeLayout(false) + CType(Me.BindingSource_Entity,System.ComponentModel.ISupportInitialize).EndInit + Me.StatusStrip_Main.ResumeLayout(false) + Me.StatusStrip_Main.PerformLayout + CType(Me.DD_ECMAdmin,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.ImageCollection1,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.DD_DMSDataSet,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.VWPMO_WF_USER_ACTIVEBindingSource,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.VWPMO_WF_ACTIVEBindingSource,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.TBPMO_FILES_USERBindingSource,System.ComponentModel.ISupportInitialize).EndInit + Me.ResumeLayout(false) + Me.PerformLayout - End Sub +End Sub Friend WithEvents NavPane As DevExpress.XtraBars.Navigation.TileNavPane Friend WithEvents NavButtonHome As DevExpress.XtraBars.Navigation.NavButton Friend WithEvents StatusStrip_Main As System.Windows.Forms.StatusStrip @@ -1327,13 +1352,7 @@ Partial Class frmConstructor_Main Friend WithEvents tsButtonSave As System.Windows.Forms.ToolStripButton Friend WithEvents tsButtonDelete As System.Windows.Forms.ToolStripButton Friend WithEvents tsButtonEdit As System.Windows.Forms.ToolStripButton - Friend WithEvents ToolStripDropDownButton1 As System.Windows.Forms.ToolStripDropDownButton Friend WithEvents tsButtonShowTaskOverview As System.Windows.Forms.ToolStripButton - Friend WithEvents WindreamsucheNeuLadenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents CreateWorkflowTasksToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ZeigeRecordLogsToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents OfficeVorlagenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents VerknüpfungenAnzeigenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents TCDetails As DevExpress.XtraTab.XtraTabControl Friend WithEvents TabDetails As DevExpress.XtraTab.XtraTabPage Friend WithEvents TabWindream As DevExpress.XtraTab.XtraTabPage @@ -1389,12 +1408,7 @@ Partial Class frmConstructor_Main Friend WithEvents ListViewFollowUps As System.Windows.Forms.ListView Friend WithEvents ColumnHeader1 As System.Windows.Forms.ColumnHeader Friend WithEvents ColumnHeader2 As System.Windows.Forms.ColumnHeader - Friend WithEvents RecordKopierenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents DatenNeuLadenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents ToolStripSeparator4 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents ToolStripSeparator5 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents AnwendungscacheFreigebenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents SplitContainerMain As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents SplitContainerTop As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents ImageCollection1 As DevExpress.Utils.ImageCollection @@ -1448,4 +1462,18 @@ Partial Class frmConstructor_Main Friend WithEvents tsbtnEntitySearch As System.Windows.Forms.ToolStripButton Friend WithEvents ToolStripSeparator18 As System.Windows.Forms.ToolStripSeparator Friend WithEvents docCM_GetRights As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip + Friend WithEvents tslbldisplayRecords As System.Windows.Forms.ToolStripLabel + Friend WithEvents ToolStripDropDownButton3 As System.Windows.Forms.ToolStripDropDownButton + Friend WithEvents CopyRecordtsmi As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents NewVarianttsmi As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents CreateWorkflowtaskstsmi As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents showRecordLogtsmi As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents ChangeParentLinktsmi As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents DocSearchRefresh As System.Windows.Forms.ToolStripButton + Friend WithEvents AnwendungscacheResettsmi As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents OfficeVorlagentsmi As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents ToolStripSeparator5 As System.Windows.Forms.ToolStripSeparator + Friend WithEvents ToolStripSeparator4 As System.Windows.Forms.ToolStripSeparator + Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator End Class diff --git a/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx b/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx index 5c23f4c..bd034f1 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx @@ -117,13 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Default - - - Default - 188, 22 @@ -167,34 +160,6 @@ 189, 138 - - - - - - - - - - - - None - - - - - - - - - - - - None - - - Default - 226, 22 @@ -276,123 +241,122 @@ 227, 270 - - + + 200, 22 - - + + Copy record - - + + 200, 22 - - None + + New variant - - - + + 197, 6 - - + + 200, 22 - - Default + + Change parent-link - - Top, Left + + 200, 22 - - + + Create workflowtasks - - Tile + + 200, 22 - - Inherit + + Show record-logs - - 0, 0 + + 200, 22 - - - Center + + Office templates - - + + 197, 6 - - None + + 200, 22 - - + + Reset application-cache - - - 0 + + 125, 22 - - Regular + + record-functions - - Horizontal + + 49, 22 - - + + Add - - 0 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABWSURBVDhPY6AK+Pbt238S8PsvX74YQLVCAEjCyckJjj+8 + /wjHyGIguq2tDdMQUgwAYZghUO2kGwDCID1Q7fgNQMbIamhrADF41IBBaQA5GKqdEsDAAADtDPd9n5qK + lQAAAABJRU5ErkJggg== + - - Regular + + 51, 22 - - Horizontal + + Save - - + + 60, 22 - - + + Delete - - + + 95, 22 - - 0 + + Work Record - - Regular + + TaskOverview - - Horizontal + + 118, 22 - - + + Set changes back - - Default + + 63, 22 - - + + Cancel - - + + 128, 22 - - + + Only reading access - - None + + 97, 22 + + + No file-access Details - - - - - Default - 209, 22 @@ -483,63 +447,12 @@ 209, 22 + + Properties + 210, 320 - - - - - - - - - - - None - - - - - - - - - Default - - - Top, Left - - - - - - Tile - - - Inherit - - - 0, 0 - - - Center - - - - - - None - - - - - - - - - Default - Configuration User @@ -568,48 +481,15 @@ Entity-wide search - - + + 107, 22 - - - - - - - - None + + Refresh search windream-files - - - - - Default - - - - - - - - - - - - None - - - Default - - - Default - - - Default - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m @@ -630,288 +510,33 @@ delete user - - - - - - - - - - - None - - - Default - Add user tu follow up - - - - - - - - - - - None - - - Default - - - - - - - - - - - - None - - - Default - - - - - - - - - - - - None - - - Default - - - - - - - - - - - - None - - - Default - 216, 13 Attention: this list overdrives the general list. - - - - - - - - - - - None - Special recipient for record: - - - - - - - - - - - None - - - Default - 92, 15 Follow Up saved - - - - - - - - - - - None - - - Default - - - - - - - - - - - - None - - - Default - - - - - - - - - - - - None - - - Default - - - - - - - - - - - - None - - - - - - - - - - - - None - - - Default - 91, 13 Saved Follow Ups - - - - - - - - - - - None - Follow Up - - - - - Default - - - - - - - - - Default - - - Top, Left - - - - - - Tile - - - Inherit - - - 0, 0 - - - Center - - - - - - None - - - - - - 0 - - - Regular - - - Horizontal - - - - - - - - - - - - - - - - - - None - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -924,9 +549,6 @@ rkJggg== - - Default - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -979,18 +601,6 @@ 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - - - - - - - - - - - None - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -1002,149 +612,6 @@ positions - - - - - - - - Default - - - 49, 22 - - - Add - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABWSURBVDhPY6AK+Pbt238S8PsvX74YQLVCAEjCyckJjj+8 - /wjHyGIguq2tDdMQUgwAYZghUO2kGwDCID1Q7fgNQMbIamhrADF41IBBaQA5GKqdEsDAAADtDPd9n5qK - lQAAAABJRU5ErkJggg== - - - - 51, 22 - - - Save - - - 60, 22 - - - Delete - - - 95, 22 - - - Work Record - - - TaskOverview - - - 118, 22 - - - Set changes back - - - 63, 22 - - - Cancel - - - 128, 22 - - - Only reading access - - - 97, 22 - - - No file-access - - - 926, 22 - - - refresh windream-search - - - 923, 6 - - - 926, 22 - - - Create Workflowtasks - - - 926, 22 - - - Office templates - - - 926, 22 - - - Change parent-record link - - - 923, 6 - - - 926, 22 - - - Record - Copy - - - 926, 22 - - - Record - Show record logs - - - 923, 6 - - - 926, 22 - - - Clear Applications cache - - - 123, 22 - - - record functions - - - - - - - - - - - - None - - - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -1172,24 +639,7 @@ uIEEMbxns0OpzYNRITMZmOv/PZbXJi3WJC3WJC3Wo939Ao+TPgKX3Mi+AAAAAElFTkSuQmCC - - - - - Default - - - - - - - - - - - - None - + AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu @@ -1197,24 +647,6 @@ ZXZFeHByZXNzLlV0aWxzLkltYWdlQ29sbGVjdGlvblN0cmVhbWVyAAAAAAIAAAAL - - Default - - - - - - - - - - - - None - - - Default - AAABAAgAEBAAAAEACABoBQAAhgAAABAQAAABACAAaAQAAO4FAAAYGAAAAQAIAMgGAABWCgAAGBgAAAEA @@ -1664,16 +1096,4 @@ AAAADwAA/gAAAAAPAAD//4AAAB8AAP///8AP/wAA////////AAD///////8AAP///////wAA - - - - - - - - - - - None - \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index 04512c1..a23dd11 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -340,10 +340,10 @@ Ziehen Sie Spaltenüberschriften in diesen Bereich um nach diesen gruppieren zu lassen - 0, 0 + 0, 25 - 1067, 237 + 1067, 212 0 @@ -360,6 +360,105 @@ 0 + + 502, 134 + + + Segoe UI Semibold, 9pt, style=Bold, Italic + + + 109, 22 + + + tslbldisplayRecords + + + 228, 22 + + + Record kopieren + + + 228, 22 + + + Neue Variante + + + Erzeugt eine neue Variante und speichert den bisherigen Record. + + + 225, 6 + + + False + + + 228, 22 + + + Ändere Parent-Verknüpfung + + + 228, 22 + + + Erstelle Workflowtasks + + + 228, 22 + + + Zeige Record-Logs + + + 228, 22 + + + Office-Vorlagen + + + 225, 6 + + + 228, 22 + + + Anwendungscache freigeben + + + Magenta + + + 138, 22 + + + Record-Funktionen + + + 0, 0 + + + 1067, 25 + + + 0 + + + ToolStrip1 + + + ToolStrip1 + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SplitContainerTop.Panel2 + + + 1 + Panel2 @@ -400,7 +499,7 @@ Fill - 0, 25 + 0, 0 True @@ -409,7 +508,7 @@ Fill - 0, 0 + 0, 25 1360, 343 @@ -429,8 +528,148 @@ 0 + + 757, 17 + + + False + + + Magenta + + + 89, 22 + + + Hinzufügen + + + False + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABWSURBVDhPY6AK+Pbt238S8PsvX74YQLVCAEjCyckJjj+8 + /wjHyGIguq2tDdMQUgwAYZghUO2kGwDCID1Q7fgNQMbIamhrADF41IBBaQA5GKqdEsDAAADtDPd9n5qK + lQAAAABJRU5ErkJggg== + + + + Magenta + + + 79, 22 + + + Speichern + + + False + + + Magenta + + + 71, 22 + + + Löschen + + + False + + + Magenta + + + 83, 22 + + + Bearbeiten + + + False + + + Magenta + + + 100, 22 + + + Taskübersicht + + + Magenta + + + 159, 22 + + + Rückgängig Änderungen + + + False + + + Magenta + + + 85, 22 + + + Abbrechen + + + False + + + Segoe UI, 9pt + + + 132, 22 + + + Nur lesenden Zugriff + + + False + + + 110, 22 + + + Kein Dateizugriff + + + False + + + 0, 0 + + + 1360, 25 + + + 0 + + + ToolStrip1 + + + ToolStripEdit + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabDetails + + + 1 + - 1360, 343 + 1360, 368 Detailansicht @@ -448,7 +687,7 @@ 0 - 1362, 371 + 1362, 396 1 @@ -586,7 +825,7 @@ Aqua - 1360, 318 + 1360, 343 7 @@ -676,6 +915,18 @@ Entitätsweite Suche + + 6, 25 + + + Magenta + + + 131, 22 + + + Suche aktualisieren + 0, 0 @@ -701,7 +952,7 @@ 1 - 1360, 343 + 1360, 368 windream-Dateien @@ -1132,7 +1383,7 @@ 2 - 1360, 343 + 1360, 368 Wiedervorlage @@ -1159,7 +1410,7 @@ Cyan - 1360, 318 + 1360, 343 0 @@ -1183,7 +1434,7 @@ 0, 25 - 1360, 318 + 1360, 343 2 @@ -1387,7 +1638,7 @@ - 1360, 343 + 1360, 368 Positionen @@ -1416,209 +1667,6 @@ 0 - - 757, 17 - - - False - - - Magenta - - - 89, 22 - - - Hinzufügen - - - False - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABWSURBVDhPY6AK+Pbt238S8PsvX74YQLVCAEjCyckJjj+8 - /wjHyGIguq2tDdMQUgwAYZghUO2kGwDCID1Q7fgNQMbIamhrADF41IBBaQA5GKqdEsDAAADtDPd9n5qK - lQAAAABJRU5ErkJggg== - - - - Magenta - - - 79, 22 - - - Speichern - - - False - - - Magenta - - - 71, 22 - - - Löschen - - - False - - - Magenta - - - 83, 22 - - - Bearbeiten - - - False - - - Magenta - - - 100, 22 - - - Taskübersicht - - - Magenta - - - 159, 22 - - - Rückgängig Änderungen - - - False - - - Magenta - - - 85, 22 - - - Abbrechen - - - False - - - Segoe UI, 9pt - - - 132, 22 - - - Nur lesenden Zugriff - - - False - - - 110, 22 - - - Kein Dateizugriff - - - False - - - 929, 22 - - - windream-Suche neu laden - - - 926, 6 - - - 929, 22 - - - Erstelle Workflowtasks - - - 929, 22 - - - Office Vorlagen - - - False - - - 929, 22 - - - Ändere Parent-Verknüpfung - - - 926, 6 - - - 929, 22 - - - Record kopieren - - - 929, 22 - - - Zeige Record Logs - - - 926, 6 - - - 929, 22 - - - Anwendungscache freigeben - - - Magenta - - - 138, 22 - - - Record-Funktionen - - - 0, 0 - - - 1362, 25 - - - 0 - - - ToolStrip1 - - - ToolStripEdit - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - SplitContainerMain.Panel2 - - - 1 - Panel2 @@ -2496,6 +2544,126 @@ DevExpress.XtraGrid.Views.Tile.TileView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + tslbldisplayRecords + + + System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ToolStripDropDownButton3 + + + System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + CopyRecordtsmi + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NewVarianttsmi + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ToolStripSeparator5 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ChangeParentLinktsmi + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + CreateWorkflowtaskstsmi + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + showRecordLogtsmi + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + OfficeVorlagentsmi + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ToolStripSeparator4 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + AnwendungscacheResettsmi + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsButtonAdd + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsButtonSave + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsButtonDelete + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsButtonEdit + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsButtonShowTaskOverview + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsbtnRedo + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsButtonCancel + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tslblLocked + + + System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tslblFileslocked + + + System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + docCM_Open @@ -2670,6 +2838,18 @@ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripSeparator3 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DocSearchRefresh + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ColumnHeader1 @@ -2754,126 +2934,6 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsButtonAdd - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tsButtonSave - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tsButtonDelete - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tsButtonEdit - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tsButtonShowTaskOverview - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tsbtnRedo - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tsButtonCancel - - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tslblLocked - - - System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tslblFileslocked - - - System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripDropDownButton1 - - - System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - WindreamsucheNeuLadenToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripSeparator3 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - CreateWorkflowTasksToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - OfficeVorlagenToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - VerknüpfungenAnzeigenToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripSeparator4 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - RecordKopierenToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ZeigeRecordLogsToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripSeparator5 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - AnwendungscacheFreigebenToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - BindingSource_Entity diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index 7b238b2..76fb85e 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -324,6 +324,12 @@ Public Class frmConstructor_Main SplitContainerTop.PanelVisibility = SplitPanelVisibility.Panel2 SplitContainerMain.Collapsed = True NODE_NAVIGATION = True + Else + If DT_VWPMO_CONSTRUCTOR_FORMS.Rows.Count = 1 Then + SplitContainerTop.PanelVisibility = SplitPanelVisibility.Both + SplitContainerTop.CollapsePanel = SplitCollapsePanel.Panel1 + SplitContainerTop.Collapsed = True + End If End If DT_CONSTRUCT_VIEW = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_FORM_CONSTRUCTOR WHERE GUID = " & CONSTRUCTORID) Dim SEL1 = String.Format("SELECT * FROM TBPMO_FORM WHERE GUID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE SCREEN_ID = {0} AND CONSTRUCT_ID = {1})", CURRENT_SCREEN_ID, CONSTRUCTORID) @@ -943,7 +949,7 @@ Public Class frmConstructor_Main DisableEditMode() - VerknüpfungenAnzeigenToolStripMenuItem.Enabled = True + ChangeParentLinktsmi.Enabled = True elapsed = sw.Elapsed.TotalSeconds sw.Stop() sw.Reset() @@ -1005,19 +1011,20 @@ Public Class frmConstructor_Main docCM_linkRecord.Enabled = True docCM_InWork.Enabled = True docCM_Copy.Enabled = True - RecordKopierenToolStripMenuItem.Enabled = True + CopyRecordtsmi.Enabled = True + NewVarianttsmi.Enabled = True docCM_PropertiesFile.Enabled = True tslblLocked.Visible = False tslblFileslocked.Visible = False TabFollowUp.PageEnabled = True TabPos.PageEnabled = True TabWindream.PageEnabled = True - WindreamsucheNeuLadenToolStripMenuItem.Enabled = True + DocSearchRefresh.Enabled = True EntitätssucheStartenToolStripMenuItem.Enabled = True docCM_Open.Enabled = True docCM_InWork.Enabled = True - VerknüpfungenAnzeigenToolStripMenuItem.Enabled = True + ChangeParentLinktsmi.Enabled = True Dim tempsql If SQL_RIGHT_READ_AND_VIEW_ONLY <> "" Then Try @@ -1066,13 +1073,13 @@ Public Class frmConstructor_Main docCM_Copy.Enabled = False docCM_RemoveLink.Enabled = False tslblLocked.Visible = True - RecordKopierenToolStripMenuItem.Enabled = False + CopyRecordtsmi.Enabled = False + NewVarianttsmi.Enabled = False TabFollowUp.PageEnabled = False TabPos.PageEnabled = False ' tsButtonShowTaskOverview.Enabled = False - CreateWorkflowTasksToolStripMenuItem.Enabled = False - CreateWorkflowTasksToolStripMenuItem.Enabled = False - VerknüpfungenAnzeigenToolStripMenuItem.Enabled = False + CreateWorkflowtaskstsmi.Enabled = False + ChangeParentLinktsmi.Enabled = False End If Catch ex As Exception @@ -1114,7 +1121,7 @@ Public Class frmConstructor_Main ' Hinzufügen sollte auch bei RIGHT_ONLY_READ verfügbar sein tslblFileslocked.Visible = True 'TabWindream.PageEnabled = False - WindreamsucheNeuLadenToolStripMenuItem.Enabled = False + DocSearchRefresh.Enabled = False EntitätssucheStartenToolStripMenuItem.Enabled = False docCM_Open.Enabled = False docCM_InWork.Enabled = False @@ -2215,7 +2222,7 @@ Public Class frmConstructor_Main Me.Cursor = Cursors.WaitCursor RECORD_CHANGED = False RECORD_ID = 0 - VerknüpfungenAnzeigenToolStripMenuItem.Enabled = True + ChangeParentLinktsmi.Enabled = True 'Setzen von Rechten 'GetSet_Rights() 'VerknüpfungenToolStripMenuItem.Enabled = False @@ -2289,7 +2296,7 @@ Public Class frmConstructor_Main Get_Grid_Sql(CONSTRUCTORID, ENTITY_ID, CURRENT_CONSTRUCTOR_DETAIL_ID) 'Anzahl der Datensätze - ENTITY_RECORD_COUNT = ClassDatabase.Execute_Scalar("SELECT COUNT(*) FROM TBPMO_RECORD where FORM_ID = " & ENTITY_ID, True) + ENTITY_RECORD_COUNT = ClassDatabase.Execute_Scalar("SELECT COUNT(*) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND FORM_ID = " & ENTITY_ID, True) If CBool(LOAD_ENTITY_SEARCH_AT_STARTUP) = True Then ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, RECORD_ID, "ENTITY", "", True, True) @@ -3020,6 +3027,11 @@ Public Class frmConstructor_Main Else selnode.Text = String.Format("{0} ({1})", selnode.Text, Get_Grid_Row_Count()) End If + Dim msg = "Anzahl Datensätze: " + If USER_LANGUAGE <> "de-DE" Then + msg = "number of records: " + End If + tslbldisplayRecords.Text = msg & Get_Grid_Row_Count() End If Catch ex As Exception MsgBox("Error in LoadGrid_Selection:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -3112,7 +3124,7 @@ Public Class frmConstructor_Main Update_Status_Label(False, "") If LogErrorsOnly = False Then ClassLogger.Add(" >> GRID_RECORD ID: " & Rec_ID.ToString, False) 'Me.pnlDetails.Visible = True - ZeigeRecordLogsToolStripMenuItem.Enabled = False + showRecordLogtsmi.Enabled = False If FORM_TYPE = 5 And EntityLoad = False Or IS_SINGLE_RECORD = True And EntityLoad = False Then '#### Es sind untergeordnete Entitäten geöffnet#### Dim linkedRecord ' Dim pID As Integer @@ -3219,7 +3231,7 @@ Public Class frmConstructor_Main Dim RC = ClassDatabase.Execute_Scalar(Record_Changes, True) If Not RC Is Nothing Then If RC > 0 Then - ZeigeRecordLogsToolStripMenuItem.Enabled = True + showRecordLogtsmi.Enabled = True End If End If @@ -3532,17 +3544,17 @@ Public Class frmConstructor_Main If CBool(wdsearch) = False Then windream_Docshow = False TabWindream.PageVisible = False - WindreamsucheNeuLadenToolStripMenuItem.Enabled = False + DocSearchRefresh.Enabled = False EntitätssucheStartenToolStripMenuItem.Enabled = False Exit Sub Else TabWindream.PageVisible = True 'If IsDBNull(DTWD.Rows(0).Item(0)) Then ' windream_Docshow = False - ' WindreamsucheNeuLadenToolStripMenuItem.Visible = False + ' DocSearchRefresh.Visible = False ' Exit Function 'End If - WindreamsucheNeuLadenToolStripMenuItem.Enabled = True + DocSearchRefresh.Enabled = True EntitätssucheStartenToolStripMenuItem.Enabled = True windream_Docshow = True If windream_inited = False Then @@ -3566,7 +3578,7 @@ Public Class frmConstructor_Main End Sub - Private Sub WD_DELETE_DOCS(DT_RESULT As Datatable) + Private Sub WD_DELETE_DOCS(DT_RESULT As DataTable) Dim sw As New Stopwatch sw.Start() Dim elapsed As Double @@ -3810,7 +3822,7 @@ Public Class frmConstructor_Main 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) + 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) @@ -3840,7 +3852,7 @@ Public Class frmConstructor_Main 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) + 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) @@ -4511,9 +4523,9 @@ Public Class frmConstructor_Main tsslblWorkflowstate.Text = text tsslblWorkflowstate.Visible = True If _MANUAL_WORKFLOW = True Then - CreateWorkflowTasksToolStripMenuItem.Visible = True + CreateWorkflowtaskstsmi.Visible = True Else - CreateWorkflowTasksToolStripMenuItem.Visible = False + CreateWorkflowtaskstsmi.Visible = False End If 'Direkten Zugriff auf RecordView Workflow erlauben tsButtonShowTaskOverview.Visible = True @@ -4539,7 +4551,7 @@ Public Class frmConstructor_Main 'Keine Workflows....also auch keinen Zugriff geben tsButtonShowTaskOverview.Visible = False If _MANUAL_WORKFLOW = True Then - CreateWorkflowTasksToolStripMenuItem.Visible = True + CreateWorkflowtaskstsmi.Visible = True End If tsslblWorkflowstate.Visible = False End If @@ -4572,64 +4584,6 @@ Public Class frmConstructor_Main CURRENT_FORM_ID = ENTITY_ID frmWD_EntityImport.ShowDialog() End Sub - - - Private Sub WindreamsucheNeuLadenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles WindreamsucheNeuLadenToolStripMenuItem.Click - ClassDOC_SEARCH.REFRESH_DOC_TABLE_RESULTS() - RUN_WDSEARCH_GRID("RECORD") - ' RUN_WD_SEARCH(WD_Suche, "RECORD") - End Sub - - Private Sub WorkflowTasksNeuErstellenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CreateWorkflowTasksToolStripMenuItem.Click - Dim result As MsgBoxResult - Dim stg, caption As String - If USER_LANGUAGE = "de-DE" Then - stg = "Wollen Sie die Workflowtasks für diesen Datensatz erzeugen? Alte Workflows werden gelöscht!" - caption = "Bestätigung erforderlich:" - Else - stg = "Do You really want to create workflowtasks for this record? Existing workflows will be deleted!" - caption = "Confirmation needed:" - End If - result = MessageBox.Show(stg, caption, MessageBoxButtons.YesNo, MessageBoxIcon.Question) - If result = MsgBoxResult.Yes Then - Try - CURRENT_FORM_ID = ENTITY_ID - Dim sql = "EXEC PRPMO_CREATE_WF_TASKS " & CURRENT_FORM_ID & ", " & RECORD_ID - If ClassDatabase.Execute_non_Query(sql) = True Then - VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, Environment.UserName) - Show_act_WFTask() - If USER_LANGUAGE = "de-DE" Then - stg = "Workflows erzeugt! Wollen Sie die Workflowübersicht nun anzeigen?" - caption = "Erfolgreich:" - Else - stg = "Workflows created! Would You like to show the Workflow-Overview?" - caption = "Success:" - End If - result = MessageBox.Show(stg, caption, MessageBoxButtons.YesNo, MessageBoxIcon.Question) - If result = MsgBoxResult.Yes Then - ClassJumpRecord.JumpToRecord(2, RECORD_ID) - JUMP_RECORD_ID = 0 - End If - Else - If USER_LANGUAGE = "de-DE" Then - stg = "Die Workflows konnten nicht erzeugt werden. Bitte prüfen Sie die Log-Datei!" - Else - stg = "Error in Creating Workflow-Tasks. Please check the logfile!" - End If - MsgBox(stg, MsgBoxStyle.Exclamation) - End If - Catch ex As Exception - MsgBox("Unexpected Error in Create Workflowtasks Record: " & ex.Message, MsgBoxStyle.Critical) - End Try - End If - - End Sub - - Private Sub ZeigeRecordLogsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZeigeRecordLogsToolStripMenuItem.Click - CURRENT_RECORD_ID = RECORD_ID - frmRecord_Changes.ShowDialog() - End Sub - Private Sub FormDesignerToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles FormDesignerToolStripMenuItem.Click Try Dim SelectedNode As TreeNode = TryCast(TreeViewMain.SelectedNode, TreeNode) @@ -4767,16 +4721,16 @@ Public Class frmConstructor_Main Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, "Load_Templates") If Not IsNothing(DT) Then If DT.Rows.Count > 0 Then - OfficeVorlagenToolStripMenuItem.Enabled = True - OfficeVorlagenToolStripMenuItem.DropDownItems.Clear() + OfficeVorlagentsmi.Enabled = True + OfficeVorlagentsmi.DropDownItems.Clear() For Each row As DataRow In DT.Rows - Dim item As ToolStripMenuItem = OfficeVorlagenToolStripMenuItem + Dim item As ToolStripMenuItem = OfficeVorlagentsmi Dim newItem As ToolStripMenuItem = New ToolStripMenuItem(row.Item("TEMPLATE_NAME").ToString, Nothing, AddressOf TemplateItem_Click) newItem.Tag = row.Item("TEMPLATE_ID") item.DropDownItems.Add(newItem) ' subitem.DropDownItems.Add(newItem) Next Else - OfficeVorlagenToolStripMenuItem.Enabled = False + OfficeVorlagentsmi.Enabled = False End If End If Catch ex As Exception @@ -5026,10 +4980,6 @@ Public Class frmConstructor_Main End Try End If End Sub - - Private Sub VerknüpfungenAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerknüpfungenAnzeigenToolStripMenuItem.Click - Show_Verknuepfungen() - End Sub Sub Show_Verknuepfungen() Dim result As MsgBoxResult Dim msg = "Möchten Sie den Parent-Datensatz für den aktuellen Datensatz wirklich aktualisieren?" @@ -5068,48 +5018,9 @@ Public Class frmConstructor_Main Load_Entity_Data_Only() End If End Sub - Private Sub RecordKopierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RecordKopierenToolStripMenuItem.Click - Dim result As MsgBoxResult - Dim msg = "Möchten Sie den Datensatz wirklich kopieren?" - If USER_LANGUAGE <> "de-DE" Then - msg = "Would You like to copy the record?" - End If - result = MessageBox.Show(msg, "Copy Record:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) - If result = MsgBoxResult.Yes Then - Dim SQL = String.Format("EXEC PRDD_COPY_RECORD {0}, '{1}'", RECORD_ID, Environment.UserName) - If ClassDatabase.Execute_non_Query_withConn(SQL, 1) = True Then - Load_Entity_Data(ACT_EBENE) - End If - End If - End Sub - Private Sub DatenNeuLadenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DatenNeuLadenToolStripMenuItem.Click Load_Datafor_Entity() End Sub - - Private Sub AnwendungscacheFreigebenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AnwendungscacheFreigebenToolStripMenuItem.Click - Dim result As MsgBoxResult - Dim msg = "Möchten Sie den Anwendungscache wirklich leeren?" & vbNewLine & "Die Entität wird dann automatisch neugeladen!" - If USER_LANGUAGE <> "de-DE" Then - msg = "Would You like to clear the applications-cache?" & vbNewLine & "All data will be loaded new!" - End If - result = MessageBox.Show(msg, "Clear cache:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) - If result = MsgBoxResult.Yes Then - Try - Cursor = Cursors.WaitCursor - CURRENT_FORM_ID = ENTITY_ID - ClassControlValueCache.ClearCache() - DisableEditMode() - Load_Entity_Data(ACT_EBENE) - RECORD_CHANGED = False - Catch ex As Exception - MsgBox("Unexpected Error in Clear Cache:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) - Finally - Cursor = Cursors.Default - End Try - End If - End Sub - Private Sub grvwGrid_ColumnFilterChanged(sender As Object, e As EventArgs) Handles grvwGrid.ColumnFilterChanged SET_ROWCOUNT_STRING() End Sub @@ -5122,6 +5033,11 @@ Public Class frmConstructor_Main Else selnode.Text = String.Format("{0} ({1})", selnode.Text, grvwGrid.RowCount) End If + Dim msg = "Anzahl Datensätze: " + If USER_LANGUAGE <> "de-DE" Then + msg = "number of records: " + End If + tslbldisplayRecords.Text = msg & grvwGrid.RowCount End Sub Public Sub New() ' Dieser Aufruf ist für den Designer erforderlich. @@ -5900,7 +5816,7 @@ Public Class frmConstructor_Main Cursor = Cursors.WaitCursor For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows If ClassDOC_SEARCH.SET_WD_RIGHTS(row.Item("DOC_ID"), row.Item("DOC_PATH"), ENTITY_ID) = True Then - + Else err = True msg = String.Format("Unerwarteter Fehler im Rechtemodul für Datei: " & vbNewLine & "{0}" & vbNewLine & "Bitte prüfen Sie die Logdatei!", row.Item("DOC_PATH")) @@ -6152,4 +6068,115 @@ Public Class frmConstructor_Main MsgBox("Could not read the rights for selected file! Check the log for further infomation!", MsgBoxStyle.Exclamation) End If End Sub + + Private Sub CreateWorkflowtaskstsbtn_Click(sender As Object, e As EventArgs) Handles CreateWorkflowtaskstsmi.Click + Dim result As MsgBoxResult + Dim stg, caption As String + If USER_LANGUAGE = "de-DE" Then + stg = "Wollen Sie die Workflowtasks für diesen Datensatz erzeugen? Alte Workflows werden gelöscht!" + caption = "Bestätigung erforderlich:" + Else + stg = "Do You really want to create workflowtasks for this record? Existing workflows will be deleted!" + caption = "Confirmation needed:" + End If + result = MessageBox.Show(stg, caption, MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result = MsgBoxResult.Yes Then + Try + CURRENT_FORM_ID = ENTITY_ID + Dim sql = "EXEC PRPMO_CREATE_WF_TASKS " & CURRENT_FORM_ID & ", " & RECORD_ID + If ClassDatabase.Execute_non_Query(sql) = True Then + VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, Environment.UserName) + Show_act_WFTask() + If USER_LANGUAGE = "de-DE" Then + stg = "Workflows erzeugt! Wollen Sie die Workflowübersicht nun anzeigen?" + caption = "Erfolgreich:" + Else + stg = "Workflows created! Would You like to show the Workflow-Overview?" + caption = "Success:" + End If + result = MessageBox.Show(stg, caption, MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result = MsgBoxResult.Yes Then + ClassJumpRecord.JumpToRecord(2, RECORD_ID) + JUMP_RECORD_ID = 0 + End If + Else + If USER_LANGUAGE = "de-DE" Then + stg = "Die Workflows konnten nicht erzeugt werden. Bitte prüfen Sie die Log-Datei!" + Else + stg = "Error in Creating Workflow-Tasks. Please check the logfile!" + End If + MsgBox(stg, MsgBoxStyle.Exclamation) + End If + Catch ex As Exception + MsgBox("Unexpected Error in Create Workflowtasks Record: " & ex.Message, MsgBoxStyle.Critical) + End Try + End If + End Sub + + Private Sub ChangeParentLinktsbtn_Click(sender As Object, e As EventArgs) Handles ChangeParentLinktsmi.Click + Show_Verknuepfungen() + End Sub + + Private Sub CopyRecordtsbtn_Click(sender As Object, e As EventArgs) Handles CopyRecordtsmi.Click + Dim result As MsgBoxResult + Dim msg = "Möchten Sie den Datensatz wirklich kopieren?" + If USER_LANGUAGE <> "de-DE" Then + msg = "Would You like to copy the record?" + End If + result = MessageBox.Show(msg, "Copy Record:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result = MsgBoxResult.Yes Then + Dim SQL = String.Format("EXEC PRDD_COPY_RECORD {0}, '{1}'", RECORD_ID, Environment.UserName) + If ClassDatabase.Execute_non_Query_withConn(SQL, 1) = True Then + Load_Entity_Data(ACT_EBENE) + End If + End If + End Sub + + Private Sub showRecordLogtsbtn_Click(sender As Object, e As EventArgs) Handles showRecordLogtsmi.Click + CURRENT_RECORD_ID = RECORD_ID + frmRecord_Changes.ShowDialog() + End Sub + + Private Sub DocSearchRefresh_Click(sender As Object, e As EventArgs) Handles DocSearchRefresh.Click + ClassDOC_SEARCH.REFRESH_DOC_TABLE_RESULTS() + RUN_WDSEARCH_GRID("RECORD") + End Sub + + Private Sub AnwendungscacheResettsbtn_Click(sender As Object, e As EventArgs) Handles AnwendungscacheResettsmi.Click + Dim result As MsgBoxResult + Dim msg = "Möchten Sie den Anwendungscache wirklich leeren?" & vbNewLine & "Die Entität wird dann automatisch neugeladen!" + If USER_LANGUAGE <> "de-DE" Then + msg = "Would You like to clear the applications-cache?" & vbNewLine & "All data will be loaded new!" + End If + result = MessageBox.Show(msg, "Clear cache:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result = MsgBoxResult.Yes Then + Try + Cursor = Cursors.WaitCursor + CURRENT_FORM_ID = ENTITY_ID + ClassControlValueCache.ClearCache() + DisableEditMode() + Load_Entity_Data(ACT_EBENE) + RECORD_CHANGED = False + Catch ex As Exception + MsgBox("Unexpected Error in Clear Cache:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + Finally + Cursor = Cursors.Default + End Try + End If + End Sub + + Private Sub OfficeVorlagenToolStripMenuItem_Click(sender As Object, e As EventArgs) + + End Sub + + Private Sub NewVarianttsmi_Click(sender As Object, e As EventArgs) Handles NewVarianttsmi.Click + CURRENT_FORM_ID = ENTITY_ID + CURRENT_RECORD_ID = RECORD_ID + Dim recid = CURRENT_RECORD_ID + frmNewVariant.ShowDialog() + If recid <> CURRENT_RECORD_ID Then + Load_Datafor_Entity() + LocateRecordById(CURRENT_RECORD_ID) + End If + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmNewVariant.Designer.vb b/app/DD-Record-Organiser/frmNewVariant.Designer.vb new file mode 100644 index 0000000..7096809 --- /dev/null +++ b/app/DD-Record-Organiser/frmNewVariant.Designer.vb @@ -0,0 +1,148 @@ + _ +Partial Class frmNewVariant + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel() + Me.OK_Button = New System.Windows.Forms.Button() + Me.Cancel_Button = New System.Windows.Forms.Button() + Me.Label1 = New System.Windows.Forms.Label() + Me.Label2 = New System.Windows.Forms.Label() + Me.cmbReason = New System.Windows.Forms.ComboBox() + Me.Label3 = New System.Windows.Forms.Label() + Me.txtComment = New System.Windows.Forms.TextBox() + Me.TableLayoutPanel1.SuspendLayout() + Me.SuspendLayout() + ' + 'TableLayoutPanel1 + ' + Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.TableLayoutPanel1.ColumnCount = 2 + Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) + Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) + Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0) + Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0) + Me.TableLayoutPanel1.Location = New System.Drawing.Point(226, 185) + Me.TableLayoutPanel1.Name = "TableLayoutPanel1" + Me.TableLayoutPanel1.RowCount = 1 + Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!)) + Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29) + Me.TableLayoutPanel1.TabIndex = 0 + ' + 'OK_Button + ' + Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None + Me.OK_Button.Location = New System.Drawing.Point(3, 3) + Me.OK_Button.Name = "OK_Button" + Me.OK_Button.Size = New System.Drawing.Size(67, 23) + Me.OK_Button.TabIndex = 0 + Me.OK_Button.Text = "OK" + ' + 'Cancel_Button + ' + Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None + Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel + Me.Cancel_Button.Location = New System.Drawing.Point(76, 3) + Me.Cancel_Button.Name = "Cancel_Button" + Me.Cancel_Button.Size = New System.Drawing.Size(67, 23) + Me.Cancel_Button.TabIndex = 1 + Me.Cancel_Button.Text = "Abbrechen" + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(12, 9) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(364, 13) + Me.Label1.TabIndex = 1 + Me.Label1.Text = "Bestimmen Sie hier bitte die Details für die Erstellung einer neuen Variante." + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(12, 34) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(186, 13) + Me.Label2.TabIndex = 2 + Me.Label2.Text = "Grund für die Erstellung der Variante:" + ' + 'cmbReason + ' + Me.cmbReason.FormattingEnabled = True + Me.cmbReason.Location = New System.Drawing.Point(12, 50) + Me.cmbReason.Name = "cmbReason" + Me.cmbReason.Size = New System.Drawing.Size(364, 21) + Me.cmbReason.TabIndex = 3 + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(12, 88) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(114, 13) + Me.Label3.TabIndex = 4 + Me.Label3.Text = "Kommentar: (optional)" + ' + 'txtComment + ' + Me.txtComment.Location = New System.Drawing.Point(15, 104) + Me.txtComment.Multiline = True + Me.txtComment.Name = "txtComment" + Me.txtComment.Size = New System.Drawing.Size(361, 65) + Me.txtComment.TabIndex = 5 + ' + 'frmNewVariant + ' + Me.AcceptButton = Me.OK_Button + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.CancelButton = Me.Cancel_Button + Me.ClientSize = New System.Drawing.Size(384, 226) + Me.Controls.Add(Me.txtComment) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.cmbReason) + Me.Controls.Add(Me.Label2) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.TableLayoutPanel1) + Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "frmNewVariant" + Me.ShowInTaskbar = False + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.Text = "Neue Variante definieren" + Me.TableLayoutPanel1.ResumeLayout(False) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel + Friend WithEvents OK_Button As System.Windows.Forms.Button + Friend WithEvents Cancel_Button As System.Windows.Forms.Button + Friend WithEvents Label1 As System.Windows.Forms.Label + Friend WithEvents Label2 As System.Windows.Forms.Label + Friend WithEvents cmbReason As System.Windows.Forms.ComboBox + Friend WithEvents Label3 As System.Windows.Forms.Label + Friend WithEvents txtComment As System.Windows.Forms.TextBox + +End Class diff --git a/app/DD-Record-Organiser/frmNewVariant.resx b/app/DD-Record-Organiser/frmNewVariant.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/app/DD-Record-Organiser/frmNewVariant.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmNewVariant.vb b/app/DD-Record-Organiser/frmNewVariant.vb new file mode 100644 index 0000000..2b5e984 --- /dev/null +++ b/app/DD-Record-Organiser/frmNewVariant.vb @@ -0,0 +1,56 @@ +Imports System.Windows.Forms + +Public Class frmNewVariant + Dim DT_REASONS As DataTable + + Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click + If cmbReason.SelectedIndex <> -1 Then + Dim result As MsgBoxResult + Dim msg = "Möchten Sie nun eine neue Variante anlegen?" + If USER_LANGUAGE <> "de-DE" Then + msg = "Would You now really create a new variant?" + End If + result = MessageBox.Show(msg, "Create variant:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result = MsgBoxResult.Yes Then + Dim SQL = String.Format("EXEC PRDD_COPY_RECORD {0}, '{1}'", CURRENT_RECORD_ID, Environment.UserName) + If ClassDatabase.Execute_non_Query_withConn(SQL, 1) = True Then + Dim sel = String.Format("SELECT MAX(GUID) FROM TBPMO_RECORD WHERE UPPER(ADDED_WHO) = '{0}'", Environment.UserName.ToUpper) + Dim REC_ID = ClassDatabase.Execute_Scalar(sel) + Dim Upd = String.Format("UPDATE TBPMO_RECORD SET PARENT_RECORD = {0},CHANGED_WHO = '{1}' WHERE GUID = {2}", REC_ID, Environment.UserName, CURRENT_RECORD_ID) + If ClassDatabase.Execute_non_Query(Upd) = True Then + Dim ins = String.Format("INSERT INTO TBPMO_RECORD_VARIANT (RECORD_ID,REASON_CODE,COMMENT,ADDED_WHO) VALUES ({0},'{1}','{2}','{3}')", CURRENT_RECORD_ID, cmbReason.SelectedText, txtComment.Text, Environment.UserName) + If ClassDatabase.Execute_non_Query(ins) = True Then + Upd = String.Format("UPDATE TBPMO_RECORD SET RECORD_ENTITY_ID = (SELECT RECORD_ENTITY_ID FROM TBPMO_RECORD WHERE GUID = {0}),CHANGED_WHO = '{1}' WHERE GUID = {2}", CURRENT_RECORD_ID, Environment.UserName, REC_ID) + If ClassDatabase.Execute_non_Query(ins) = True Then + CURRENT_RECORD_ID = REC_ID + Me.DialogResult = System.Windows.Forms.DialogResult.OK + Me.Close() + End If + End If + End If + End If + End If + Else + MsgBox("Please choose an entry out of the combobox!", MsgBoxStyle.Exclamation) + End If + End Sub + + Private Sub Cancel_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Cancel_Button.Click + Me.DialogResult = System.Windows.Forms.DialogResult.Cancel + Me.Close() + End Sub + + Private Sub frmNewVariant_Load(sender As Object, e As EventArgs) Handles Me.Load + Try + Dim sel = String.Format("SELECT * FROM TBPMO_ENTITY_VARIANT_REASONS WHERE ENTITY_ID = {0}", CURRENT_FORM_ID) + DT_REASONS = ClassDatabase.Return_Datatable(sel) + cmbReason.DataSource = DT_REASONS + cmbReason.DisplayMember = DT_REASONS.Columns("REASON_CODE").ColumnName + cmbReason.ValueMember = DT_REASONS.Columns(0).ColumnName + Me.cmbReason.SelectedIndex = -1 + Me.txtComment.Text = "" + Catch ex As Exception + MsgBox("Error in Loading Basic Data: " & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub +End Class