diff --git a/.vs/DD_PM_WINDREAM/v15/.suo b/.vs/DD_PM_WINDREAM/v15/.suo index 37e3a74..54a697a 100644 Binary files a/.vs/DD_PM_WINDREAM/v15/.suo and b/.vs/DD_PM_WINDREAM/v15/.suo differ diff --git a/.vs/DD_PM_WINDREAM/v15/Server/sqlite3/db.lock b/.vs/DD_PM_WINDREAM/v15/Server/sqlite3/db.lock new file mode 100644 index 0000000..e69de29 diff --git a/.vs/DD_PM_WINDREAM/v15/Server/sqlite3/storage.ide b/.vs/DD_PM_WINDREAM/v15/Server/sqlite3/storage.ide new file mode 100644 index 0000000..8a6b4d2 Binary files /dev/null and b/.vs/DD_PM_WINDREAM/v15/Server/sqlite3/storage.ide differ diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 9ff774a..53d2b25 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -24,6 +24,8 @@ Partial Class frmMain Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) + Dim GridFormatRule1 As DevExpress.XtraGrid.GridFormatRule = New DevExpress.XtraGrid.GridFormatRule() + Dim FormatConditionRuleValue1 As DevExpress.XtraEditors.FormatConditionRuleValue = New DevExpress.XtraEditors.FormatConditionRuleValue() Me.ImageListProfile = New System.Windows.Forms.ImageList(Me.components) Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet() Me.TBPM_PROFILEBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -265,6 +267,9 @@ Partial Class frmMain Me.GridViewProfile.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewProfile.Appearance.Row.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.GridViewProfile.Appearance.Row.Options.UseFont = True + GridFormatRule1.Name = "Format0" + GridFormatRule1.Rule = FormatConditionRuleValue1 + Me.GridViewProfile.FormatRules.Add(GridFormatRule1) Me.GridViewProfile.GridControl = Me.GridControlProfile Me.GridViewProfile.GroupPanelText = "Ziehen Sie Spaltenüberschriften in diesen Bereich um nach diesen gruppieren zu la" & "ssen" diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 9328cd4..cf8dff0 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAdgBAQHYAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAeABAQHgAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 3a2cb4c..992c698 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -3,6 +3,8 @@ Imports DLLLicenseManager Imports DevExpress.LookAndFeel Imports System.Globalization Imports DevExpress.Utils +Imports DevExpress.XtraGrid.Views.Grid.ViewInfo +Imports DevExpress.XtraGrid.Views.Grid Public Class frmMain Private _windreamPM As ClassPMWindream @@ -159,19 +161,14 @@ Public Class frmMain If Me.Visible = True And frmProfileDesigner.Visible = False Then DTPROFIL = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_PROFILE WHERE GUID = " & CURRENT_ProfilGUID) PROFILE_COUNT = 0 - Dim sql = String.Format("SELECT T.PROFIL_ID,T1.TITLE, T.DOC_ID, T.FILE_PATH, T.DMS_ERSTELLT_DATE,[dbo].[FNPM_LAST_WORKUSER_DOC] (T.PROFIL_ID,T.DOC_ID) AS 'Last User',[dbo].[FNPM_LAST_EDITED_DOC] (T.PROFIL_ID,T.DOC_ID) as 'Last edited' FROM TBPM_PROFILE_FILES T, VWPM_PROFILE_USER T1 " & + Dim sql = String.Format("SELECT '1' TL_STATE,T.PROFIL_ID,T1.TITLE, T.DOC_ID, T.FILE_PATH, T.DMS_ERSTELLT_DATE,[dbo].[FNPM_LAST_WORKUSER_DOC] (T.PROFIL_ID,T.DOC_ID) AS 'Last User',[dbo].[FNPM_LAST_EDITED_DOC] (T.PROFIL_ID,T.DOC_ID) as 'Last edited' FROM TBPM_PROFILE_FILES T, VWPM_PROFILE_USER T1 " & "WHERE T.PROFIL_ID = T1.PROFIL_ID " & "AND T1.ACTIVE = 1 And (UPPER(T1.USERNAME) = UPPER('{0}')) Order By T1.PRIORITY", Environment.UserName) Dim DTGRID As DataTable = ClassDatabase.Return_Datatable(sql, True) If Not IsNothing(DTGRID) Then GridControlProfile.DataSource = DTGRID - Try - GridViewProfile.Columns.Item("PROFIL_ID").Visible = False - GridViewProfile.Columns("Last edited").DisplayFormat.FormatType = FormatType.DateTime - GridViewProfile.Columns("Last edited").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" - Catch ex As Exception + GridControlProfile.ForceInitialize() - End Try 'Detail-Daten laden Dim SQL_DETAILS Try @@ -183,6 +180,7 @@ Public Class frmMain Dim DT_DETAILS As DataTable = ClassDatabase.Return_Datatable(SQL_DETAILS, True) End If + Try Dim XMLPath = GetXML_LayoutName() GridViewProfile.RestoreLayoutFromXml(XMLPath) @@ -190,6 +188,17 @@ Public Class frmMain End Try + Try + GridViewProfile.Columns.Item("PROFIL_ID").Visible = False + GridViewProfile.Columns("Last edited").DisplayFormat.FormatType = FormatType.DateTime + GridViewProfile.Columns("Last edited").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" + GridViewProfile.Columns.Item("TITLE").GroupIndex = 0 + + GridViewProfile.OptionsView.ShowGroupPanel = False + GridViewProfile.OptionsBehavior.AutoExpandAllGroups = True + Catch ex As Exception + + End Try Else GridControlProfile.DataSource = Nothing @@ -344,4 +353,28 @@ Public Class frmMain Me.Visible = True LoadProfile_PM() End Sub + + Private Sub GridViewProfile_CustomDrawGroupRow(sender As Object, e As DevExpress.XtraGrid.Views.Base.RowObjectCustomDrawEventArgs) Handles GridViewProfile.CustomDrawGroupRow + Dim info As GridGroupRowInfo = TryCast(e.Info, GridGroupRowInfo) + + If info.Column.FieldName = "TITLE" Then + info.GroupText = info.GroupValueText + End If + End Sub + + Private Sub GridViewProfile_RowCellStyle(sender As Object, e As RowCellStyleEventArgs) Handles GridViewProfile.RowCellStyle + Dim view As GridView = TryCast(sender, GridView) + + If e.Column.FieldName = "TL_STATE" Then + + + If e.CellValue = "1" Then + e.Appearance.BackColor = Color.LightSalmon + ElseIf e.CellValue = "2" Then + e.Appearance.BackColor = Color.LightGoldenrodYellow + ElseIf e.CellValue = "3" Then + e.Appearance.BackColor = Color.LightGreen + End If + End If + End Sub End Class \ No newline at end of file