diff --git a/resources/assets/js/components/search/CasesFilter.vue b/resources/assets/js/components/search/CasesFilter.vue index d0a16a1fb..bac411417 100644 --- a/resources/assets/js/components/search/CasesFilter.vue +++ b/resources/assets/js/components/search/CasesFilter.vue @@ -16,14 +16,6 @@ stacked > - - {{ $t("ID_BY_PROCESS_NAME") }} - {{ $t("ID_BY_PROCESS_CATEGORY") }} + + {{ $t("ID_BY_PROCESS_NAME") }} + diff --git a/resources/assets/js/components/search/MyCasesFilter.vue b/resources/assets/js/components/search/MyCasesFilter.vue index fee5726d1..e626db99e 100644 --- a/resources/assets/js/components/search/MyCasesFilter.vue +++ b/resources/assets/js/components/search/MyCasesFilter.vue @@ -17,14 +17,6 @@ stacked > - - {{$t('ID_BY_PROCESS_NAME') }} - {{$t('ID_BY_PROCESS_CATEGORY') }} - + + {{$t('ID_BY_PROCESS_NAME') }} + diff --git a/resources/assets/js/home/AdvancedSearch/AdvancedSearch.vue b/resources/assets/js/home/AdvancedSearch/AdvancedSearch.vue index 686d7fc46..77f73e302 100644 --- a/resources/assets/js/home/AdvancedSearch/AdvancedSearch.vue +++ b/resources/assets/js/home/AdvancedSearch/AdvancedSearch.vue @@ -49,12 +49,12 @@
{{ props.row.APP_STATUS }}
-
- {{ props.row.PROCESS_NAME }} -
{{ props.row.PROCESS_CATEGORY }}
+
+ {{ props.row.PROCESS_NAME }} +
@@ -145,8 +145,8 @@ export default { }, columns: [ "case_number", - "process_name", "process_category", + "process_name", "status", "thread_title", "task", @@ -161,8 +161,8 @@ export default { filterable: false, headings: { case_number: this.$i18n.t("ID_MYCASE_NUMBER"), - process_name: this.$i18n.t("ID_PROCESS_NAME"), process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), + process_name: this.$i18n.t("ID_PROCESS_NAME"), 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 ca59463f3..d69bc4ddf 100644 --- a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue +++ b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue @@ -55,12 +55,12 @@
{{ props.row.THREAD_TITLE }}
-
- {{ props.row.PROCESS_NAME }} -
{{ props.row.PROCESS_CATEGORY }}
+
+ {{ props.row.PROCESS_NAME }} +
@@ -130,12 +130,12 @@ {{ props["item"]["THREAD_TITLE"] }} - - {{ props["item"]["PROCESS_NAME"] }} - {{ props["item"]["PROCESS_CATEGORY"] }} + + {{ props["item"]["PROCESS_NAME"] }} + {{ props["item"]["DUE_DATE"] }} @@ -187,12 +187,12 @@ {{ props["item"]["THREAD_TITLE"] }} - - {{ props["item"]["PROCESS_NAME"] }} - {{ props["item"]["PROCESS_CATEGORY"] }} + + {{ props["item"]["PROCESS_NAME"] }} + {{ props["item"]["DUE_DATE"] }} @@ -565,28 +565,6 @@ export default { return `${this.tagPrefix}: ${data[0].label || ""}`; }, }, - processName: { - group: "checkbox", - type: "ProcessName", - id: "processName", - title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_PROCESS_NAME')}`, - optionLabel: this.$i18n.t('ID_BY_PROCESS_NAME'), - detail: "", - tagText: "", - tagPrefix: this.$i18n.t('ID_SEARCH_BY_PROCESS_NAME'), - autoShow: false, - items:[ - { - id: "process", - value: "", - options: [], - placeholder: this.$i18n.t('ID_PROCESS_NAME') - } - ], - makeTagText: function (params, data) { - return `${this.tagPrefix} ${data[0].options && data[0].options.label || ''}`; - } - }, processCategory: { group: "checkbox", type: "ProcessCategory", @@ -609,6 +587,28 @@ export default { return `${this.tagPrefix} ${data[0].options && data[0].options.label || ''}`; } }, + processName: { + group: "checkbox", + type: "ProcessName", + id: "processName", + title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_PROCESS_NAME')}`, + optionLabel: this.$i18n.t('ID_BY_PROCESS_NAME'), + detail: "", + tagText: "", + tagPrefix: this.$i18n.t('ID_SEARCH_BY_PROCESS_NAME'), + autoShow: false, + items:[ + { + id: "process", + value: "", + options: [], + placeholder: this.$i18n.t('ID_PROCESS_NAME') + } + ], + makeTagText: function (params, data) { + return `${this.tagPrefix} ${data[0].options && data[0].options.label || ''}`; + } + }, showUserTooltip: true } }; diff --git a/resources/assets/js/home/Draft/Draft.vue b/resources/assets/js/home/Draft/Draft.vue index acc8164d2..e992c045d 100644 --- a/resources/assets/js/home/Draft/Draft.vue +++ b/resources/assets/js/home/Draft/Draft.vue @@ -51,12 +51,12 @@
{{ props.row.THREAD_TITLE }}
-
- {{ props.row.PROCESS_NAME }} -
{{ props.row.PROCESS_CATEGORY }}
+
+ {{ props.row.PROCESS_NAME }} +
@@ -99,14 +99,6 @@ {{ props["item"]["THREAD_TITLE"] }} -
- {{ props["headings"][props.column] }} : - {{ props["item"]["PROCESS_NAME"] }} - -
{{ props["headings"][props.column] }} :{{ props["item"]["PROCESS_CATEGORY"] }}
+
+ {{ props["headings"][props.column] }} : + {{ props["item"]["PROCESS_NAME"] }} + +
{{ props["headings"][props.column] }} :
-
- {{ props["headings"][props.column] }} : - {{ props["item"]["PROCESS_NAME"] }} - -
{{ props["headings"][props.column] }} :{{ props["item"]["PROCESS_CATEGORY"] }}
+
+ {{ props["headings"][props.column] }} : + {{ props["item"]["PROCESS_NAME"] }} + +
{{ props["headings"][props.column] }} : {{ props.row.THREAD_TITLE }}
-
- {{ props.row.PROCESS_NAME }} -
{{ props.row.PROCESS_CATEGORY }}
+
+ {{ props.row.PROCESS_NAME }} +
@@ -106,14 +106,6 @@ {{ props["item"]["THREAD_TITLE"] }} -
- {{ props["headings"][props.column] }} : - {{ props["item"]["PROCESS_NAME"] }} - -
{{ props["headings"][props.column] }} :{{ props["item"]["PROCESS_CATEGORY"] }}
+
+ {{ props["headings"][props.column] }} : + {{ props["item"]["PROCESS_NAME"] }} + +
{{ props["headings"][props.column] }} :
-
- {{ props["headings"][props.column] }} : - {{ props["item"]["PROCESS_NAME"] }} - -
{{ props["headings"][props.column] }} :{{ props["item"]["PROCESS_CATEGORY"] }}
+
+ {{ props["headings"][props.column] }} : + {{ props["item"]["PROCESS_NAME"] }} + +
{{ props["headings"][props.column] }} :
-
- {{ props.row.PROCESS_NAME }} -
{{ props.row.PROCESS_CATEGORY }}
+
+ {{ props.row.PROCESS_NAME }} +
@@ -163,8 +163,8 @@ export default { filterable: false, headings: { case_number: this.$i18n.t("ID_MYCASE_NUMBER"), - process_name: this.$i18n.t("ID_PROCESS_NAME"), process_category: this.$i18n.t("ID_CATEGORY_PROCESS"), + process_name: this.$i18n.t("ID_PROCESS_NAME"), 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 8342e0b3e..1066cbbdc 100644 --- a/resources/assets/js/home/Paused/Paused.vue +++ b/resources/assets/js/home/Paused/Paused.vue @@ -45,12 +45,12 @@
{{ props.row.THREAD_TITLE }}
-
- {{ props.row.PROCESS_NAME }} -
{{ props.row.PROCESS_CATEGORY }}
+
+ {{ props.row.PROCESS_NAME }} +
@@ -105,14 +105,6 @@ {{ props["item"]["THREAD_TITLE"] }} -
- {{ props["headings"][props.column] }} : - {{ props["item"]["PROCESS_NAME"] }} - -
{{ props["headings"][props.column] }} :{{ props["item"]["PROCESS_CATEGORY"] }}
+
+ {{ props["headings"][props.column] }} : + {{ props["item"]["PROCESS_NAME"] }} + +
{{ props["headings"][props.column] }} :
-
- {{ props["headings"][props.column] }} : - {{ props["item"]["PROCESS_NAME"] }} - -
{{ props["headings"][props.column] }} :{{ props["item"]["PROCESS_CATEGORY"] }}
+
+ {{ props["headings"][props.column] }} : + {{ props["item"]["PROCESS_NAME"] }} + +
{{ props["headings"][props.column] }} : {{ props.row.THREAD_TITLE }}
-
- {{ props.row.PROCESS_NAME }} -
{{ props.row.PROCESS_CATEGORY }}
+
+ {{ props.row.PROCESS_NAME }} +
@@ -100,14 +100,6 @@ {{ props["item"]["THREAD_TITLE"] }} -
- {{ props["headings"][props.column] }} : - {{ props["item"]["PROCESS_NAME"] }} - -
{{ props["headings"][props.column] }} :{{ props["item"]["PROCESS_CATEGORY"] }}
+
+ {{ props["headings"][props.column] }} : + {{ props["item"]["PROCESS_NAME"] }} + +
{{ props["headings"][props.column] }} :
-
- {{ props["headings"][props.column] }} : - {{ props["item"]["PROCESS_NAME"] }} - -
{{ props["headings"][props.column] }} :{{ props["item"]["PROCESS_CATEGORY"] }}
+
+ {{ props["headings"][props.column] }} : + {{ props["item"]["PROCESS_NAME"] }} + +
{{ props["headings"][props.column] }} : true ], [ 'list' => ['inbox', 'draft', 'paused', 'unassigned'], - 'field' => 'process_name', - 'name' => G::LoadTranslation('ID_PROCESS_NAME'), + 'field' => 'process_category', + 'name' => G::LoadTranslation('ID_PROCESS_CATEGORY'), 'type' => 'string', 'source' => 'APPLICATION', 'typeSearch' => 'search text', @@ -392,8 +392,8 @@ class CaseList extends Model 'set' => true ], [ 'list' => ['inbox', 'draft', 'paused', 'unassigned'], - 'field' => 'process_category', - 'name' => G::LoadTranslation('ID_PROCESS_CATEGORY'), + 'field' => 'process_name', + 'name' => G::LoadTranslation('ID_PROCESS_NAME'), 'type' => 'string', 'source' => 'APPLICATION', 'typeSearch' => 'search text',