fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/3.7.0 (pull request #8256)

Browse Source 
release/3.7.0
This commit is contained in:
Paula Quispe
2021-11-03 22:08:49 +00:00
committed by Julio Cesar Laura Avendaño
parent bcc0aec481 f91133374f
commit e6846d5afb
6 changed files with 531 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@@ -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",

2
package.json
View File

@@ -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",

977
resources/assets/js/home/TaskMetrics/VueChartLvThree.vue
View File

File diff suppressed because it is too large Load Diff

3
workflow/engine/classes/model/AppDelegation.php
View File

@@ -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) {

12
workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php
View File

@@ -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

8
workflow/engine/src/ProcessMaker/Core/System.php
View File

@@ -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;
}