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

Merged in release/3.7.3 (pull request #8354)

Browse Source 
release/3.7.3

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Paula Quispe
2022-01-20 21:08:41 +00:00
committed by Julio Cesar Laura Avendaño
parent 9355bb16de 3a57f8c800
commit 95e8fbe6b4
9 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -395,25 +395,25 @@ export default {
let obj = this.dataCasesByRisk[seriesIndex]; let obj = this.dataCasesByRisk[seriesIndex];
return `<div class="apexcharts-theme-light"> return `<div class="apexcharts-theme-light">
<div class="apexcharts-tooltip-title" style="font-family: Helvetica, Arial, sans-serif; font-size: 12px;"> <div class="apexcharts-tooltip-title" style="font-family: Helvetica, Arial, sans-serif; font-size: 12px;">
${"Number Case"} : ${obj["number_case"]} ${this.$t("ID_CASE_NUMBER")} : ${obj["number_case"]}
</div> </div>
<div class="apexcharts-tooltip-series-group apexcharts-active" style="order: 1; display: flex;"> <div class="apexcharts-tooltip-series-group apexcharts-active" style="order: 1; display: flex;">
<div class="apexcharts-tooltip-text" style="font-family: Helvetica, Arial, sans-serif; font-size: 12px;"> <div class="apexcharts-tooltip-text" style="font-family: Helvetica, Arial, sans-serif; font-size: 12px;">
<div class="apexcharts-tooltip-y-group"> <div class="apexcharts-tooltip-y-group">
<span class="" style="background-color: #28a745;"></span> <span class="" style="background-color: #28a745;"></span>
<span class="apexcharts-tooltip-text-y-label">Delegated</span> : <span class="apexcharts-tooltip-text-y-value">${ <span class="apexcharts-tooltip-text-y-label">${this.$t("ID_DELEGATED")}</span> : <span class="apexcharts-tooltip-text-y-value">${
obj["delegated"] obj["delegated"]
}</span> }</span>
</div> </div>
<div class="apexcharts-tooltip-y-group"> <div class="apexcharts-tooltip-y-group">
<span class="" style="background-color: #28a745;"></span> <span class="" style="background-color: #28a745;"></span>
<span class="apexcharts-tooltip-text-y-label">At Risk</span> : <span class="apexcharts-tooltip-text-y-value">${ <span class="apexcharts-tooltip-text-y-label">${this.$t("ID_AT_RISK")}</span> : <span class="apexcharts-tooltip-text-y-value">${
obj["at_risk"] obj["at_risk"]
}</span> }</span>
</div> </div>
<div class="apexcharts-tooltip-y-group"> <div class="apexcharts-tooltip-y-group">
<span class="" style="background-color: #28a745;"></span> <span class="" style="background-color: #28a745;"></span>
<span class="apexcharts-tooltip-text-y-label">Due Date</span> : <span class="apexcharts-tooltip-text-y-value">${ <span class="apexcharts-tooltip-text-y-label">${this.$t("ID_CASESLIST_DEL_TASK_DUE_DATE")}</span> : <span class="apexcharts-tooltip-text-y-value">${
obj["due_date"] obj["due_date"]
}</span> }</span>
</div> </div>

10
workflow/engine/classes/WorkspaceTools.php
View File

@@ -832,6 +832,16 @@ class WorkspaceTools
$description = $database->executeQuery($database->generateDescTableSQL($table)); $description = $database->executeQuery($database->generateDescTableSQL($table));
$oldSchema[$table] = []; $oldSchema[$table] = [];
foreach ($description as $field) { foreach ($description as $field) {
$type = $field['Type'];
if ($type === "int") {
$field['Type'] = $type . "(11)";
}
if ($type === "tinyint") {
$field['Type'] = $type . "(4)";
}
if ($type === "bigint") {
$field['Type'] = $type . "(20)";
}
$oldSchema[$table][$field['Field']]['Field'] = $field['Field']; $oldSchema[$table][$field['Field']]['Field'] = $field['Field'];
$oldSchema[$table][$field['Field']]['Type'] = $field['Type']; $oldSchema[$table][$field['Field']]['Type'] = $field['Type'];
$oldSchema[$table][$field['Field']]['Null'] = $field['Null']; $oldSchema[$table][$field['Field']]['Null'] = $field['Null'];

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

@@ -198,6 +198,9 @@ class Users extends BaseUsers
if (empty($aFields['USR_DEFAULT_LANG'])) { if (empty($aFields['USR_DEFAULT_LANG'])) {
$aFields['USR_DEFAULT_LANG'] = 'en'; $aFields['USR_DEFAULT_LANG'] = 'en';
} }
//sometimes the USR_DEFAULT_LANG value is made up, it is formatted in order to find the value.
$explode = explode('-', $aFields['USR_DEFAULT_LANG']);
$aFields['USR_DEFAULT_LANG'] = strtolower($explode[0]);
$translations = new Language(); $translations = new Language();
$translation = $translations->loadByCode($aFields['USR_DEFAULT_LANG']); $translation = $translations->loadByCode($aFields['USR_DEFAULT_LANG']);
$aFields['USR_DEFAULT_LANG_NAME'] = $translation['LANGUAGE_NAME']; $aFields['USR_DEFAULT_LANG_NAME'] = $translation['LANGUAGE_NAME'];

14
workflow/engine/config/schema.xml
View File

@@ -4314,7 +4314,7 @@
<column name="VAR_LABEL" type="VARCHAR" size="255" default=""/> <column name="VAR_LABEL" type="VARCHAR" size="255" default=""/>
<column name="VAR_DBCONNECTION" type="VARCHAR" size="32"/> <column name="VAR_DBCONNECTION" type="VARCHAR" size="32"/>
<column name="VAR_SQL" type="LONGVARCHAR"/> <column name="VAR_SQL" type="LONGVARCHAR"/>
<column name="VAR_NULL" type="TINYINT" size="32" default="0"/> <column name="VAR_NULL" type="TINYINT" default="0"/>
<column name="VAR_DEFAULT" type="VARCHAR" size="32" default=""/> <column name="VAR_DEFAULT" type="VARCHAR" size="32" default=""/>
<column name="VAR_ACCEPTED_VALUES" type="LONGVARCHAR"/> <column name="VAR_ACCEPTED_VALUES" type="LONGVARCHAR"/>
<column name="INP_DOC_UID" type="VARCHAR" size="32" default=""/> <column name="INP_DOC_UID" type="VARCHAR" size="32" default=""/>
@@ -6049,10 +6049,10 @@
<column name="id" type="BIGINT" size="20" required="true" autoIncrement="true" primaryKey="true"/> <column name="id" type="BIGINT" size="20" required="true" autoIncrement="true" primaryKey="true"/>
<column name="queue" type="VARCHAR" size="255" required="true"/> <column name="queue" type="VARCHAR" size="255" required="true"/>
<column name="payload" type="LONGVARCHAR" required="true"/> <column name="payload" type="LONGVARCHAR" required="true"/>
<column name="attempts" type="TINYINT" size="3" required="true"/> <column name="attempts" type="TINYINT" required="true"/>
<column name="reserved_at" type="BIGINT" size="10" required="false"/> <column name="reserved_at" type="BIGINT" size="20" required="false"/>
<column name="available_at" type="BIGINT" size="10" required="true"/> <column name="available_at" type="BIGINT" size="20" required="true"/>
<column name="created_at" type="BIGINT" size="10" required="true"/> <column name="created_at" type="BIGINT" size="20" required="true"/>
<index name="jobs_queue_index"> <index name="jobs_queue_index">
<index-column name="queue"/> <index-column name="queue"/>
</index> </index>
@@ -6086,9 +6086,9 @@
<column name="body" type="VARCHAR" size="255" required="false"/> <column name="body" type="VARCHAR" size="255" required="false"/>
<column name="type" type="VARCHAR" size="255" required="false"/> <column name="type" type="VARCHAR" size="255" required="false"/>
<column name="category" type="VARCHAR" size="255" required="false"/> <column name="category" type="VARCHAR" size="255" required="false"/>
<column name="system" type="TINYINT" size="3" required="false"/> <column name="system" type="TINYINT" required="false"/>
<column name="timezone" type="VARCHAR" size="255" required="false"/> <column name="timezone" type="VARCHAR" size="255" required="false"/>
<column name="enable" type="TINYINT" size="3" required="false"/> <column name="enable" type="TINYINT" required="false"/>
<column name="creation_date" type="TIMESTAMP" required="false"/> <column name="creation_date" type="TIMESTAMP" required="false"/>
<column name="last_update" type="TIMESTAMP" required="false"/> <column name="last_update" type="TIMESTAMP" required="false"/>
</table> </table>

6
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -6101,6 +6101,12 @@ msgstr "Delay Field"
msgid "Delayed" msgid "Delayed"
msgstr "Delayed" msgstr "Delayed"
# TRANSLATION
# LABEL/ID_DELEGATED
#: LABEL/ID_DELEGATED
msgid "Delegated"
msgstr "Delegated"
# TRANSLATION # TRANSLATION
# LABEL/ID_DELEGATE_DATE_FROM # LABEL/ID_DELEGATE_DATE_FROM
#: LABEL/ID_DELEGATE_DATE_FROM #: LABEL/ID_DELEGATE_DATE_FROM

1
workflow/engine/data/mysql/insert.sql
View File

@@ -57844,6 +57844,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_DEFINITION','en','Definition','2014-01-15') , ( 'LABEL','ID_DEFINITION','en','Definition','2014-01-15') ,
( 'LABEL','ID_DELAY_FIELD','en','Delay Field','2014-01-15') , ( 'LABEL','ID_DELAY_FIELD','en','Delay Field','2014-01-15') ,
( 'LABEL','ID_DELAYED','en','Delayed','2021-01-20') , ( 'LABEL','ID_DELAYED','en','Delayed','2021-01-20') ,
( 'LABEL','ID_DELEGATED','en','Delegated','2022-01-12') ,
( 'LABEL','ID_DELEGATE_DATE_FROM','en','Date from','2017-10-18') , ( 'LABEL','ID_DELEGATE_DATE_FROM','en','Date from','2017-10-18') ,
( 'LABEL','ID_DELEGATE_DATE_TO','en','to','2014-01-15') , ( 'LABEL','ID_DELEGATE_DATE_TO','en','to','2014-01-15') ,
( 'LABEL','ID_DELEGATE_USER','en','Delegated User','2014-01-15') , ( 'LABEL','ID_DELEGATE_USER','en','Delegated User','2014-01-15') ,

10
workflow/engine/methods/authenticationSources/src/components/formAuthenticationSources.vue
View File

@@ -488,11 +488,11 @@
gridText: JSON.stringify(gridText), gridText: JSON.stringify(gridText),
signInPolicyForLDAP: row.AUTH_SOURCE_SIGNIN_POLICY_FOR_LDAP, signInPolicyForLDAP: row.AUTH_SOURCE_SIGNIN_POLICY_FOR_LDAP,
inactiveUsers: row.AUTH_SOURCE_RETIRED_OU, inactiveUsers: row.AUTH_SOURCE_RETIRED_OU,
role: row.USR_ROLE, role: row.USR_ROLE || "",
groupIdentifier: row.AUTH_SOURCE_IDENTIFIER_FOR_USER_GROUP, groupIdentifier: row.AUTH_SOURCE_IDENTIFIER_FOR_USER_GROUP || "",
userClassIdentifier: row.AUTH_SOURCE_IDENTIFIER_FOR_USER_CLASS, userClassIdentifier: row.AUTH_SOURCE_IDENTIFIER_FOR_USER_CLASS || "",
groupClassIdentifier: row.GROUP_CLASS_IDENTIFIER, groupClassIdentifier: row.GROUP_CLASS_IDENTIFIER || "",
departmentClassIdentifier: row.DEPARTMENT_CLASS_IDENTIFIER departmentClassIdentifier: row.DEPARTMENT_CLASS_IDENTIFIER || ""
}; };
return obj; return obj;
}, },

