diff --git a/ProcessMaker/Http/Controllers/Api/ProcessLaunchpadController.php b/ProcessMaker/Http/Controllers/Api/ProcessLaunchpadController.php index 9b460e9712..40e7cdd9dd 100644 --- a/ProcessMaker/Http/Controllers/Api/ProcessLaunchpadController.php +++ b/ProcessMaker/Http/Controllers/Api/ProcessLaunchpadController.php @@ -47,7 +47,6 @@ public function getProcesses(Request $request) // Get the processes $processes = $processes ->select('processes.*') - ->withRequestCount() ->orderBy('processes.name', 'asc') ->paginate($perPage); @@ -58,6 +57,10 @@ public function getProcesses(Request $request) $process->launchpad = ProcessLaunchpad::getLaunchpad($launchpad, $process->id); } + $process = $processes->map(function ($process) { + $process->counts = $this->getCounts($process->id); + }); + return new ProcessCollection($processes); } @@ -104,8 +107,9 @@ public function index(Request $request, Process $process) }]) ->where('id', $process->id) ->get() - ->map(function ($process) { + ->map(function ($process) use ($request) { $process->counts = $this->getCounts($process->id); + $process->bookmark_id = Bookmark::getBookmarked(true, $process->id, $request->user()->id); return $process; }); diff --git a/ProcessMaker/Models/Process.php b/ProcessMaker/Models/Process.php index 111b637904..35526657be 100644 --- a/ProcessMaker/Models/Process.php +++ b/ProcessMaker/Models/Process.php @@ -1816,15 +1816,4 @@ public function scopeOrderByRecentRequests($query) ->limit(1) ); } - - public function scopeWithRequestCount($query) - { - return $query->withCount(['requests' => function ($query) { - return $query->where('status', 'ACTIVE') - // User has participated - ->whereHas('tokens', function ($q) { - $q->where('user_id', Auth::user()->id); - }); - }]); - } } diff --git a/resources/js/processes-catalogue/components/Bookmark.vue b/resources/js/processes-catalogue/components/Bookmark.vue new file mode 100644 index 0000000000..2f2533d72e --- /dev/null +++ b/resources/js/processes-catalogue/components/Bookmark.vue @@ -0,0 +1,87 @@ + + + + + \ No newline at end of file diff --git a/resources/js/processes-catalogue/components/CardProcess.vue b/resources/js/processes-catalogue/components/CardProcess.vue index 034588dfcd..11f2f6c160 100644 --- a/resources/js/processes-catalogue/components/CardProcess.vue +++ b/resources/js/processes-catalogue/components/CardProcess.vue @@ -10,7 +10,7 @@ > -
+
+
+
+ + + +
+
+ + + +
+
+ +
+
+
+

{{ $t('Details') }}

+

{{ selectedProcess.name }}

+

{{ selectedProcess.description }}

+

{{ $t('Version') }} {{ processVersion }}

+

{{ $t('Started Cases') }}

+

{{ startedCases.toLocaleString() }}

+
+ + +
+
+ +
@@ -18,15 +57,18 @@ \ No newline at end of file + + + \ No newline at end of file diff --git a/resources/js/processes-catalogue/components/ProcessCollapseInfo.vue b/resources/js/processes-catalogue/components/ProcessCollapseInfo.vue index ca1ca956b4..c18f207457 100644 --- a/resources/js/processes-catalogue/components/ProcessCollapseInfo.vue +++ b/resources/js/processes-catalogue/components/ProcessCollapseInfo.vue @@ -1,79 +1,11 @@