MS AdhocWorkflow
This commit is contained in:
@@ -841,7 +841,8 @@ Public Class frmValidator
|
||||
.SortByColumn = "Y_LOC, X_LOC"
|
||||
})
|
||||
|
||||
oSQL = $"SELECT T.* from TBPM_CONTROL_TABLE T, TBPM_PROFILE_CONTROLS T1 WHERE T1.CONTROL_ACTIVE = 1 AND T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY T.SEQUENCE"
|
||||
oSQL = $"SELECT IIF(LANG.CAPTION IS NULL,T.SPALTEN_HEADER,LANG.CAPTION) SPALTEN_HEADER_LANG, T.* from TBPM_CONTROL_TABLE T INNER JOIN TBPM_PROFILE_CONTROLS T1 ON T.CONTROL_ID = T1.GUID
|
||||
LEFT JOIN (SELECT * FROM TBPM_CONTOL_TABLE_LANG WHERE LANG_CODE = '{USER_LANGUAGE}') LANG ON T.GUID = LANG.COL_ID WHERE T1.CONTROL_ACTIVE = 1 AND T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY T.SEQUENCE"
|
||||
DT_COLUMNS_GRID = DatabaseFallback.GetDatatable("TBPM_CONTROL_TABLE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
|
||||
.FilterExpression = $"PROFIL_ID = {CURRENT_ProfilGUID}",
|
||||
.SortByColumn = "SEQUENCE"
|
||||
@@ -2507,11 +2508,17 @@ Public Class frmValidator
|
||||
|
||||
Private Function CreateWMObject() As String
|
||||
LOGGER.Debug($"in GetWMDocFileString...'")
|
||||
Dim oWMRELPATH As String = BASEDATA_DT_CONFIG.Rows.Item(0).Item("WM_REL_PATH")
|
||||
If oWMRELPATH.EndsWith("\") = False Then
|
||||
oWMRELPATH = oWMRELPATH & "\"
|
||||
If WMSUFFIX.EndsWith("\") = False Then
|
||||
WMSUFFIX = WMSUFFIX & "\"
|
||||
End If
|
||||
Dim oWMOwnPath = WMDocPathWindows.Replace(oWMRELPATH, "")
|
||||
Dim oWMOwnPath As String
|
||||
If WM_AHWF_docPath <> String.Empty Then
|
||||
oWMOwnPath = WM_AHWF_docPath
|
||||
WMDocPathWindows = oWMOwnPath
|
||||
Else
|
||||
oWMOwnPath = WMDocPathWindows.Replace(WMSUFFIX, "")
|
||||
End If
|
||||
|
||||
LOGGER.Debug($"oWMOwnPath: {oWMOwnPath}")
|
||||
Try
|
||||
Dim oNormalizedPath = WINDREAM.NormalizePath(oWMOwnPath)
|
||||
@@ -2535,6 +2542,11 @@ Public Class frmValidator
|
||||
End Function
|
||||
Private Function GetDocPathWindows(_CheckStandard As Integer)
|
||||
Try
|
||||
If ActiveWorkflowType = ConstAHWorkflow_BlindFile Then
|
||||
WMDocPathWindows = WM_AHWF_docPath
|
||||
CURRENT_DOC_PATH = WM_AHWF_docPath
|
||||
Return True
|
||||
End If
|
||||
Dim oResult As String
|
||||
|
||||
Dim oSQL = $"SELECT dbo.FNPM_GET_FILEPATH ({CURRENT_DOC_GUID},{_CheckStandard})"
|
||||
@@ -2752,6 +2764,9 @@ Public Class frmValidator
|
||||
' DocumentViewerValidator.LoadFile(WMDocPathWindows)
|
||||
|
||||
Try
|
||||
If DocumentViewerValidator.Visible = False Then
|
||||
DocumentViewerValidator.Visible = True
|
||||
End If
|
||||
Dim oDocument As DocumentResultList.Document = Nothing
|
||||
' Load DocumentInfo
|
||||
oDocument = Documentloader.Load(CURRENT_DOC_ID, WMDocPathWindows)
|
||||
@@ -2763,7 +2778,12 @@ Public Class frmValidator
|
||||
LOGGER.Error(ex)
|
||||
Exit Sub
|
||||
End Try
|
||||
|
||||
If ActiveWorkflowType = ConstAHWorkflow_BlindFile Then
|
||||
SplitContainer1.Panel2Collapsed = True
|
||||
DocumentViewerValidator.Visible = False
|
||||
RibbonPageFile.Visible = False
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
' Load Document in Document Viewer
|
||||
Dim oFileName = $"{CURRENT_DOC_ID}.{Current_Document.Extension}"
|
||||
@@ -3785,7 +3805,7 @@ Public Class frmValidator
|
||||
Click_Additional_Searches()
|
||||
End If
|
||||
Else
|
||||
MsgBox("Für dieses Profil wurde noch keine Eingabemaske definiert!" & vbNewLine & "Informieren Sie Ihren PM-Administrator!" & vbNewLine & "Das Fenster wird geschlossen!", MsgBoxStyle.Exclamation, "Achtung:")
|
||||
MsgBox("No Form-Mask defined for this profile!" & vbNewLine & "Please inform Your admin!" & vbNewLine & "The validator will be closed!", MsgBoxStyle.Exclamation, "Attention:")
|
||||
Me.Close()
|
||||
End If
|
||||
|
||||
@@ -3833,7 +3853,7 @@ Public Class frmValidator
|
||||
Else
|
||||
RibbonPageGroupCustom.Visible = False
|
||||
End If
|
||||
If Not IsNothing(WMDocPathWindows) Then
|
||||
If Not IsNothing(WMDocPathWindows) And ActiveWorkflowType = ConstAHWorkflow_BlindFile Then
|
||||
If ButtonExport2Folder_Caption <> "" And WMDocPathWindows <> "" Then
|
||||
If File.Exists(WMDocPathWindows) Then
|
||||
barbtnitmExport.Caption = ButtonExport2Folder_Caption
|
||||
@@ -5287,7 +5307,7 @@ Public Class frmValidator
|
||||
oView.FocusedColumn = oView.Columns.Item(oColumn.ColumnName)
|
||||
|
||||
pMissing = True
|
||||
pMissingMessage = $"Fehlende Eingabe in Tabelle '{pGrid.Name}' in Spalte '{oDefinition.Item("SPALTEN_HEADER")}', Zeile '{oRowHandle + 1}'"
|
||||
pMissingMessage = $"Fehlende Eingabe in Tabelle '{pGrid.Name}' in Spalte '{oDefinition.Item("SPALTEN_HEADER_LANG")}', Zeile '{oRowHandle + 1}'"
|
||||
Return False
|
||||
End If
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user