Merge mit Branch 2.5.4.0
This commit is contained in:
@@ -135,7 +135,7 @@ Public Class frmMain
|
||||
End If
|
||||
Try
|
||||
ClassAllgemeineFunktionen.LoginOut("LOGOUT")
|
||||
LOGGER.Info("TaskFlow closed - " & Now, False)
|
||||
LOGGER.Info("taskFLOW closed - " & Now, False)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
End Try
|
||||
@@ -1404,8 +1404,8 @@ Public Class frmMain
|
||||
cultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
|
||||
Thread.CurrentThread.CurrentCulture = cultureInfo
|
||||
Thread.CurrentThread.CurrentUICulture = cultureInfo
|
||||
CultureInfo.DefaultThreadCurrentCulture = cultureInfo
|
||||
CultureInfo.DefaultThreadCurrentUICulture = cultureInfo
|
||||
cultureInfo.DefaultThreadCurrentCulture = cultureInfo
|
||||
cultureInfo.DefaultThreadCurrentUICulture = cultureInfo
|
||||
End If
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@@ -2444,12 +2444,9 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
|
||||
SQL_VALIDATOR_SEARCHES = SQL_VALIDATOR_SEARCHES.Replace("@USR_LANG_CODE", User.Language)
|
||||
oSQL = SQL_VALIDATOR_SEARCHES
|
||||
End If
|
||||
'BASEDATA_DT_PROFILES_SEARCHES_DOC = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_SEARCH", "TYPE = 'DOC'", "PROFILE_ID,TAB_INDEX")
|
||||
|
||||
BASEDATA_DT_PROFILES_SEARCHES_DOC = DatabaseECM.GetDatatable(oSQL)
|
||||
'.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
|
||||
' .FilterExpression = "TYPE = 'DOC'",
|
||||
' .SortByColumn = "PROFILE_ID,TAB_INDEX"
|
||||
'})
|
||||
|
||||
If pMode = "Load" Then
|
||||
DT_FILTERED_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Clone()
|
||||
End If
|
||||
@@ -3071,7 +3068,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
|
||||
Dim oLink = "<HTML><body><p><a href=" + "file:///" + oFilePath + ">Link zur Datei</a></p></body></HTML>"
|
||||
Dim oLink2 = "<a href=" + "file:///" + oFilePath + ">Link zur Datei</a>"
|
||||
If Not IsNothing(oFilePath) Then
|
||||
Process.Start($"mailto:{oReceipiant}?subject=Link aus TaskFlow Manager&body={oLink}")
|
||||
Process.Start($"mailto:{oReceipiant}?subject=Link aus taskFLOW Manager&body={oLink}")
|
||||
End If
|
||||
End If
|
||||
|
||||
@@ -3257,6 +3254,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
|
||||
LOGGER.Debug($"oTargetPath: {oTargetPath}")
|
||||
LOGGER.Debug($"oSourcePath: {oSourcePath}")
|
||||
If oTargetPath = String.Empty Or oSourcePath = String.Empty Then
|
||||
LOGGER.Warn($"oTargetPath is nothing - PRofile can not be startet . Check TARGET_PATH_BLIND_FILE Column in Profile")
|
||||
Exit Sub
|
||||
End If
|
||||
oTargetPath = $"{oTargetPath}\{Now.Year}\{Now.Month}\{Now.Day}"
|
||||
|
||||
Reference in New Issue
Block a user