diff --git a/resources/assets/js/components/search/CustomFilter.vue b/resources/assets/js/components/search/CustomFilter.vue index 73f846031..837817e28 100644 --- a/resources/assets/js/components/search/CustomFilter.vue +++ b/resources/assets/js/components/search/CustomFilter.vue @@ -17,7 +17,7 @@ > + \ No newline at end of file diff --git a/resources/assets/js/home/AdvancedSearch/AdvancedSearch.vue b/resources/assets/js/home/AdvancedSearch/AdvancedSearch.vue index e4766ecf7..686d7fc46 100644 --- a/resources/assets/js/home/AdvancedSearch/AdvancedSearch.vue +++ b/resources/assets/js/home/AdvancedSearch/AdvancedSearch.vue @@ -162,7 +162,7 @@ export default { headings: { case_number: this.$i18n.t("ID_MYCASE_NUMBER"), process_name: this.$i18n.t("ID_PROCESS_NAME"), - process_category: this.$i18n.t("ID_PROCESS_CATEGORY"), + process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), status: this.$i18n.t("ID_STATUS"), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), task: this.$i18n.t("ID_TASK"), diff --git a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue index 75ddc2859..2dfec0c74 100644 --- a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue +++ b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue @@ -58,7 +58,9 @@
{{ props.row.PROCESS_NAME }}
- +
+ {{ props.row.PROCESS_CATEGORY }} +
@@ -136,6 +138,9 @@ {{ props["item"]["PROCESS_NAME"] }} + + {{ props["item"]["PROCESS_CATEGORY"] }} + {{ props["item"]["DUE_DATE"] }} @@ -195,6 +200,9 @@ {{ props["item"]["PROCESS_NAME"] }} + + {{ props["item"]["PROCESS_CATEGORY"] }} + {{ props["item"]["DUE_DATE"] }} @@ -332,6 +340,7 @@ export default { case_number: this.$i18n.t("ID_MYCASE_NUMBER"), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), process_name: this.$i18n.t("ID_PROCESS_NAME"), + process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), task: this.$i18n.t("ID_TASK"), send_by: this.$i18n.t("ID_SEND_BY"), due_date: this.$i18n.t("ID_DUE_DATE"), @@ -408,7 +417,8 @@ export default { thread_title: "caseTitle", delegation_date: "delegationDate", send_by: "bySendBy", - process_name: "processName" + process_name: "processName", + process_category: "processCategory" }, customItems:{ VARCHAR: { @@ -592,6 +602,28 @@ export default { return `${this.tagPrefix} ${data[0].options && data[0].options.label || ''}`; } }, + processCategory: { + group: "checkbox", + type: "ProcessCategory", + id: "processCategory", + title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_PROCESS_CATEGORY')}`, + optionLabel: this.$i18n.t('ID_BY_PROCESS_CATEGORY'), + detail: "", + tagText: "", + tagPrefix: this.$i18n.t('ID_SEARCH_BY_PROCESS_CATEGORY'), + autoShow: false, + items:[ + { + id: "process", + value: "", + options: [], + placeholder: this.$i18n.t('ID_CATEGORY_PROCESS') + } + ], + makeTagText: function (params, data) { + return `${this.tagPrefix} ${data[0].options && data[0].options.label || ''}`; + } + }, showUserTooltip: true } }; @@ -860,6 +892,7 @@ export default { CASE_NUMBER: v.APP_NUMBER, THREAD_TITLE: v.DEL_TITLE, PROCESS_NAME: v.PRO_TITLE, + PROCESS_CATEGORY: v.CATEGORY, TASK: [ { TITLE: v.TAS_TITLE, diff --git a/resources/assets/js/home/Draft/Draft.vue b/resources/assets/js/home/Draft/Draft.vue index 1233b9d65..acc8164d2 100644 --- a/resources/assets/js/home/Draft/Draft.vue +++ b/resources/assets/js/home/Draft/Draft.vue @@ -315,7 +315,7 @@ export default { case_number: this.$i18n.t("ID_MYCASE_NUMBER"), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), process_name: this.$i18n.t("ID_PROCESS_NAME"), - process_category: this.$i18n.t("ID_PROCESS_CATEGORY"), + process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), task: this.$i18n.t("ID_TASK"), priority: this.$i18n.t("ID_PRIORITY"), actions: "" diff --git a/resources/assets/js/home/Draft/defaultMixins.js b/resources/assets/js/home/Draft/defaultMixins.js index 435876963..15bed6b65 100644 --- a/resources/assets/js/home/Draft/defaultMixins.js +++ b/resources/assets/js/home/Draft/defaultMixins.js @@ -54,7 +54,7 @@ export default { case_number: this.$i18n.t("ID_MYCASE_NUMBER"), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), process_name: this.$i18n.t("ID_PROCESS_NAME"), - process_category: this.$i18n.t("ID_PROCESS_CATEGORY"), + process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), task: this.$i18n.t("ID_TASK"), current_user: this.$i18n.t("ID_CURRENT_USER"), due_date: this.$i18n.t("ID_DUE_DATE"), diff --git a/resources/assets/js/home/Inbox/Inbox.vue b/resources/assets/js/home/Inbox/Inbox.vue index 8536d9106..ed7c7464e 100644 --- a/resources/assets/js/home/Inbox/Inbox.vue +++ b/resources/assets/js/home/Inbox/Inbox.vue @@ -361,7 +361,7 @@ export default { case_number: this.$i18n.t("ID_MYCASE_NUMBER"), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), process_name: this.$i18n.t("ID_PROCESS_NAME"), - process_category: this.$i18n.t("ID_PROCESS_CATEGORY"), + process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), task: this.$i18n.t("ID_TASK"), send_by: this.$i18n.t("ID_SEND_BY"), due_date: this.$i18n.t("ID_DUE_DATE"), diff --git a/resources/assets/js/home/Inbox/defaultMixins.js b/resources/assets/js/home/Inbox/defaultMixins.js index 228c9c7c5..b308fe031 100644 --- a/resources/assets/js/home/Inbox/defaultMixins.js +++ b/resources/assets/js/home/Inbox/defaultMixins.js @@ -54,7 +54,7 @@ export default { case_number: this.$i18n.t("ID_MYCASE_NUMBER"), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), process_name: this.$i18n.t("ID_PROCESS_NAME"), - process_category: this.$i18n.t("ID_PROCESS_CATEGORY"), + process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), task: this.$i18n.t("ID_TASK"), send_by: this.$i18n.t("ID_SEND_BY"), current_user: this.$i18n.t("ID_CURRENT_USER"), diff --git a/resources/assets/js/home/MyCases/MyCases.vue b/resources/assets/js/home/MyCases/MyCases.vue index 65182b4d5..0ac4b6498 100644 --- a/resources/assets/js/home/MyCases/MyCases.vue +++ b/resources/assets/js/home/MyCases/MyCases.vue @@ -164,7 +164,7 @@ export default { headings: { case_number: this.$i18n.t("ID_MYCASE_NUMBER"), process_name: this.$i18n.t("ID_PROCESS_NAME"), - process_category: this.$i18n.t("ID_PROCESS_CATEGORY"), + process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), pending_taks: this.$i18n.t("ID_PENDING_TASKS"), status: this.$i18n.t("ID_CASESLIST_APP_STATUS"), diff --git a/resources/assets/js/home/Paused/Paused.vue b/resources/assets/js/home/Paused/Paused.vue index 40e90c4c4..48b6e1968 100644 --- a/resources/assets/js/home/Paused/Paused.vue +++ b/resources/assets/js/home/Paused/Paused.vue @@ -361,7 +361,7 @@ export default { case_number: this.$i18n.t("ID_MYCASE_NUMBER"), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), process_name: this.$i18n.t("ID_PROCESS_NAME"), - process_category: this.$i18n.t("ID_PROCESS_CATEGORY"), + process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), task: this.$i18n.t("ID_TASK"), send_by: this.$i18n.t("ID_SEND_BY"), due_date: this.$i18n.t("ID_DUE_DATE"), diff --git a/resources/assets/js/home/Paused/defaultMixins.js b/resources/assets/js/home/Paused/defaultMixins.js index 0e3ebf1c0..2eea5e2f8 100644 --- a/resources/assets/js/home/Paused/defaultMixins.js +++ b/resources/assets/js/home/Paused/defaultMixins.js @@ -53,7 +53,7 @@ export default { case_number: this.$i18n.t("ID_MYCASE_NUMBER"), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), process_name: this.$i18n.t("ID_PROCESS_NAME"), - process_category: this.$i18n.t("ID_PROCESS_CATEGORY"), + process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), task: this.$i18n.t("ID_TASK"), send_by: this.$i18n.t("ID_SEND_BY"), current_user: this.$i18n.t("ID_CURRENT_USER"), diff --git a/resources/assets/js/home/Unassigned/Unassigned.vue b/resources/assets/js/home/Unassigned/Unassigned.vue index b2f5d630a..4d3714eb0 100644 --- a/resources/assets/js/home/Unassigned/Unassigned.vue +++ b/resources/assets/js/home/Unassigned/Unassigned.vue @@ -353,7 +353,7 @@ export default { case_number: this.$i18n.t("ID_MYCASE_NUMBER"), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), process_name: this.$i18n.t("ID_PROCESS_NAME"), - process_category: this.$i18n.t("ID_PROCESS_CATEGORY"), + process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), task: this.$i18n.t("ID_TASK"), send_by: this.$i18n.t("ID_SEND_BY"), due_date: this.$i18n.t("ID_DUE_DATE"), diff --git a/resources/assets/js/home/Unassigned/defaultMixins.js b/resources/assets/js/home/Unassigned/defaultMixins.js index dfc67d9df..bb32f88cc 100644 --- a/resources/assets/js/home/Unassigned/defaultMixins.js +++ b/resources/assets/js/home/Unassigned/defaultMixins.js @@ -53,7 +53,7 @@ export default { case_number: this.$i18n.t("ID_MYCASE_NUMBER"), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'), process_name: this.$i18n.t("ID_PROCESS_NAME"), - process_category: this.$i18n.t("ID_PROCESS_CATEGORY"), + process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), task: this.$i18n.t("ID_TASK"), send_by: this.$i18n.t("ID_SEND_BY"), current_user: this.$i18n.t("ID_CURRENT_USER"),