fix merge conflict

fix merge conflict 5

fix tag label

fix CR notes

fix filtes conbined

resources/assets/js/api/Api.js

@@ -69,6 +69,7 @@ const services = {
     PROCESSES: "/home/processes",
     USERS: "/home/users",
     TASKS: "/home/tasks",
+    CATEGORIES: "/home/categories",
     DEBUG_STATUS: "/home/process-debug-status?processUid={prj_uid}"
 };
 

resources/assets/js/api/Filters.js

@@ -82,6 +82,18 @@ export let filters = {
             keys: {},
         });
     },
+    /**
+     * Service to get the categories list
+     */
+    categories(query) {
+        return Api.get({
+            service: "CATEGORIES",
+            params: {
+                name: query,
+            },
+            keys: {},
+        });
+    },
     /**
      * Service to get the users list
      */

resources/assets/js/components/search/AdvancedFilter.vue

@@ -195,6 +195,8 @@ import CasePriority from "./popovers/CasePriority.vue";
 import CaseStatus from "./popovers/CaseStatus.vue";
 import CurrentUser from "./popovers/CurrentUser.vue";
 import TaskTitle from "./popovers/TaskTitle.vue";
+import Participation from "./popovers/Participation.vue";
+import ProcessCategory from "./popovers/ProcessCategory.vue";
 import api from "./../../api/index";
 
 export default {
@@ -209,7 +211,9 @@ export default {
         CaseStatus,
         CurrentUser,
         DateFilter,
-        TaskTitle
+        TaskTitle,
+        Participation,
+        ProcessCategory
     },
     data() {
         return {
@@ -219,11 +223,11 @@ export default {
                 {   
                     type: "CaseNumber",
                     id: "caseNumber",
-                    title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_IUD')}`,
+                    title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_CASE_NUMBER')}`,
-                    optionLabel: this.$i18n.t('ID_IUD'),
+                    optionLabel: this.$i18n.t('ID_BY_CASE_NUMBER'),
                     detail: this.$i18n.t('ID_PLEASE_SET_A_RANGE_TO_CASES_TO_SEARCH'),
                     tagText: "",
-                    tagPrefix:  this.$i18n.t('ID_IUD'),
+                    tagPrefix: this.$i18n.t('ID_SEARCH_BY_CASE_NUMBER'),
                     items:[
                         {
                             id: "filterCases",
@@ -231,15 +235,15 @@ export default {
                         }
                     ],
                     makeTagText: function (params, data) {
-                          return  `${params.tagPrefix}: ${data[0].value}`;
+                          return  `${params.tagPrefix} ${data[0].value}`;
                     }
                 },
                 {
                     type: "CaseTitle",
                     id: "caseTitle",
-                    title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_CASE_TITLE')}`,
+                    title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_CASE_TITLE')}`,
-                    optionLabel: this.$i18n.t('ID_CASE_TITLE'),
+                    optionLabel: this.$i18n.t('ID_BY_CASE_TITLE'),
-                    tagPrefix:  this.$i18n.t('ID_CASE_TITLE'),
+                    tagPrefix:  this.$i18n.t('ID_SEARCH_BY_CASE_TITLE'),
                     detail: "",
                     tagText: "",
                     items:[
@@ -249,14 +253,14 @@ export default {
                         }
                     ],
                     makeTagText: function (params, data) {
-                        return  `${this.tagPrefix}: ${data[0].value}`;
+                        return  `${this.tagPrefix} ${data[0].value}`;
                     }
                 },
                 {
                     type: "caseStatus",
                     id: "CaseStatus",
-                    title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_CASE_STATUS')}`,
+                    title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_STATUS')}`,
-                    optionLabel: this.$i18n.t('ID_STATUS'),
+                    optionLabel: this.$i18n.t('ID_BY_STATUS'),
                     detail: this.$i18n.t('ID_PLEASE_SELECT_THE_STATUS_FOR_THE_SEARCH'),
                     tagText: "",
                     tagPrefix:  this.$i18n.t('ID_SEARCH_BY_STATUS'),
@@ -291,11 +295,11 @@ export default {
                 {
                     type: "ProcessName",
                     id: "processName",
-                    title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_PROCESS_NAME')}`,
+                    title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_PROCESS_NAME')}`,
-                    optionLabel: this.$i18n.t('ID_PROCESS_NAME'),
+                    optionLabel: this.$i18n.t('ID_BY_PROCESS_NAME'),
                     detail: "",
                     tagText: "",
-                    tagPrefix:  this.$i18n.t('ID_PROCESS_NAME'),
+                    tagPrefix:  this.$i18n.t('ID_SEARCH_BY_PROCESS_NAME'),
                     items:[
                         {
                             id: "process",
@@ -311,8 +315,8 @@ export default {
                 {
                     type: "TaskTitle",
                     id: "taskTitle",
-                    title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_TASK_NAME')}`,
+                    title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_TASK')}`,
-                    optionLabel: this.$i18n.t('ID_TASK'),
+                    optionLabel: this.$i18n.t('ID_BY_TASK'),
                     detail: "",
                     tagText: "",
                     tagPrefix:  this.$i18n.t('ID_SEARCH_BY_TASK_NAME'),
@@ -331,12 +335,12 @@ export default {
                 {
                     type: "CurrentUser",
                     id: "currentUser",
-                    title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_CURRENT_USER')}`,
+                    title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_CURRENT_USER')}`,
-                    optionLabel: this.$i18n.t('ID_CURRENT_USER'),
+                    optionLabel: this.$i18n.t('ID_BY_CURRENT_USER'),
                     detail: "",
                     placeholder: this.$i18n.t('ID_USER_NAME'),
                     tagText: "",
-                    tagPrefix:  this.$i18n.t('ID_USER'),
+                    tagPrefix:  this.$i18n.t('ID_SEARCH_BY_CURRENT_USER'),
                     items:[
                         {
                             id: "user",
@@ -376,9 +380,9 @@ export default {
                 {
                     type: "DateFilter",
                     id: "finishDate",
-                    title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_FINISH_DATE')}`,
+                    title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_FINISH_DATE')}`,
-                    optionLabel: this.$i18n.t('ID_FINISH_DATE'),
+                    optionLabel: this.$i18n.t('ID_BY_FINISH_DATE'),
-                    detail: this.$i18n.t('Please set a range of cases Finish Date to search:'),
+                    detail: this.$i18n.t('ID_PLEASE_SET_A_RANGE_OF_CASES_FINISH_DATE_TO_SEARCH'),
                     tagText: "",
                     tagPrefix:  this.$i18n.t('ID_SEARCH_BY_FINISH_DATE'),
                     items:[
@@ -396,8 +400,66 @@ export default {
                     makeTagText: function (params, data) {
                         return  `${params.tagPrefix} ${data[0].value} - ${data[1].value}`;
                     }
+                },
+                {
+                    type: "Participation",
+                    id: "participation",
+                    title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_PARTICIPATION')}`,
+                    optionLabel: this.$i18n.t('ID_BY_PARTICIPATION'),
+                    detail: this.$i18n.t('ID_CHECK_ONE_OPTION_ENABLE_SEARCH'),
+                    tagText: "",
+                    tagPrefix:  this.$i18n.t('ID_SEARCH_BY_PARTICIPATION'),
+                    items:[
+                        {
+                            id: "startedBy",
+                            value: "",
+                            options: [],
+                            placeholder: "",
+                            status: "not_accepted",
+                            title: this.$i18n.t("ID_STARTED_BY")
+                        },
+                        {
+                            id: "completedBy",
+                            value: "",
+                            options: [],
+                            placeholder: "",
+                            disabled: true,
+                            status: "not_accepted",
+                            title: this.$i18n.t("ID_COMPLETED_BY")
+                        }
+                    ],
+                    makeTagText: function (params, data) {
+                        let text = data && (data[0].value || data[1].value) ? "": data[0].title;
+                        if(data && data[0].value){
+                            text += data[0].title + ": " + data[0].label;
+                            text +=  data && data[1].value ? "; ": "";
+                        }
+                        if(data && data[1].value){
+                             text += data[1].title + ": " + data[1].label;
+                        }
+                        return text;
+                    }
+                },
+                {
+                    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'),
+                    items:[
+                        {
+                            id: "category",
+                            value: "",
+                            options: [],
+                            placeholder: ""
+                        }
+                    ],
+                    makeTagText: function (params, data) {
+                        return  `${params.tagPrefix}:  ${data[0].label || ''}`;
+                    }
                 }
-              
             ],
             selected: "",
             itemModel: {},
@@ -492,8 +554,9 @@ export default {
                                 filterVar: value.id,
                                 fieldId: item,
                                 value: '',
-                                label: "",
+                                label: value.label,
-                                options: []
+                                options: [],
+                                title: value.title
                             });
                         }
                     });

resources/assets/js/components/search/CasesFilter.vue

@@ -15,12 +15,13 @@
                 name="flavour-2a"
                 stacked
             ></b-form-radio-group>
+        <b-form-group>
+        </b-form-group>
             <b-form-checkbox
                 id="checkbox-1"
                 v-model="byProcessName"
                 name="checkbox-1"
                 value="processName"
-
             >
                 {{$t('ID_BY_PROCESS_NAME') }}
             </b-form-checkbox>

resources/assets/js/components/search/popovers/Participation.vue

@@ -0,0 +1,151 @@
+<template>
+    <div>
+        <SearchPopover :target="tag" @savePopover="onOk" :title="info.title">
+            <template v-slot:body>
+                <p>{{ info.detail }}</p>
+                <form ref="form" @submit.stop.prevent="handleSubmit">
+                    <b-form-group
+                        label-for="name"
+                        :invalid-feedback="$t('ID_PROCESS_IS_REQUIRED')"
+                    >
+                        <b-form-checkbox
+                            id="started"
+                            v-model="filter[0].status"
+                            name="started"
+                            value="accepted"
+                            unchecked-value="not_accepted"
+                            >
+                            {{$t("ID_STARTED_BY")}}
+                        </b-form-checkbox>
+                        <multiselect
+                            v-model="filter[0].options"
+                            :options="users"
+                            :placeholder="$t('ID_USER_NAME')"
+                            label="USR_FULLNAME"
+                            track-by="USR_ID"
+                            :show-no-results="false"
+                            @search-change="asyncFind"
+                            :loading="isLoading"
+                            id="started"
+                            :limit="10"
+                            :clear-on-select="true"
+                            :disabled="filter[0].status !== 'accepted'"
+                        >
+                        </multiselect>
+                    </b-form-group> 
+                    <b-form-group>
+                        <b-form-checkbox
+                            id="completed"
+                            v-model="filter[1].status"
+                            name="completed"
+                            value="accepted"
+                            unchecked-value="not_accepted"
+                            >
+                            {{$t("ID_COMPLETED_BY")}}
+                        </b-form-checkbox>
+                        <multiselect
+                            v-model="filter[1].options"
+                            :options="users"
+                            :placeholder="$t('ID_USER_NAME')"
+                            label="USR_FULLNAME"
+                            track-by="USR_ID"
+                            :show-no-results="false"
+                            @search-change="asyncFind"
+                            :loading="isLoading"
+                            id="completed"
+                            :limit="10"
+                            :clear-on-select="true"
+                            :disabled="filter[1].status !== 'accepted'"
+                        >
+                        </multiselect>
+                    </b-form-group>
+                </form>
+            </template>
+        </SearchPopover>
+    </div>
+</template>
+
+<script>
+import SearchPopover from "./SearchPopover.vue";
+import Multiselect from "vue-multiselect";
+import api from "./../../../api/index";
+
+export default {
+    components: {
+        SearchPopover,
+        Multiselect
+    },
+    props: ["tag", "info", "filter"],
+    data() {
+        return {
+            users: [],
+            isLoading: false,
+            started: "",
+            completed: ""
+        };
+    },
+    watch: {
+        filter: { 
+            immediate: true, 
+            handler(newVal, oldVal) { 
+                if (newVal[0].status === "not_accepted") {
+                    newVal[0].options = [];
+                    newVal[0].label = "";
+                    newVal[0].value = "";
+                }
+                if (newVal[1].status === "not_accepted") {
+                    newVal[1].options = [];
+                    newVal[1].label = "";
+                    newVal[1].value = "";
+                }
+                
+            }
+        }
+    },
+    methods: {
+        /**
+         * Find asynchronously in the server
+         * @param {string} query - string from the text field
+         */
+        asyncFind(query) {
+            this.isLoading = true;
+            api.filters
+                .userList(query)
+                .then((response) => {
+                    this.users = response.data;
+                    this.isLoading = false;
+                })
+                .catch((e) => {
+                    console.error(err);
+                });
+        },
+        /**
+         * Form validations review
+         */
+        checkFormValidity() {
+            const valid = this.query !== "";
+            this.valueState = valid;
+            return valid;
+        },
+        /**
+         * On Ok event handler
+         */
+        onOk() {
+            this.handleSubmit();
+        },
+        /**
+         *  Form submit handler
+         */
+        handleSubmit() {
+            this.filter[0].value =  this.filter[0].options.USR_ID;
+            this.filter[0].label = this.filter[0].options.USR_FULLNAME;
+            this.filter[1].value =  this.filter[1].options.USR_ID;
+            this.filter[1].label = this.filter[1].options.USR_FULLNAME;
+            this.$emit("updateSearchTag", this.filter);
+            this.$root.$emit("bv::hide::popover");
+        }
+    }
+};
+</script>
+<style src="vue-multiselect/dist/vue-multiselect.min.css"></style>
+<style scoped></style>

resources/assets/js/components/search/popovers/ProcessCategory.vue

@@ -0,0 +1,97 @@
+<template>
+    <div>
+        <SearchPopover :target="tag" @savePopover="onOk" :title="info.title">
+            <template v-slot:body>
+                <p>{{ info.detail }}</p>
+                <form ref="form" @submit.stop.prevent="handleSubmit">
+                    <b-form-group
+                        label-for="name"
+                        :invalid-feedback="$t('ID_PROCESS_IS_REQUIRED')"
+                    >
+                        <multiselect
+                            v-model="filter[0].options"
+                            :options="categories"
+                            :placeholder="$t('ID_CATEGORY_NAME')"
+                            label="CATEGORY_NAME"
+                            track-by="CATEGORY_ID"
+                            :show-no-results="false"
+                            @search-change="asyncFind"
+                            :loading="isLoading"
+                            id="started"
+                            :limit="10"
+                            :clear-on-select="true"
+                        >
+                        </multiselect>
+                    </b-form-group> 
+                </form>
+            </template>
+        </SearchPopover>
+    </div>
+</template>
+    updateSearchTag
+<script>
+import SearchPopover from "./SearchPopover.vue";
+import Multiselect from "vue-multiselect";
+import api from "./../../../api/index";
+
+export default {
+    components: {
+        SearchPopover,
+        Multiselect
+    },
+    props: ["tag", "info", "filter"],
+    data() {
+        return {
+            categories: [],
+            isLoading: false,
+            started: "",
+            completed: ""
+        };
+    },
+   
+    methods: {
+        /**
+         * Find asynchronously in the server
+         * @param {string} query - string from the text field
+         */
+        asyncFind(query) {
+            this.isLoading = true;
+            api.filters
+                .categories(query)
+                .then((response) => {
+                    this.categories = response.data;
+                    this.isLoading = false;
+                })
+                .catch((e) => {
+                    console.error(err);
+                });
+        },
+        /**
+         * Form validations review
+         */
+        checkFormValidity() {
+            const valid = this.query !== "";
+            this.valueState = valid;
+            return valid;
+        },
+        /**
+         * On Ok event handler
+         */
+        onOk() {
+            this.handleSubmit();
+        },
+        /**
+         *  Form submit handler
+         */
+        handleSubmit() {
+            this.filter[0].value =  this.filter[0].options.CATEGORY_ID;
+            this.filter[0].label = this.filter[0].options.CATEGORY_NAME;
+           
+            this.$emit("updateSearchTag", this.filter);
+            this.$root.$emit("bv::hide::popover");
+        }
+    }
+};  
+</script>
+<style src="vue-multiselect/dist/vue-multiselect.min.css"></style>
+<style scoped></style>

resources/assets/js/home/AdvancedSearch.vue

@@ -218,10 +218,12 @@ export default {
                 start = data.page === 1 ? 0 : limit * (data.page - 1);
             paged = start + "," + limit;
             filters["paged"] = paged;
-            return new Promise((resolutionFunc, rejectionFunc) => {
+            _.forIn(this.filters, function (item, key) {
-                _.forIn(this.filters, function(item, key) {
+                if(filters && item.value) {
                     filters[item.filterVar] = item.value;
-                });
+                }
+            });
+            return new Promise((resolutionFunc, rejectionFunc) => {
                 api.cases
                     .search(filters)
                     .then((response) => {

resources/assets/js/home/Draft.vue

@@ -235,7 +235,9 @@ export default {
       };
 
       _.forIn(this.filters, function (item, key) {
-        filters[item.filterVar] = item.value;
+          if(filters && item.value) {
+              filters[item.filterVar] = item.value;
+          }
       });
       return new Promise((resolutionFunc, rejectionFunc) => {
         api.cases

resources/assets/js/home/Inbox/Todo.vue

@@ -369,7 +369,9 @@ export default {
       };
 
       _.forIn(this.filters, function (item, key) {
-        filters[item.filterVar] = item.value;
+          if(filters && item.value) {
+              filters[item.filterVar] = item.value;
+          }
       });
       return new Promise((resolutionFunc, rejectionFunc) => {
         api.cases

resources/assets/js/home/MyCases.vue

@@ -300,8 +300,10 @@ export default {
                 filter: that.filterHeader,
                 paged: paged,
             };
-            _.forIn(this.filters, function(item, key) {
+            _.forIn(this.filters, function (item, key) {
-                filters[item.filterVar] = item.value;
+                if(filters && item.value) {
+                    filters[item.filterVar] = item.value;
+                }
             });
             return new Promise((resolutionFunc, rejectionFunc) => {
                 api.cases

resources/assets/js/home/Paused.vue

@@ -255,7 +255,9 @@ export default {
       };
 
       _.forIn(this.filters, function (item, key) {
-        filters[item.filterVar] = item.value;
+          if(filters && item.value) {
+              filters[item.filterVar] = item.value;
+          }
       });
       return new Promise((resolutionFunc, rejectionFunc) => {
         api.cases

resources/assets/js/home/Unassigned.vue

@@ -222,8 +222,10 @@ export default {
         paged: paged,
       };
 
-      _.forIn(this.$parent.filters, function (item, key) {
+      _.forIn(this.filters, function (item, key) {
-        filters[item.filterVar] = item.value;
+          if(filters && item.value) {
+              filters[item.filterVar] = item.value;
+          }
       });
       return new Promise((resolutionFunc, rejectionFunc) => {
         api.cases

workflow/engine/content/translations/english/processmaker.en.po

@@ -3065,12 +3065,30 @@ msgstr "By Case #"
 msgid "By Case Title"
 msgstr "By Case Title"
 
+# TRANSLATION
+# LABEL/ID_BY_CURRENT_USER
+#: LABEL/ID_BY_CURRENT_USER
+msgid "By Current User"
+msgstr "By Current User"
+
 # TRANSLATION
 # LABEL/ID_BY_FINISH_DATE
 #: LABEL/ID_BY_FINISH_DATE
 msgid "By Finish Date"
 msgstr "By Finish Date"
 
+# TRANSLATION
+# LABEL/ID_BY_PARTICIPATION
+#: LABEL/ID_BY_PARTICIPATION
+msgid "By Participation"
+msgstr "By Participation"
+
+# TRANSLATION
+# LABEL/ID_BY_PROCESS_CATEGORY
+#: LABEL/ID_BY_PROCESS_CATEGORY
+msgid "By Process Category"
+msgstr "By Process Category"
+
 # TRANSLATION
 # LABEL/ID_BY_PROCESS_NAME
 #: LABEL/ID_BY_PROCESS_NAME
@@ -4415,6 +4433,12 @@ msgstr "Check All"
 msgid "Please check the fields marked in red."
 msgstr "Please check the fields marked in red."
 
+# TRANSLATION
+# LABEL/ID_CHECK_ONE_OPTION_ENABLE_SEARCH
+#: LABEL/ID_CHECK_ONE_OPTION_ENABLE_SEARCH
+msgid "Please check one option to be enabled for search."
+msgstr "Please check one option to be enabled for search."
+
 # TRANSLATION
 # LABEL/ID_CHECK_PORT
 #: LABEL/ID_CHECK_PORT
@@ -4619,6 +4643,12 @@ msgstr "Comments"
 msgid "[LABEL/ID_COMPLETED] Completed"
 msgstr "Completed"
 
+# TRANSLATION
+# LABEL/ID_COMPLETED_BY
+#: LABEL/ID_COMPLETED_BY
+msgid "Completed By:"
+msgstr "Completed By:"
+
 # TRANSLATION
 # LABEL/ID_COMPLETED_BY_USER
 #: LABEL/ID_COMPLETED_BY_USER
@@ -24197,12 +24227,30 @@ msgstr "Search by Case #:"
 msgid "Search by Case Title:"
 msgstr "Search by Case Title:"
 
+# TRANSLATION
+# LABEL/ID_SEARCH_BY_CURRENT_USER
+#: LABEL/ID_SEARCH_BY_CURRENT_USER
+msgid "Search by Current User:"
+msgstr "Search by Current User:"
+
 # TRANSLATION
 # LABEL/ID_SEARCH_BY_FINISH_DATE
 #: LABEL/ID_SEARCH_BY_FINISH_DATE
 msgid "Search by Finish Date:"
 msgstr "Search by Finish Date:"
 
+# TRANSLATION
+# LABEL/ID_SEARCH_BY_PARTICIPATION
+#: LABEL/ID_SEARCH_BY_PARTICIPATION
+msgid "Search by Participation:"
+msgstr "Search by Participation:"
+
+# TRANSLATION
+# LABEL/ID_SEARCH_BY_PROCESS_CATEGORY
+#: LABEL/ID_SEARCH_BY_PROCESS_CATEGORY
+msgid "Search by Process Category:"
+msgstr "Search by Process Category:"
+
 # TRANSLATION
 # LABEL/ID_SEARCH_BY_PROCESS_NAME
 #: LABEL/ID_SEARCH_BY_PROCESS_NAME
@@ -25247,6 +25295,12 @@ msgstr "Stages"
 msgid "Log Files"
 msgstr "Log Files"
 
+# TRANSLATION
+# LABEL/ID_STARTED_BY
+#: LABEL/ID_STARTED_BY
+msgid "Started By:"
+msgstr "Started By:"
+
 # TRANSLATION
 # LABEL/ID_STARTED_CASES
 #: LABEL/ID_STARTED_CASES

workflow/engine/data/mysql/insert.sql

@@ -57318,8 +57318,11 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_BUY_NOW','en','Buy now','2014-09-18') ,
 ( 'LABEL','ID_BY_CASE_NUMBER','en','By Case #','2020-12-16') ,
 ( 'LABEL','ID_BY_CASE_TITLE','en','By Case Title','2020-12-16') ,
+( 'LABEL','ID_BY_CURRENT_USER','en','By Current User','2021-07-13') ,
 ( 'LABEL','ID_BY_FINISH_DATE','en','By Finish Date','2020-12-16') ,
-( 'LABEL','ID_BY_PROCESS_NAME','en','Process Name','2020-12-16') ,
+( 'LABEL','ID_BY_PARTICIPATION','en','By Participation','2021-07-13') ,
+( 'LABEL','ID_BY_PROCESS_CATEGORY','en','By Process Category','2021-07-13') ,
+( 'LABEL','ID_BY_PROCESS_NAME','en','By Process Name','2020-12-16') ,
 ( 'LABEL','ID_BY_TASK','en','By Task','2020-12-16') ,
 ( 'LABEL','ID_BY_ROLE','en','By Role','2020-12-15') ,
 ( 'LABEL','ID_BY_STATUS','en','By Status','2020-12-16') ,
@@ -57547,6 +57550,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_CHECK_AGAIN','en','Check again','2014-01-15') ,
 ( 'LABEL','ID_CHECK_ALL','en','Check All','2014-01-15') ,
 ( 'LABEL','ID_CHECK_FIELDS_MARK_RED','en','Please check the fields marked in red.','2014-10-06') ,
+( 'LABEL','ID_CHECK_ONE_OPTION_ENABLE_SEARCH','en','Please check one option to be enabled for search.','2021-07-13') ,
 ( 'LABEL','ID_CHECK_PORT','en','Checking port','2014-01-15') ,
 ( 'LABEL','ID_CHECK_PORT_FAILED','en','Error Testing Connection: Checking port failed','2015-09-18') ,
 ( 'LABEL','ID_CHECK_UPDATES','en','Check for updates (you need to be connected to the Internet)','2017-02-21') ,
@@ -57588,6 +57592,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_COMMAND_EXECUTED_SUCCESSFULY','en','command executed successfully','2014-10-21') ,
 ( 'LABEL','ID_COMMENTS','en','Comments','2014-01-15') ,
 ( 'LABEL','ID_COMPLETED','en','Completed','2014-01-15') ,
+( 'LABEL','ID_COMPLETED_BY','en','Completed By:','2021-07-13') ,
 ( 'LABEL','ID_COMPLETED_BY_USER','en','Completed By User','2014-01-15') ,
 ( 'LABEL','ID_COMPLETED_CASES','en','Completed Cases','2015-03-09') ,
 ( 'LABEL','ID_COMPLETED_TASK','en','Completed Task','2014-01-15') ,
@@ -60945,7 +60950,10 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_SEARCH_ALSO_APP_UID','en','Search also in the APP_UID field','2014-10-30') ,
 ( 'LABEL','ID_SEARCH_BY_CASE_NUMBER','en','Search by Case #:','2020-12-16') ,
 ( 'LABEL','ID_SEARCH_BY_CASE_TITLE','en','Search by Case Title:','2020-12-16') ,
+( 'LABEL','ID_SEARCH_BY_CURRENT_USER','en','Search by Current User:','2021-07-13')
 ( 'LABEL','ID_SEARCH_BY_FINISH_DATE','en','Search by Finish Date:','2020-12-16') ,
+( 'LABEL','ID_SEARCH_BY_PARTICIPATION','en','Search by Participation:','2021-07-13') ,
+( 'LABEL','ID_SEARCH_BY_PROCESS_CATEGORY','en','Search by Process Category:','2021-07-13') ,
 ( 'LABEL','ID_SEARCH_BY_PROCESS_NAME','en','Search by Process Name:','2020-12-16') ,
 ( 'LABEL','ID_SEARCH_BY_START_DATE','en','Search by Start Date:','2020-12-16') ,
 ( 'LABEL','ID_SEARCH_BY_STATUS','en','Search by Status:','2020-12-22') ,
@@ -61125,6 +61133,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_STAGE','en','Stage','2014-01-15') ,
 ( 'LABEL','ID_STAGES','en','Stages','2014-01-15') ,
 ( 'LABEL','ID_STANDARD_LOGGING','en','Log Files','2018-02-19') ,
+( 'LABEL','ID_STARTED_BY','en','Started By:','2021-07-13') ,
 ( 'LABEL','ID_STARTED_CASES','en','My Started Cases','2014-01-15') ,
 ( 'LABEL','ID_STARTED_SUCCESSFULLY','en','Started successfully','2014-01-15') ,
 ( 'LABEL','ID_STARTING_LOG_FILE','en','Starting log file','2014-01-15') ,