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

update observations

Browse Source
This commit is contained in:
Henry Jordan
2021-03-31 14:33:21 +00:00
parent 1977c923fe
commit 399e3019b0
5 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
resources/assets/js/home/CaseDetail.vue
View File

@@ -131,7 +131,7 @@ export default {
ButtonFleft, ButtonFleft,
ModalNewRequest, ModalNewRequest,
ModalClaimCase, ModalClaimCase,
TaskCell, TaskCell
}, },
props: {}, props: {},
data() { data() {
@@ -140,7 +140,7 @@ export default {
dismissSecs: 5, dismissSecs: 5,
dismissCountDown: 0, dismissCountDown: 0,
message: "", message: "",
variant: "info", variant: "info"
}, },
dataCase: null, dataCase: null,
newCase: { newCase: {
@@ -156,7 +156,7 @@ export default {
"assignee", "assignee",
"status", "status",
"due_date", "due_date",
"actions", "actions"
], ],
showTable: true, showTable: true,
tableData: [], tableData: [],
@@ -167,7 +167,7 @@ export default {
assignee: this.$i18n.t("ID_CURRENT_USER"), assignee: this.$i18n.t("ID_CURRENT_USER"),
status: this.$i18n.t("ID_STATUS"), status: this.$i18n.t("ID_STATUS"),
due_date: this.$i18n.t("ID_DUE_DATE"), due_date: this.$i18n.t("ID_DUE_DATE"),
actions: this.$i18n.t("ID_ACTIONS"), actions: this.$i18n.t("ID_ACTIONS")
}, },
selectable: { selectable: {
mode: "single", // or 'multiple' mode: "single", // or 'multiple'
@@ -188,17 +188,17 @@ export default {
titleInput: this.$i18n.t("ID_REQUEST_DOCUMENTS"), titleInput: this.$i18n.t("ID_REQUEST_DOCUMENTS"),
titleOutput: this.$i18n.t("ID_OUTPUT_DOCUMENTS"), titleOutput: this.$i18n.t("ID_OUTPUT_DOCUMENTS"),
inputDocuments: [], inputDocuments: [],
outputDocuments: [], outputDocuments: []
}, },
dataAttachedDocuments: { dataAttachedDocuments: {
title: "Attached Documents", title: "Attached Documents",
items: [], items: []
}, },
attachDocuments: false, attachDocuments: false,
dataComments: { dataComments: {
title: "Comments", title: "Comments",
items: [], items: []
}, }
}; };
}, },
@@ -220,7 +220,7 @@ export default {
_.extend({}, this.dataCase, { _.extend({}, this.dataCase, {
COMMENT: comment, COMMENT: comment,
SEND_MAIL: send, SEND_MAIL: send,
FILES: files, FILES: files
}) })
) )
.then((response) => { .then((response) => {
@@ -261,13 +261,13 @@ export default {
this.dataCaseStatusTab = []; this.dataCaseStatusTab = [];
this.dataCaseStatusTab.push({ this.dataCaseStatusTab.push({
title: null, title: null,
items: response.data.caseProperties, items: response.data.caseProperties
}); });
_.each(response.data.taskProperties, (o) => { _.each(response.data.taskProperties, (o) => {
this.dataCaseStatusTab.push({ this.dataCaseStatusTab.push({
title: null, title: null,
items: _.isArray(o) ? o : [o], items: _.isArray(o) ? o : [o]
}); });
}); });
@@ -285,7 +285,7 @@ export default {
status: data[5].label, status: data[5].label,
create: data[6].label, create: data[6].label,
delegationDate: this.$i18n.t("ID_TASK_DELEGATE_DATE"), delegationDate: this.$i18n.t("ID_TASK_DELEGATE_DATE"),
duration: this.$i18n.t("ID_DURATION"), duration: this.$i18n.t("ID_DURATION")
}, },
text: { text: {
process: data[1].value, process: data[1].value,
@@ -295,17 +295,17 @@ export default {
status: data[5].value, status: data[5].value,
create: data[6].value, create: data[6].value,
delegationDate: data[7] ? data[7].value : "", delegationDate: data[7] ? data[7].value : "",
duration: data[8] ? data[8].value : "", duration: data[8] ? data[8].value : ""
}, }
}; };
// Hack for identify the cancel case button // Hack for identify the cancel case button
Api.cases.actions(this.dataCase).then((response) => { Api.cases.actions(this.dataCase).then((response) => {
action = _.find(response.data, function (o) { action = _.find(response.data, function (o) {
return o.id == "ACTIONS"; return o.id === "ACTIONS";
}); });
if (action) { if (action) {
option = _.find(action.options, function (o) { option = _.find(action.options, function (o) {
return o.fn == "cancelCase"; return o.fn === "cancelCase";
}); });
if (option && !option.hide) { if (option && !option.hide) {
that.dataCaseSummary.onClick = () => { that.dataCaseSummary.onClick = () => {
@@ -335,7 +335,7 @@ export default {
title: document[i].TITLE, title: document[i].TITLE,
extension: document[i].TITLE.split(".")[1], extension: document[i].TITLE.split(".")[1],
onClick: () => {}, onClick: () => {},
data: document[i], data: document[i]
}; };
this.dataIoDocuments.inputDocuments.push(info); this.dataIoDocuments.inputDocuments.push(info);
} }
@@ -361,7 +361,7 @@ export default {
title: document[i].TITLE, title: document[i].TITLE,
extension: document[i].TITLE.split(".")[1], extension: document[i].TITLE.split(".")[1],
onClick: () => {}, onClick: () => {},
data: document[i], data: document[i]
}; };
this.dataIoDocuments.outputDocuments.push(info); this.dataIoDocuments.outputDocuments.push(info);
} }
@@ -436,7 +436,7 @@ export default {
), ),
date: n.NOTE_DATE, date: n.NOTE_DATE,
comment: n.NOTE_CONTENT, comment: n.NOTE_CONTENT,
data: n, data: n
}); });
}); });
@@ -454,7 +454,7 @@ export default {
) { ) {
sections.push({ sections.push({
title: o.section, title: o.section,
items: [], items: []
}); });
index = 0; index = 0;
} }
@@ -490,7 +490,7 @@ export default {
{ {
TITLE: v.TAS_TITLE, TITLE: v.TAS_TITLE,
CODE_COLOR: v.TAS_COLOR, CODE_COLOR: v.TAS_COLOR,
COLOR: v.TAS_COLOR_LABEL, COLOR: v.TAS_COLOR_LABEL
}, },
], ],
CASE_TITLE: v.DEL_TITLE, CASE_TITLE: v.DEL_TITLE,
@@ -500,7 +500,7 @@ export default {
userName: v.USR_USERNAME, userName: v.USR_USERNAME,
firstName: v.USR_LASTNAME, firstName: v.USR_LASTNAME,
lastName: v.USR_LASTNAME, lastName: v.USR_LASTNAME,
format: window.config.FORMATS.format || null, format: window.config.FORMATS.format || null
}) })
: this.$i18n.t("ID_UNASSIGNED"), : this.$i18n.t("ID_UNASSIGNED"),
STATUS: v.DEL_THREAD_STATUS, STATUS: v.DEL_THREAD_STATUS,
@@ -509,7 +509,7 @@ export default {
APP_UID: v.APP_UID, APP_UID: v.APP_UID,
DEL_INDEX: v.DEL_INDEX, DEL_INDEX: v.DEL_INDEX,
PRO_UID: v.PRO_UID, PRO_UID: v.PRO_UID,
TAS_UID: v.TAS_UID, TAS_UID: v.TAS_UID
}); });
}); });
return data; return data;
@@ -546,7 +546,7 @@ export default {
DEL_INDEX: data.row.DEL_INDEX, DEL_INDEX: data.row.DEL_INDEX,
PRO_UID: data.row.PRO_UID, PRO_UID: data.row.PRO_UID,
TAS_UID: data.row.TAS_UID, TAS_UID: data.row.TAS_UID,
ACTION: this.dataCase.ACTION || "todo", ACTION: this.dataCase.ACTION || "todo"
}); });
this.$emit("onUpdatePage", "XCase"); this.$emit("onUpdatePage", "XCase");
} }

