From 25f6b2f1d3edd82dd8b16f52339c3bd86088197b Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Wed, 29 Nov 2023 12:43:54 -0400 Subject: [PATCH 1/5] feature/FOUR-11536 --- .../ProcessesCatalogueController.php | 5 +- .../components/ProcessInfo.vue | 5 +- .../components/ProcessOptions.vue | 102 ++++++++++++++++++ .../views/processes-catalogue/open.blade.php | 2 +- 4 files changed, 108 insertions(+), 6 deletions(-) create mode 100644 resources/js/processes-catalogue/components/ProcessOptions.vue diff --git a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php index a17e35eb57..aaa67f593b 100644 --- a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php +++ b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php @@ -21,9 +21,6 @@ public function index(Request $request) */ public function open(Process $process, $id) { - return view('processes-catalogue.open', [ - 'process' => $process, - 'processId' => $id - ]); + return view('processes-catalogue.open', compact('id')); } } diff --git a/resources/js/processes-catalogue/components/ProcessInfo.vue b/resources/js/processes-catalogue/components/ProcessInfo.vue index 94e210d00d..aac435aecc 100644 --- a/resources/js/processes-catalogue/components/ProcessInfo.vue +++ b/resources/js/processes-catalogue/components/ProcessInfo.vue @@ -17,7 +17,7 @@ Process Map - Process Options + @@ -28,8 +28,11 @@ + + diff --git a/resources/views/processes-catalogue/open.blade.php b/resources/views/processes-catalogue/open.blade.php index 4532aea778..d617bad9ac 100644 --- a/resources/views/processes-catalogue/open.blade.php +++ b/resources/views/processes-catalogue/open.blade.php @@ -10,7 +10,7 @@ @section('content')
- +
@endsection From 4adf90b3dfd83d8df039827108266e8e9a54af84 Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Wed, 29 Nov 2023 13:29:52 -0400 Subject: [PATCH 2/5] feature/FOUR-11536 --- .../components/ProcessOptions.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/resources/js/processes-catalogue/components/ProcessOptions.vue b/resources/js/processes-catalogue/components/ProcessOptions.vue index 9b12ad7cde..aa800dcfcb 100644 --- a/resources/js/processes-catalogue/components/ProcessOptions.vue +++ b/resources/js/processes-catalogue/components/ProcessOptions.vue @@ -57,6 +57,9 @@ export default { this.getStartEvents(); }, methods: { + /** + * get start events for dropdown Menu + */ getStartEvents() { window.ProcessMaker.apiClient .get(`processes/${this.processId}`) @@ -69,18 +72,17 @@ export default { }); }); }, + /** + * Start new request + */ goToNewRequest(event) { - window.ProcessMaker.apiClient + ProcessMaker.apiClient .post(`/process_events/${this.processId}?event=${event}`) .then((response) => { this.spin = 0; let instance = response.data; this.$cookies.set("fromTriggerStartEvent", true, "1min"); - if (this.$cookies.get("isMobile") === "true") { - window.location = `/requests/mobile/${instance.id}`; - } else { - window.location = `/requests/${instance.id}`; - } + window.location = `/requests/${instance.id}`; }).catch((err) => { const data = err.response.data; if (data.message) { From ca020b85f41e90acbeaf030c1774459f809d049f Mon Sep 17 00:00:00 2001 From: luNunezProcessmaker Date: Wed, 29 Nov 2023 14:48:03 -0400 Subject: [PATCH 3/5] feature/FOUR-11536 --- .../components/ProcessInfo.vue | 54 +++++++------- .../components/ProcessOptions.vue | 71 ++++++++++++++++++- 2 files changed, 99 insertions(+), 26 deletions(-) diff --git a/resources/js/processes-catalogue/components/ProcessInfo.vue b/resources/js/processes-catalogue/components/ProcessInfo.vue index aac435aecc..239dad1aba 100644 --- a/resources/js/processes-catalogue/components/ProcessInfo.vue +++ b/resources/js/processes-catalogue/components/ProcessInfo.vue @@ -1,37 +1,41 @@ diff --git a/resources/js/processes-catalogue/components/ProcessOptions.vue b/resources/js/processes-catalogue/components/ProcessOptions.vue index 8756c51ad7..bca4b59279 100644 --- a/resources/js/processes-catalogue/components/ProcessOptions.vue +++ b/resources/js/processes-catalogue/components/ProcessOptions.vue @@ -9,10 +9,7 @@ > {{ $t('Start this process') }} -