Summer Improvements

ProcessMaker/Helpers/MobileHelper.php

@@ -13,4 +13,9 @@ public static function isMobile($userAgent)
 
         return false;
     }
+
+    public static function detectMobile()
+    {
+        return isset($_SERVER['HTTP_USER_AGENT']) && self::isMobile($_SERVER['HTTP_USER_AGENT']);
+    }
 }

ProcessMaker/Http/Controllers/Api/ProcessController.php

@@ -45,7 +45,7 @@ class ProcessController extends Controller
 {
     const CAROUSEL_TYPES = [
         'IMAGE' => 'image',
-        'EMBED' => 'embed'
+        'EMBED' => 'embed',
     ];
 
     /**
@@ -128,6 +128,7 @@ public function index(Request $request)
                     'id' => $item['id'],
                     'events'=> $item['start_events']];
             });
+
             return new ApiCollection($modifiedCollection);
         }
 
@@ -402,7 +403,7 @@ public function store(Request $request)
      * @param Process $process
      * @return ResponseFactory|Response
      *
-     * @throws \Throwable
+     * @throws Throwable
      *
      * @OA\Put(
      *     path="/processes/{processId}",
@@ -520,7 +521,7 @@ public function update(Request $request, Process $process)
     public function updateBpmn(Request $request, Process $process)
     {
         $request->validate(Process::rules($process));
-        
+
         // bpmn validation
         if ($schemaErrors = $this->validateBpmn($request)) {
             $warnings = [];
@@ -557,7 +558,8 @@ public function updateBpmn(Request $request, Process $process)
         ], 200);
     }
 
-    private function updateSubprocessElement($parentProcess, $request, $process) {
+    private function updateSubprocessElement($parentProcess, $request, $process)
+    {
         $definitions = $parentProcess->getDefinitions();
         $elements = $definitions->getElementsByTagName('callActivity');
         foreach ($elements as $element) {
@@ -584,7 +586,7 @@ private function updateSubprocessElement($parentProcess, $request, $process) {
      * @param Process $process
      * @return ResponseFactory|Response
      *
-     * @throws \Throwable
+     * @throws Throwable
      *
      * @OA\Put(
      *     path="/processes/{processId}/draft",
@@ -948,7 +950,7 @@ public function startProcesses(Request $request)
      * @param Process $process
      * @return ResponseFactory|Response
      *
-     * @throws \Throwable
+     * @throws Throwable
      *
      * @OA\Put(
      *     path="/processes/{processId}/restore",
@@ -1294,7 +1296,7 @@ public function import_ready($code)
      *
      * @return resource
      *
-     * @throws \Throwable
+     * @throws Throwable
      *
      * @OA\Post(
      *     path="/processes/{process_id}/import/assignments",
@@ -1440,7 +1442,7 @@ public function importAssignments(Process $process, Request $request)
      * @param Process $process
      * @param Request $request
      *
-     * @return \ProcessMaker\Http\Resources\ProcessRequests
+     * @return ProcessRequests
      *
      * @OA\Post(
      *     path="/process_events/{process_id}",
@@ -1778,7 +1780,7 @@ public function deleteMediaImages(Request $request, Process $process)
      * @param string $uuid
      * @param string $collectionName
      * @return bool
-    */
+     */
     private function deleteImage(Process $process, $uuid, $collectionName)
     {
         // Retrieve the media image by UUID and collection name
@@ -1788,6 +1790,7 @@ private function deleteImage(Process $process, $uuid, $collectionName)
         // If the media image exists, delete it and return true
         if ($mediaImagen) {
             $mediaImagen->delete();
+
             return true;
         } else {
             // Otherwise, return false

ProcessMaker/Http/Controllers/Api/ProcessLaunchpadController.php

@@ -12,6 +12,7 @@
 use ProcessMaker\Models\Media;
 use ProcessMaker\Models\Process;
 use ProcessMaker\Models\ProcessLaunchpad;
+use ProcessMaker\Models\ProcessRequest;
 
 class ProcessLaunchpadController extends Controller
 {
@@ -24,7 +25,9 @@ public function getProcesses(Request $request)
         $processes = Process::nonSystem()->active();
         // Filter by category
         $category = $request->input('category', null);
-        if (!empty($category)) {
+        if ($category === 'recent') {
+            $processes->orderByRecentRequests();
+        } elseif (!empty($category)) {
             $processes->processCategory($category);
         }
         // Filter pmql
@@ -54,9 +57,30 @@ 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);
     }
 
+    protected function getCounts($processId)
+    {
+        $result = ProcessRequest::where('process_id', $processId)
+            ->selectRaw('status, count(*) as count')
+            ->groupBy('status')
+            ->get();
+
+        $completed = $result->where('status', 'COMPLETED')->first()?->count ?? 0;
+        $in_progress = $result->where('status', 'ACTIVE')->first()?->count ?? 0;
+
+        return [
+            'completed' => $completed,
+            'in_progress' => $in_progress,
+            'total' => $completed + $in_progress,
+        ];
+    }
+
     /**
      * Get the size of the page.
      * per_page=# (integer, the page requested) (Default: 10).
@@ -83,7 +107,12 @@ public function index(Request $request, Process $process)
             }])
             ->where('id', $process->id)
             ->get()
-            ->toArray();
+            ->map(function ($process) use ($request) {
+                $process->counts = $this->getCounts($process->id);
+                $process->bookmark_id = Bookmark::getBookmarked(true, $process->id, $request->user()->id);
+
+                return $process;
+            });
 
         return new ApiResource($processes);
     }
@@ -120,9 +149,9 @@ public function destroy(ProcessLaunchpad $launch)
         return response([], 204);
     }
 
-   /**
-    * Store the elements related to the carousel [IMAGE, EMBED URL]
-    */
+    /**
+     * Store the elements related to the carousel [IMAGE, EMBED URL]
+     */
     public function saveContentCarousel(Request $request, Process $process)
     {
         $contentCarousel = $request->input('imagesCarousel');
@@ -144,7 +173,6 @@ public function saveContentCarousel(Request $request, Process $process)
                         // Nothing
                         break;
                 }
-
             }
         }
     }

