diff --git a/ProcessMaker/Http/Middleware/GenerateMenus.php b/ProcessMaker/Http/Middleware/GenerateMenus.php index d1b3bf5ea5..a0ce2ca771 100644 --- a/ProcessMaker/Http/Middleware/GenerateMenus.php +++ b/ProcessMaker/Http/Middleware/GenerateMenus.php @@ -38,8 +38,8 @@ public function handle(Request $request, Closure $next) }); $menu->group(['prefix' => 'requests'], function ($request_items) { $request_items->add( - __('Requests'), - ['route' => 'requests.index', 'id' => 'requests'] + __('Cases'), + ['route' => 'cases.index', 'id' => 'requests'] )->active('requests/*'); }); //@TODO change the index to the correct blade @@ -141,21 +141,21 @@ public function handle(Request $request, Closure $next) }); Menu::make('sidebar_request', function ($menu) { $submenu = $menu->add(__('Request')); - $submenu->add(__('My Requests'), [ - 'route' => ['requests_by_type', ''], + $submenu->add(__('My Cases'), [ + 'route' => ['cases_by_type', ''], 'icon' => 'fa-id-badge', ]); $submenu->add(__('In Progress'), [ - 'route' => ['requests_by_type', 'in_progress'], + 'route' => ['cases_by_type', 'in_progress'], 'icon' => 'fa-clipboard-list', ]); $submenu->add(__('Completed'), [ - 'route' => ['requests_by_type', 'completed'], + 'route' => ['cases_by_type', 'completed'], 'icon' => 'fa-clipboard-check', ]); if (\Auth::check() && \Auth::user()->can('view-all_requests')) { - $submenu->add(__('All Requests'), [ - 'route' => ['requests_by_type', 'all'], + $submenu->add(__('All Cases'), [ + 'route' => ['cases_by_type', 'all'], 'icon' => 'fa-clipboard', ]); } diff --git a/resources/img/cases-loading.svg b/resources/img/cases-loading.svg new file mode 100644 index 0000000000..f2f3af62b6 --- /dev/null +++ b/resources/img/cases-loading.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/js/components/requests/requestModal.vue b/resources/js/components/requests/requestModal.vue index bbcec83093..26b565322e 100644 --- a/resources/js/components/requests/requestModal.vue +++ b/resources/js/components/requests/requestModal.vue @@ -123,7 +123,7 @@ -

{{ $t('Finding Requests available to you...') }}

+

{{ $t('Finding Cases available to you...') }}