2
workflow/engine/methods/users/usersAjax.php
View File

@@ -132,7 +132,7 @@ try {
$data = [['LAN_ID' => '', 'LAN_NAME' => '- ' . G::LoadTranslation('ID_NONE') . ' -']]; $data = [['LAN_ID' => '', 'LAN_NAME' => '- ' . G::LoadTranslation('ID_NONE') . ' -']];
foreach ($languages as $lang) { foreach ($languages as $lang) {
$data[] = [ $data[] = [
'LAN_ID' => $lang['LOCALE'], 'LAN_ID' => strtolower($lang['LAN_ID']),
'LAN_NAME' => $lang['LANGUAGE'] 'LAN_NAME' => $lang['LANGUAGE']
]; ];
} }

3
workflow/engine/src/ProcessMaker/Project/Bpmn.php
View File

@@ -408,6 +408,7 @@ class Bpmn extends Handler
$project->delete(); $project->delete();
} }
if (!$force) {
$process = new Processes(); $process = new Processes();
$repTable = $process->getReportTables($this->getUid()); $repTable = $process->getReportTables($this->getUid());
$rows = []; $rows = [];
@@ -420,6 +421,7 @@ class Bpmn extends Handler
$repTable = new pmTablesProxy(); $repTable = new pmTablesProxy();
$repTable->delete($httpData); $repTable->delete($httpData);
} }
}
self::log("Remove Project Success!"); self::log("Remove Project Success!");
} }
@@ -1689,5 +1691,4 @@ class Bpmn extends Handler
throw $e; throw $e;
} }
} }
} }