diff --git a/app/DD-Record-Organiser/My Project/licenses.licx.bak b/app/DD-Record-Organiser/My Project/licenses.licx.bak index f191714..e655405 100644 --- a/app/DD-Record-Organiser/My Project/licenses.licx.bak +++ b/app/DD-Record-Organiser/My Project/licenses.licx.bak @@ -1,17 +1,2 @@ -DevExpress.XtraScheduler.SchedulerControl, DevExpress.XtraScheduler.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraVerticalGrid.VGridControl, DevExpress.XtraVerticalGrid.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v14.2, Version=14.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD-Record-Organiser/XtraForm2.Designer.vb b/app/DD-Record-Organiser/XtraForm2.Designer.vb index a05b2b9..e7549ff 100644 --- a/app/DD-Record-Organiser/XtraForm2.Designer.vb +++ b/app/DD-Record-Organiser/XtraForm2.Designer.vb @@ -20,16 +20,16 @@ Partial Class frmConstructor_Main _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() - Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode3 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode4 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim TileViewItemElement8 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement9 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement10 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main)) Dim TileViewItemElement1 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() Dim TileViewItemElement2 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() Dim TileViewItemElement3 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main)) - Dim TileViewItemElement4 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TileViewItemElement5 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TileViewItemElement6 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() - Dim TileViewItemElement7 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() + Dim TileViewItemElement11 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement() Me.grvwCarousel = New DevExpress.XtraGrid.Views.Layout.LayoutView() Me.GridControlSelection = New DevExpress.XtraGrid.GridControl() Me.ContextMenu_GridControlSelection = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -113,11 +113,11 @@ Partial Class frmConstructor_Main ' Me.GridControlSelection.ContextMenuStrip = Me.ContextMenu_GridControlSelection Me.GridControlSelection.Dock = System.Windows.Forms.DockStyle.Fill - GridLevelNode1.LevelTemplate = Me.grvwCarousel - GridLevelNode1.RelationName = "Level1" - GridLevelNode2.LevelTemplate = Me.grvwTiles - GridLevelNode2.RelationName = "Level2" - Me.GridControlSelection.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1, GridLevelNode2}) + GridLevelNode3.LevelTemplate = Me.grvwCarousel + GridLevelNode3.RelationName = "Level1" + GridLevelNode4.LevelTemplate = Me.grvwTiles + GridLevelNode4.RelationName = "Level2" + Me.GridControlSelection.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode3, GridLevelNode4}) Me.GridControlSelection.Location = New System.Drawing.Point(0, 0) Me.GridControlSelection.MainView = Me.grvwGrid Me.GridControlSelection.Name = "GridControlSelection" @@ -172,15 +172,15 @@ Partial Class frmConstructor_Main Me.grvwTiles.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.TileViewColumn1, Me.TileViewColumn2, Me.TileViewColumn3}) Me.grvwTiles.GridControl = Me.GridControlSelection Me.grvwTiles.Name = "grvwTiles" - TileViewItemElement1.Column = Me.TileViewColumn1 - TileViewItemElement1.Text = "element1" - TileViewItemElement2.Column = Me.TileViewColumn2 - TileViewItemElement2.Text = "element2" - TileViewItemElement3.Column = Me.TileViewColumn3 - TileViewItemElement3.Text = "element3" - Me.grvwTiles.TileTemplate.Add(TileViewItemElement1) - Me.grvwTiles.TileTemplate.Add(TileViewItemElement2) - Me.grvwTiles.TileTemplate.Add(TileViewItemElement3) + TileViewItemElement8.Column = Me.TileViewColumn1 + TileViewItemElement8.Text = "element1" + TileViewItemElement9.Column = Me.TileViewColumn2 + TileViewItemElement9.Text = "element2" + TileViewItemElement10.Column = Me.TileViewColumn3 + TileViewItemElement10.Text = "element3" + Me.grvwTiles.TileTemplate.Add(TileViewItemElement8) + Me.grvwTiles.TileTemplate.Add(TileViewItemElement9) + Me.grvwTiles.TileTemplate.Add(TileViewItemElement10) ' 'TileViewColumn1 ' @@ -403,29 +403,29 @@ Partial Class frmConstructor_Main Me.TileView2.OptionsTiles.ItemSize = New System.Drawing.Size(280, 160) Me.TileView2.OptionsTiles.RowCount = 2 Me.TileView2.SortInfo.AddRange(New DevExpress.XtraGrid.Columns.GridColumnSortInfo() {New DevExpress.XtraGrid.Columns.GridColumnSortInfo(Me.colAktenzustand, DevExpress.Data.ColumnSortOrder.Ascending)}) - TileViewItemElement4.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - TileViewItemElement4.Appearance.Normal.ForeColor = System.Drawing.Color.DodgerBlue - TileViewItemElement4.Appearance.Normal.Options.UseFont = True - TileViewItemElement4.Appearance.Normal.Options.UseForeColor = True - TileViewItemElement4.Column = Me.colAktenzeichen - 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.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside - TileViewItemElement5.Text = "TileViewColumn5" - TileViewItemElement6.Column = Me.colTagderEintragungimRegister - TileViewItemElement6.Text = "colTagderEintragungimRegister" - TileViewItemElement6.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual - TileViewItemElement6.TextLocation = New System.Drawing.Point(120, 20) - TileViewItemElement7.Column = Me.colAktenzustand - TileViewItemElement7.Text = "colAktenzustand" - Me.TileView2.TileTemplate.Add(TileViewItemElement4) - Me.TileView2.TileTemplate.Add(TileViewItemElement5) - Me.TileView2.TileTemplate.Add(TileViewItemElement6) - Me.TileView2.TileTemplate.Add(TileViewItemElement7) + TileViewItemElement1.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + TileViewItemElement1.Appearance.Normal.ForeColor = System.Drawing.Color.DodgerBlue + TileViewItemElement1.Appearance.Normal.Options.UseFont = True + TileViewItemElement1.Appearance.Normal.Options.UseForeColor = True + TileViewItemElement1.Column = Me.colAktenzeichen + TileViewItemElement1.Text = "colAktenzeichen" + TileViewItemElement1.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual + TileViewItemElement1.TextLocation = New System.Drawing.Point(120, 0) + TileViewItemElement2.Column = Me.TileViewColumn5 + TileViewItemElement2.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleLeft + TileViewItemElement2.ImageBorder = DevExpress.XtraEditors.TileItemElementImageBorderMode.None + TileViewItemElement2.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomInside + TileViewItemElement2.Text = "TileViewColumn5" + TileViewItemElement3.Column = Me.colTagderEintragungimRegister + TileViewItemElement3.Text = "colTagderEintragungimRegister" + TileViewItemElement3.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual + TileViewItemElement3.TextLocation = New System.Drawing.Point(120, 20) + TileViewItemElement11.Column = Me.colAktenzustand + TileViewItemElement11.Text = "colAktenzustand" + Me.TileView2.TileTemplate.Add(TileViewItemElement1) + Me.TileView2.TileTemplate.Add(TileViewItemElement2) + Me.TileView2.TileTemplate.Add(TileViewItemElement3) + Me.TileView2.TileTemplate.Add(TileViewItemElement11) Me.TileView2.ViewCaption = "dfsdfsdf" ' 'TileViewColumn4 diff --git a/app/DD-Record-Organiser/XtraForm2.resx b/app/DD-Record-Organiser/XtraForm2.resx index 08a0b88..2c5d2be 100644 --- a/app/DD-Record-Organiser/XtraForm2.resx +++ b/app/DD-Record-Organiser/XtraForm2.resx @@ -160,6 +160,9 @@ 565, 17 + + 565, 17 + 945, 17 diff --git a/app/DD-Record-Organiser/XtraForm2.vb b/app/DD-Record-Organiser/XtraForm2.vb index de2aedb..4e4e925 100644 --- a/app/DD-Record-Organiser/XtraForm2.vb +++ b/app/DD-Record-Organiser/XtraForm2.vb @@ -413,23 +413,21 @@ Public Class frmConstructor_Main EBENE3_ENTITY = "" 'tslblEntity2.Visible = False 'tslblEntity3.Visible = False - + _sql = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId)) EBENE1_COLUMNNAME = ClassDatabase.Execute_Scalar("SELECT COLUMN_NAME1 FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FormId) EBENE2_COLUMNNAME = "" EBENE3_COLUMNNAME = "" EBENE2_GRID_RESULT = Nothing EBENE3_GRID_RESULT = Nothing '_sql = ClassDatabase.Execute_Scalar("SELECT SQL_QUICK_VIEW FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FormId) - _sql = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId)) - Case 2 - Dim Level1Select = ClassDatabase.Execute_Scalar("SELECT LEVEL1_SELECT FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FormId) - If CBool(Level1Select) = False And CURRENT_FORM_TYPE <> 5 And EBENE1_RECID = 0 Then - MsgBox("Entität '" & TreeViewLevelSelect.SelectedNode.Text & "' kann nicht ohne Auswahl eines Ebene 1 Datensatzes gewählt werden!", MsgBoxStyle.Exclamation) - TreeViewLevelSelect.SelectedNode = TreeViewLevelSelect.SelectedNode.Parent - Exit Sub - End If + 'Dim Level1Select = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId)) 'ClassDatabase.Execute_Scalar("SELECT LEVEL1_SELECT FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FormId) + 'If CBool(Level1Select) = False And CURRENT_FORM_TYPE <> 5 And EBENE1_RECID = 0 Then + ' MsgBox("Entität '" & TreeViewLevelSelect.SelectedNode.Text & "' kann nicht ohne Auswahl eines Ebene 1 Datensatzes gewählt werden!", MsgBoxStyle.Exclamation) + ' TreeViewLevelSelect.SelectedNode = TreeViewLevelSelect.SelectedNode.Parent + ' Exit Sub + 'End If EBENE2_ENTITY = TreeViewLevelSelect.SelectedNode.Text ACT_EBENE_STRING = EBENE2_ENTITY If LogErrorsOnly = False Then ClassLogger.Add(">> Ebene 2 in TreeView selektiert", False) @@ -438,6 +436,10 @@ Public Class frmConstructor_Main If EBENE1_RECID > 0 Then PARENT_RECORDID = EBENE1_RECID CURRENT_PARENTID = EBENE1_RECID + _sql = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId)) + _sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2") + _sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID" + _sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID) End If 'tslblEntity3.Visible = False Select Case CURRENT_FORM_TYPE @@ -455,6 +457,9 @@ Public Class frmConstructor_Main '_sql = ClassDatabase.Execute_Scalar("SELECT SQL_QUICK_VIEW FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FormId) _sql = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId)) _sql = _sql.Replace("@RecordID", EBENE1_RECID) + _sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2") + _sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID" + _sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID) Else _sql = ClassDatabase.Execute_Scalar("SELECT SQL_QUICK_VIEW FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FormId) End If @@ -488,8 +493,13 @@ Public Class frmConstructor_Main 'Wenn bereits ein Record für Ebene 1 gewählt wurde dann eisnchränken If EBENE2_RECID > 0 Then Try - _sql = ClassDatabase.Execute_Scalar("SELECT SQL_SELECT_EBENE2 FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FormId, True) + _sql = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId)) _sql = _sql.Replace("@RecordID", EBENE2_RECID) + _sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2") + _sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID" + _sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID) + + Catch ex As Exception End Try @@ -599,6 +609,7 @@ Public Class frmConstructor_Main For Each Column As DataColumn In DT.Columns Dim index As Integer = DT.Columns.IndexOf(Column) + Dim RECORDID_Column As TileViewItemElement Dim ImageColumn As TileViewItemElement Dim HeadlineColumn As TileViewItemElement Dim TextColumn As TileViewItemElement @@ -607,6 +618,11 @@ Public Class frmConstructor_Main Select Case index Case 0 ' RecordId + RECORDID_Column = New TileViewItemElement() + With RECORDID_Column + .Column = TileView1.Columns(0) + + End With Case 1 ' Index 1 ist das Bild If Column.DataType.ToString.Contains("Byte") Then @@ -1040,4 +1056,14 @@ Public Class frmConstructor_Main Private Sub AnsichtUmschaltenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AnsichtUmschaltenToolStripMenuItem.Click GridControlSelection.MainView = grvwTiles End Sub + + Private Sub TileView1_ItemClick(sender As Object, e As TileViewItemClickEventArgs) Handles TileView1.ItemClick + Console.WriteLine("TileView1.ItemClick") + Dim val As Integer = TileView1.GetRowCellValue(TileView1.FocusedRowHandle, "Record-ID") + + End Sub + + Private Sub TileView1_SelectionChanged(sender As Object, e As DevExpress.Data.SelectionChangedEventArgs) Handles TileView1.SelectionChanged + Console.WriteLine("TileView1.SelectionChanged") + End Sub End Class