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/img/new-case-load.svg b/resources/img/new-case-load.svg new file mode 100644 index 0000000000..9aabfa5869 --- /dev/null +++ b/resources/img/new-case-load.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/resources/js/components/requests/requestModal.vue b/resources/js/components/requests/requestModal.vue index bbcec83093..d83dc3c6d2 100644 --- a/resources/js/components/requests/requestModal.vue +++ b/resources/js/components/requests/requestModal.vue @@ -14,7 +14,7 @@ md="8" >

- {{ $t("We've made it easy for you to start a Case for the following Processes. Select a Process to start your Case.") }} + {{ $t("Select a Process below to get started.") }}

-
-
- - - - - - - - -
-
-

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

+ new-case-loading +

+ {{ $t('Finding your processes') }} +

+

+ {{ $t('Please wait a moment while we locate and load your processes.') }} +

+

+ {{ $t('This should only take a few seconds.') }} +

diff --git a/resources/js/processes-catalogue/components/DefaultTab.vue b/resources/js/processes-catalogue/components/DefaultTab.vue index eb054091d4..06946e9816 100644 --- a/resources/js/processes-catalogue/components/DefaultTab.vue +++ b/resources/js/processes-catalogue/components/DefaultTab.vue @@ -1,14 +1,12 @@ @@ -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/lang/de.json b/resources/lang/de.json index 441bd44685..8cd3ab0912 100644 --- a/resources/lang/de.json +++ b/resources/lang/de.json @@ -984,7 +984,7 @@ "We can't find a user with that e-mail address.": "Wir können keinen Benutzer mit dieser E-Mail-Adresse finden.", "We have e-mailed your password reset link!": "Wir haben Ihnen eine E-Mail mit einem Link zum Zurücksetzen Ihres Passworts gesendet!", "We recommended a transparent PNG at :size pixels.": "Wir empfehlen ein transparentes PNG mit :size Pixeln.", - "We've made it easy for you to start a Case for the following Processes. Select a Process to start your Case.": "Mit unserem Programm ist es ganz einfach, eine Anfrage für die folgenden Prozesse zu generieren. Wählen Sie einen Prozess aus, um Ihre Anfrage zu generieren.", + "Select a Process below to get started.": "Wählen Sie einen Prozess aus, um Ihre Anfrage zu generieren.", "Web Entry": "Web-Eintrag", "week": "Woche", "Welcome": "Willkommen", diff --git a/resources/lang/en.json b/resources/lang/en.json index 633d26ca3a..a6d1fd626f 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", @@ -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", @@ -989,11 +991,13 @@ "Modified By Tasks": "Modified By Tasks", "Modified": "Modified", "month": "month", + "More Information": "More Information", "Multi Column": "Multi Column", "Multi-Instance (Parallel)": "Multi-Instance (Parallel)", "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", @@ -1067,6 +1071,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.", @@ -1206,6 +1211,7 @@ "Position": "Position", "Postal Code": "Postal Code", "Powered by ProcessMaker AI": "Powered by ProcessMaker AI", + "Process Information": "Process Information", "Generate single fields or entire forms with our generative assistant": "Generate single fields or entire forms with our generative assistant", "Collect a string of text and format it as one of several data types": "Collect a string of text and format it as one of several data types", "Collect options from a list, as radio butttons or dropdowns": "Collect options from a list, as radio butttons or dropdowns", @@ -2066,7 +2072,7 @@ "We have e-mailed your password reset link!": "We have e-mailed your password reset link!", "We recommend using fewer than 25 form elements in your screen for optimal performance.": "We recommend using fewer than 25 form elements in your screen for optimal performance.", "We recommended a transparent PNG at :size pixels.": "We recommended a transparent PNG at :size pixels.", - "We've made it easy for you to start a Case for the following Processes. Select a Process to start your Case.": "We've made it easy for you to start a Case for the following Processes. Select a Process to start your Case.", + "Select a Process below to get started.": "Select a Process to start your Case.", "Web Entry": "Web Entry", "Webhook URL": "Webhook URL", "week": "week", @@ -2112,6 +2118,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 113748c10c..76692bdc09 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", @@ -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 permissions to access this content": "No tiene permisos para acceder a este contenido", @@ -985,7 +988,7 @@ "We can't find a user with that e-mail address.": "No podemos encontrar un usuario con esa dirección de correo electrónico.", "We have e-mailed your password reset link!": "¡Le hemos enviado por correo electrónico el enlace para restablecer su contraseña!", "We recommended a transparent PNG at :size pixels.": "Recomendamos un PNG transparente en tamaño de píxeles:.", - "We've made it easy for you to start a Case for the following Processes. Select a Process to start your Case.": "Le facilitamos el inicio de una Solicitud para los siguientes Procesos. Seleccione un Proceso para iniciar su Solicitud.", + "Select a Process below to get started.": "Seleccione un Proceso para iniciar su Solicitud.", "Web Entry": "Entrada web", "week": "semana", "Welcome": "Bienvenido", @@ -1007,6 +1010,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!", @@ -1303,6 +1307,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 b3d9b4a49b..54aa82a1fb 100644 --- a/resources/lang/fr.json +++ b/resources/lang/fr.json @@ -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", @@ -984,7 +984,7 @@ "We can't find a user with that e-mail address.": "Cette adresse e-mail ne correspond à aucun utilisateur.", "We have e-mailed your password reset link!": "Nous vous avons envoyé un e-mail contenant le lien de réinitialisation de votre mot de passe !", "We recommended a transparent PNG at :size pixels.": "Nous recommandons l'utilisation d'un fichier PNG transparent de :size pixels.", - "We've made it easy for you to start a Case for the following Processes. Select a Process to start your Case.": "Nous avons simplifié pour vous la création de demandes pour les processus suivants. Sélectionnez un processus pour créer votre demande.", + "Select a Process below to get started.": "Sélectionnez un processus pour créer votre demande.", "Web Entry": "Page d'accès", "week": "semaine", "Welcome": "Bienvenue", diff --git a/resources/views/processes/edit.blade.php b/resources/views/processes/edit.blade.php index 53bbe63c5e..bb60166511 100644 --- a/resources/views/processes/edit.blade.php +++ b/resources/views/processes/edit.blade.php @@ -53,154 +53,302 @@
{{-- Configuration --}} -