This commit is contained in:
SchreiberM
2017-03-10 11:52:55 +01:00
parent b623a129f5
commit 701f303176
15 changed files with 300 additions and 250 deletions

View File

@@ -279,8 +279,7 @@ Public Class frmConstructor_Main
ClassWindowLocation.LoadFormLocationSize(Me, CONSTRUCTORID, CURRENT_SCREEN_ID, "CONSTRUCTOR_MAIN")
' VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString
'Me.VWPMO_WF_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString
'VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, USER_USERNAME)
ClassWorkflow.Refresh_Workflows_Entity()
SQL = String.Format("SELECT *, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), {1}) AS 'CAPTION' " & _
"FROM VWPMO_CONSTRUCTOR_FORMS WHERE SCREEN_ID = {2} AND CONSTRUCT_ID = {3} ORDER BY SEQUENCE", USER_LANGUAGE, CURRENT_SCREEN_ID, CURRENT_SCREEN_ID, CONSTRUCTORID)
@@ -4408,23 +4407,22 @@ Public Class frmConstructor_Main
End Sub
Sub Show_act_WFTask()
Try
Dim query = From table In DD_DMSDataSet.VWPMO_WF_ACTIVE.AsEnumerable()
Dim query = From table In CURRENT_VWPMO_WF_ACTIVE.AsEnumerable()
Select table Where table.Item("ENTITY_ID") = ENTITY_ID
Dim Entity_rows = query.ToList()
If Entity_rows.Count > 0 Then
tsButtonShowTaskOverview.Visible = True
tsButtonShowTaskOverview.Enabled = True
If _MANUAL_WORKFLOW = True Then
CreateWorkflowtaskstsmi.Enabled = True
End If
tsslblWorkflowstate.Visible = True
Else
tsButtonShowTaskOverview.Visible = False
CreateWorkflowtaskstsmi.Enabled = False
tsslblWorkflowstate.Visible = False
End If
tsButtonShowTaskOverview.Visible = False
For Each _row In Entity_rows
If _row.Item("RECORD_ID") = RECORD_ID Then
tsButtonShowTaskOverview.Visible = True
CURRENT_TASK_ID = _row.Item("WF_TASK_ID")
Dim text = "Task: " & _row.Item("WF_TITLE")
text += " - " & _row.Item("STATE_TITLE")
@@ -5903,7 +5901,7 @@ Public Class frmConstructor_Main
CURRENT_ENTITY_ID = ENTITY_ID
Dim sql = "EXEC PRPMO_CREATE_WF_TASKS " & CURRENT_ENTITY_ID & ", " & RECORD_ID
If ClassDatabase.Execute_non_Query(sql) = True Then
' VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, USER_USERNAME)
ClassWorkflow.Refresh_Workflows_Entity()
Show_act_WFTask()
If USER_LANGUAGE = "de-DE" Then
stg = "Workflows erzeugt! Wollen Sie die Workflowübersicht nun anzeigen?"
@@ -5915,6 +5913,7 @@ Public Class frmConstructor_Main
result = MessageBox.Show(stg, caption, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
If result = MsgBoxResult.Yes Then
ClassJumpRecord.JumpToRecord(2, RECORD_ID)
ClassWorkflow.Refresh_Workflows_Entity()
JUMP_RECORD_ID = 0
End If
Else