Add process categories

ProcessMaker/Http/Controllers/Api/Administration/GroupsController.php

@@ -39,15 +39,15 @@ public function index(Request $request)
                 // Need to include number of users associations with this group
                 $groups = $groups->leftJoin('group_users', 'group_users.group_id', 'groups.id')
                     ->groupBy('groups.id')
-                    ->select(DB::raw('groups.*, count(group_users.id) as total_users'));
+                    ->select(DB::raw('`groups`.*, count(group_users.id) as total_users'));
             }
             $groups = $groups->paginate($perPage);
         } else {
             if($orderBy == 'total_users') {
                 // Need to include users count with roles
                 $groups = Group::leftJoin('group_users', 'group_users.group_id', 'groups.id')
                     ->groupBy('groups.id')
-                    ->select(DB::raw('groups.*, count(group_users.id) as total_users'))
+                    ->select(DB::raw('`groups`.*, count(group_users.id) as total_users'))
                     ->orderBy($orderBy, $orderDirection)->paginate($perPage);
             } else {
                 $groups = Group::orderBy($orderBy, $orderDirection)->paginate($perPage);

ProcessMaker/Http/Controllers/Api/Administration/ProcessCategoryController.php

@@ -4,10 +4,11 @@
 
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\Request;
-use ProcessMaker\Facades\ProcessCategoryManager;
 use ProcessMaker\Http\Controllers\Controller;
 use ProcessMaker\Model\Permission;
 use ProcessMaker\Model\ProcessCategory;
+use ProcessMaker\Transformers\ProcessCategoryTransformer;
+use Ramsey\Uuid\Uuid;
 
 /**
  * Implements endpoints to manage the process categories.
@@ -25,12 +26,24 @@ class ProcessCategoryController extends Controller
      */
     public function index(Request $request)
     {
-        $this->authorize('has-permission', Permission::PM_SETUP_PROCESS_CATEGORIES);
+        $query = ProcessCategory::where('uid', '!=', '')
+                 ->withCount('processes');
+
         $filter = $request->input("filter");
-        $start = $request->input("start");
-        $limit = $request->input("limit");
-        $response = ProcessCategoryManager::index($filter, $start, $limit);
-        return response($this->formatList($response), 200);
+        $filter === null ? : $query->where(
+            'name', 'like', '%' . $filter . '%'
+        );
+
+        $orderBy = $request->input('order_by', 'name');
+        $orderDirection = $request->input('order_direction', 'ASC');
+        $orderBy === null ? : $query->orderBy($orderBy, $orderDirection);
+
+        $status = $request->input('status');
+        $status === null ? : $query->where('status', $status);
+
+        $perPage = $request->input('per_page', 10);
+        $result = $query->paginate($perPage);
+        return fractal($result, new ProcessCategoryTransformer())->respond();
     }
 
     /**
@@ -42,10 +55,15 @@ public function index(Request $request)
      */
     public function store(Request $request)
     {
-        $this->authorize('has-permission', Permission::PM_SETUP_PROCESS_CATEGORIES);
         $data = $request->json()->all();
-        $response = ProcessCategoryManager::store($data);
-        return response($this->format($response), 201);
+
+        $processCategory = new ProcessCategory();
+        $processCategory->uid = str_replace('-', '', Uuid::uuid4());
+        $processCategory->fill($data);
+        $processCategory->saveOrFail();
+
+
+        return fractal($processCategory, new ProcessCategoryTransformer())->respond(201);
     }
 
     /**
@@ -59,8 +77,10 @@ public function store(Request $request)
     public function update(Request $request, ProcessCategory $processCategory)
     {
         $data = $request->json()->all();
-        $response = ProcessCategoryManager::update($processCategory, $data);
-        return response($this->format($response), 200);
+        $processCategory->fill($data);
+        $processCategory->saveOrFail();
+
+        return fractal($processCategory, new ProcessCategoryTransformer())->respond(200);
     }
 
     /**
@@ -72,7 +92,7 @@ public function update(Request $request, ProcessCategory $processCategory)
      */
     public function destroy(ProcessCategory $processCategory)
     {
-        ProcessCategoryManager::remove($processCategory);
+        $processCategory->delete();
         return response('', 204);
     }
 
@@ -85,39 +105,7 @@ public function destroy(ProcessCategory $processCategory)
      */
     public function show(ProcessCategory $processCategory)
     {
-        return response($this->format($processCategory), 200);
-    }
-
-    /**
-     * Format the process category as a JSON response.
-     *
-     * @param ProcessCategory $processCategory
-     *
-     * @return array
-     */
-    public function format(ProcessCategory $processCategory)
-    {
-        return [
-            "cat_uid" => $processCategory->uid,
-            "cat_name" => $processCategory->name,
-            "cat_total_processes" => isset($processCategory->processes_count)
-                ? $processCategory->processes_count : 0,
-        ];
-    }
-
-    /**
-     * Format the process category index as a JSON response.
-     *
-     * @param Collection $processCategories
-     *
-     * @return array
-     */
-    public function formatList(Collection $processCategories)
-    {
-        $response = [];
-        foreach ($processCategories as $processCategory) {
-            $response[] = $this->format($processCategory);
-        }
-        return $response;
+        return fractal($processCategory, new ProcessCategoryTransformer())
+               ->respond();
     }
 }

ProcessMaker/Http/Controllers/Designer/ProcessCategoryController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace ProcessMaker\Http\Controllers\Designer;
+
+use ProcessMaker\Http\Controllers\Controller;
+
+class ProcessCategoryController extends Controller
+{
+
+    /**
+     * Get the list task
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function index()
+    {
+        return view('processes.categories.index');
+    }
+
+}

ProcessMaker/Http/Middleware/GenerateMenus.php

@@ -106,7 +106,20 @@ public function handle(Request $request, Closure $next)
               'id' => 'homeid'
           ]);
        });
-        Menu::make('sidebar_process', function ($menu) {});
+
+        Menu::make('sidebar_processes', function ($menu) {
+          $submenu = $menu->add(__('menus.sidebar_processes.processes'));
+          $submenu->add(__('menus.sidebar_processes.processes'), [
+              'route' => 'processes',
+              'icon' => 'fa-play-circle',
+              'id' => 'processes'
+          ]);
+          $submenu->add(__('menus.sidebar_processes.categories'), [
+              'route' => 'process-categories-index',
+              'icon' => 'fa-list',
+              'id' => 'process-categories'
+          ]);
+        });
 
         Menu::make('sidebar_designer', function ($menu) {});