2
resources/assets/js/home/TabsCaseDetail.vue
View File

@@ -45,7 +45,7 @@ export default {
}, },
props: { props: {
dataCase: Object, dataCase: Object,
dataCaseStatus: Array, dataCaseStatus: Array
}, },
data() { data() {
return { return {

2
workflow/engine/classes/Cases.php
View File

@@ -672,7 +672,7 @@ class Cases
return [ return [
'title' => $threadTitle, 'title' => $threadTitle,
'description' => $threadDescription, 'description' => $threadDescription
]; ];
} }

1
workflow/engine/controllers/appProxy.php
View File

@@ -364,7 +364,6 @@ class AppProxy extends HttpProxyController
]; ];
// Get the pending threads // Get the pending threads
$delegation = new Delegation(); $delegation = new Delegation();
$threads = [];
$threads = $delegation::getPendingThreads($appFields['APP_NUMBER']); $threads = $delegation::getPendingThreads($appFields['APP_NUMBER']);
$i = 0; $i = 0;
$taskProperties[$i] = [ $taskProperties[$i] = [

2
workflow/engine/src/ProcessMaker/Model/Delegation.php
View File

@@ -1900,7 +1900,7 @@ class Delegation extends Model
return [ return [
'title' => $threadTitle, 'title' => $threadTitle,
'description' => $threadDescription, 'description' => $threadDescription
]; ];
} }