Merge branch 'master' of http://scmadmin@172.24.11.74:90/scm/git/record_organizer

app/DD-Record-Organiser/XtraForm2.Designer.vb

@@ -72,7 +72,6 @@ Partial Class XtraForm2
         Me.SplitContainer_Bottom = New DevExpress.XtraEditors.SplitContainerControl()
         Me.VWTEMPQUICKVIEWTableAdapter = New DD_Record_Organiser.DD_ECMAdminTableAdapters.VWTEMPQUICKVIEWTableAdapter()
         Me.TableAdapterManager = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager()
-        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()
@@ -174,10 +173,13 @@ Partial Class XtraForm2
         Me.grvwTiles.GridControl = Me.GridControlSelection
         Me.grvwTiles.Name = "grvwTiles"
         TileViewItemElement1.Column = Me.TileViewColumn1
+        TileViewItemElement1.ImageBorderColor = System.Drawing.Color.Empty
         TileViewItemElement1.Text = "element1"
         TileViewItemElement2.Column = Me.TileViewColumn2
+        TileViewItemElement2.ImageBorderColor = System.Drawing.Color.Empty
         TileViewItemElement2.Text = "element2"
         TileViewItemElement3.Column = Me.TileViewColumn3
+        TileViewItemElement3.ImageBorderColor = System.Drawing.Color.Empty
         TileViewItemElement3.Text = "element3"
         Me.grvwTiles.TileTemplate.Add(TileViewItemElement1)
         Me.grvwTiles.TileTemplate.Add(TileViewItemElement2)
@@ -321,7 +323,6 @@ 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"
@@ -353,8 +354,7 @@ Partial Class XtraForm2
         Me.TileView1.Name = "TileView1"
         Me.TileView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
         Me.TileView1.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
-        Me.TileView1.OptionsFind.AlwaysVisible = True
+        Me.TileView1.OptionsTiles.RowCount = 3
-        Me.TileView1.OptionsTiles.RowCount = 2
         '
         'XtraTabPage2
         '
@@ -388,7 +388,7 @@ Partial Class XtraForm2
         '
         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.TileViewColumn6})
+        Me.TileView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.TileViewColumn4, Me.colAktenzeichen, Me.TileViewColumn5, Me.colTagderEintragungimRegister, Me.colAktenzustand})
         Me.TileView2.ColumnSet.GroupColumn = Me.colAktenzustand
         Me.TileView2.GridControl = Me.GridControl2
         Me.TileView2.GroupCount = 1
@@ -403,19 +403,23 @@ Partial Class XtraForm2
         TileViewItemElement4.Appearance.Normal.Options.UseFont = True
         TileViewItemElement4.Appearance.Normal.Options.UseForeColor = True
         TileViewItemElement4.Column = Me.colAktenzeichen
+        TileViewItemElement4.ImageBorderColor = System.Drawing.Color.Empty
         TileViewItemElement4.Text = "colAktenzeichen"
         TileViewItemElement4.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual
         TileViewItemElement4.TextLocation = New System.Drawing.Point(120, 0)
         TileViewItemElement5.Column = Me.TileViewColumn5
         TileViewItemElement5.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft
         TileViewItemElement5.ImageBorder = DevExpress.XtraEditors.TileItemElementImageBorderMode.None
+        TileViewItemElement5.ImageBorderColor = System.Drawing.Color.Empty
         TileViewItemElement5.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside
         TileViewItemElement5.Text = "TileViewColumn5"
         TileViewItemElement6.Column = Me.colTagderEintragungimRegister
+        TileViewItemElement6.ImageBorderColor = System.Drawing.Color.Empty
         TileViewItemElement6.Text = "colTagderEintragungimRegister"
         TileViewItemElement6.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual
         TileViewItemElement6.TextLocation = New System.Drawing.Point(120, 20)
         TileViewItemElement7.Column = Me.colAktenzustand
+        TileViewItemElement7.ImageBorderColor = System.Drawing.Color.Empty
         TileViewItemElement7.Text = "colAktenzustand"
         Me.TileView2.TileTemplate.Add(TileViewItemElement4)
         Me.TileView2.TileTemplate.Add(TileViewItemElement5)
