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

PMCORE-3703-D

Browse Source 
PMCORE-3703-D update

update

update 1
This commit is contained in:
henry jordan
2022-04-26 12:33:53 +00:00
parent 08de27578e
commit 11113a9e67
4 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue
View File

@@ -251,7 +251,7 @@
</b-col> </b-col>
<b-col cols="6"> <b-col cols="6">
<b-form-checkbox <b-form-checkbox
v-if="props.row.field =='process_category' || props.row.field =='process_name'" v-if="disabledField(props.row.field)"
v-model="enabledFilterRows" v-model="enabledFilterRows"
@change="onTongleFilter(props.row.field)" @change="onTongleFilter(props.row.field)"
name="check-button" name="check-button"
@@ -432,7 +432,7 @@ export default {
this.dataCaseList =this.params.columns.filter(elem => elem.set === true); this.dataCaseList =this.params.columns.filter(elem => elem.set === true);
this.dataCaseList.forEach(function (value) { this.dataCaseList.forEach(function (value) {
//Force to false in process_category & process_name //Force to false in process_category & process_name
if (value.enableFilter && (value.field != "process_category" && value.field != "process_name" )) { if (value.enableFilter && !that.disabledField(value.field)) {
that.enabledFilterRows.push(value.field); that.enabledFilterRows.push(value.field);
} }
}); });
@@ -741,6 +741,10 @@ export default {
columns.push('actions'); columns.push('actions');
columns.unshift('detail'); columns.unshift('detail');
return columns return columns
},
disabledField(field){
const fields = [ "due_date" , "process_category" , "process_name" , "priority" ];
return !(fields.indexOf(field) == -1);
} }
}, },
}; };

10
resources/assets/js/home/CustomCaseList/CustomCaseList.vue
View File

