diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json new file mode 100644 index 0000000..f8b4888 --- /dev/null +++ b/.vs/ProjectSettings.json @@ -0,0 +1,3 @@ +{ + "CurrentProjectSetting": null +} \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 4ad3d83..87da166 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/.vs/slnx.sqlite-journal b/.vs/slnx.sqlite-journal new file mode 100644 index 0000000..dfc25ff Binary files /dev/null and b/.vs/slnx.sqlite-journal differ diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 992c698..84d31af 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -161,25 +161,29 @@ 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 '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 sql = CURRENT_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") + sql = sql.replace("@USER", Environment.UserName) + sql = sql.replace("@MACHINE_NAME", Environment.MachineName) + sql = sql.replace("@DATE", Now.ToShortDateString) + '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 GridControlProfile.ForceInitialize() 'Detail-Daten laden - Dim SQL_DETAILS - Try - SQL_DETAILS = DTPROFIL.Rows(0).Item("DETAIL_SQL") - Catch ex As Exception - SQL_DETAILS = String.Empty - End Try - If SQL_DETAILS <> String.Empty Then - Dim DT_DETAILS As DataTable = ClassDatabase.Return_Datatable(SQL_DETAILS, True) + 'Dim SQL_DETAILS + 'Try + ' SQL_DETAILS = DTPROFIL.Rows(0).Item("DETAIL_SQL") + 'Catch ex As Exception + ' SQL_DETAILS = String.Empty + 'End Try + 'If SQL_DETAILS <> String.Empty Then + ' Dim DT_DETAILS As DataTable = ClassDatabase.Return_Datatable(SQL_DETAILS, True) - End If + 'End If Try Dim XMLPath = GetXML_LayoutName() @@ -189,15 +193,20 @@ Public Class frmMain End Try Try - GridViewProfile.Columns.Item("PROFIL_ID").Visible = False + GridViewProfile.Columns.Item("TITLE").GroupIndex = 0 + GridViewProfile.Columns.Item("TITLE").Visible = False + GridViewProfile.Columns.Item("PROFILE_ID").Visible = False + GridViewProfile.Columns.Item("FULL_FILE_PATH").Visible = False + GridViewProfile.Columns.Item("DOC_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 - + ClassLogger.Add("Unexpected Error in Formatting Grid: " & ex.Message) End Try Else diff --git a/app/DD_PM_WINDREAM/frmSplash.vb b/app/DD_PM_WINDREAM/frmSplash.vb index 7bda013..2ad3e22 100644 --- a/app/DD_PM_WINDREAM/frmSplash.vb +++ b/app/DD_PM_WINDREAM/frmSplash.vb @@ -98,7 +98,7 @@ Public NotInheritable Class frmSplash bw.ReportProgress(CalcProgress(5), "Initialize windream-Settings") Init.InitWindream() - System.Threading.Thread.Sleep(500) + System.Threading.Thread.Sleep(250) End If