Merge branch 'feature/PMCORE-3049' of https://bitbucket.org/colosa/processmaker into taskmetrics

This commit is contained in:
Henry Jordan
2021-08-16 18:56:17 +00:00
23 changed files with 1405 additions and 815 deletions

View File

@@ -409,11 +409,7 @@ class RBAC
"PER_CODE" => "PM_SETUP_CLEAR_CACHE",
"PER_NAME" => "Setup Clear Cache"
],
[
"PER_UID" => "00000000000000000000000000000025",
"PER_CODE" => "PM_SETUP_HEART_BEAT",
"PER_NAME" => "Setup Heart Beat"
],
// The 00000000000000000000000000000025 was deleted related to the heart beat
[
"PER_UID" => "00000000000000000000000000000026",
"PER_CODE" => "PM_SETUP_ENVIRONMENT",

5
package-lock.json generated
View File

@@ -3079,6 +3079,11 @@
"integrity": "sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU=",
"dev": true
},
"downloadjs": {
"version": "1.4.7",
"resolved": "https://registry.npmjs.org/downloadjs/-/downloadjs-1.4.7.tgz",
"integrity": "sha1-9p+W+UDg0FU9rCkROYZaPNAQHjw="
},
"duplexify": {
"version": "3.7.1",
"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",

View File

@@ -31,6 +31,7 @@
"bootstrap-vue-font-awesome-picker": "^0.1.3",
"chart.js": "^2.7.2",
"dateformat": "^3.0.3",
"downloadjs": "^1.4.7",
"faker": "^5.1.0",
"font-awesome": "^4.7.0",
"hammerjs": "^2.0.8",

View File

@@ -23,7 +23,6 @@ INSERT INTO `RBAC_PERMISSIONS` VALUES
('00000000000000000000000000000022','PM_SETUP_CALENDAR','2016-03-01 00:00:00','2016-03-01 00:00:00',1,'00000000000000000000000000000002'),
('00000000000000000000000000000023','PM_SETUP_PROCESS_CATEGORIES','2016-03-01 00:00:00','2016-03-01 00:00:00',1,'00000000000000000000000000000002'),
('00000000000000000000000000000024','PM_SETUP_CLEAR_CACHE','2016-03-01 00:00:00','2016-03-01 00:00:00',1,'00000000000000000000000000000002'),
('00000000000000000000000000000025','PM_SETUP_HEART_BEAT','2016-03-01 00:00:00','2016-03-01 00:00:00',1,'00000000000000000000000000000002'),
('00000000000000000000000000000026','PM_SETUP_ENVIRONMENT','2016-03-01 00:00:00','2016-03-01 00:00:00',1,'00000000000000000000000000000002'),
('00000000000000000000000000000027','PM_SETUP_PM_TABLES','2016-03-01 00:00:00','2016-03-01 00:00:00',1,'00000000000000000000000000000002'),
('00000000000000000000000000000028','PM_SETUP_LOGIN','2016-03-01 00:00:00','2016-03-01 00:00:00',1,'00000000000000000000000000000002'),
@@ -105,7 +104,6 @@ INSERT INTO `RBAC_ROLES_PERMISSIONS` VALUES
('00000000000000000000000000000002','00000000000000000000000000000022'),
('00000000000000000000000000000002','00000000000000000000000000000023'),
('00000000000000000000000000000002','00000000000000000000000000000024'),
('00000000000000000000000000000002','00000000000000000000000000000025'),
('00000000000000000000000000000002','00000000000000000000000000000026'),
('00000000000000000000000000000002','00000000000000000000000000000027'),
('00000000000000000000000000000002','00000000000000000000000000000028'),
@@ -187,7 +185,6 @@ INSERT INTO `RBAC_ROLES_PERMISSIONS` VALUES
('00000000000000000000000000000004','00000000000000000000000000000022'),
('00000000000000000000000000000004','00000000000000000000000000000023'),
('00000000000000000000000000000004','00000000000000000000000000000024'),
('00000000000000000000000000000004','00000000000000000000000000000025'),
('00000000000000000000000000000004','00000000000000000000000000000026'),
('00000000000000000000000000000004','00000000000000000000000000000027'),
('00000000000000000000000000000004','00000000000000000000000000000028'),

View File

@@ -51,10 +51,11 @@ export default {
this.$refs["modal-delete-list"].hide();
},
deleteCustomCaseList() {
api.deleteCaseList(this.data).then((response) => {
if (response.statusText == "OK") {
that.$refs["modal-pause-case"].hide();
that.$parent.$refs["vueTable"].getData();
let that = this;
api.deleteCaseList(this.data).then((response) => {
if (response.statusText === "OK") {
that.$refs["modal-delete-list"].hide();
that.$parent.$refs["table"].getData();
}
});
}

View File

@@ -0,0 +1,269 @@
<template>
<b-modal
ref="modal-preview"
scrollable
size="xl"
>
<template v-slot:modal-title></template>
<b-container fluid>
<v-server-table
:data="tableData"
:columns="columns"
:options="options"
ref="table-preview"
name="preview"
>
<div slot="detail">
<i class="fas fa-info-circle"></i>
</div>
<div slot="case_number" slot-scope="props">
{{ props.row.CASE_NUMBER }}
</div>
<div slot="case_title" slot-scope="props">
{{ props.row.CASE_TITLE }}
</div>
<div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }}
</div>
<div slot="task" slot-scope="props">
<TaskCell :data="props.row.TASK" />
</div>
<div slot="send_by" slot-scope="props">
<CurrentUserCell :data="props.row.USER_DATA" />
</div>
<div slot="current_user" slot-scope="props">
{{ props.row.USERNAME_DISPLAY_FORMAT }}
</div>
<div slot="due_date" slot-scope="props">
{{ props.row.DUE_DATE }}
</div>
<div slot="delegation_date" slot-scope="props">
{{ props.row.DELEGATION_DATE }}
</div>
<div slot="priority" slot-scope="props">
{{ props.row.PRIORITY }}
</div>
<div slot="actions">
<i class="fas fa-ellipsis-v"></i>
</div>
</v-server-table>
</b-container>
<template #modal-footer>
<b-button
variant="danger"
data-dismiss="modal"
@click="cancel"
>
{{ $t("ID_CANCEL") }}
</b-button>
</template>
</b-modal>
</template>
<script>
import api from "../../api/index";
import utils from "../../utils/utils";
import TaskCell from "../../components/vuetable/TaskCell.vue";
import CurrentUserCell from "../../components/vuetable/CurrentUserCell.vue"
export default {
name: "ModalPreview",
props: [],
components: {
TaskCell,
CurrentUserCell,
},
data() {
return {
type: null,
columns: null,
tableData: [],
options: {
filterable: false,
pagination: {
show: false
},
headings: {
detail: this.$i18n.t("ID_DETAIL_CASE"),
case_number: this.$i18n.t("ID_MYCASE_NUMBER"),
case_title: this.$i18n.t("ID_CASE_TITLE"),
process_name: this.$i18n.t("ID_PROCESS_NAME"),
task: this.$i18n.t("ID_TASK"),
send_by: this.$i18n.t("ID_SEND_BY"),
due_date: this.$i18n.t("ID_DUE_DATE"),
delegation_date: this.$i18n.t("ID_DELEGATION_DATE"),
priority: this.$i18n.t("ID_PRIORITY"),
actions: "",
},
requestFunction(data) {
return this.$parent.$parent.$parent.$parent.getCasesForPreview(data)
},
},
}
},
mounted() {
},
methods: {
show() {
this.$refs["modal-preview"].show();
},
cancel() {
this.$refs["modal-preview"].hide();
},
/**
* Get cases data
*/
getCasesForPreview(data) {
let that = this,
dt,
paged,
limit = data.limit,
start = data.page === 1 ? 0 : limit * (data.page - 1),
filters = {},
sort = "";
paged = start + "," + limit;
filters = {
paged: paged,
}
_.forIn(this.filters, function (item, key) {
if(filters && item.value) {
filters[item.filterVar] = item.value;
}
});
if (sort) {
filters["sort"] = sort;
}
return new Promise((resolutionFunc, rejectionFunc) => {
switch (that.type) {
case 'inbox':
api.cases
.todo(filters)
.then((response) => {
dt = that.formatDataResponse(response.data.data);
resolutionFunc({
data: dt,
count: response.data.total,
});
})
.catch((e) => {
rejectionFunc(e);
});
break;
case 'draft':
api.cases
.draft(filters)
.then((response) => {
dt = that.formatDataResponse(response.data.data);
resolutionFunc({
data: dt,
count: response.data.total,
});
})
.catch((e) => {
rejectionFunc(e);
});
break;
case 'paused':
api.cases
.paused(filters)
.then((response) => {
dt = that.formatDataResponse(response.data.data);
resolutionFunc({
data: dt,
count: response.data.total,
});
})
.catch((e) => {
rejectionFunc(e);
});
break;
case 'unassigned':
api.cases
.unassigned(filters)
.then((response) => {
dt = that.formatDataResponse(response.data.data);
resolutionFunc({
data: dt,
count: response.data.total,
});
})
.catch((e) => {
rejectionFunc(e);
});
break;
}
});
},
/**
* Format Response API to grid todo and columns
*/
formatDataResponse(response) {
let data = [];
_.forEach(response, (v) => {
data.push({
CASE_NUMBER: v.APP_NUMBER,
CASE_TITLE: v.DEL_TITLE,
PROCESS_NAME: v.PRO_TITLE,
TASK: [{
TITLE: v.TAS_TITLE,
CODE_COLOR: v.TAS_COLOR,
COLOR: v.TAS_COLOR_LABEL,
DELAYED_TITLE:
v.TAS_STATUS === "OVERDUE"
? this.$i18n.t("ID_DELAYED") + ":"
: this.statusTitle[v.TAS_STATUS],
DELAYED_MSG: v.TAS_STATUS === "OVERDUE" ? v.DELAY : "",
}],
USER_DATA: this.formatUser(v.SEND_BY_INFO),
USERNAME_DISPLAY_FORMAT: utils.userNameDisplayFormat({
userName: v.USR_LASTNAME,
firstName: v.USR_LASTNAME,
lastName: v.USR_LASTNAME,
format: window.config.FORMATS.format || null,
}),
DUE_DATE: v.DEL_TASK_DUE_DATE_LABEL,
DELEGATION_DATE: v.DEL_DELEGATE_DATE_LABEL,
PRIORITY: v.DEL_PRIORITY_LABEL,
DEL_INDEX: v.DEL_INDEX,
APP_UID: v.APP_UID,
PRO_UID: v.PRO_UID,
TAS_UID: v.TAS_UID,
});
});
return data;
},
/**
* Set the format to show user's information
* @return {array} dataFormat
*/
formatUser(data) {
var dataFormat = [],
userDataFormat;
userDataFormat = utils.userNameDisplayFormat({
userName: data.user_tooltip.usr_firstname,
firstName: data.user_tooltip.usr_lastname,
lastName: data.user_tooltip.usr_username,
format: window.config.FORMATS.format || null
});
dataFormat.push({
USERNAME_DISPLAY_FORMAT: userDataFormat,
EMAIL: data.user_tooltip.usr_email,
POSITION: data.user_tooltip.usr_position,
AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
window.config.SYS_URI +
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
UNASSIGNED: userDataFormat !== "" ? true : false
});
return dataFormat;
}
}
}
</script>
<style>
.VueTables__limit-field {
display: none;
}
.table-responsive {
margin-top: -1rem;
}
</style>

View File

@@ -1,7 +1,7 @@
import axios from "axios";
import Api from "../../../../api/Api";
import Services from "./Services";
import Defaults from "./Mocks/defaults.json";
class caseListApi extends Api {
constructor(services) {
// Here, it calls the parent class' constructor with lengths
@@ -49,6 +49,31 @@ class caseListApi extends Api {
}
);
}
reportTables(data) {
return this.get({
service: 'REPORT_TABLES',
params: data,
keys: {}
});
}
getDefault(module){
return Defaults[module]
}
createCaseList(data) {
return this.post({
service: "CASE_LIST",
data: data
});
}
updateCaseList(data) {
return this.put({
service: "PUT_CASE_LIST",
keys: {
id: data.id
},
data: data
});
}
}
let api = new caseListApi(Services);

File diff suppressed because it is too large Load Diff

View File

@@ -2,5 +2,8 @@ export default {
CASE_LIST_TODO: "/caseList/inbox",
CASE_LIST_DRAFT: "/caseList/draft",
CASE_LIST_UNASSIGNED: "/caseList/unassigned",
CASE_LIST_PAUSED: "/caseList/paused"
CASE_LIST_PAUSED: "/caseList/paused",
REPORT_TABLES: "/caseList/report-tables",
CASE_LIST: "/caseList",
PUT_CASE_LIST: "/caseList/{id}"
};

View File

@@ -7,22 +7,13 @@
<h5 >{{ $t("ID_CUSTOM_CASES_LISTS") }}</h5>
<div class="x_content">
<b-container fluid>
<b-tabs content-class="mt-3">
<b-tab :title="$t('TO_DO')" active>
<Tables module="inbox"
<b-tabs content-class="mt-3" @input="onInputTab">
<b-tab v-for="i in tabs" :key="'dyn-tab-' + i.key" :title="i.title" lazy>
<Tables :module="i.key"
@showSketch="onShowSketch"
@closeSketch="onCloseSketch"
/>
</b-tab>
<b-tab :title="$t('ID_DRAFT')" lazy>
<Tables module="draft"/>
</b-tab>
<b-tab :title="$t('ID_UNASSIGNED')" lazy>
<Tables module="unassigned"/>
</b-tab>
<b-tab :title="$t('ID_PAUSED')" lazy>
<Tables module="paused"/>
</b-tab>
</b-tabs>
</b-container>
@@ -30,8 +21,9 @@
</div>
<div class="container" v-if="showSketch">
<CaseListSketch
@showSketch="onShowSketch"
@showSketch="onShowSketch"
@closeSketch="onCloseSketch"
:module="tabModule"
:params="params"
/>
</div>
@@ -50,11 +42,30 @@ export default {
data() {
return {
showSketch: false,
params: {}
params: {},
tabModule: null,
tabs: [
{
key: "inbox",
title: this.$i18n.t("TO_DO")
},
{
key: "draft",
title: this.$i18n.t("ID_DRAFT")
},
{
key: "unassigned",
title: this.$i18n.t("ID_UNASSIGNED")
},
{
key: "paused",
title: this.$i18n.t("ID_PAUSED")
}
]
};
},
mounted() {
this.tabModule= this.tabs[0];
},
methods: {
onShowSketch (params) {
@@ -63,6 +74,9 @@ export default {
},
onCloseSketch (params) {
this.showSketch = false;
},
onInputTab(tabIndex){
this.tabModule= this.tabs[tabIndex];
}
}
};

View File

@@ -1,6 +1,7 @@
<template>
<div id="people">
<ModalDeleteCaseList ref="modal-delete-list"></ModalDeleteCaseList>
<ModalPreview ref="modal-preview"></ModalPreview>
<button-fleft :data="newList"></button-fleft>
<button-fleft :data="importList"></button-fleft>
<v-server-table
@@ -16,11 +17,9 @@
</div>
<div slot="owner" slot-scope="props">
<OwnerCell :data="props.row.owner" />
</div>
</div>
</v-server-table>
</div>
</template>
<script>
import Api from "./Api/CaseList";
@@ -28,7 +27,10 @@ import ButtonFleft from "../../../components/home/ButtonFleft.vue";
import Ellipsis from "../../../components/utils/ellipsis.vue";
import utils from "../../../utils/utils";
import OwnerCell from "../../../components/vuetable/OwnerCell";
import ModalDeleteCaseList from "./../../Modals/ModalDeleteCaseList.vue"
import ModalDeleteCaseList from "./../../Modals/ModalDeleteCaseList.vue";
import ModalPreview from "./../../Modals/ModalPreview.vue";
import download from "downloadjs";
export default {
name: "Tables",
props: ["module"],
@@ -36,7 +38,8 @@ export default {
ButtonFleft,
Ellipsis,
OwnerCell,
ModalDeleteCaseList
ModalDeleteCaseList,
ModalPreview,
},
data() {
return {
@@ -49,12 +52,12 @@ export default {
class: "btn-success",
onClick: () => {
this.$emit("showSketch", {
name: "Rocko",
description: "algo te texto",
tableUid: "1234",
iconList: 'far fa-calendar-alt',
iconColor: '#4287f5',
iconColorScreen:'#4287f5',
name: "",
description: "",
tableUid: "",
iconList: "far fa-check-circle",
iconColor: '#000000',
iconColorScreen: '#FFFFFF',
type: this.module
});
@@ -103,7 +106,8 @@ export default {
return this.$parent.$parent.getCasesForVueTable(data);
},
}
},
customColumns: [],
};
},
methods: {
@@ -182,59 +186,102 @@ export default {
this.$refs["modal-delete-list"].data = data;
this.$refs["modal-delete-list"].show();
},
/**
* Show modal preview
* @param {object} data
*/
showPreview(data) {
},
editCustomCaseList(data) {
},
downloadCaseList(data) {
this.$refs["modal-preview"].columns = this.getColumns(data);
this.$refs["modal-preview"].type = data.type;
this.$refs["modal-preview"].show();
},
/**
* Show options in the ellipsis
* @param {objec} data
*/
updateDataEllipsis(data) {
let that = this;
this.showEllipsis = !this.showEllipsis;
if (this.showEllipsis) {
this.dataEllipsis = {
buttons: {
open: {
name: "delete",
icon: "far fa-trash-alt",
color: "red",
fn: function() {
that.showModalDelete(data);
* Get columns to show in the preview
* @param {Object} data
* @returns {Array} columns
*/
getColumns(data) {
var columns = [],
auxColumn,
i;
for (i = 0; i < data.columns.length; i += 1) {
auxColumn = data.columns[i];
if (auxColumn.set) {
columns.push(auxColumn.field);
}
},
note: {
name: "edit",
icon: "far fa-edit",
fn: function() {
that.editCustomCaseList(data);
}
},
reassign: {
name: "download",
icon: "fas fa-arrow-circle-down",
fn: function() {
that.downloadCaseList(data);
}
},
pause: {
name: "preview",
icon: "fas fa-tv",
color: "green",
fn: function() {
that.showPreview(data);
}
}
}
}
}
},
columns.push('actions');
columns.unshift('detail');
return columns
},
editCustomCaseList(data) {
this.$emit("showSketch", {
id: data.id,
name: data.name,
description: data.description,
tableUid: data.tableUid,
tableName: data.tableName,
iconList: data.iconList,
iconColor: data.iconColor,
iconColorScreen: data.iconColorScreen,
columns: data.columns,
enableFilter: data.enableFilter,
type: this.module
});
},
/**
* Export the Custom Case List in a json
* @param {object} data
*/
downloadCaseList(data) {
var fileName = data.name,
typeMime = "text/plain";
download(JSON.stringify(data), fileName + ".json", typeMime);
},
/**
* Show options in the ellipsis
* @param {objec} data
*/
updateDataEllipsis(data) {
let that = this;
this.showEllipsis = !this.showEllipsis;
if (this.showEllipsis) {
this.dataEllipsis = {
buttons: {
open: {
name: "delete",
icon: "far fa-trash-alt",
color: "red",
fn: function() {
that.showModalDelete(data);
}
},
note: {
name: "edit",
icon: "far fa-edit",
fn: function() {
that.editCustomCaseList(data);
}
},
reassign: {
name: "download",
icon: "fas fa-arrow-circle-down",
fn: function() {
that.downloadCaseList(data);
}
},
pause: {
name: "preview",
icon: "fas fa-tv",
color: "green",
fn: function() {
that.showPreview(data);
}
}
}
}
}
},
}
};
</script>

File diff suppressed because it is too large Load Diff

View File

@@ -3325,6 +3325,8 @@ class WorkspaceTools
*/
public function checkRbacPermissions()
{
CLI::logging("-> Remove the permissions depreacated in RBAC \n");
$this->removePermission();
CLI::logging("-> Verifying roles permissions in RBAC \n");
//Update table RBAC permissions
$RBAC = RBAC::getSingleton();
@@ -4079,6 +4081,26 @@ class WorkspaceTools
CLI::logging(" Migrating Self-Service by Value Cases Done \n");
}
/**
* Remove the permissions deprecated
*/
public function removePermission()
{
// Initializing
$this->initPropel(true);
$con = Propel::getConnection(RbacUsersPeer::DATABASE_NAME);
// Remove the permission PM_SETUP_HEART_BEAT
CLI::logging("-> Remove permission PM_SETUP_HEART_BEAT \n");
$con->begin();
$stmt = $con->createStatement();
$rs = $stmt->executeQuery("DELETE FROM RBAC_ROLES_PERMISSIONS WHERE PER_UID = '00000000000000000000000000000025'");
$con->commit();
$con->begin();
$stmt = $con->createStatement();
$rs = $stmt->executeQuery("DELETE FROM RBAC_PERMISSIONS WHERE PER_UID = '00000000000000000000000000000025'");
$con->commit();
}
/**
* Populate new fields used for avoiding the use of the "APP_CACHE_VIEW" table
*/

View File

@@ -7769,6 +7769,12 @@ msgstr "Enable Google Drive."
msgid "Enable PM Gmail"
msgstr "Enable PM Gmail"
# TRANSLATION
# LABEL/ID_ENABLE_SEARCH_FILTER
#: LABEL/ID_ENABLE_SEARCH_FILTER
msgid "Enable Search Filter"
msgstr "Enable Search Filter"
# TRANSLATION
# LABEL/ID_ENABLE_USER
#: LABEL/ID_ENABLE_USER
@@ -8537,6 +8543,12 @@ msgstr "Failure"
msgid "FALSE"
msgstr "FALSE"
# TRANSLATION
# LABEL/ID_FIELD
#: LABEL/ID_FIELD
msgid "Field"
msgstr "Field"
# TRANSLATION
# LABEL/ID_FIELDS
#: LABEL/ID_FIELDS
@@ -9083,6 +9095,12 @@ msgstr "Fri"
msgid "From"
msgstr "From"
# TRANSLATION
# LABEL/ID_SENDER
#: LABEL/ID_SENDER
msgid "Sender"
msgstr "Sender"
# TRANSLATION
# LABEL/ID_FROM_EMAIL
#: LABEL/ID_FROM_EMAIL
@@ -9899,6 +9917,12 @@ msgstr "Hour(s)"
msgid "HTML"
msgstr "HTML"
# TRANSLATION
# LABEL/ID_ICON
#: LABEL/ID_ICON
msgid "Icon"
msgstr "Icon"
# TRANSLATION
# LABEL/ID_IDENTIFIER_IMPORT_USER
#: LABEL/ID_IDENTIFIER_IMPORT_USER
@@ -19109,6 +19133,12 @@ msgstr "Memory Limit (MB)"
msgid "Memory Limit value has to be either a positive integer or -1"
msgstr "Memory Limit value has to be either a positive integer or -1"
# TRANSLATION
# LABEL/ID_MENU_COLOR
#: LABEL/ID_MENU_COLOR
msgid "Menu Color"
msgstr "Menu Color"
# TRANSLATION
# LABEL/ID_MENU_NAME
#: LABEL/ID_MENU_NAME
@@ -24215,6 +24245,12 @@ msgstr "Scheduled Task ID"
msgid "Schema"
msgstr "Schema"
# TRANSLATION
# LABEL/ID_SCREEN_COLOR_ICON
#: LABEL/ID_SCREEN_COLOR_ICON
msgid "Screen Color Icon"
msgstr "Screen Color Icon"
# TRANSLATION
# LABEL/ID_SCRIPT_TASK
#: LABEL/ID_SCRIPT_TASK
@@ -24851,6 +24887,12 @@ msgstr "Test SMTP Connection"
msgid "Setup"
msgstr "Setup"
# TRANSLATION
# LABEL/ID_SET_A_CASE_LIST_NAME
#: LABEL/ID_SET_A_CASE_LIST_NAME
msgid "Set a Case List Name"
msgstr "Set a Case List Name"
# TRANSLATION
# LABEL/ID_SET_A_TABLE_NAME
#: LABEL/ID_SET_A_TABLE_NAME
@@ -25304,6 +25346,12 @@ msgstr "Some actor(s) is/are already assigned to task <b>{0}</b>"
# TRANSLATION
# LABEL/ID_SOME_FIELDS_REQUIRED
#: LABEL/ID_SOME_FIELDS_REQUIRED
msgid "Some Text"
msgstr "Some Text"
# TRANSLATION
# LABEL/ID_SOME_TEXT
#: LABEL/ID_SOME_TEXT
msgid "Some Fields are required."
msgstr "Some Fields are required."
@@ -25313,6 +25361,12 @@ msgstr "Some Fields are required."
msgid "Sort by"
msgstr "Sort by"
# TRANSLATION
# LABEL/ID_SOURCE
#: LABEL/ID_SOURCE
msgid "Source"
msgstr "Source"
# TRANSLATION
# LABEL/ID_SOUTHPANEL
#: LABEL/ID_SOUTHPANEL
@@ -26891,6 +26945,12 @@ msgstr "Tue"
msgid "Type"
msgstr "Type"
# TRANSLATION
# LABEL/ID_TYPE_OF_SEARCHING
#: LABEL/ID_TYPE_OF_SEARCHING
msgid "Type of Searching"
msgstr "Type of Searching"
# TRANSLATION
# LABEL/ID_TYPE_PASSWORD
#: LABEL/ID_TYPE_PASSWORD
@@ -43797,42 +43857,6 @@ msgstr ""
msgid "[setup/plugin_ListOptions.xml?MNU_IMPORT] Import"
msgstr "Import"
# setup/processHeartBeatConfig.xml?HB_TITLE
# setup/processHeartBeatConfig.xml
#: title - HB_TITLE
msgid "Processmaker Heartbeat"
msgstr "Processmaker Heartbeat"
# setup/processHeartBeatConfig.xml?HB_OPTION
# setup/processHeartBeatConfig.xml
#: dropdown - HB_OPTION
msgid "Enable Heartbeat"
msgstr "Enable Heartbeat"
# setup/processHeartBeatConfig.xml?HB_OPTION-0
# setup/processHeartBeatConfig.xml
#: dropdown - HB_OPTION - 0
msgid "[setup/processHeartBeatConfig.xml?HB_OPTION-0]"
msgstr "No"
# setup/processHeartBeatConfig.xml?HB_OPTION-1
# setup/processHeartBeatConfig.xml
#: dropdown - HB_OPTION - 1
msgid "[setup/processHeartBeatConfig.xml?HB_OPTION-1]"
msgstr "Yes"
# setup/processHeartBeatConfig.xml?HB_SAVE
# setup/processHeartBeatConfig.xml
#: button - HB_SAVE
msgid "[setup/processHeartBeatConfig.xml?HB_SAVE] save"
msgstr "save"
# setup/processHeartBeatConfig.xml?HB_LINKINFO
# setup/processHeartBeatConfig.xml
#: link - HB_LINKINFO
msgid "[setup/processHeartBeatConfig.xml?HB_LINKINFO] Read Online Documentation"
msgstr "Read Online Documentation"
# setup/showMessage.xml?TITLE
# setup/showMessage.xml
#: title - TITLE

View File

@@ -30,7 +30,6 @@ INSERT INTO CONTENT (CON_CATEGORY,CON_PARENT,CON_ID,CON_LANG,CON_VALUE) VALUES
('PER_NAME','','00000000000000000000000000000022','en','Setup Calendar'),
('PER_NAME','','00000000000000000000000000000023','en','Setup Process Categories'),
('PER_NAME','','00000000000000000000000000000024','en','Setup Clear Cache'),
('PER_NAME','','00000000000000000000000000000025','en','Setup Heart Beat'),
('PER_NAME','','00000000000000000000000000000026','en','Setup Environment'),
('PER_NAME','','00000000000000000000000000000027','en','Setup PM Tables'),
('PER_NAME','','00000000000000000000000000000028','en','Setup Login'),
@@ -58127,6 +58126,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_ENABLE_PLUGIN_TIP','en','Enable the selected add-on','2014-10-21') ,
( 'LABEL','ID_ENABLE_PMDRIVE','en','Enable Google Drive.','2016-01-05') ,
( 'LABEL','ID_ENABLE_PMGMAIL','en','Enable PM Gmail','2015-07-27') ,
( 'LABEL','ID_ENABLE_SEARCH_FILTER','en','Enable Search Filter','2021-08-13') ,
( 'LABEL','ID_ENABLE_USER','en','Enable User','2014-10-10') ,
( 'LABEL','ID_ENABLE_VERSIONING','en','Enable Versioning','2014-01-15') ,
( 'LABEL','ID_ENABLE_VIRTUAL_KEYBOARD','en','Enable Virtual Keyboard (Only uxmodern skin)','2014-01-15') ,
@@ -58265,6 +58265,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_FAILED_VALIDATION_IN_CLASS1','en','Failed Validation in class {CLASS}.','2014-01-15') ,
( 'LABEL','ID_FAILURE','en','Failure','2014-01-15') ,
( 'LABEL','ID_FALSE','en','FALSE','2014-01-15') ,
( 'LABEL','ID_FIELD','en','Field','2021-08-10') ,
( 'LABEL','ID_FIELDS','en','Fields','2014-01-15') ,
( 'LABEL','ID_FIELDS_CHANGED_NUMBER','en','Fields changed','2014-01-15') ,
( 'LABEL','ID_FIELDS_LIST','en','Fields handler','2014-01-15') ,
@@ -58358,6 +58359,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_FORMS_METADATA_CACHE','en','Forms metadata cache','2014-01-15') ,
( 'LABEL','ID_FRI','en','Fri','2014-01-15') ,
( 'LABEL','ID_FROM','en','From','2014-01-15') ,
( 'LABEL','ID_SENDER','en','Sender','2021-08-13') ,
( 'LABEL','ID_FROM_EMAIL','en','Sender Email','2017-02-21') ,
( 'LABEL','ID_FROM_FINISH_DATE','en','From Finish Date','2020-12-16') ,
( 'LABEL','ID_FROM_NAME','en','Sender Name','2017-02-21') ,
@@ -58500,6 +58502,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_HOUR_ABBREVIATE','en','Hr(s)','2020-10-02') ,
( 'LABEL','ID_HOUR_HOURS','en','Hour(s)','2014-10-30') ,
( 'LABEL','ID_HTML','en','HTML','2014-01-15') ,
( 'LABEL','ID_ICON','en','Icon','2021-08-10') ,
( 'LABEL','ID_IDENTIFIER_IMPORT_USER','en','Identifier for an imported user','2014-01-15') ,
( 'LABEL','ID_IMAGE','en','Image','2014-01-15') ,
( 'LABEL','ID_IMAGES_SELECTED','en','images selected','2014-01-15') ,
@@ -60070,6 +60073,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_MEMBER_OF','en','MEMBER OF','2014-01-15') ,
( 'LABEL','ID_MEMORY_LIMIT','en','Memory Limit (MB)','2014-01-15') ,
( 'LABEL','ID_MEMORY_LIMIT_VALIDATE','en','Memory Limit value has to be either a positive integer or -1','2017-04-05') ,
( 'LABEL','ID_MENU_COLOR','en','Menu Color','2021-08-10') ,
( 'LABEL','ID_MENU_NAME','en','Enterprise Manager','2014-10-17') ,
( 'LABEL','ID_MESSAGE','en','Message','2014-01-15') ,
( 'LABEL','ID_MESSAGES','en','Messages','2014-01-15') ,
@@ -60948,6 +60952,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_SCHEDULER_SUCCESS_UPDATE','en','Case Scheduler has been updated correctly.','2014-01-15') ,
( 'LABEL','ID_SCHEDULER_TASK','en','Scheduled Task ID','2014-01-15') ,
( 'LABEL','ID_SCHEMA','en','Schema','2014-01-15') ,
( 'LABEL','ID_SCREEN_COLOR_ICON','en','Screen Color Icon','2021-08-10') ,
( 'LABEL','ID_SCRIPT_TASK','en','Script Task','2015-10-19') ,
( 'LABEL','ID_SCRIPT_TASK_ACTIVITY_ALREADY_REGISTERED','en','The Script-Task with {0}: "{1}" already registered','2016-08-01') ,
( 'LABEL','ID_SEARCH','en','Search','2014-01-15') ,
@@ -61057,6 +61062,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_SETUP','en','Admin','2014-01-15') ,
( 'LABEL','ID_SETUP_MAILCONF_TITLE','en','Test SMTP Connection','2014-01-15') ,
( 'LABEL','ID_SETUP_WEBSERVICES','en','Setup','2014-01-15') ,
( 'LABEL','ID_SET_A_CASE_LIST_NAME','en','Set a Case List Name','2021-08-10') ,
( 'LABEL','ID_SET_A_TABLE_NAME','en','Set a Table Name','2014-01-15') ,
( 'LABEL','ID_SET_COLUMNS','en','Set Columns','2014-10-10') ,
( 'LABEL','ID_SET_MANAGER','en','Set Manager','2015-03-09') ,
@@ -61135,7 +61141,9 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_SOMETHING_WRONG','en','Something was wrong','2014-01-15') ,
( 'LABEL','ID_SOME_ACTORS_ALREADY_ASSIGNED','en','Some actor(s) is/are already assigned to task <b>{0}</b>','2014-01-15') ,
( 'LABEL','ID_SOME_FIELDS_REQUIRED','en','Some Fields are required.','2014-01-15') ,
( 'LABEL','ID_SOME_TEXT','en','Some Text','2021-08-10') ,
( 'LABEL','ID_SORT_BY','en','Sort by','2015-04-28') ,
( 'LABEL','ID_SOURCE','en','Source','2021-08-10') ,
( 'LABEL','ID_SOUTHPANEL','en','southPanel','2014-01-15') ,
( 'LABEL','ID_SPECIFY_DELEGATION_INDEX','en','Please specify the delegation index','2014-01-15') ,
( 'LABEL','ID_SPLIT_BUTTON','en','Split Button','2014-01-15') ,
@@ -61438,6 +61446,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_TRYING_CANCEL','en','You are tying to cancel the current case. Please be aware this action cannot be undone','2020-12-01') ,
( 'LABEL','ID_TUE','en','Tue','2014-01-15') ,
( 'LABEL','ID_TYPE','en','Type','2014-01-15') ,
( 'LABEL','ID_TYPE_OF_SEARCHING','en','Type of Searching','2021-08-13') ,
( 'LABEL','ID_TYPE_PASSWORD','en','Type Password','2020-12-15') ,
( 'LABEL','ID_TYPE_PROCESS','en','Process Type','2014-10-22') ,
( 'LABEL','ID_TWICE_PER_DAY','en','Twice per day','2014-10-22') ,

View File

@@ -71,16 +71,6 @@ if ($RBAC->userCanAccess('PM_SETUP') === 1) {
* Remove heartbeat config from core, it will probably be used again
* when the functionality will be redesigned.
*/
if ($RBAC->userCanAccess('PM_SETUP_HEART_BEAT') === 1 && false) {
$G_TMP_MENU->AddIdRawOption(
'HEARTBEAT',
'processHeartBeatConfig',
G::LoadTranslation('ID_HEARTBEAT_CONFIG'),
'heartBeat.jpg',
'',
'settings'
);
}
}
if ($RBAC->userCanAccess('PM_SETUP_ENVIRONMENT') === 1) {
$G_TMP_MENU->AddIdRawOption(

View File

@@ -2,6 +2,7 @@
use Eusebiu\JavaScript\Facades\ScriptVariables;
use Illuminate\Support\Facades\View;
use ProcessMaker\Core\System;
use ProcessMaker\Model\User;
global $translation;
global $RBAC;
@@ -33,4 +34,5 @@ ScriptVariables::add('SYS_URI', SYS_URI);
ScriptVariables::add('SYS_LANG', SYS_LANG);
ScriptVariables::add('TRANSLATIONS', $translation);
ScriptVariables::add('FORMATS', $conf->getFormats());
ScriptVariables::add('userId', User::getId($_SESSION['USER_LOGGED']));
echo View::make('Views::admin.settings.customCasesList', compact("userCanAccess"))->render();

View File

@@ -1,38 +0,0 @@
<?php
/**
* main.php Cases List main processor
*
* ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2010 Colosa Inc.23
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
global $RBAC;
$RBAC->requirePermissions('PM_SETUP', 'PM_SETUP_HEART_BEAT');
$oHeadPublisher = headPublisher::getSingleton();
$oServerConf = ServerConf::getSingleton();
//you can use SYS_TEMP or SYS_SYS ON HEAR_BEAT_CONF to save for each workspace
$sflag = $oServerConf->getHeartbeatProperty('HB_OPTION', 'HEART_BEAT_CONF');
$heartBeatChecked = $sflag == 1 ? true : false;
$oHeadPublisher->addExtJsScript('setup/processHeartBeatConfig', true); //adding a javascript file .js
$oHeadPublisher->assign('heartBeatChecked', $heartBeatChecked);
G::RenderPage('publish', 'extJs');

View File

@@ -73,7 +73,7 @@ class Metrics extends Api
/**
* Get total cases by range
*
* @url /process-total-cases
* @url GET /process-total-cases
*
* @param string $caseList
* @param int $processId
@@ -89,6 +89,7 @@ class Metrics extends Api
*/
public function getTotalCasesByRange($caseList, $processId = null, $dateFrom = null, $dateTo = null, $groupBy = 'day')
{
$usrId = $this->getUserId();
try {
switch ($caseList) {
case 'inbox':
@@ -104,6 +105,7 @@ class Metrics extends Api
$list = new Unassigned();
break;
}
$list->setUserId($usrId);
$result = $list->getCountersByRange($processId, $dateFrom, $dateTo, $groupBy);
return $result;
} catch (Exception $e) {

View File

@@ -70,7 +70,7 @@ store = new Ext.data.GroupingStore( {
{header: _("DATE_LABEL"), width: 100, dataIndex: "ABE_REQ_DATE", sortable: true},
{header: _("ID_CASE_NUMBER_CAPITALIZED"), width: 70, dataIndex: "APP_NUMBER", sortable: true},
{header: _("ID_SUBJECT"), width: 150, dataIndex: "ABE_REQ_SUBJECT", sortable: true},
{header: _("ID_FROM"), width: 110, dataIndex: "USER", sortable: true},
{header: _("ID_SENDER"), width: 110, dataIndex: "USER", sortable: true},
{header: _("ID_TO"), width: 110, dataIndex: "ABE_REQ_SENT_TO", sortable: true},
{header: _("ID_STATUS"), width: 40, dataIndex: "ABE_REQ_STATUS", sortable: true},
{header: _("ID_ANSWERED"), width: 60, dataIndex: "ABE_REQ_ANSWERED"},

View File

@@ -1,44 +0,0 @@
<form id="{$form_id}" name="{$form_name}" action="{$form_action}" class="{$form_className}" method="post" encType="multipart/form-data" style="margin:0px;" onsubmit="return validateForm('{$form_objectRequiredFields}');"> <div class="borderForm" style="width:{$form_width}; padding-left:0; padding-right:0; border-width:{$form_border};">
<div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div>
<div class="content" style="height:{$form_height};" >
<table width="99%">
<tr>
<td valign='top'>
<input type="hidden" class="notValidateThisFields" name="__notValidateThisFields__" id="__notValidateThisFields__" value="{$form_objectRequiredFields}" />
<input type="hidden" name="DynaformRequiredFields" id="DynaformRequiredFields" value="{$form_objectRequiredFields}" />
<table cellspacing="0" cellpadding="0" border="0" width="100%">
<tr>
<td class='FormTitle' colspan="2" align="">
<table width="100%"><tr><td width="50%" class='FormTitle'>{$form.HB_TITLE} </td><td align="right" >{$form.HB_LINKINFO}</td></tr></table>
</td>
</tr>
<tr>
<td class='FormLabel' width="{$form_labelWidth}">{$HB_OPTION}</td>
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.HB_OPTION} </td> //-->
<td class='FormFieldContent' width='{$form_fieldContentWidth}' >{$form.HB_OPTION}</td>
</tr>
<tr>
<td class='FormButton' colspan="2" align="center">{$form.HB_SAVE}</td>
</tr>
<tr>
<!-- <td class='FormLabel' width="{$form_labelWidth}">{$HB_LINKINFO}</td> //-->
<!-- <td class='FormFieldContent' width="{$form_width}" >{$form.HB_LINKINFO} </td> //-->
<!-- <td class='FormFieldContent' width='{$form_fieldContentWidth}' >{$form.HB_LINKINFO}</td> -->
</tr>
</table>
</td>
</tr>
</table>
</div>
<div class="boxBottom"><div class="a"></div><div class="b"></div><div class="c"></div></div>
</div>
<script type="text/javascript">
{$form.HB_JS}
</script>
</form>
<script type="text/javascript">
try {literal}{{/literal} dynaformSetFocus();}catch(e){literal}{{/literal}}
</script>

View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<dynaForm name="ProcessHeartBeatConfig" width="55%" enableTemplate="1">
<HB_TITLE type="title" enablehtml="0" btn_cancel="Cancel" enableHTML="1">
<en><![CDATA[Processmaker Heartbeat]]></en>
</HB_TITLE>
<HB_OPTION type="dropdown" required="0" readonly="0" savelabel="0" mode="edit" options="Array">
<en><![CDATA[Enable Heartbeat]]><option name="0"><![CDATA[No]]></option><option name="1"><![CDATA[Yes]]></option></en>
</HB_OPTION>
<HB_SAVE type="button" onclick="sendValues(this.form);">
<en><![CDATA[save]]></en>
</HB_SAVE>
<HB_LINKINFO type="link" colWidth="60" titleAlign="left" align="left" link="#" onclick="var k=window.open('http://wiki.processmaker.com/index.php/Heartbeat ','_blank');return false;">
<en><![CDATA[Read Online Documentation]]></en>
</HB_LINKINFO>
<HB_JS type="javascript">
var sendValues=function(form){
var hbOption = getField('HB_OPTION').value;
ajax_function('processHeartBeatSave','','HB_OPTION='+hbOption,'POST') ;
window.location = 'processHeartBeatConfig';
};
</HB_JS>
</dynaForm>