MS_09.11.2015

2015-11-09 15:51:25 +01:00 · 2015-11-09 15:51:25 +01:00 · 42e4df1a5e
commit 42e4df1a5e
parent 861e6b82e0
3 changed files with 68 additions and 58 deletions
--- a/app/DD-Record-Organiser/ClassControlBuilder.vb
+++ b/app/DD-Record-Organiser/ClassControlBuilder.vb
@ -1032,8 +1032,8 @@ Public Class ClassControlBuilder
        AddHandler itemAdd.Click, AddressOf itemAdd_Click
        AddHandler itemDel.Click, AddressOf itemDel_Click
        AddHandler itemSave.Click, AddressOf itemSave_Click
-
-        If read_only Then
+        'Nur bei ReadOnly alle Auswahlmöglichkeiten
+        If read_only = False Then
            ctx.Items.Add(itemAdd)
            ctx.Items.Add(itemDel)
        End If
--- a/app/DD-Record-Organiser/XtraForm2.Designer.vb
+++ b/app/DD-Record-Organiser/XtraForm2.Designer.vb
@ -45,6 +45,10 @@ Partial Class XtraForm2
        Me.TileViewColumn3 = New DevExpress.XtraGrid.Columns.TileViewColumn()
        Me.grvwGrid = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.LayoutViewCard1 = New DevExpress.XtraGrid.Views.Layout.LayoutViewCard()
+        Me.colAktenzeichen = New DevExpress.XtraGrid.Columns.TileViewColumn()
+        Me.TileViewColumn5 = New DevExpress.XtraGrid.Columns.TileViewColumn()
+        Me.colTagderEintragungimRegister = New DevExpress.XtraGrid.Columns.TileViewColumn()
+        Me.colAktenzustand = New DevExpress.XtraGrid.Columns.TileViewColumn()
        Me.navPane = New DevExpress.XtraBars.Navigation.TileNavPane()
        Me.btn_home = New DevExpress.XtraBars.Navigation.NavButton()
        Me.btn_Refresh = New DevExpress.XtraBars.Navigation.NavButton()
@ -59,19 +63,16 @@ Partial Class XtraForm2
        Me.TileView1 = New DevExpress.XtraGrid.Views.Tile.TileView()
        Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
        Me.GridControl2 = New DevExpress.XtraGrid.GridControl()
+        Me.VWTEMPQUICKVIEWBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin()
        Me.TileView2 = New DevExpress.XtraGrid.Views.Tile.TileView()
+        Me.TileViewColumn4 = New DevExpress.XtraGrid.Columns.TileViewColumn()
        Me.SplitContainer_Main = New DevExpress.XtraEditors.SplitContainerControl()
        Me.SplitContainer_Top = New DevExpress.XtraEditors.SplitContainerControl()
        Me.SplitContainer_Bottom = New DevExpress.XtraEditors.SplitContainerControl()
-        Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin()
-        Me.VWTEMPQUICKVIEWBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.VWTEMPQUICKVIEWTableAdapter = New DD_Record_Organiser.DD_ECMAdminTableAdapters.VWTEMPQUICKVIEWTableAdapter()
        Me.TableAdapterManager = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager()