@@ -127,7 +127,7 @@
<span v-if="column === 'case_number'" class="v-card-text-highlight"> <span v-if="column === 'case_number'" class="v-card-text-highlight">
{{ props["item"]["CASE_NUMBER"] }} {{ props["item"]["CASE_NUMBER"] }}
</span> </span>
<span v-if="column === 'thread_title'" class="v-card-text-highlight"> <span v-if="column === 'case_title'" class="v-card-text-highlight">
{{ props["item"]["THREAD_TITLE"] }} {{ props["item"]["THREAD_TITLE"] }}
</span> </span>
<span v-if="column === 'process_category'" class="v-card-text-highlight"> <span v-if="column === 'process_category'" class="v-card-text-highlight">
@@ -184,7 +184,7 @@
<span v-if="column === 'case_number'" class="v-card-text-highlight"> <span v-if="column === 'case_number'" class="v-card-text-highlight">
{{ props["item"]["CASE_NUMBER"] }} {{ props["item"]["CASE_NUMBER"] }}
</span> </span>
<span v-if="column === 'thread_title'" class="v-card-text-highlight"> <span v-if="column === 'case_title'" class="v-card-text-highlight">
{{ props["item"]["THREAD_TITLE"] }} {{ props["item"]["THREAD_TITLE"] }}
</span> </span>
<span v-if="column === 'process_category'" class="v-card-text-highlight"> <span v-if="column === 'process_category'" class="v-card-text-highlight">
@@ -398,7 +398,7 @@ export default {
}, },
itemMap: { itemMap: {
case_number: "caseNumber", case_number: "caseNumber",
task_title: "taskTitle", task: "taskTitle",
thread_title: "caseTitle", thread_title: "caseTitle",
delegation_date: "delegationDate", delegation_date: "delegationDate",
send_by: "bySendBy", send_by: "bySendBy",
@@ -810,9 +810,7 @@ export default {
} }
} }
that.headings[item.field] = item.name; that.headings[item.field] = item.name;
if(item.enableFilter){
columns.push(item.field); columns.push(item.field);
}
}); });
that.filterItems = newItems; that.filterItems = newItems;
dt = that.formatDataResponse(response.data.data); dt = that.formatDataResponse(response.data.data);
@@ -849,7 +847,7 @@ export default {
product.optionLabel = item.name; product.optionLabel = item.name;
product.tagPrefix = item.name; product.tagPrefix = item.name;
if (product.items && product.items[0]) { if (product.items && product.items[0]) {
product.items[0].id = item.field; product.items[0].id = item.idFilter?item.idFilter : item.field;
} }
product.placeholder = ""; product.placeholder = "";
return product; return product;

4
resources/assets/js/home/CustomCaseList/defaultMixins.js
View File

@@ -11,7 +11,7 @@ export default {
dataCasesList: [], dataCasesList: [],
defaultColumns: [ defaultColumns: [
"case_number", "case_number",
"thread_title", "case_title",
"process_name", "process_name",
"task", "task",
"send_by", "send_by",
@@ -69,7 +69,7 @@ export default {
}, },
headings: { headings: {
case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_number: this.$i18n.t("ID_MYCASE_NUMBER"),
thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), case_title: this.$i18n.t('ID_CASE_THREAD_TITLE'),
process_name: this.$i18n.t("ID_PROCESS_NAME"), process_name: this.$i18n.t("ID_PROCESS_NAME"),
task: this.$i18n.t("ID_TASK"), task: this.$i18n.t("ID_TASK"),
send_by: this.$i18n.t("ID_SEND_BY"), send_by: this.$i18n.t("ID_SEND_BY"),

11
workflow/engine/src/ProcessMaker/Model/CaseList.php
View File

@@ -366,6 +366,7 @@ class CaseList extends Model
[ [
'list' => ['inbox', 'draft', 'paused', 'unassigned'], 'list' => ['inbox', 'draft', 'paused', 'unassigned'],
'field' => 'case_number', 'field' => 'case_number',
'idFilter' => 'case_number',
'name' => G::LoadTranslation('ID_MYCASE_NUMBER'), 'name' => G::LoadTranslation('ID_MYCASE_NUMBER'),
'type' => 'integer', 'type' => 'integer',
'source' => 'APPLICATION', 'source' => 'APPLICATION',
@@ -375,6 +376,7 @@ class CaseList extends Model
], [ ], [
'list' => ['inbox', 'draft', 'paused', 'unassigned'], 'list' => ['inbox', 'draft', 'paused', 'unassigned'],
'field' => 'case_title', 'field' => 'case_title',
'idFilter' => 'caseTitle',
'name' => G::LoadTranslation('ID_CASE_THREAD_TITLE'), 'name' => G::LoadTranslation('ID_CASE_THREAD_TITLE'),
'type' => 'string', 'type' => 'string',
'source' => 'APPLICATION', 'source' => 'APPLICATION',
@@ -384,6 +386,7 @@ class CaseList extends Model
], [ ], [
'list' => ['inbox', 'draft', 'paused', 'unassigned'], 'list' => ['inbox', 'draft', 'paused', 'unassigned'],
'field' => 'process_category', 'field' => 'process_category',
'idFilter' => 'process_category',
'name' => G::LoadTranslation('ID_PROCESS_CATEGORY'), 'name' => G::LoadTranslation('ID_PROCESS_CATEGORY'),
'type' => 'string', 'type' => 'string',
'source' => 'APPLICATION', 'source' => 'APPLICATION',
@@ -393,6 +396,7 @@ class CaseList extends Model
], [ ], [
'list' => ['inbox', 'draft', 'paused', 'unassigned'], 'list' => ['inbox', 'draft', 'paused', 'unassigned'],
'field' => 'process_name', 'field' => 'process_name',
'idFilter' => 'process_name',
'name' => G::LoadTranslation('ID_PROCESS_NAME'), 'name' => G::LoadTranslation('ID_PROCESS_NAME'),
'type' => 'string', 'type' => 'string',
'source' => 'APPLICATION', 'source' => 'APPLICATION',
@@ -401,7 +405,8 @@ class CaseList extends Model
'set' => true 'set' => true
], [ ], [
'list' => ['inbox', 'draft', 'paused', 'unassigned'], 'list' => ['inbox', 'draft', 'paused', 'unassigned'],
'field' => 'task_title', 'field' => 'task',
'idFilter' => 'task',
'name' => G::LoadTranslation('ID_TASK'), 'name' => G::LoadTranslation('ID_TASK'),
'type' => 'string', 'type' => 'string',
'source' => 'APPLICATION', 'source' => 'APPLICATION',
@@ -411,6 +416,7 @@ class CaseList extends Model
], [ ], [
'list' => ['inbox', 'draft', 'paused', 'unassigned'], 'list' => ['inbox', 'draft', 'paused', 'unassigned'],
'field' => 'send_by', 'field' => 'send_by',
'idFilter' => 'send_by',
'name' => G::LoadTranslation('ID_SEND_BY'), 'name' => G::LoadTranslation('ID_SEND_BY'),
'type' => 'string', 'type' => 'string',
'source' => 'APPLICATION', 'source' => 'APPLICATION',
@@ -420,6 +426,7 @@ class CaseList extends Model
], [ ], [
'list' => ['inbox', 'paused', 'unassigned'], 'list' => ['inbox', 'paused', 'unassigned'],
'field' => 'due_date', 'field' => 'due_date',
'idFilter' => 'due_date',
'name' => G::LoadTranslation('ID_DUE_DATE'), 'name' => G::LoadTranslation('ID_DUE_DATE'),
'type' => 'date', 'type' => 'date',
'source' => 'APPLICATION', 'source' => 'APPLICATION',
@@ -429,6 +436,7 @@ class CaseList extends Model
], [ ], [
'list' => ['inbox', 'paused', 'unassigned'], 'list' => ['inbox', 'paused', 'unassigned'],
'field' => 'delegation_date', 'field' => 'delegation_date',
'idFilter' => 'delegation_date',
'name' => G::LoadTranslation('ID_DELEGATION_DATE'), 'name' => G::LoadTranslation('ID_DELEGATION_DATE'),
'type' => 'date', 'type' => 'date',
'source' => 'APPLICATION', 'source' => 'APPLICATION',
@@ -438,6 +446,7 @@ class CaseList extends Model
], [ ], [
'list' => ['inbox', 'draft', 'paused', 'unassigned'], 'list' => ['inbox', 'draft', 'paused', 'unassigned'],
'field' => 'priority', 'field' => 'priority',
'idFilter' => 'priority',
'name' => G::LoadTranslation('ID_PRIORITY'), 'name' => G::LoadTranslation('ID_PRIORITY'),
'type' => 'string', 'type' => 'string',
'source' => 'APPLICATION', 'source' => 'APPLICATION',