Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 51 additions & 10 deletions ProcessMaker/Http/Controllers/CasesController.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,9 @@ public function show($case_number)
$request->summary_screen = $request->getSummaryScreen();
}
// Stage information
if ($request->status === 'COMPLETED') {
$currentStages = [
'stage_name' => __('Completed'),
];
$progressStage = 100.0; // 100% completed
} else {
$currentStages = $this->formatCurrentStage($request->last_stage_id, $request->last_stage_name);
$allStages = $this->getStagesByProcessId($request->process_id);
$progressStage = calculateProgressById($request->last_stage_id, $allStages);
}
$stageInfo = $this->getStageInfoByStatus($request);
$currentStages = $stageInfo['currentStages'];
$progressStage = $stageInfo['progressStage'];
// Load the screen configured in "Request Detail Screen"
$request->request_detail_screen = Screen::find($request->process->request_detail_screen_id);
// The user canCancel if has the processPermission and the case has only one request
Expand Down Expand Up @@ -215,4 +208,52 @@ public static function formatCurrentStage(?int $id, ?string $name): array

return $currentStages;
}

/**
* Get stage information based on request status
*
* @param ProcessRequest $request
* @return array
*/
private function getStageInfoByStatus(ProcessRequest $request): array
{
switch ($request->status) {
case 'COMPLETED':
return [
'currentStages' => [
'stage_name' => __('Completed'),
],
'progressStage' => 100.0, // 100% completed
];
case 'CANCELED':
return [
'currentStages' => [
'stage_name' => __('Canceled'),
],
'progressStage' => 0.0, // 0% progress when canceled
];
case 'ERROR':
return [
'currentStages' => [
'stage_name' => __('Error'),
],
'progressStage' => 0.0, // 0% progress when error
];
default:
$currentStages = $this->formatCurrentStage($request->last_stage_id, $request->last_stage_name);
$allStages = $this->getStagesByProcessId($request->process_id);
$progressStage = calculateProgressById($request->last_stage_id, $allStages);
if (empty($currentStages)) {
$currentStages = [
'stage_name' => __('In Progress'),
];
$progressStage = 50.0;
}

return [
'currentStages' => $currentStages,
'progressStage' => $progressStage,
];
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div v-if="percentage > 0 && title !== ''">
<div v-if="title !== ''">
<span class="tw-text-[#3C3C3C] tw-font-sans tw-text-sm tw-font-normal tw-leading-normal tw-tracking-[-0.014em]">
{{ title }}
</span>
Expand Down
Loading