-        Me.TileViewColumn4 = New DevExpress.XtraGrid.Columns.TileViewColumn()
-        Me.colAktenzeichen = New DevExpress.XtraGrid.Columns.TileViewColumn()
-        Me.TileViewColumn5 = New DevExpress.XtraGrid.Columns.TileViewColumn()
-        Me.colTagderEintragungimRegister = New DevExpress.XtraGrid.Columns.TileViewColumn()
-        Me.colAktenzustand = New DevExpress.XtraGrid.Columns.TileViewColumn()
+        Me.TileViewColumn6 = New DevExpress.XtraGrid.Columns.TileViewColumn()
        CType(Me.grvwCarousel, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridControlSelection, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.ContextMenu_GridControlSelection.SuspendLayout()
@ -87,6 +88,8 @@ Partial Class XtraForm2
        CType(Me.TileView1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.XtraTabPage2.SuspendLayout()
        CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.VWTEMPQUICKVIEWBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TileView2, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.SplitContainer_Main, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainer_Main.SuspendLayout()
@ -94,8 +97,6 @@ Partial Class XtraForm2
        Me.SplitContainer_Top.SuspendLayout()
        CType(Me.SplitContainer_Bottom, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainer_Bottom.SuspendLayout()
-        CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.VWTEMPQUICKVIEWBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'grvwCarousel
@ -220,6 +221,34 @@ Partial Class XtraForm2
        Me.LayoutViewCard1.ExpandButtonLocation = DevExpress.Utils.GroupElementLocation.AfterText
        Me.LayoutViewCard1.Name = "LayoutViewCard1"
        '
+        'colAktenzeichen
+        '
+        Me.colAktenzeichen.FieldName = "Aktenzeichen"
+        Me.colAktenzeichen.Name = "colAktenzeichen"
+        Me.colAktenzeichen.Visible = True
+        Me.colAktenzeichen.VisibleIndex = 1
+        '
+        'TileViewColumn5
+        '
+        Me.TileViewColumn5.FieldName = "Wiedergabe der Marke (Bild)"
+        Me.TileViewColumn5.Name = "TileViewColumn5"
+        Me.TileViewColumn5.Visible = True
+        Me.TileViewColumn5.VisibleIndex = 2
+        '
+        'colTagderEintragungimRegister
+        '
+        Me.colTagderEintragungimRegister.FieldName = "Tag der Eintragung im Register"
+        Me.colTagderEintragungimRegister.Name = "colTagderEintragungimRegister"
+        Me.colTagderEintragungimRegister.Visible = True
+        Me.colTagderEintragungimRegister.VisibleIndex = 3
+        '
+        'colAktenzustand
+        '
+        Me.colAktenzustand.FieldName = "Aktenzustand"
+        Me.colAktenzustand.Name = "colAktenzustand"
+        Me.colAktenzustand.Visible = True
+        Me.colAktenzustand.VisibleIndex = 4
+        '
        'navPane
        '
        Me.navPane.ButtonPadding = New System.Windows.Forms.Padding(12)
@ -292,6 +321,7 @@ Partial Class XtraForm2
        '
        'XtraTabControl1
        '
+        Me.XtraTabControl1.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.[True]
        Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0)
        Me.XtraTabControl1.Name = "XtraTabControl1"
@ -344,11 +374,21 @@ Partial Class XtraForm2
        Me.GridControl2.TabIndex = 0
        Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.TileView2})
        '
+        'VWTEMPQUICKVIEWBindingSource
+        '
+        Me.VWTEMPQUICKVIEWBindingSource.DataMember = "VWTEMPQUICKVIEW"
+        Me.VWTEMPQUICKVIEWBindingSource.DataSource = Me.DD_ECMAdmin
+        '
+        'DD_ECMAdmin
+        '
+        Me.DD_ECMAdmin.DataSetName = "DD_ECMAdmin"
+        Me.DD_ECMAdmin.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
+        '
        'TileView2
        '
        Me.TileView2.AppearanceItem.Normal.Font = New System.Drawing.Font("Segoe UI Semibold", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.TileView2.AppearanceItem.Normal.Options.UseFont = True
-        Me.TileView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.TileViewColumn4, Me.colAktenzeichen, Me.TileViewColumn5, Me.colTagderEintragungimRegister, Me.colAktenzustand})
+        Me.TileView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.TileViewColumn4, Me.colAktenzeichen, Me.TileViewColumn5, Me.colTagderEintragungimRegister, Me.colAktenzustand, Me.TileViewColumn6})
        Me.TileView2.ColumnSet.GroupColumn = Me.colAktenzustand
        Me.TileView2.GridControl = Me.GridControl2
        Me.TileView2.GroupCount = 1
@ -383,6 +423,13 @@ Partial Class XtraForm2
        Me.TileView2.TileTemplate.Add(TileViewItemElement7)
        Me.TileView2.ViewCaption = "dfsdfsdf"
        '
+        'TileViewColumn4
+        '
+        Me.TileViewColumn4.FieldName = "Record-ID"
+        Me.TileViewColumn4.Name = "TileViewColumn4"
+        Me.TileViewColumn4.Visible = True
+        Me.TileViewColumn4.VisibleIndex = 0
+        '
        'SplitContainer_Main
        '
        Me.SplitContainer_Main.Dock = System.Windows.Forms.DockStyle.Fill
@ -426,16 +473,6 @@ Partial Class XtraForm2
        Me.SplitContainer_Bottom.TabIndex = 0
        Me.SplitContainer_Bottom.Text = "SplitContainerControl1"
        '
-        'DD_ECMAdmin
-        '
-        Me.DD_ECMAdmin.DataSetName = "DD_ECMAdmin"
-        Me.DD_ECMAdmin.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
-        '
-        'VWTEMPQUICKVIEWBindingSource
-        '
-        Me.VWTEMPQUICKVIEWBindingSource.DataMember = "VWTEMPQUICKVIEW"
-        Me.VWTEMPQUICKVIEWBindingSource.DataSource = Me.DD_ECMAdmin
-        '
        'VWTEMPQUICKVIEWTableAdapter
        '
        Me.VWTEMPQUICKVIEWTableAdapter.ClearBeforeFill = True
