diff --git a/ProcessMaker/Http/Controllers/CasesController.php b/ProcessMaker/Http/Controllers/CasesController.php index c0476d984f..88d48593ad 100644 --- a/ProcessMaker/Http/Controllers/CasesController.php +++ b/ProcessMaker/Http/Controllers/CasesController.php @@ -3,8 +3,11 @@ namespace ProcessMaker\Http\Controllers; use Illuminate\Support\Facades\Auth; +use ProcessMaker\Events\ModelerStarting; use ProcessMaker\Events\ScreenBuilderStarting; use ProcessMaker\Http\Controllers\Controller; +use ProcessMaker\Http\Controllers\Process\ModelerController; +use ProcessMaker\Managers\ModelerManager; use ProcessMaker\Managers\ScreenBuilderManager; use ProcessMaker\Models\ProcessRequest; use ProcessMaker\Models\Screen; @@ -40,6 +43,10 @@ public function show($case_number) // Load event ScreenBuilderStarting $manager = app(ScreenBuilderManager::class); event(new ScreenBuilderStarting($manager, 'FORM')); + // Load event ModelerStarting + $managerModeler = app(ModelerManager::class); + event(new ModelerStarting($managerModeler)); + // Get all the request related to this case number $allRequests = ProcessRequest::where('case_number', $case_number)->get(); $parentRequest = null; @@ -81,6 +88,11 @@ public function show($case_number) // Load the process map $inflightData = $this->loadProcessMap($request); $bpmn = $inflightData['bpmn']; + + // Get all PM-Blocks + $modelerController = new ModelerController(); + $pmBlockList = $modelerController->getPmBlockList(); + // Return the view return view('cases.edit', compact( 'request', @@ -91,8 +103,10 @@ public function show($case_number) 'canPrintScreens', 'isProcessManager', 'manager', + 'managerModeler', 'bpmn', 'inflightData', + 'pmBlockList' )); } diff --git a/ProcessMaker/Traits/ProcessMapTrait.php b/ProcessMaker/Traits/ProcessMapTrait.php index d38260a8f9..590724808b 100644 --- a/ProcessMaker/Traits/ProcessMapTrait.php +++ b/ProcessMaker/Traits/ProcessMapTrait.php @@ -147,7 +147,7 @@ private function loadProcessMap(ProcessRequest $request): array 'requestCompletedNodes' => $filteredCompletedNodes, 'requestInProgressNodes' => $requestInProgressNodes, 'requestIdleNodes' => $requestIdleNodes, - 'requestId' => $request->process->id, + 'requestId' => $request->id, ]; } } diff --git a/resources/jscomposition/cases/casesDetail/components/NewOverview.vue b/resources/jscomposition/cases/casesDetail/components/NewOverview.vue index a48d6a9724..ce73174f7e 100644 --- a/resources/jscomposition/cases/casesDetail/components/NewOverview.vue +++ b/resources/jscomposition/cases/casesDetail/components/NewOverview.vue @@ -3,6 +3,9 @@ class="tw-w-full tw-h-full tw-overflow-hidden tw-relative" data-test="body-container" > +