@@ -486,13 +490,6 @@ Partial Class XtraForm2
         Me.TableAdapterManager.TBPMO_FORM_CONSTRUCTORTableAdapter = Nothing
         Me.TableAdapterManager.UpdateOrder = DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
         '
-        'TileViewColumn6
-        '
-        Me.TileViewColumn6.FieldName = "Record-ID"
-        Me.TileViewColumn6.Name = "TileViewColumn6"
-        Me.TileViewColumn6.Visible = True
-        Me.TileViewColumn6.VisibleIndex = 5
-        '
         'XtraForm2
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -574,5 +571,4 @@ 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

app/DD-Record-Organiser/XtraForm2.vb

@@ -585,35 +585,144 @@ Public Class XtraForm2
         CreateTile()
     End Sub
     Sub CreateTile()
-
+        Dim HasImages As Boolean = False
-        Dim PictureIndex = 99
+        Dim ImageIndex As Integer = -1
-        Dim DT = DirectCast(DT_SELECTION, DataTable)
         Dim i As Integer = 0
-        For Each Column As DataColumn In DT.Columns
+        Dim j As Integer = 0
-            If Column.DataType.ToString.Contains("Byte") Then
+        Dim DT As DataTable = DirectCast(DT_SELECTION, DataTable)
-                PictureIndex = i
+        Dim Elements As New List(Of TileViewItemElement)
-            End If
+
-            i += 1
+        Dim PrimaryFont As New Font("Segoe UI", 11)
-        Next
+        Dim SecondaryFont As New Font("Segoe UI", 9)
-        GridControl1.DataSource = DT
-        'Das BackgroundImage setzen
-        TileView1.ColumnSet.BackgroundImageColumn = TileView1.Columns(PictureIndex) '"Image")
-        TileView1.OptionsTiles.ItemBackgroundImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft
-        TileView1.OptionsTiles.ItemBackgroundImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside
 
-        TileView1.OptionsTiles.Orientation = Orientation.Horizontal
         'Anpassung der Eigenschaften
+        TileView1.OptionsTiles.Orientation = Orientation.Horizontal
         TileView1.AppearanceItem.Normal.ForeColor = Color.Maroon
-       
 
-       
+        ' Datatable laden
-        TileView1.TileTemplate.Add(New TileViewItemElement With {.Column = TileView1.Columns(3), .TextAlignment = TileItemContentAlignment.TopRight})
+        GridControl1.DataSource = DT
-        TileView1.TileTemplate.Add(New TileViewItemElement With {.Column = TileView1.Columns(1), .TextAlignment = TileItemContentAlignment.Manual, .TextLocation = New Point(180, 39)})
-        Try
-            TryCast(TileView1.TileTemplate(0), TileViewItemElement).Column = TileView1.Columns(3) '"Name")
-        Catch ex As Exception
 