@ -449,40 +486,12 @@ Partial Class XtraForm2
        Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTORTableAdapter = Nothing
        Me.TableAdapterManager.UpdateOrder = DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
        '
-        'TileViewColumn4
+        'TileViewColumn6
        '
-        Me.TileViewColumn4.FieldName = "Record-ID"
-        Me.TileViewColumn4.Name = "TileViewColumn4"
-        Me.TileViewColumn4.Visible = True
-        Me.TileViewColumn4.VisibleIndex = 0
-        '
-        'colAktenzeichen
-        '
-        Me.colAktenzeichen.FieldName = "Aktenzeichen"
-        Me.colAktenzeichen.Name = "colAktenzeichen"
-        Me.colAktenzeichen.Visible = True
-        Me.colAktenzeichen.VisibleIndex = 1
-        '
-        'TileViewColumn5
-        '
-        Me.TileViewColumn5.FieldName = "Wiedergabe der Marke (Bild)"
-        Me.TileViewColumn5.Name = "TileViewColumn5"
-        Me.TileViewColumn5.Visible = True
-        Me.TileViewColumn5.VisibleIndex = 2
-        '
-        'colTagderEintragungimRegister
-        '
-        Me.colTagderEintragungimRegister.FieldName = "Tag der Eintragung im Register"
-        Me.colTagderEintragungimRegister.Name = "colTagderEintragungimRegister"
-        Me.colTagderEintragungimRegister.Visible = True
-        Me.colTagderEintragungimRegister.VisibleIndex = 3
-        '
-        'colAktenzustand
-        '
-        Me.colAktenzustand.FieldName = "Aktenzustand"
-        Me.colAktenzustand.Name = "colAktenzustand"
-        Me.colAktenzustand.Visible = True
-        Me.colAktenzustand.VisibleIndex = 4
+        Me.TileViewColumn6.FieldName = "Record-ID"
+        Me.TileViewColumn6.Name = "TileViewColumn6"
+        Me.TileViewColumn6.Visible = True
+        Me.TileViewColumn6.VisibleIndex = 5
        '
        'XtraForm2
        '
@ -510,6 +519,8 @@ Partial Class XtraForm2
        CType(Me.TileView1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.XtraTabPage2.ResumeLayout(False)
        CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.VWTEMPQUICKVIEWBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TileView2, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.SplitContainer_Main, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainer_Main.ResumeLayout(False)
@ -517,8 +528,6 @@ Partial Class XtraForm2
        Me.SplitContainer_Top.ResumeLayout(False)
        CType(Me.SplitContainer_Bottom, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainer_Bottom.ResumeLayout(False)
-        CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.VWTEMPQUICKVIEWBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@ -565,4 +574,5 @@ Partial Class XtraForm2
    Friend WithEvents TileViewColumn5 As DevExpress.XtraGrid.Columns.TileViewColumn
    Friend WithEvents colTagderEintragungimRegister As DevExpress.XtraGrid.Columns.TileViewColumn
    Friend WithEvents colAktenzustand As DevExpress.XtraGrid.Columns.TileViewColumn
+    Friend WithEvents TileViewColumn6 As DevExpress.XtraGrid.Columns.TileViewColumn
 End Class
--- a/app/DD-Record-Organiser/frmConstructorDesigner.vb
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.vb
@ -446,7 +446,7 @@ Public Class frmConstructorDesigner
            Try
                Dim i = listBoxControls.SelectedValue
                If Not IsNothing(i) Then
-                    Dim insert = "INSERT INTO TBPMO_FORM_CONSTR_QUICK_DISPLAY (CONSTRUCT_ID, CONTROL_ID,ADDED_WHO) VALUES (" & SELECTED_CONSTRUCTOR_DETAIL_ID & ", " & i & ",'" & Environment.UserName & "')"
+                    Dim insert = "INSERT INTO TBPMO_FORM_CONSTR_QUICK_DISPLAY (CONSTRUCT_ID, CONTROL_ID,PICTURE,ADDED_WHO) VALUES (" & SELECTED_CONSTRUCTOR_DETAIL_ID & ", " & i & ",1,'" & Environment.UserName & "')"
                    If ClassDatabase.Execute_non_Query(insert, True) Then
                        Load_QuickDisplay()
                        lblQuickViewAdded.Visible = True