diff --git a/app/DD-Record-Organizer/frmStatistiscsADDI.Designer.vb b/app/DD-Record-Organizer/frmStatistiscsADDI.Designer.vb index c835123..732d430 100644 --- a/app/DD-Record-Organizer/frmStatistiscsADDI.Designer.vb +++ b/app/DD-Record-Organizer/frmStatistiscsADDI.Designer.vb @@ -106,7 +106,7 @@ Partial Class frmStatistiscsADDI ' Me.XtraTabPage1.Controls.Add(Me.SplitContainerTab1) Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(1342, 703) + Me.XtraTabPage1.Size = New System.Drawing.Size(1338, 700) Me.XtraTabPage1.Text = "Logins" ' 'SplitContainerTab1 @@ -119,7 +119,7 @@ Partial Class frmStatistiscsADDI Me.SplitContainerTab1.Panel1.Text = "Panel1" Me.SplitContainerTab1.Panel2.Controls.Add(Me.SplitContainerBottom) Me.SplitContainerTab1.Panel2.Text = "Panel2" - Me.SplitContainerTab1.Size = New System.Drawing.Size(1342, 703) + Me.SplitContainerTab1.Size = New System.Drawing.Size(1338, 700) Me.SplitContainerTab1.SplitterPosition = 390 Me.SplitContainerTab1.TabIndex = 4 Me.SplitContainerTab1.Text = "SplitContainerControl1" @@ -132,7 +132,7 @@ Partial Class frmStatistiscsADDI Me.SplitContainerTop.Panel1.Controls.Add(Me.GroupBox1) Me.SplitContainerTop.Panel1.Text = "Panel1" Me.SplitContainerTop.Panel2.Text = "Panel2" - Me.SplitContainerTop.Size = New System.Drawing.Size(1342, 390) + Me.SplitContainerTop.Size = New System.Drawing.Size(1338, 390) Me.SplitContainerTop.SplitterPosition = 763 Me.SplitContainerTop.TabIndex = 6 Me.SplitContainerTop.Text = "SplitContainerControl2" @@ -301,7 +301,7 @@ Partial Class frmStatistiscsADDI Me.SplitContainerBottom.Name = "SplitContainerBottom" Me.SplitContainerBottom.Panel1.Text = "Panel1" Me.SplitContainerBottom.Panel2.Text = "Panel2" - Me.SplitContainerBottom.Size = New System.Drawing.Size(1342, 301) + Me.SplitContainerBottom.Size = New System.Drawing.Size(1338, 305) Me.SplitContainerBottom.SplitterPosition = 629 Me.SplitContainerBottom.TabIndex = 0 Me.SplitContainerBottom.Text = "SplitContainerControl2" @@ -310,7 +310,7 @@ Partial Class frmStatistiscsADDI ' Me.XtraTabPage2.Controls.Add(Me.SplitContainerControl1) Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(1342, 703) + Me.XtraTabPage2.Size = New System.Drawing.Size(1338, 700) Me.XtraTabPage2.Text = "Weitere" ' 'SplitContainerControl1 @@ -323,7 +323,7 @@ Partial Class frmStatistiscsADDI Me.SplitContainerControl1.Panel1.Controls.Add(Me.ToolStrip1) Me.SplitContainerControl1.Panel1.Text = "Panel1" Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(1342, 703) + Me.SplitContainerControl1.Size = New System.Drawing.Size(1338, 700) Me.SplitContainerControl1.SplitterPosition = 383 Me.SplitContainerControl1.TabIndex = 0 Me.SplitContainerControl1.Text = "SplitContainerControl1" @@ -337,7 +337,7 @@ Partial Class frmStatistiscsADDI Me.GridControl2.Location = New System.Drawing.Point(0, 25) Me.GridControl2.MainView = Me.GridViewLogEssentials Me.GridControl2.Name = "GridControl2" - Me.GridControl2.Size = New System.Drawing.Size(1342, 358) + Me.GridControl2.Size = New System.Drawing.Size(1338, 358) Me.GridControl2.TabIndex = 4 Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewLogEssentials}) ' @@ -436,7 +436,7 @@ Partial Class frmStatistiscsADDI Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblEssential, Me.ToolStripSeparator1, Me.ToolStripButton1, Me.ToolStripButton2}) Me.ToolStrip1.Location = New System.Drawing.Point(0, 0) Me.ToolStrip1.Name = "ToolStrip1" - Me.ToolStrip1.Size = New System.Drawing.Size(1342, 25) + Me.ToolStrip1.Size = New System.Drawing.Size(1338, 25) Me.ToolStrip1.TabIndex = 0 Me.ToolStrip1.Text = "ToolStrip1" ' @@ -454,7 +454,7 @@ Partial Class frmStatistiscsADDI ' 'ToolStripButton1 ' - Me.ToolStripButton1.Image = CType(resources.GetObject("ToolStripButton1.Image"), System.Drawing.Image) + Me.ToolStripButton1.Image = Global.DD_Record_Organizer.My.Resources.Resources.action_Cancel_16xLG Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton1.Name = "ToolStripButton1" Me.ToolStripButton1.Size = New System.Drawing.Size(137, 22) @@ -463,11 +463,11 @@ Partial Class frmStatistiscsADDI 'ToolStripButton2 ' Me.ToolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right - Me.ToolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text - Me.ToolStripButton2.Image = CType(resources.GetObject("ToolStripButton2.Image"), System.Drawing.Image) + Me.ToolStripButton2.Image = Global.DD_Record_Organizer.My.Resources.Resources.CheckBox_669 + Me.ToolStripButton2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton2.Name = "ToolStripButton2" - Me.ToolStripButton2.Size = New System.Drawing.Size(124, 22) + Me.ToolStripButton2.Size = New System.Drawing.Size(140, 22) Me.ToolStripButton2.Text = "Select all visible Rows" ' 'VWDD_LOGIN_USER_HISTORYTableAdapter @@ -479,6 +479,7 @@ Partial Class frmStatistiscsADDI Me.TableAdapterManager.BackupDataSetBeforeUpdate = False Me.TableAdapterManager.Connection = Nothing Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter = Nothing Me.TableAdapterManager.TBPMO_DOCSEARCH_RESULTLIST_CONFIGTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTORTableAdapter = Nothing diff --git a/app/DD-Record-Organizer/frmStatistiscsADDI.resx b/app/DD-Record-Organizer/frmStatistiscsADDI.resx index eb31162..da3c8ab 100644 --- a/app/DD-Record-Organizer/frmStatistiscsADDI.resx +++ b/app/DD-Record-Organizer/frmStatistiscsADDI.resx @@ -132,30 +132,6 @@ 911, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABzSURBVDhPrY6xDYAwDASZLVOFOixJGAJo3AZ9JCNkxRiH - FFdYr7/3RETlD1UQQuhivODYz0+4BXndap7SUm+3AEXkEOF2CeQ6cAnkOngVxDjfhda6KXiWWuumAHAR - yHXAmSrgL4BcB5ypAgtV4GWcoB8qF+Ss567lqRSWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - 448, 17 @@ -165,6 +141,7 @@ 17, 56 + AAABAAwAAAAQAAEABACCIAAAxgAAADAwEAABAAQAaAYAAEghAAAgIBAAAQAEAOgCAACwJwAAGBgQAAEA diff --git a/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.Designer.vb b/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.Designer.vb index d132946..eb42d3d 100644 --- a/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.Designer.vb +++ b/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.Designer.vb @@ -32,6 +32,7 @@ Partial Class frmWD_ObjecttypeConfig Dim CHANGED_WHENLabel As System.Windows.Forms.Label Dim Label4 As System.Windows.Forms.Label Dim Label2 As System.Windows.Forms.Label + Dim Label3 As System.Windows.Forms.Label Me.Label1 = New System.Windows.Forms.Label() Me.DD_DMSDataSet = New DD_Record_Organizer.DD_DMSDataSet() Me.TBPMO_WD_OBJECTTYPEBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -68,6 +69,7 @@ Partial Class frmWD_ObjecttypeConfig CHANGED_WHENLabel = New System.Windows.Forms.Label() Label4 = New System.Windows.Forms.Label() Label2 = New System.Windows.Forms.Label() + Label3 = New System.Windows.Forms.Label() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPMO_WD_OBJECTTYPEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPMO_WD_OBJECTTYPEBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit() @@ -109,6 +111,11 @@ Partial Class frmWD_ObjecttypeConfig resources.ApplyResources(Label4, "Label4") Label4.Name = "Label4" ' + 'Label2 + ' + resources.ApplyResources(Label2, "Label2") + Label2.Name = "Label2" + ' 'Label1 ' resources.ApplyResources(Me.Label1, "Label1") @@ -307,20 +314,22 @@ Partial Class frmWD_ObjecttypeConfig ' 'cmbADDIRelIdx ' + Me.cmbADDIRelIdx.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_WD_OBJECTTYPEBindingSource, "IDXNAME_RELATION", True)) Me.cmbADDIRelIdx.FormattingEnabled = True resources.ApplyResources(Me.cmbADDIRelIdx, "cmbADDIRelIdx") Me.cmbADDIRelIdx.Name = "cmbADDIRelIdx" ' 'cmbDoctype ' + Me.cmbDoctype.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_WD_OBJECTTYPEBindingSource, "IDXNAME_DOCTYPE", True)) Me.cmbDoctype.FormattingEnabled = True resources.ApplyResources(Me.cmbDoctype, "cmbDoctype") Me.cmbDoctype.Name = "cmbDoctype" ' - 'Label2 + 'Label3 ' - resources.ApplyResources(Label2, "Label2") - Label2.Name = "Label2" + resources.ApplyResources(Label3, "Label3") + Label3.Name = "Label3" ' 'frmWD_ObjecttypeConfig ' @@ -334,6 +343,7 @@ Partial Class frmWD_ObjecttypeConfig Me.Controls.Add(Me.lblSaveDokart) Me.Controls.Add(GUIDLabel) Me.Controls.Add(Me.GUIDTextBox) + Me.Controls.Add(Label3) Me.Controls.Add(OBJECT_TYPELabel) Me.Controls.Add(Me.OBJECT_TYPEComboBox) Me.Controls.Add(ADDED_WHOLabel) diff --git a/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.resx b/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.resx index e745eeb..f46d1b3 100644 --- a/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.resx +++ b/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.resx @@ -180,7 +180,7 @@ $this - 8 + 9 False @@ -213,7 +213,7 @@ $this - 10 + 11 False @@ -246,7 +246,7 @@ $this - 12 + 13 False @@ -279,7 +279,7 @@ $this - 14 + 15 False @@ -312,7 +312,7 @@ $this - 16 + 17 False @@ -348,6 +348,39 @@ 3 + + False + + + True + + + NoControl + + + 274, 102 + + + 173, 17 + + + 87 + + + Indexname für Dokumentart: + + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + True @@ -376,7 +409,7 @@ $this - 19 + 20 17, 17 @@ -579,7 +612,7 @@ $this - 18 + 19 False @@ -627,7 +660,7 @@ $this - 9 + 10 False @@ -654,7 +687,7 @@ $this - 11 + 12 False @@ -681,7 +714,7 @@ $this - 13 + 14 False @@ -708,7 +741,7 @@ $this - 15 + 16 False @@ -735,7 +768,7 @@ $this - 17 + 18 True @@ -839,38 +872,38 @@ 0 - + False - + True - + NoControl - - 274, 102 + + 522, 54 - - 173, 17 + + 161, 17 - - 87 + + 4 - - Indexname für Dokumentart: + + Konfigurierte Objekttypen: - - Label2 + + Label3 - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 1 + + 8 True diff --git a/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.vb b/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.vb index e69e931..5fac549 100644 --- a/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.vb +++ b/app/DD-Record-Organizer/frmWD_ObjecttypeConfig.vb @@ -1,4 +1,8 @@ Imports DD_LIB_Standards +Imports DevExpress.Data.Helpers +Imports DevExpress.XtraEditors +Imports DevExpress.XtraEditors.Controls + Public Class frmWD_ObjecttypeConfig Private Shared _Instance As frmWD_ObjecttypeConfig = Nothing @@ -12,40 +16,42 @@ Public Class frmWD_ObjecttypeConfig Private Sub TBPMO_WD_OBJECTTYPEBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Handles TBPMO_WD_OBJECTTYPEBindingNavigatorSaveItem.Click Save_ObjecttypeKonfig() End Sub - Sub Save_ObjecttypeKonfig() + Private Sub Save_ObjecttypeKonfig() Try - Me.TBPMO_WD_OBJECTTYPEBindingSource.EndEdit() - If DD_DMSDataSet.TBPMO_WD_OBJECTTYPE.GetChanges Is Nothing = False Then - Me.CHANGED_WHOTextBox.Text = USER_USERNAME - Me.TBPMO_WD_OBJECTTYPEBindingSource.EndEdit() - Me.TBPMO_WD_OBJECTTYPETableAdapter.Update(Me.DD_DMSDataSet.TBPMO_WD_OBJECTTYPE) - Me.lblSaveDokart.Visible = True + TBPMO_WD_OBJECTTYPEBindingSource.EndEdit() + + If IsNothing(DD_DMSDataSet.TBPMO_WD_OBJECTTYPE.GetChanges()) = False Then + CHANGED_WHOTextBox.Text = USER_USERNAME + TBPMO_WD_OBJECTTYPEBindingSource.EndEdit() + TBPMO_WD_OBJECTTYPETableAdapter.Update(DD_DMSDataSet.TBPMO_WD_OBJECTTYPE) + lblSaveDokart.Visible = True Else - Me.lblSaveDokart.Visible = False + lblSaveDokart.Visible = False End If Catch ex As Exception MsgBox("Error in Save Objecttype-Config:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try End Sub Private Sub frmObjecttypeConfig_Load(sender As Object, e As EventArgs) Handles MyBase.Load - 'TODO: Diese Codezeile lädt Daten in die Tabelle "DD_DMSDataSet.TBPMO_WD_OBJECTTYPE". Sie können sie bei Bedarf verschieben oder entfernen. Try TBPMO_WD_OBJECTTYPETableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBPMO_WD_OBJECTTYPETableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_WD_OBJECTTYPE) + TBPMO_WD_OBJECTTYPETableAdapter.Fill(DD_DMSDataSet.TBPMO_WD_OBJECTTYPE) + + LoadObjectTypes() + LoadIndices() Catch ex As Exception MsgBox("Error loading Form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try - End Sub - Private Sub ObjektTypenEintragen() + Private Sub LoadObjectTypes() Try Dim oDokumentTyp As WINDREAMLib.WMObject ' Combobox leeren - Me.OBJECT_TYPEComboBox.Items.Clear() + OBJECT_TYPEComboBox.Items.Clear() ' alle Objekttypen durchlaufen For Each oDokumentTyp In clsWD_GET.GetObjecttypesAsObjects ' und in die Combobox eintragen - Me.OBJECT_TYPEComboBox.Items.Add(oDokumentTyp.aName) + OBJECT_TYPEComboBox.Items.Add(oDokumentTyp.aName) Next Catch ex As Exception MsgBox("Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Fehler beim Eintragen der Objekttypen") @@ -54,43 +60,59 @@ Public Class frmWD_ObjecttypeConfig End Sub Private Sub OBJECT_TYPEComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles OBJECT_TYPEComboBox.SelectedIndexChanged - load_Indices() + LoadIndices() + + ' Doctype Combobox Text leeren wenn der aktuell ausgewählte Index nicht im aktuellen Objekttyp vorhanden ist + If ComboboxContains(cmbDoctype, cmbDoctype.Text) = False Then + cmbDoctype.Text = String.Empty + End If + + ' Relation Combobox Text leeren wenn der aktuell ausgewählte Index nicht im aktuellen Objekttyp vorhanden ist + If ComboboxContains(cmbADDIRelIdx, cmbADDIRelIdx.Text) = False Then + cmbADDIRelIdx.Text = String.Empty + End If End Sub - Sub load_Indices() + + Private Function ComboboxContains(combobox As System.Windows.Forms.ComboBox, toFind As String) Try - If Me.OBJECT_TYPEComboBox.SelectedIndex <> -1 Then - 'Me.IDXNAME_ENTITYIDComboBox.Items.Clear() - 'Me.IDXNAME_PARENTIDComboBox.Items.Clear() - Me.cmbDoctype.Items.Clear() - 'Me.cmbRecordIndex.Items.Clear() - Me.cmbADDIRelIdx.Items.Clear() + Dim found = False + + For Each item As String In combobox.Items + If item = toFind Then + found = True + End If + Next + + Return found + Catch ex As Exception + MsgBox("Error in ComboboxContains: " & ex.Message, MsgBoxStyle.Exclamation) + Return False + End Try + End Function + + Private Sub LoadIndices() + Try + If OBJECT_TYPEComboBox.Text.Count > 0 Then + cmbDoctype.Items.Clear() + cmbADDIRelIdx.Items.Clear() Dim indexe = clsWD_GET.GetIndicesByObjecttype(OBJECT_TYPEComboBox.Text) If indexe IsNot Nothing Then For Each index As String In indexe - 'Me.IDXNAME_ENTITYIDComboBox.Items.Add(index) - 'Me.IDXNAME_PARENTIDComboBox.Items.Add(index) - Me.cmbDoctype.Items.Add(index) - 'Me.cmbRecordIndex.Items.Add(index) - Me.cmbADDIRelIdx.Items.Add(index) + cmbDoctype.Items.Add(index) + cmbADDIRelIdx.Items.Add(index) Next End If End If Catch ex As Exception - MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in OBJECT_TYPEComboBox.SelectedIndexChanged: ") + MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in LoadIndices: ") End Try End Sub - Private Sub TBPMO_WD_OBJECTTYPEBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPMO_WD_OBJECTTYPEBindingSource.AddingNew + Private Sub TBPMO_WD_OBJECTTYPEBindingSource_AddingNew(sender As Object, e As ComponentModel.AddingNewEventArgs) Handles TBPMO_WD_OBJECTTYPEBindingSource.AddingNew Try - Me.DD_DMSDataSet.TBPMO_WD_OBJECTTYPE.ADDED_WHOColumn.DefaultValue = USER_USERNAME + DD_DMSDataSet.TBPMO_WD_OBJECTTYPE.ADDED_WHOColumn.DefaultValue = USER_USERNAME Catch ex As Exception MsgBox("Error in Save Objecttype-Config:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try - - End Sub - - Private Sub frmObjecttypeConfig_Shown(sender As Object, e As EventArgs) Handles Me.Shown - ObjektTypenEintragen() - load_Indices() End Sub End Class \ No newline at end of file