correction tooltip

ProcessMaker · Dec 18, 2024 · 0d487ca · 0d487ca
1 parent 5d3c352
commit 0d487ca
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git 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,12 @@ 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();
+        // dd($pmBlockList);
+
         // Return the view
         return view('cases.edit', compact(
             'request',
@@ -91,8 +104,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
@@ -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
@@ -49,7 +49,6 @@ import MapLegend from "./MapLegend.vue";
 import { getInflightData, getProcessName } from "../variables";
 
 const translate = ProcessMaker.i18n;
-const processName = ref(getProcessName());
 const processTitle = ref(`${getProcessName()} ${translate.t("In-Flight Map")}`);
 // processTitle.value = `${getProcessName()} ${translate.t("In-Flight Map")}`;
 const keyModeler = ref(Math.random());

diff --git a/resources/views/cases/edit.blade.php b/resources/views/cases/edit.blade.php
@@ -141,6 +141,8 @@ class="tw-grow tw-overflow-hidden"
     const requestCount = @json($requestCount);
     const inflightData = @json($inflightData);
 
+    window.ProcessMaker.PMBlockList = @json($pmBlockList);
+
     window.ProcessMaker.modeler = {
       xml: @json($bpmn),
       configurables: [],
@@ -171,6 +173,11 @@ class="tw-grow tw-overflow-hidden"
   @foreach($manager->getScripts() as $script)
     <script src="{{$script}}"></script>
   @endforeach
+  @foreach($managerModeler->getScripts() as $script)
+    @if (!str_contains($script, 'slideshow'))
+      <script src="{{ $script }}"></script>
+    @endif
+  @endforeach
 @endsection
 
 @section('css')