From 684008944fdabe8c8b7aab56e0c37f24fd9f6b4d Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Tue, 26 Oct 2021 19:30:58 +0000 Subject: [PATCH 1/6] PMCORE-3458 --- .../js/home/TaskMetrics/VueChartLvThree.vue | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue index bbd17f288..2ae16d432 100644 --- a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue +++ b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue @@ -137,11 +137,11 @@ export default { size: this.data[3] && this.data[3].data.size ? this.data[3].data.size - : { name: this.$t("ID_ALL"), id: "all" }, + : { name: "20", id: "20" }, riskType: this.data[3] && this.data[3].data.riskType ? this.data[3].data.riskType - : "ON_TIME", + : "AT_RISK", settingsBreadcrumbs: [ { class: "fas fa-info-circle", @@ -150,11 +150,11 @@ export default { }, ], sizeOptions: [ - { name: this.$t("ID_ALL"), id: "all" }, - { name: "5", id: "5" }, { name: "10", id: "10" }, - { name: "15", id: "15" }, { name: "20", id: "20" }, + { name: "30", id: "30" }, + { name: "40", id: "40" }, + { name: "50", id: "50" }, ], dataCasesByRisk: [], width: 0, @@ -222,47 +222,47 @@ export default { * Change datepickers or radio button */ changeOption() { - let dt; - if (this.dateFrom && this.dateTo) { - dt = { - process: this.data[2].id, - caseList: this.data[1].id.toLowerCase(), - dateFrom: moment(this.dateFrom).format("YYYY-MM-DD"), - dateTo: moment(this.dateTo).format("YYYY-MM-DD"), - riskStatus: this.riskType, - }; - this.size.id != "all" ? (dt["topCases"] = this.size.id) : null; - this.dateNow = moment().format("YYYY-MM-DD h:mm:ss a"); - this.updateSettings(); - } + let dt; + if (this.dateFrom && this.dateTo) { + dt = { + process: this.data[2].id, + caseList: this.data[1].id.toLowerCase(), + dateFrom: moment(this.dateFrom).format("YYYY-MM-DD"), + dateTo: moment(this.dateTo).format("YYYY-MM-DD"), + riskStatus: this.riskType, + }; + this.size.id != "all" ? (dt["topCases"] = this.size.id) : null; + this.dateNow = moment().format("YYYY-MM-DD h:mm:ss a"); + this.updateSettings(); + } }, /** * Load option saved in userConfig */ loadOption() { - let that = this, - dt; - if (this.data.length > 2) { - if (this.dateFrom && this.dateTo) { - dt = { - process: this.data[2].id, - caseList: this.data[1].id.toLowerCase(), - dateFrom: moment(this.dateFrom).format("YYYY-MM-DD"), - dateTo: moment(this.dateTo).format("YYYY-MM-DD"), - riskStatus: this.riskType, - }; - this.size.id != "all" ? (dt["topCases"] = this.size.id) : null; - this.dateNow = moment().format("YYYY-MM-DD h:mm:ss a"); - Api.process - .totalCasesByRisk(dt) - .then((response) => { - that.formatDataRange(response.data); - }) - .catch((e) => { - console.error(e); - }); - } + let that = this, + dt; + if (this.data.length > 2) { + if (this.dateFrom && this.dateTo) { + dt = { + process: this.data[2].id, + caseList: this.data[1].id.toLowerCase(), + dateFrom: moment(this.dateFrom).format("YYYY-MM-DD"), + dateTo: moment(this.dateTo).format("YYYY-MM-DD"), + riskStatus: this.riskType, + }; + this.size.id != "all" ? (dt["topCases"] = this.size.id) : null; + this.dateNow = moment().format("YYYY-MM-DD h:mm:ss a"); + Api.process + .totalCasesByRisk(dt) + .then((response) => { + that.formatDataRange(response.data); + }) + .catch((e) => { + console.error(e); + }); } + } }, /** * Format response fromn API From e4cd922dfe566aad0f7a15721fd2e64787c950d0 Mon Sep 17 00:00:00 2001 From: Rodrigo Quelca Date: Wed, 27 Oct 2021 13:28:30 +0000 Subject: [PATCH 2/6] PMCORE-3451: Task Metrics Level 3 hand doesnt work allowing to navigate withing the nodes PMCORE_3.7.0-5487 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 70a3e8db0..1fd5f775e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -257,9 +257,9 @@ } }, "apexcharts": { - "version": "3.28.1", - "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.28.1.tgz", - "integrity": "sha512-5M1KitI/XmY2Sx6ih9vQOXyQUTmotDG/cML2N6bkBlVseF10RPSzM7dkrf7Y68apSZF6e7J581gXXu1+qkLhCA==", + "version": "3.29.0", + "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.29.0.tgz", + "integrity": "sha512-PhI17VayidYAbLb5/g+7WOeirgFrVopzt0qGwLq8V+cd6NXx4CeHYq3S0pDZiUGO7UFQ4YIrT8+ie9/Fnler+w==", "requires": { "svg.draggable.js": "^2.2.2", "svg.easing.js": "^2.0.0", diff --git a/package.json b/package.json index 982d59e17..7637f5383 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@fortawesome/fontawesome-svg-core": "^1.2.35", "@fortawesome/free-solid-svg-icons": "^5.15.3", "@fortawesome/vue-fontawesome": "^2.0.2", - "apexcharts": "^3.27.3", + "apexcharts": "^3.28.2", "axios": "^0.15.3", "bootstrap": "^4.5.3", "bootstrap-colorpicker": "^3.0.3", From 30742b47461f49ebed3429c1696e68ab3d9fc5bd Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Thu, 28 Oct 2021 16:15:12 +0000 Subject: [PATCH 3/6] update --- .../js/home/TaskMetrics/VueChartLvThree.vue | 997 +++++++++--------- 1 file changed, 519 insertions(+), 478 deletions(-) diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue index 2ae16d432..7c2d66f14 100644 --- a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue +++ b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue @@ -1,105 +1,107 @@ - \ No newline at end of file + From 232eb450aa9c60851889b13b4a99ef24454e023e Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Fri, 29 Oct 2021 12:44:51 -0400 Subject: [PATCH 4/6] PMCORE-3490 Custom Case List is displaying other Processes cases than the one belong to the Report Table of a Process PMCORE_3.7.0-5474 --- .../src/ProcessMaker/BusinessModel/Cases/Home.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php index e9ea2cfd7..c70465f2f 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php @@ -278,6 +278,7 @@ class Home ->first(); if (!empty($caseList)) { $tableName = $caseList->ADD_TAB_NAME; + $proUid = $caseList->PRO_UID; //this gets the configured columns $columns = json_decode($caseList->CAL_COLUMNS); @@ -300,13 +301,18 @@ class Home } //this modifies the query - if (!empty($tableName) && !empty($fields)) { - $arguments[] = function ($query) use ($tableName, $fields, $customFilters, $types) { + if (!empty($tableName)) { + $arguments[] = function ($query) use ($tableName, $fields, $customFilters, $types, $proUid) { + //setting the related process + $query->where('PROCESS.PRO_UID', '=', $proUid); + + //setting columns data from report table $query->leftJoin($tableName, "{$tableName}.APP_UID", "=", "APP_DELEGATION.APP_UID"); foreach ($fields as $value) { $query->addSelect($value); } - //filters for custom case list + + //setting filters for custom case list foreach ($customFilters as $key => $filter) { if (in_array($key, $fields)) { //special case for date range From cdd4a3ff77fda149bc2e21f23b813af3ccd0905d Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Mon, 1 Nov 2021 16:22:25 +0000 Subject: [PATCH 5/6] PMCORE-3451 update level 3 --- resources/assets/js/home/TaskMetrics/VueChartLvThree.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue index 7c2d66f14..77c6bed58 100644 --- a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue +++ b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue @@ -145,7 +145,7 @@ export default { riskType: this.data[3] && this.data[3].data.riskType ? this.data[3].data.riskType - : "AT_RISK", + : "ON_TIME", settingsBreadcrumbs: [ { class: "fas fa-info-circle", From 61ac04bc0e81de7476f2afb229026e7e031add02 Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Wed, 3 Nov 2021 11:10:20 -0400 Subject: [PATCH 6/6] PMCORE-3491 --- workflow/engine/classes/model/AppDelegation.php | 3 ++- workflow/engine/src/ProcessMaker/Core/System.php | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php index 095fae749..71a40b45d 100644 --- a/workflow/engine/classes/model/AppDelegation.php +++ b/workflow/engine/classes/model/AppDelegation.php @@ -50,7 +50,8 @@ class AppDelegation extends BaseAppDelegation { try { // This value needs to have a value like 0.x - $risk = 0.2; + $systemConfiguration = Bootstrap::getSystemConfiguration(); + $risk = $systemConfiguration['at_risk_delegation_max_time']; return $risk; } catch (Exception $e) { diff --git a/workflow/engine/src/ProcessMaker/Core/System.php b/workflow/engine/src/ProcessMaker/Core/System.php index 8c3e69bb3..1fd30c670 100644 --- a/workflow/engine/src/ProcessMaker/Core/System.php +++ b/workflow/engine/src/ProcessMaker/Core/System.php @@ -84,7 +84,8 @@ class System 'report_table_double_number' => 4, 'ext_ajax_timeout' => 600000, 'disable_task_manager_routing_async' => '0', - 'on_one_server_enable' => 0 + 'on_one_server_enable' => 0, + 'at_risk_delegation_max_time' => '0.2', ]; /** @@ -1246,6 +1247,11 @@ class System $config['disable_task_manager_routing_async'] = self::$defaultConfig['disable_task_manager_routing_async']; } + $value = $config['at_risk_delegation_max_time']; + if ($value > 0 && $value < 1) { + $config['at_risk_delegation_max_time'] = self::$defaultConfig['at_risk_delegation_max_time']; + } + return $config; }