- -
- {{ titleText }} -
-
- {{ descriptionText }} +
+ + {{ titleText }} + {{ descriptionText }}
@@ -18,7 +16,7 @@ export default { props: { imageSrc: { type: String, - default: "/img/tasks-loading.svg", + default: "/img/cases-loading.svg", }, altText: { type: String, @@ -38,8 +36,38 @@ export default { diff --git a/resources/js/processes-catalogue/components/ProcessTab.vue b/resources/js/processes-catalogue/components/ProcessTab.vue index c327460d78..6d8a339875 100644 --- a/resources/js/processes-catalogue/components/ProcessTab.vue +++ b/resources/js/processes-catalogue/components/ProcessTab.vue @@ -6,7 +6,7 @@ lazy >
diff --git a/resources/js/processes-catalogue/components/TaskTab.vue b/resources/js/processes-catalogue/components/TaskTab.vue index 0c67f94fdf..22b8ef9977 100644 --- a/resources/js/processes-catalogue/components/TaskTab.vue +++ b/resources/js/processes-catalogue/components/TaskTab.vue @@ -19,10 +19,8 @@
diff --git a/resources/js/tasks/components/TasksList.vue b/resources/js/tasks/components/TasksList.vue index b27f874437..8f43156949 100644 --- a/resources/js/tasks/components/TasksList.vue +++ b/resources/js/tasks/components/TasksList.vue @@ -310,7 +310,7 @@ export default { }, { value: "showRequestSummary", - content: "Open Request", + content: "Open Case", icon: "fas fa-clipboard", link: true, href: "/requests/{{process_request.id}}", diff --git a/resources/lang/en.json b/resources/lang/en.json index 0c29908269..18995f236b 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -93,6 +93,7 @@ "Align Top": "Align Top", "All {{assets}} will be included in this export.": "All {{assets}} will be included in this export.", "All assignments were saved.": "All assignments were saved.", + "All Cases": "All Cases", "All Clear": "All Clear", "All elements related to this process will be imported.": "All elements related to this process will be imported.", "All Notifications": "All Notifications", @@ -251,7 +252,7 @@ "Call Activity": "Call Activity", "Callback": "Callback", "Can not assign this task because there is no previous user assigned before this task": "Can not assign this task because there is no previous user assigned before this task", - "Cancel Request": "Cancel Request", + "Cancel Case": "Cancel Case", "Cancel Screen": "Cancel Screen", "Cancel": "Cancel", "Cancel And Go Back": "Cancel And Go Back", @@ -262,6 +263,7 @@ "CAPTCHA controls cannot be placed within a Loop control.": "CAPTCHA controls cannot be placed within a Loop control.", "Case": "Case", "Case by Status": "Case by Status", + "Cases": "Cases", "Cases Started": "Cases Started", "Catch Events": "Catch Events", "Categories are required to create a process": "Categories are required to create a process", @@ -730,7 +732,7 @@ "Filter Controls": "Filter Controls", "Filter the column:": "Filter the column:", "Filter": "Filter", - "Finding Requests available to you...": "Finding Requests available to you...", + "Finding Cases available to you...": "Finding Cases available to you...", "First Name": "First Name", "Flow completed": "Flow completed", "Flow in loop": "Flow in loop", @@ -993,6 +995,7 @@ "Multi-Instance (Sequential)": "Multi-Instance (Sequential)", "Multicolumn / Table": "Multicolumn / Table", "Must be unique": "Must be unique", + "My Cases": "My Cases", "My Bookmarks": "My Bookmarks", "My Projects": "My Projects", "My Requests": "My Requests", @@ -1066,6 +1069,7 @@ "No elements found. Consider changing the search query.": "No elements found. Consider changing the search query.", "No Errors": "No Errors", "No files available for download": "No files available for download", + "No items to show.": "No items to show.", "No Image": "No Image", "No Loop Mode": "No Loop Mode", "No new notifications at the moment.": "No new notifications at the moment.", @@ -2108,6 +2112,7 @@ "You have {{ inOverDue }} overdue {{ taskText }} pending": "You have {{ inOverDue }} overdue {{ taskText }} pending", "You have made no requests of this process.": "You have made no requests of this process.", "You have no tasks from this process.": "You have no tasks from this process.", + "You have to start a Case of this process.": "You have to start a Case of this process.", "You must authorize your account before configuring folders": "You must authorize your account before configuring folders", "You must have your database credentials available in order to continue.": "You must have your database credentials available in order to continue.", "You must select at least one day.": "You must select at least one day.", diff --git a/resources/lang/es.json b/resources/lang/es.json index 8ee7535c2c..5172b99a0b 100644 --- a/resources/lang/es.json +++ b/resources/lang/es.json @@ -39,6 +39,7 @@ "After importing, you can reassign users and groups to your Process.": "Después de importar, puede reasignar usuarios y grupos a su Proceso.", "After": "Después", "All assignments were saved.": "Todas las tareas fueron guardadas.", + "All Cases": "Todos los casos", "All Notifications": "Todas las notificaciones", "All Requests": "Todas las solicitudes", "All Rights Reserved": "Todos los derechos reservados", @@ -113,7 +114,7 @@ "Calcs": "Calculadas", "Calculated Properties": "Propiedades calculadas", "Call Activity": "Actividad de llamadas", - "Cancel Request": "Cancelar solicitud", + "Cancel Case": "Cancelar solicitud", "Cancel Screen": "Cancelar pantalla", "Cancel": "Cancelar", "Canceled": "Cancelado", @@ -366,7 +367,7 @@ "Filter Controls": "Controles de filtro", "Filter the column:": "Filtrar la columna:", "Filter": "Filtrar", - "Finding Requests available to you...": "Buscando solicitudes disponibles para usted...", + "Finding Cases available to you...": "Buscando solicitudes disponibles para usted...", "First Name": "Nombre de pila", "Flow splits implicitly": "El flujo se divide implícitamente", "Font Size": "Tamaño de fuente", @@ -492,6 +493,7 @@ "Must be unique": "Debe ser único", "Multi Column": "Múltiples columnas", "Multicolumn / Table": "Columnas múltiples/tabla", + "My Cases": "Mis Casos", "My Requests": "Mis solicitudes", "Name must be unique": "El nombre debe ser único", "Name of Variable to store the output": "Nombre de variable para almacenar la salida", @@ -534,6 +536,7 @@ "No Data Found": "Ne se encontraron datos", "No elements found. Consider changing the search query.": "No se encontraron elementos. Considere cambiar la consulta de búsqueda.", "No Errors": "Sin errores", + "No items to show.": "No hay casos para mostrar.", "No files available for download": "No hay archivos disponibles para descarga", "No Notifications Found": "No se encontraron notificaciones", "no problems to report": "sin problemas que reportar", @@ -1006,6 +1009,7 @@ "You don't currently have any tasks assigned to you": "Actualmente no tiene tareas asignadas", "You don't have any Processes.": "Usted no tiene ningún proceso.", "You have {{ inOverDue }} overdue {{ taskText }} pending": "Tiene {{ inOverDue }} vencidos {{ taskText }} pendiente", + "You have to start a Case of this process.": "Usted tiene que iniciar un caso en este proceso", "You must have your database credentials available in order to continue.": "Debe tener las credenciales de su base de datos disponibles para poder continuar.", "Your account has been timed out for security.": "Se ha finalizado el tiempo de espera por motivos de seguridad.", "Your password has been reset!": "¡Su contraseña ha sido restablecida!", @@ -1302,6 +1306,7 @@ "Browser": "Navegador", "Callback": "Devolución de llamada", "Case": "Caso", + "Cases": "Casos", "Catch Events": "Eventos de captura", "Change Version Details": "Cambiar detalles de la versión", "Check Flow": "Comprobar flujo", diff --git a/resources/lang/fr.json b/resources/lang/fr.json index 69aa0c818f..efd867e563 100644 --- a/resources/lang/fr.json +++ b/resources/lang/fr.json @@ -113,7 +113,7 @@ "Calcs": "Calculs", "Calculated Properties": "Propriétés calculées", "Call Activity": "Activité d'appel", - "Cancel Request": "Annuler la demande", + "Cancel Case": "Annuler la demande", "Cancel Screen": "Annuler l'écran", "Cancel": "Annuler", "Canceled": "Annulé", @@ -365,7 +365,7 @@ "Filter Controls": "Commandes de filtre", "Filter the column:": "Filtrer la colonne:", "Filter": "Filtrer", - "Finding Requests available to you...": "Trouver des demandes disponibles pour vous...", + "Finding Cases available to you...": "Trouver des demandes disponibles pour vous...", "First Name": "Prénom", "Flow splits implicitly": "Le flux se divise implicitement", "Font Size": "Taille de police", diff --git a/resources/views/processes/edit.blade.php b/resources/views/processes/edit.blade.php index 851a909957..109382ceca 100644 --- a/resources/views/processes/edit.blade.php +++ b/resources/views/processes/edit.blade.php @@ -116,7 +116,7 @@
- {!! Form::label('cancelRequest', __('Cancel Request')) !!} + {!! Form::label('cancelRequest', __('Cancel Case')) !!} [ - __('Requests') => route('requests.index'), + __('Cases') => route('requests.index'), function() use ($title) { return [__($title), null]; } ]]) @endsection @@ -22,31 +22,31 @@ function() use ($title) { return [__($title), null]; } @can('view-all_requests') @endcan diff --git a/resources/views/requests/show.blade.php b/resources/views/requests/show.blade.php index bf95616171..bd222297d6 100644 --- a/resources/views/requests/show.blade.php +++ b/resources/views/requests/show.blade.php @@ -342,7 +342,7 @@ class="btn d-block mr-0 ml-auto button-collapse"
    • @endif diff --git a/routes/api.php b/routes/api.php index 7ca9f54b60..dcce54ac36 100644 --- a/routes/api.php +++ b/routes/api.php @@ -210,6 +210,8 @@ }); Route::get('/tasks/rule-execution-log', [InboxRulesController::class, 'executionLog'])->name('inboxrules.execution-log'); + // Cases + Route::get('cases', [ProcessRequestController::class, 'index'])->name('cases.index'); // Requests Route::get('requests', [ProcessRequestController::class, 'index'])->name('requests.index'); // Already filtered in controller Route::get('requests/{process}/count', [ProcessRequestController::class, 'getCount'])->name('requests.count'); diff --git a/routes/web.php b/routes/web.php index a6fe29b85f..317bb87eb6 100644 --- a/routes/web.php +++ b/routes/web.php @@ -134,7 +134,13 @@ Route::get('/redirect-to-intended', [HomeController::class, 'redirectToIntended'])->name('redirect_to_intended'); Route::post('/keep-alive', [LoginController::class, 'keepAlive'])->name('keep-alive'); - + // Cases + Route::get('cases', [RequestController::class, 'index'])->name('cases.index')->middleware('no-cache'); + Route::get('cases/{request}', [RequestController::class, 'show'])->name('cases.show'); + Route::get('cases/{type?}', [RequestController::class, 'index'])->name('cases_by_type') + ->where('type', 'all|in_progress|completed') + ->middleware('no-cache'); + // Requests Route::get('requests/search', [RequestController::class, 'search'])->name('requests.search'); Route::get('requests/{type?}', [RequestController::class, 'index']) ->where('type', 'all|in_progress|completed')