diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index 89b4b04..ed83f46 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -1011,6 +1011,8 @@ + + diff --git a/app/DD-Record-Organiser/My Project/Resources.Designer.vb b/app/DD-Record-Organiser/My Project/Resources.Designer.vb index 055cfc2..276a7e7 100644 --- a/app/DD-Record-Organiser/My Project/Resources.Designer.vb +++ b/app/DD-Record-Organiser/My Project/Resources.Designer.vb @@ -360,6 +360,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property cancel() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("cancel", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property cancel1() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("cancel1", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/app/DD-Record-Organiser/My Project/Resources.resx b/app/DD-Record-Organiser/My Project/Resources.resx index d245901..9387468 100644 --- a/app/DD-Record-Organiser/My Project/Resources.resx +++ b/app/DD-Record-Organiser/My Project/Resources.resx @@ -127,20 +127,20 @@ ..\Resources\note_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\flag_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\1532_Flag_Blue.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\application_form.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Einstellungen3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\PropertyGridEditorPart_6041.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Men2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\save.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -160,17 +160,14 @@ ..\Resources\database_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dtp1.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\folder_Open_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\user_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Property_501.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\application_form.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -181,6 +178,9 @@ ..\Resources\database_table.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Monitor_Screen_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\table_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -193,12 +193,18 @@ ..\Resources\table.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\lbl.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\database.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Label_684.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\user_suit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\table_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -214,6 +220,9 @@ ..\Resources\handdrawn_arrow_right_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\color_wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -226,21 +235,21 @@ ..\Resources\Close_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\AddTable_5632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\database_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\UserInterfaceEditor_5845.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\f2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\page_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ListBox_686_24.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ico6078.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -253,21 +262,18 @@ ..\Resources\TextBox_708.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\calendar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\add1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\save1.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\module_32xSM.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\folder_Open_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -283,8 +289,8 @@ ..\Resources\database_key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_gear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\005_Task_32x42_72.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\138_PushPin_32x42_721.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -295,9 +301,6 @@ ..\Resources\brainpool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\GroupBox_680.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Men6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -328,14 +331,17 @@ ..\Resources\brick_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\DD_Icons-ADDI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\RadioButton_701.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\PropertyGridEditorPart_6041.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\shield_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -358,8 +364,8 @@ ..\Resources\Go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\1532_Flag_Blue.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_connect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -376,15 +382,15 @@ ..\Resources\ImageListControl_683.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\userAccounts.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\folder_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ComboBox_672.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -400,14 +406,11 @@ ..\Resources\module_32xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\AddTable_5632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calendar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\grid_Data_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\lbl.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_gear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Home_5699_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -436,35 +439,35 @@ ..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Einstellungen3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\flag_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\CheckBox_669.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Monitor_Screen_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\grid_Data_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Men2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Property_501.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\page_excel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\HomeHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Excel_25ixel.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Table_748.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\f2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\GroupBox_680.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bricks.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -481,11 +484,11 @@ ..\Resources\user_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\dtp1.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\005_Task_32x42_72.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ComboBox_672.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\AddressEnvelope_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -493,8 +496,8 @@ ..\Resources\cmb.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\user_suit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\HomeHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\FilteredObject_13400_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -508,13 +511,16 @@ ..\Resources\Checkbox.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ListBox_686_24.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\action_Cancel_16xLG1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\DD_Icons-ADDI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\cancel.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 \ No newline at end of file diff --git a/app/DD-Record-Organiser/Resources/cancel.png b/app/DD-Record-Organiser/Resources/cancel.png new file mode 100644 index 0000000..c149c2b Binary files /dev/null and b/app/DD-Record-Organiser/Resources/cancel.png differ diff --git a/app/DD-Record-Organiser/Resources/cancel1.png b/app/DD-Record-Organiser/Resources/cancel1.png new file mode 100644 index 0000000..7640cd5 Binary files /dev/null and b/app/DD-Record-Organiser/Resources/cancel1.png differ diff --git a/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb b/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb index 800af62..933a2d6 100644 --- a/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb +++ b/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb @@ -778,6 +778,7 @@ Partial Class frmDokumentart_Konfig 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False + Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Me.TBDD_DOKUMENTARTTableAdapter Me.TableAdapterManager.TBDD_EINGANGSARTENTableAdapter = Me.TBDD_EINGANGSARTENTableAdapter Me.TableAdapterManager.TBDD_EMAIL_ACCOUNTTableAdapter = Nothing @@ -785,7 +786,6 @@ Partial Class frmDokumentart_Konfig Me.TableAdapterManager.TBDD_INDEX_AUTOMTableAdapter = Me.TBDD_INDEX_AUTOMTableAdapter Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing - Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FILES_USERTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing @@ -797,6 +797,9 @@ Partial Class frmDokumentart_Konfig Me.TableAdapterManager.TBPMO_KONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing Me.TableAdapterManager.TBPMO_RECORDTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_TEMPLATETableAdapter = Nothing Me.TableAdapterManager.TBPMO_WD_FVIEW_DT_INDEXTableAdapter = Nothing Me.TableAdapterManager.TBPMO_WD_OBJECTTYPETableAdapter = Nothing Me.TableAdapterManager.TBPMO_WORKFLOW_FORMTableAdapter = Nothing @@ -873,7 +876,7 @@ Partial Class frmDokumentart_Konfig Me.XtraTabPage1.Controls.Add(Me.ListBox2) Me.XtraTabPage1.Controls.Add(Me.TBDD_INDEX_AUTOMBindingNavigator) Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(1265, 252) + Me.XtraTabPage1.Size = New System.Drawing.Size(1261, 249) Me.XtraTabPage1.Text = "Automatische Indexe" ' 'Label2 @@ -998,7 +1001,7 @@ Partial Class frmDokumentart_Konfig Me.ListBox2.ItemHeight = 15 Me.ListBox2.Location = New System.Drawing.Point(0, 25) Me.ListBox2.Name = "ListBox2" - Me.ListBox2.Size = New System.Drawing.Size(305, 227) + Me.ListBox2.Size = New System.Drawing.Size(305, 224) Me.ListBox2.TabIndex = 2 Me.ListBox2.TabStop = False Me.ListBox2.ValueMember = "GUID" @@ -1018,7 +1021,7 @@ Partial Class frmDokumentart_Konfig Me.TBDD_INDEX_AUTOMBindingNavigator.MovePreviousItem = Me.ToolStripButton4 Me.TBDD_INDEX_AUTOMBindingNavigator.Name = "TBDD_INDEX_AUTOMBindingNavigator" Me.TBDD_INDEX_AUTOMBindingNavigator.PositionItem = Me.ToolStripTextBox1 - Me.TBDD_INDEX_AUTOMBindingNavigator.Size = New System.Drawing.Size(1265, 25) + Me.TBDD_INDEX_AUTOMBindingNavigator.Size = New System.Drawing.Size(1261, 25) Me.TBDD_INDEX_AUTOMBindingNavigator.TabIndex = 1 Me.TBDD_INDEX_AUTOMBindingNavigator.Text = "BindingNavigator1" ' @@ -1125,7 +1128,7 @@ Partial Class frmDokumentart_Konfig Me.XtraTabPage2.Controls.Add(Me.ComboBox1) Me.XtraTabPage2.Controls.Add(Me.BindingNavigator1) Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(1265, 252) + Me.XtraTabPage2.Size = New System.Drawing.Size(1261, 249) Me.XtraTabPage2.Text = "Zurodnung Dokumentart - Entität" ' 'Label3 @@ -1265,7 +1268,7 @@ Partial Class frmDokumentart_Konfig Me.BindingNavigator1.MovePreviousItem = Me.ToolStripButton11 Me.BindingNavigator1.Name = "BindingNavigator1" Me.BindingNavigator1.PositionItem = Me.ToolStripTextBox2 - Me.BindingNavigator1.Size = New System.Drawing.Size(1265, 25) + Me.BindingNavigator1.Size = New System.Drawing.Size(1261, 25) Me.BindingNavigator1.TabIndex = 2 Me.BindingNavigator1.Text = "BindingNavigator1" ' diff --git a/app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb b/app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb index 9718002..696c9d0 100644 --- a/app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb +++ b/app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb @@ -26,16 +26,20 @@ Partial Class frmDokumentart_NameConvention Me.Label1 = New System.Windows.Forms.Label() Me.txtnamenKonv = New System.Windows.Forms.TextBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.btnAddIndexA = New System.Windows.Forms.Button() Me.btnAddIndexM = New System.Windows.Forms.Button() + Me.cmbIndex_m = New System.Windows.Forms.ComboBox() + Me.Label4 = New System.Windows.Forms.Label() + Me.cmbEntity = New System.Windows.Forms.ComboBox() + Me.btnAddIndexA = New System.Windows.Forms.Button() Me.cmbIndex_A = New System.Windows.Forms.ComboBox() Me.TBDD_INDEX_AUTOMBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() - Me.cmbIndex_m = New System.Windows.Forms.ComboBox() Me.Label3 = New System.Windows.Forms.Label() - Me.Label2 = New System.Windows.Forms.Label() Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.Button1 = New System.Windows.Forms.Button() Me.btnTrennzeichen = New System.Windows.Forms.Button() + Me.cmbDate = New System.Windows.Forms.ComboBox() + Me.Label20 = New System.Windows.Forms.Label() Me.btndelete = New System.Windows.Forms.Button() Me.btnOK = New System.Windows.Forms.Button() Me.btnclose = New System.Windows.Forms.Button() @@ -45,22 +49,24 @@ Partial Class frmDokumentart_NameConvention Me.TBDD_INDEX_AUTOMTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBDD_INDEX_AUTOMTableAdapter() Me.VERSION_DELIMITERTextBox = New System.Windows.Forms.TextBox() Me.FILE_DELIMITERTextBox = New System.Windows.Forms.TextBox() - Me.Button1 = New System.Windows.Forms.Button() - Me.cmbDate = New System.Windows.Forms.ComboBox() - Me.Label20 = New System.Windows.Forms.Label() + Me.GroupBox3 = New System.Windows.Forms.GroupBox() + Me.Label5 = New System.Windows.Forms.Label() + Me.Label6 = New System.Windows.Forms.Label() Me.GroupBox1.SuspendLayout() CType(Me.TBDD_INDEX_AUTOMBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox2.SuspendLayout() CType(Me.TBPMO_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + Me.GroupBox3.SuspendLayout() Me.SuspendLayout() ' 'Label1 ' Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label1.Location = New System.Drawing.Point(9, 20) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(438, 51) + Me.Label1.Size = New System.Drawing.Size(400, 45) Me.Label1.TabIndex = 0 Me.Label1.Text = "Definieren Sie hier die Namenskonvention zur ausgewählten Dokumentart." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Sie haben" & _ " die Möglichkeit den Dateinamen aus den unten aufgeführten" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Indizes und Textbaus" & _ @@ -68,52 +74,83 @@ Partial Class frmDokumentart_NameConvention ' 'txtnamenKonv ' - Me.txtnamenKonv.Location = New System.Drawing.Point(12, 74) + Me.txtnamenKonv.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtnamenKonv.Location = New System.Drawing.Point(12, 93) Me.txtnamenKonv.Name = "txtnamenKonv" - Me.txtnamenKonv.Size = New System.Drawing.Size(401, 25) + Me.txtnamenKonv.Size = New System.Drawing.Size(417, 23) Me.txtnamenKonv.TabIndex = 1 ' 'GroupBox1 ' - Me.GroupBox1.Controls.Add(Me.btnAddIndexA) Me.GroupBox1.Controls.Add(Me.btnAddIndexM) - Me.GroupBox1.Controls.Add(Me.cmbIndex_A) Me.GroupBox1.Controls.Add(Me.cmbIndex_m) - Me.GroupBox1.Controls.Add(Me.Label3) - Me.GroupBox1.Controls.Add(Me.Label2) Me.GroupBox1.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GroupBox1.Location = New System.Drawing.Point(12, 114) + Me.GroupBox1.Location = New System.Drawing.Point(12, 124) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(237, 124) + Me.GroupBox1.Size = New System.Drawing.Size(237, 56) Me.GroupBox1.TabIndex = 2 Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "Indexe zur Auswahl:" - ' - 'btnAddIndexA - ' - Me.btnAddIndexA.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD - Me.btnAddIndexA.Location = New System.Drawing.Point(197, 89) - Me.btnAddIndexA.Name = "btnAddIndexA" - Me.btnAddIndexA.Size = New System.Drawing.Size(30, 23) - Me.btnAddIndexA.TabIndex = 5 - Me.btnAddIndexA.UseVisualStyleBackColor = True + Me.GroupBox1.Text = "Globale automatische Indexe:" ' 'btnAddIndexM ' Me.btnAddIndexM.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD - Me.btnAddIndexM.Location = New System.Drawing.Point(197, 41) + Me.btnAddIndexM.Location = New System.Drawing.Point(197, 24) Me.btnAddIndexM.Name = "btnAddIndexM" Me.btnAddIndexM.Size = New System.Drawing.Size(30, 23) Me.btnAddIndexM.TabIndex = 4 Me.btnAddIndexM.UseVisualStyleBackColor = True ' + 'cmbIndex_m + ' + Me.cmbIndex_m.DisplayMember = "DOKUMENTART_ID" + Me.cmbIndex_m.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmbIndex_m.FormattingEnabled = True + Me.cmbIndex_m.Location = New System.Drawing.Point(9, 24) + Me.cmbIndex_m.Name = "cmbIndex_m" + Me.cmbIndex_m.Size = New System.Drawing.Size(182, 25) + Me.cmbIndex_m.TabIndex = 2 + Me.cmbIndex_m.ValueMember = "DOKUMENTART_ID" + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Font = New System.Drawing.Font("Segoe UI Semibold", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label4.Location = New System.Drawing.Point(6, 58) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(87, 15) + Me.Label4.TabIndex = 7 + Me.Label4.Text = "Entität wählen:" + ' + 'cmbEntity + ' + Me.cmbEntity.DisplayMember = "GUID" + Me.cmbEntity.Font = New System.Drawing.Font("Segoe UI Semibold", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmbEntity.FormattingEnabled = True + Me.cmbEntity.Location = New System.Drawing.Point(9, 74) + Me.cmbEntity.Name = "cmbEntity" + Me.cmbEntity.Size = New System.Drawing.Size(218, 23) + Me.cmbEntity.TabIndex = 6 + Me.cmbEntity.ValueMember = "GUID" + ' + 'btnAddIndexA + ' + Me.btnAddIndexA.Enabled = False + Me.btnAddIndexA.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD + Me.btnAddIndexA.Location = New System.Drawing.Point(197, 120) + Me.btnAddIndexA.Name = "btnAddIndexA" + Me.btnAddIndexA.Size = New System.Drawing.Size(30, 23) + Me.btnAddIndexA.TabIndex = 5 + Me.btnAddIndexA.UseVisualStyleBackColor = True + ' 'cmbIndex_A ' Me.cmbIndex_A.DataSource = Me.TBDD_INDEX_AUTOMBindingSource Me.cmbIndex_A.DisplayMember = "INDEXNAME" + Me.cmbIndex_A.Enabled = False Me.cmbIndex_A.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cmbIndex_A.FormattingEnabled = True - Me.cmbIndex_A.Location = New System.Drawing.Point(9, 89) + Me.cmbIndex_A.Location = New System.Drawing.Point(9, 120) Me.cmbIndex_A.Name = "cmbIndex_A" Me.cmbIndex_A.Size = New System.Drawing.Size(182, 25) Me.cmbIndex_A.TabIndex = 3 @@ -129,36 +166,15 @@ Partial Class frmDokumentart_NameConvention Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet" Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' - 'cmbIndex_m - ' - Me.cmbIndex_m.DisplayMember = "DOKUMENTART_ID" - Me.cmbIndex_m.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cmbIndex_m.FormattingEnabled = True - Me.cmbIndex_m.Location = New System.Drawing.Point(9, 41) - Me.cmbIndex_m.Name = "cmbIndex_m" - Me.cmbIndex_m.Size = New System.Drawing.Size(182, 25) - Me.cmbIndex_m.TabIndex = 2 - Me.cmbIndex_m.ValueMember = "DOKUMENTART_ID" - ' 'Label3 ' Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(6, 69) + Me.Label3.Location = New System.Drawing.Point(6, 100) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(129, 17) + Me.Label3.Size = New System.Drawing.Size(158, 17) Me.Label3.TabIndex = 1 - Me.Label3.Text = "Automatischer Index:" - ' - 'Label2 - ' - Me.Label2.AutoSize = True - Me.Label2.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(6, 21) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(104, 17) - Me.Label2.TabIndex = 0 - Me.Label2.Text = "Manueller Index:" + Me.Label3.Text = "Control-Werte aus Entität:" ' 'GroupBox2 ' @@ -166,18 +182,27 @@ Partial Class frmDokumentart_NameConvention Me.GroupBox2.Controls.Add(Me.btnTrennzeichen) Me.GroupBox2.Controls.Add(Me.cmbDate) Me.GroupBox2.Controls.Add(Me.Label20) - Me.GroupBox2.Location = New System.Drawing.Point(255, 114) + Me.GroupBox2.Location = New System.Drawing.Point(255, 124) Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(216, 124) + Me.GroupBox2.Size = New System.Drawing.Size(216, 104) Me.GroupBox2.TabIndex = 3 Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "Variablen einfügen:" ' + 'Button1 + ' + Me.Button1.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD + Me.Button1.Location = New System.Drawing.Point(180, 72) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(30, 23) + Me.Button1.TabIndex = 13 + Me.Button1.UseVisualStyleBackColor = True + ' 'btnTrennzeichen ' Me.btnTrennzeichen.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD Me.btnTrennzeichen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnTrennzeichen.Location = New System.Drawing.Point(6, 40) + Me.btnTrennzeichen.Location = New System.Drawing.Point(6, 24) Me.btnTrennzeichen.Name = "btnTrennzeichen" Me.btnTrennzeichen.Size = New System.Drawing.Size(168, 25) Me.btnTrennzeichen.TabIndex = 6 @@ -185,10 +210,29 @@ Partial Class frmDokumentart_NameConvention Me.btnTrennzeichen.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnTrennzeichen.UseVisualStyleBackColor = True ' + 'cmbDate + ' + Me.cmbDate.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmbDate.FormattingEnabled = True + Me.cmbDate.Items.AddRange(New Object() {"YY_MM_DD", "YYYY_MM_DD", "DD_MM_YY", "DD_MM_YYYY"}) + Me.cmbDate.Location = New System.Drawing.Point(6, 72) + Me.cmbDate.Name = "cmbDate" + Me.cmbDate.Size = New System.Drawing.Size(168, 23) + Me.cmbDate.TabIndex = 12 + ' + 'Label20 + ' + Me.Label20.AutoSize = True + Me.Label20.Location = New System.Drawing.Point(3, 52) + Me.Label20.Name = "Label20" + Me.Label20.Size = New System.Drawing.Size(99, 17) + Me.Label20.TabIndex = 11 + Me.Label20.Text = "Datum-Struktur:" + ' 'btndelete ' Me.btndelete.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete - Me.btndelete.Location = New System.Drawing.Point(419, 74) + Me.btndelete.Location = New System.Drawing.Point(435, 93) Me.btndelete.Name = "btndelete" Me.btndelete.Size = New System.Drawing.Size(28, 25) Me.btndelete.TabIndex = 4 @@ -198,9 +242,9 @@ Partial Class frmDokumentart_NameConvention ' Me.btnOK.Image = Global.DD_Record_Organiser.My.Resources.Resources.save_16xLG Me.btnOK.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnOK.Location = New System.Drawing.Point(261, 244) + Me.btnOK.Location = New System.Drawing.Point(258, 306) Me.btnOK.Name = "btnOK" - Me.btnOK.Size = New System.Drawing.Size(94, 26) + Me.btnOK.Size = New System.Drawing.Size(110, 26) Me.btnOK.TabIndex = 5 Me.btnOK.Text = "Speichern" Me.btnOK.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -208,11 +252,14 @@ Partial Class frmDokumentart_NameConvention ' 'btnclose ' - Me.btnclose.Location = New System.Drawing.Point(361, 244) + Me.btnclose.Image = Global.DD_Record_Organiser.My.Resources.Resources.cancel1 + Me.btnclose.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnclose.Location = New System.Drawing.Point(374, 306) Me.btnclose.Name = "btnclose" - Me.btnclose.Size = New System.Drawing.Size(110, 26) + Me.btnclose.Size = New System.Drawing.Size(94, 26) Me.btnclose.TabIndex = 6 Me.btnclose.Text = "Abbruch" + Me.btnclose.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnclose.UseVisualStyleBackColor = True ' 'TBPMO_KONFIGURATIONBindingSource @@ -227,6 +274,7 @@ Partial Class frmDokumentart_NameConvention 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False + Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Nothing Me.TableAdapterManager.TBDD_EINGANGSARTENTableAdapter = Nothing Me.TableAdapterManager.TBDD_EMAIL_ACCOUNTTableAdapter = Nothing @@ -234,7 +282,6 @@ Partial Class frmDokumentart_NameConvention Me.TableAdapterManager.TBDD_INDEX_AUTOMTableAdapter = Me.TBDD_INDEX_AUTOMTableAdapter Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing - Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FILES_USERTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing @@ -246,6 +293,9 @@ Partial Class frmDokumentart_NameConvention Me.TableAdapterManager.TBPMO_KONFIGURATIONTableAdapter = Me.TBPMO_KONFIGURATIONTableAdapter Me.TableAdapterManager.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing Me.TableAdapterManager.TBPMO_RECORDTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_TEMPLATETableAdapter = Nothing Me.TableAdapterManager.TBPMO_WD_FVIEW_DT_INDEXTableAdapter = Nothing Me.TableAdapterManager.TBPMO_WD_OBJECTTYPETableAdapter = Nothing Me.TableAdapterManager.TBPMO_WORKFLOW_FORMTableAdapter = Nothing @@ -279,40 +329,51 @@ Partial Class frmDokumentart_NameConvention Me.FILE_DELIMITERTextBox.Size = New System.Drawing.Size(36, 18) Me.FILE_DELIMITERTextBox.TabIndex = 10 ' - 'Button1 + 'GroupBox3 ' - Me.Button1.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD - Me.Button1.Location = New System.Drawing.Point(180, 91) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(30, 23) - Me.Button1.TabIndex = 13 - Me.Button1.UseVisualStyleBackColor = True + Me.GroupBox3.Controls.Add(Me.Label5) + Me.GroupBox3.Controls.Add(Me.btnAddIndexA) + Me.GroupBox3.Controls.Add(Me.Label4) + Me.GroupBox3.Controls.Add(Me.cmbEntity) + Me.GroupBox3.Controls.Add(Me.cmbIndex_A) + Me.GroupBox3.Controls.Add(Me.Label3) + Me.GroupBox3.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.GroupBox3.Location = New System.Drawing.Point(15, 186) + Me.GroupBox3.Name = "GroupBox3" + Me.GroupBox3.Size = New System.Drawing.Size(237, 153) + Me.GroupBox3.TabIndex = 11 + Me.GroupBox3.TabStop = False + Me.GroupBox3.Text = "Entitäts-abhängige Indexe:" ' - 'cmbDate + 'Label5 ' - Me.cmbDate.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cmbDate.FormattingEnabled = True - Me.cmbDate.Items.AddRange(New Object() {"YY_MM_DD", "YYYY_MM_DD", "DD_MM_YY", "DD_MM_YYYY"}) - Me.cmbDate.Location = New System.Drawing.Point(6, 91) - Me.cmbDate.Name = "cmbDate" - Me.cmbDate.Size = New System.Drawing.Size(168, 23) - Me.cmbDate.TabIndex = 12 + Me.Label5.AutoSize = True + Me.Label5.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label5.Location = New System.Drawing.Point(6, 21) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(236, 26) + Me.Label5.TabIndex = 8 + Me.Label5.Text = "Zur Dateibenennung können Sie auch Werte aus " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "dem zur Laufzeit aktuellen Datensa" & _ + "tzes nutzen." ' - 'Label20 + 'Label6 ' - Me.Label20.AutoSize = True - Me.Label20.Location = New System.Drawing.Point(3, 69) - Me.Label20.Name = "Label20" - Me.Label20.Size = New System.Drawing.Size(99, 17) - Me.Label20.TabIndex = 11 - Me.Label20.Text = "Datum-Struktur:" + Me.Label6.AutoSize = True + Me.Label6.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label6.Location = New System.Drawing.Point(12, 73) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(177, 17) + Me.Label6.TabIndex = 12 + Me.Label6.Text = "Aktuelle Namenkonvention:" ' 'frmDokumentart_NameConvention ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 17.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(478, 278) + Me.ClientSize = New System.Drawing.Size(478, 349) Me.ControlBox = False + Me.Controls.Add(Me.Label6) + Me.Controls.Add(Me.GroupBox3) Me.Controls.Add(Me.FILE_DELIMITERTextBox) Me.Controls.Add(Me.VERSION_DELIMITERTextBox) Me.Controls.Add(Me.btnclose) @@ -327,14 +388,15 @@ Partial Class frmDokumentart_NameConvention Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.Name = "frmDokumentart_NameConvention" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Assistent zur Namenskonvention:" + Me.Text = "Assistent zur Namenskonvention/Dateibenennung:" Me.GroupBox1.ResumeLayout(False) - Me.GroupBox1.PerformLayout() CType(Me.TBDD_INDEX_AUTOMBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox2.ResumeLayout(False) Me.GroupBox2.PerformLayout() CType(Me.TBPMO_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + Me.GroupBox3.ResumeLayout(False) + Me.GroupBox3.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -349,7 +411,6 @@ Partial Class frmDokumentart_NameConvention Friend WithEvents cmbIndex_A As System.Windows.Forms.ComboBox Friend WithEvents cmbIndex_m As System.Windows.Forms.ComboBox Friend WithEvents Label3 As System.Windows.Forms.Label - Friend WithEvents Label2 As System.Windows.Forms.Label Friend WithEvents btnAddIndexA As System.Windows.Forms.Button Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox Friend WithEvents btndelete As System.Windows.Forms.Button @@ -368,4 +429,9 @@ Partial Class frmDokumentart_NameConvention Friend WithEvents Button1 As System.Windows.Forms.Button Friend WithEvents cmbDate As System.Windows.Forms.ComboBox Friend WithEvents Label20 As System.Windows.Forms.Label + Friend WithEvents Label4 As System.Windows.Forms.Label + Friend WithEvents cmbEntity As System.Windows.Forms.ComboBox + Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox + Friend WithEvents Label5 As System.Windows.Forms.Label + Friend WithEvents Label6 As System.Windows.Forms.Label End Class diff --git a/app/DD-Record-Organiser/frmDokumentart_NameConvention.resx b/app/DD-Record-Organiser/frmDokumentart_NameConvention.resx index cbc4fde..edae27d 100644 --- a/app/DD-Record-Organiser/frmDokumentart_NameConvention.resx +++ b/app/DD-Record-Organiser/frmDokumentart_NameConvention.resx @@ -120,6 +120,12 @@ 871, 17 + + 871, 17 + + + 17, 17 + 17, 17 diff --git a/app/DD-Record-Organiser/frmDokumentart_NameConvention.vb b/app/DD-Record-Organiser/frmDokumentart_NameConvention.vb index 63d65d5..ae70b89 100644 --- a/app/DD-Record-Organiser/frmDokumentart_NameConvention.vb +++ b/app/DD-Record-Organiser/frmDokumentart_NameConvention.vb @@ -1,4 +1,9 @@ Public Class frmDokumentart_NameConvention + Private DT_ENTITIES As DataTable + Private FORM_ID As Integer + Private FORM_VIEW_ID As Integer + Private TBPMO_WD_FORMVIEW_DOKTYPES_GUID As Integer + Private loaded As Boolean = False Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnAddIndexM.Click If Not Me.cmbIndex_m.Text = "" Then @@ -13,7 +18,7 @@ Private Sub btnAddIndexA_Click(sender As Object, e As EventArgs) Handles btnAddIndexA.Click If Not Me.cmbIndex_A.Text = "" Then 'AREANLAGE-[%mARENR]-[%aKurzname]-I[%Version] - Dim text As String = "[%a" & Me.cmbIndex_A.Text.ToString.ToUpper & "]" + Dim text As String = "[%a" & Me.cmbIndex_A.Text.ToString.ToUpper & "|" & cmbIndex_A.SelectedValue & "]" Dim altePosition As Integer = Me.txtnamenKonv.SelectionStart() Me.txtnamenKonv.Text = Me.txtnamenKonv.Text.Insert(altePosition, text) Me.txtnamenKonv.SelectionStart = altePosition + text.Length @@ -33,10 +38,12 @@ Me.TBPMO_KONFIGURATIONTableAdapter.Connection.ConnectionString = MyConnectionString Me.TBPMO_KONFIGURATIONTableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_KONFIGURATION) Me.TBDD_INDEX_AUTOMTableAdapter.Fill(Me.DD_DMSDataSet.TBDD_INDEX_AUTOM, frmDokumentart_Konfig.akt_DokartID) - 'Me.TBINDEX_MANTableAdapter.Fill(Me.DSDokumentart.TBINDEX_MAN, frmAdministration._aktDokID) - 'Me.TBINDEX_AUTOMTableAdapter.Fill(Me.DSDokumentart.TBINDEX_AUTOM, frmAdministration._aktDokID) - - txtnamenKonv.Text = frmDokumentart_Konfig.akt_Namenkonvention + DT_ENTITIES = ClassDatabase.Return_Datatable("select T.GUID, T.FORMVIEW_ID, T1.FORM_TITLE FROM TBPMO_WD_FORMVIEW_DOKTYPES T, TBPMO_FORM_VIEW T1 WHERE T.FORMVIEW_ID = T1.GUID AND T1.SCREEN_ID = 1 AND T.DOCTYPE_ID = " & frmDokumentart_Konfig.akt_DokartID & " ORDER BY T1.FORM_TITLE", "Load NameConventionData") + cmbEntity.DataSource = DT_ENTITIES + cmbEntity.DisplayMember = DT_ENTITIES.Columns(2).ColumnName + cmbEntity.ValueMember = DT_ENTITIES.Columns(0).ColumnName + cmbEntity.SelectedIndex = 0 + 'txtnamenKonv.Text = frmDokumentart_Konfig.akt_Namenkonvention Catch ex As Exception MsgBox("Fehler beim Laden der Grunddaten zur Dokumentart: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try @@ -50,8 +57,11 @@ End Sub Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click - frmDokumentart_Konfig.akt_Namenkonvention = txtnamenKonv.Text - Me.Close() + Dim sql = "UPDATE TBPMO_WD_FORMVIEW_DOKTYPES SET NAME_CONVENTION = '" & txtnamenKonv.Text & "', CHANGED_WHO = '" & Environment.UserName & "' WHERE GUID = " & TBPMO_WD_FORMVIEW_DOKTYPES_GUID + If ClassDatabase.Execute_non_Query(sql, True) = True Then + frmDokumentart_Konfig.akt_Namenkonvention = txtnamenKonv.Text + Me.Close() + End If End Sub Private Sub btnclose_Click(sender As Object, e As EventArgs) Handles btnclose.Click @@ -73,4 +83,48 @@ Me.txtnamenKonv.SelectionStart = altePosition + text.Length End If End Sub + + Private Sub cmbEntity_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbEntity.SelectedIndexChanged + Try + If cmbEntity.SelectedIndex <> -1 Then + TBPMO_WD_FORMVIEW_DOKTYPES_GUID = Me.cmbEntity.SelectedValue + FORM_VIEW_ID = ClassDatabase.Execute_Scalar("SELECT FORMVIEW_ID FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE GUID = " & TBPMO_WD_FORMVIEW_DOKTYPES_GUID, True) + Dim NameConv = ClassDatabase.Execute_Scalar("SELECT NAME_CONVENTION FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE GUID = " & TBPMO_WD_FORMVIEW_DOKTYPES_GUID, True) + If Not IsNothing(NameConv) Then + Me.txtnamenKonv.Text = NameConv + Load_Controls() + End If + End If + Catch ex As Exception + MsgBox("Error in cmbEntity.SelectedIndexChanged: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub + Sub Load_Controls() + If loaded = False Then Exit Sub + Try + Dim DT1 As DataTable = ClassDatabase.Return_Datatable("SELECT [CONTROL_ID] , [CONTROL_COL_NAME] AS DISPLAY FROM [VWPMO_CONTROL_SCREEN] WHERE CTRLTYPE_ID in (2,3,4) and FORM_ID = (SELECT FORM_ID FROM TBPMO_FORM_VIEW WHERE GUID = " & FORM_VIEW_ID & ")", "LoadControlsForEntity - NameConvention") + If DT1.Rows.Count >= 1 Then + cmbIndex_A.DataSource = DT1 + cmbIndex_A.DisplayMember = DT1.Columns(1).ColumnName + cmbIndex_A.ValueMember = DT1.Columns(0).ColumnName + cmbIndex_A.DroppedDown = True + cmbIndex_A.Enabled = True + btnAddIndexA.Enabled = True + Else + cmbIndex_A.Enabled = False + btnAddIndexA.Enabled = False + cmbIndex_A.DroppedDown = False + End If + + Catch ex As Exception + MsgBox("Error in Load Controls for EntitySelect: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + End Sub + + Private Sub frmDokumentart_NameConvention_Shown(sender As Object, e As EventArgs) Handles Me.Shown + loaded = True + If DT_ENTITIES.Rows.Count = 1 Then + Load_Controls() + End If + End Sub End Class \ No newline at end of file