ProcessMaker/Http/Controllers/Api/TaskDraftController.php

@@ -12,6 +12,19 @@
 
 class TaskDraftController extends Controller
 {
+    public function index(Request $request, ProcessRequestToken $task)
+    {
+        $search = ['task_id' => $task->id];
+        $draft = TaskDraft::where($search)->first();
+
+        if ($draft) {
+            $draftData = $draft->data;
+            return new ApiResource($draftData);
+        }
+
+        return new ApiResource(null);
+    }
+
     public function update(Request $request, ProcessRequestToken $task)
     {
         $search = ['task_id' => $task->id];
@@ -24,7 +37,6 @@ public function update(Request $request, ProcessRequestToken $task)
         }
         $draft->data = $data;
         $draft->saveOrFail();
-
         return new ApiResource($draft);
     }
 

ProcessMaker/Http/Controllers/Auth/LoginController.php

@@ -277,11 +277,11 @@ public function loggedOut(Request $request)
      * Handle a login request to the application.
      * Overrides the original login action.
      *
-     * @param  \Illuminate\Http\Request $request
-     * @param  \ProcessMaker\Models\User $user
+     * @param  Request $request
+     * @param  User $user
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|\Illuminate\Http\JsonResponse
      *
-     * @throws \Illuminate\Validation\ValidationException
+     * @throws ValidationException
      */
     public function login(Request $request, User $user)
     {
@@ -340,7 +340,7 @@ public function login(Request $request, User $user)
     /**
      * Throws locked error message
      *
-     * @throws \Illuminate\Validation\ValidationException
+     * @throws ValidationException
      */
     protected function throwLockedLoginResponse()
     {

ProcessMaker/Http/Controllers/ProcessController.php

@@ -124,7 +124,7 @@ public function edit(Process $process)
             'canEditData',
             'addons',
             'assignedProjects',
-            'isDraft'
+            'isDraft',
         ]));
     }
 

ProcessMaker/Http/Controllers/ProcessesCatalogueController.php

@@ -5,12 +5,13 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use ProcessMaker\Events\ScreenBuilderStarting;
+use ProcessMaker\Helpers\MobileHelper;
 use ProcessMaker\Http\Controllers\Controller;
 use ProcessMaker\Managers\ScreenBuilderManager;
-use ProcessMaker\Models\Process;
 use ProcessMaker\Models\Bookmark;
-use ProcessMaker\Models\ProcessLaunchpad;
+use ProcessMaker\Models\Process;
 use ProcessMaker\Models\ProcessCategory;
+use ProcessMaker\Models\ProcessLaunchpad;
 use ProcessMaker\Traits\HasControllerAddons;
 
 /**
@@ -22,7 +23,7 @@
 class ProcessesCatalogueController extends Controller
 {
     use HasControllerAddons;
-    
+
     public function index(Request $request, Process $process = null)
     {
         $manager = app(ScreenBuilderManager::class);
@@ -33,6 +34,13 @@ public function index(Request $request, Process $process = null)
             $process->launchpad = ProcessLaunchpad::getLaunchpad(true, $process->id);
             $process->bookmark_id = Bookmark::getBookmarked(true, $process->id, $currentUser['id']);
         }
+
+        if (MobileHelper::detectMobile()) {
+            $title = __('Process Browser');
+
+            return view('processes-catalogue.mobile', compact('title', 'process', 'currentUser', 'manager'));
+        }
+
         return view('processes-catalogue.index', compact('process', 'currentUser', 'manager'));
     }
 }

ProcessMaker/Http/Controllers/TaskController.php

@@ -165,8 +165,12 @@ public function edit(ProcessRequestToken $task, string $preview = '')
 
     public function quickFillEdit(ProcessRequestToken $task)
     {
+        $screenVersion = $task->getScreenVersion();
+        $screenFields = $screenVersion ? $screenVersion->screenFilteredFields() : [];
+
         return view('tasks.editQuickFill', [
             'task' => $task,
+            'screenFields' => $screenFields,
         ]);
     }
 }