From 5d3c35289808b394000ea0ab8e10bf4636570b28 Mon Sep 17 00:00:00 2001 From: Fabio Date: Tue, 17 Dec 2024 16:07:14 -0400 Subject: [PATCH 1/3] FOUR-20543:Review the tooltip status of each task --- .../cases/casesDetail/components/NewOverview.vue | 9 ++++++++- resources/views/requests/show.blade.php | 3 --- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/jscomposition/cases/casesDetail/components/NewOverview.vue b/resources/jscomposition/cases/casesDetail/components/NewOverview.vue index a48d6a9724..e8896f2ee3 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" > +

+ {{ processTitle }} +

aria-labelledby="overview-tab">
-

- {{ __(':name In-Flight Map', ['name' => $request->process->name]) }} -

From 0d487ca4a748d61bb297f9ac7b473a2ac84d4b12 Mon Sep 17 00:00:00 2001 From: Fabio Date: Wed, 18 Dec 2024 15:16:09 -0400 Subject: [PATCH 2/3] correction tooltip --- ProcessMaker/Http/Controllers/CasesController.php | 15 +++++++++++++++ ProcessMaker/Traits/ProcessMapTrait.php | 2 +- .../cases/casesDetail/components/NewOverview.vue | 1 - resources/views/cases/edit.blade.php | 7 +++++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ProcessMaker/Http/Controllers/CasesController.php b/ProcessMaker/Http/Controllers/CasesController.php index c0476d984f..110e905025 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,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 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 e8896f2ee3..3346618374 100644 --- 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 index 9058c18fa5..d249ca6ab5 100644 --- 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) @endforeach + @foreach($managerModeler->getScripts() as $script) + @if (!str_contains($script, 'slideshow')) + + @endif + @endforeach @endsection @section('css') From 3d1cb73ca713eba6e903281923edd780ec096282 Mon Sep 17 00:00:00 2001 From: Fabio Date: Wed, 18 Dec 2024 15:35:28 -0400 Subject: [PATCH 3/3] CR --- ProcessMaker/Http/Controllers/CasesController.php | 1 - .../jscomposition/cases/casesDetail/components/NewOverview.vue | 1 - 2 files changed, 2 deletions(-) diff --git a/ProcessMaker/Http/Controllers/CasesController.php b/ProcessMaker/Http/Controllers/CasesController.php index 110e905025..88d48593ad 100644 --- a/ProcessMaker/Http/Controllers/CasesController.php +++ b/ProcessMaker/Http/Controllers/CasesController.php @@ -92,7 +92,6 @@ public function show($case_number) // Get all PM-Blocks $modelerController = new ModelerController(); $pmBlockList = $modelerController->getPmBlockList(); - // dd($pmBlockList); // Return the view return view('cases.edit', compact( diff --git a/resources/jscomposition/cases/casesDetail/components/NewOverview.vue b/resources/jscomposition/cases/casesDetail/components/NewOverview.vue index 3346618374..ce73174f7e 100644 --- a/resources/jscomposition/cases/casesDetail/components/NewOverview.vue +++ b/resources/jscomposition/cases/casesDetail/components/NewOverview.vue @@ -50,7 +50,6 @@ import { getInflightData, getProcessName } from "../variables"; const translate = ProcessMaker.i18n; const processTitle = ref(`${getProcessName()} ${translate.t("In-Flight Map")}`); -// processTitle.value = `${getProcessName()} ${translate.t("In-Flight Map")}`; const keyModeler = ref(Math.random()); const modelerRef = ref(""); const tooltipRef = ref(null);