This commit is contained in:
Digital Data - Marlon Schreiber 2018-02-07 10:18:53 +01:00
parent e093a5a102
commit 574a6dac49
5 changed files with 28 additions and 16 deletions

3
.vs/ProjectSettings.json Normal file
View File

@ -0,0 +1,3 @@
{
"CurrentProjectSetting": null
}

Binary file not shown.

BIN
.vs/slnx.sqlite-journal Normal file

Binary file not shown.

View File

@ -161,25 +161,29 @@ Public Class frmMain
If Me.Visible = True And frmProfileDesigner.Visible = False Then If Me.Visible = True And frmProfileDesigner.Visible = False Then
DTPROFIL = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_PROFILE WHERE GUID = " & CURRENT_ProfilGUID) DTPROFIL = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_PROFILE WHERE GUID = " & CURRENT_ProfilGUID)
PROFILE_COUNT = 0 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 " & Dim sql = CURRENT_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW")
"WHERE T.PROFIL_ID = T1.PROFIL_ID " & sql = sql.replace("@USER", Environment.UserName)
"AND T1.ACTIVE = 1 And (UPPER(T1.USERNAME) = UPPER('{0}')) Order By T1.PRIORITY", 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) Dim DTGRID As DataTable = ClassDatabase.Return_Datatable(sql, True)
If Not IsNothing(DTGRID) Then If Not IsNothing(DTGRID) Then
GridControlProfile.DataSource = DTGRID GridControlProfile.DataSource = DTGRID
GridControlProfile.ForceInitialize() GridControlProfile.ForceInitialize()
'Detail-Daten laden 'Detail-Daten laden
Dim SQL_DETAILS 'Dim SQL_DETAILS
Try 'Try
SQL_DETAILS = DTPROFIL.Rows(0).Item("DETAIL_SQL") ' SQL_DETAILS = DTPROFIL.Rows(0).Item("DETAIL_SQL")
Catch ex As Exception 'Catch ex As Exception
SQL_DETAILS = String.Empty ' SQL_DETAILS = String.Empty
End Try 'End Try
If SQL_DETAILS <> String.Empty Then 'If SQL_DETAILS <> String.Empty Then
Dim DT_DETAILS As DataTable = ClassDatabase.Return_Datatable(SQL_DETAILS, True) ' Dim DT_DETAILS As DataTable = ClassDatabase.Return_Datatable(SQL_DETAILS, True)
End If 'End If
Try Try
Dim XMLPath = GetXML_LayoutName() Dim XMLPath = GetXML_LayoutName()
@ -189,15 +193,20 @@ Public Class frmMain
End Try End Try
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.FormatType = FormatType.DateTime
GridViewProfile.Columns("Last edited").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" GridViewProfile.Columns("Last edited").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
GridViewProfile.Columns.Item("TITLE").GroupIndex = 0
GridViewProfile.OptionsView.ShowGroupPanel = False GridViewProfile.OptionsView.ShowGroupPanel = False
GridViewProfile.OptionsBehavior.AutoExpandAllGroups = True GridViewProfile.OptionsBehavior.AutoExpandAllGroups = True
Catch ex As Exception Catch ex As Exception
ClassLogger.Add("Unexpected Error in Formatting Grid: " & ex.Message)
End Try End Try
Else Else

View File

@ -98,7 +98,7 @@ Public NotInheritable Class frmSplash
bw.ReportProgress(CalcProgress(5), "Initialize windream-Settings") bw.ReportProgress(CalcProgress(5), "Initialize windream-Settings")
Init.InitWindream() Init.InitWindream()
System.Threading.Thread.Sleep(500) System.Threading.Thread.Sleep(250)
End If End If