-        End Try
+        For Each Column As DataColumn In DT.Columns
+            Dim index As Integer = DT.Columns.IndexOf(Column)
+
+            Select Case index
+                Case 0
+                    ' RecordId
+                Case 1
+                    ' Index 1 ist das Bild
+                    If Column.DataType.ToString.Contains("Byte") Then
+                        Dim ImageColumn As New TileViewItemElement()
+                        With ImageColumn
+                            .Column = TileView1.Columns(1)
+                            .ImageSize = New Size(124, 60)
+                            .ImageScaleMode = TileItemImageScaleMode.Squeeze
+                            .ImageAlignment = TileItemContentAlignment.Manual
+                            .ImageLocation = New Point(0, 0)
+                        End With
+                        Elements.Add(ImageColumn)
+                    End If
+                Case 2
+                    ' Index 2 ist die Headline
+                    Dim HeadlineColumn As New TileViewItemElement()
+                    With HeadlineColumn
+                        .Column = TileView1.Columns(2)
+                        .TextAlignment = TileItemContentAlignment.TopRight
+                        .Appearance.Normal.Font = PrimaryFont
+                        .Appearance.Normal.ForeColor = SystemColors.MenuHighlight
+                        .Column.OptionsFilter.AllowFilter = True
+                    End With
+                    Elements.Add(HeadlineColumn)
+                Case 3 - 5
+                    ' Indexe 3 - 5 sind normale Textzeilen
+                    Dim TextColumn As New TileViewItemElement()
+                    With TextColumn
+                        .Column = TileView1.Columns(i)
+                        .TextAlignment = TileItemContentAlignment.MiddleRight
+                        .Column.OptionsFilter.AllowFilter = True
+                        '.AnchorElement = Elements.Last()
+                        '.AnchorAlignment = AnchorAlignment.Bottom
+                    End With
+                    Elements.Add(TextColumn)
+            End Select
+
+
+        Next
+
+        For Each El As TileViewItemElement In Elements
+            TileView1.TileTemplate.Add(El)
+        Next
+
+        'Dim PictureIndex As Integer = -1
+        'Dim DT = DirectCast(DT_SELECTION, DataTable)
+        'Dim i As Integer = 0
+        'For Each Column As DataColumn In DT.Columns
+        '    If Column.DataType.ToString.Contains("Byte") Then
+        '        PictureIndex = i
+        '    End If
+        '    i += 1
+        'Next
+
+        'If PictureIndex <> -1 Then
+        '    HasImages = True
+        'End If
+
+        'GridControl1.DataSource = DT
+        'Das BackgroundImage setzen
+        'If PictureIndex <> -1 Then
+        '    TileView1.ColumnSet.BackgroundImageColumn = TileView1.Columns(PictureIndex) '"Image")
+        '    TileView1.OptionsTiles.ItemBackgroundImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft
+        '    TileView1.OptionsTiles.ItemBackgroundImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside
+        'End If
+
+
+
+
+
+        'Dim ImageColumn As New TileViewItemElement()
+        'With ImageColumn
+        '    .Column = TileView1.Columns(2)
+        '    .ImageSize = New Size(124, 60)
+        '    .ImageAlignment = TileItemContentAlignment.MiddleLeft
+        '    .ImageScaleMode = TileItemImageScaleMode.ZoomOutside
+        '    .ImageBorder = TileItemElementImageBorderMode.None
+        '    .MaxWidth = 124
+        'End With
+
+
+
+
+
+        'Dim PrimaryColumn As New TileViewItemElement()
+        'With PrimaryColumn
+        '    .Column = TileView1.Columns(1)
+        '    .TextAlignment = TileItemContentAlignment.TopRight
+        '    .Appearance.Normal.ForeColor = SystemColors.MenuHighlight
+        '    .Appearance.Normal.Font = PrimaryFont
+        'End With
+
+        'Dim SecondaryColumn As New TileViewItemElement()
+        'With SecondaryColumn
+        '    .Column = TileView1.Columns(3)
+        '    '.TextAlignment = TileItemContentAlignment.MiddleRight
+        '    .Appearance.Normal.ForeColor = Color.Black
+        '    .Appearance.Normal.Font = SecondaryFont
+        '    .TextAlignment = TileItemContentAlignment.MiddleRight
+        'End With
+
+
+
+
+        'TileView1.TileTemplate.Add(PrimaryColumn)
+        'TileView1.TileTemplate.Add(ImageColumn)
+        'TileView1.TileTemplate.Add(SecondaryColumn)
+
+        'TileView1.TileTemplate.Add(New TileViewItemElement With {.Column = TileView1.Columns(3), .TextAlignment = TileItemContentAlignment.MiddleCenter})
+        'TileView1.TileTemplate.Add(New TileViewItemElement With {.Column = TileView1.Columns(1), .TextAlignment = TileItemContentAlignment.Manual, .TextLocation = New Point(180, 39)})
+        'Try
+        '    TryCast(TileView1.TileTemplate(0), TileViewItemElement).Column = TileView1.Columns(3) '"Name")
+        'Catch ex As Exception
+
+        'End Try
         'TileView1.TileTemplate.Add(New TileViewItemElement With {.Column = TileView1.Columns("Date"), .TextAlignment = TileItemContentAlignment.Manual, .TextLocation = New Point(150, 100)})
     End Sub
     Private Function GET_GROUP_RECORD(FORM_ID As Integer)