add my cases filters

restore xml forms fix auto show
2020-12-17 17:38:18 +00:00
parent 0deccd5657
commit 6eb336bb21
15 changed files with 1413 additions and 609 deletions
--- a/resources/assets/js/api/Cases.js
+++ b/resources/assets/js/api/Cases.js
@@ -7,10 +7,7 @@ export let cases = {
    myCases(data) {
        return Api.get({
            service: "MY_CASES",
-            params: {
-                filter: data.filter,
-                paged: data.paged
-            },
+            params: data,
            keys: {}
        });
    },
--- a/resources/assets/js/components/search/AdvancedFilter.vue
+++ b/resources/assets/js/components/search/AdvancedFilter.vue
--- a/resources/assets/js/components/search/MyCasesFilter.vue
+++ b/resources/assets/js/components/search/MyCasesFilter.vue
--- a/resources/assets/js/components/search/popovers/CaseIntegerNumber.vue
+++ b/resources/assets/js/components/search/popovers/CaseIntegerNumber.vue
@@ -0,0 +1,83 @@
+<template>
+    <div>
+        <SearchPopover
+            :target="tag"
+            :showPopover="showPopover"
+            @closePopover="onClose"
+            @savePopover="onOk"
+            :title="info.title"
+            :autoShow="info.autoShow || false"
+        >
+            <template v-slot:body>
+                <p>{{ info.detail }}</p>
+                <form ref="form" @submit.stop.prevent="handleSubmit">
+                    <b-form-group
+                        :state="valueState"
+                        label-for="name-input"
+                        :invalid-feedback="$t('ID_INVALID_CASE_NUMBER_RANGE')"
+                    >
+                        <b-form-input
+                            id="name-input"
+                            v-model="filter[0].value"
+                            :placeholder="$t('ID_CASE_NUMBER_FILTER_EG')"
+                            :state="valueState"
+                            required
+                            type="number"
+                        ></b-form-input>
+                    </b-form-group>
+                </form>
+            </template>
+        </SearchPopover>
+    </div>
+</template>
+
+<script>
+import SearchPopover from "./SearchPopover.vue";
+
+export default {
+    components: {
+        SearchPopover,
+    },
+    props: ["tag", "info", "filter"],
+    data() {
+        return {
+            valueState: null,
+            showPopover: false,
+        };
+    },
+    methods: {
+        onClose() {
+            this.showPopover = true;
+        },
+        checkFormValidity() {
+            const valid = this.$refs.form.checkValidity();
+            this.valueState = valid;
+            return this.valueState;
+        },
+        handleSubmit() {
+            let self = this;
+            // Exit when the form isn't valid
+            if (!this.checkFormValidity()) {
+                return;
+            }
+            // Hide the modal manually
+            this.$nextTick(() => {
+              
+                this.$emit("updateSearchTag", this.filter);
+                self.$root.$emit("bv::hide::popover");
+            });
+        },
+        onOk() {
+            this.handleSubmit();
+        },
+        onClickTag(tag) {
+            this.$root.$emit("bv::hide::popover");
+        }
+    },
+};
+</script>
+<style scoped>
+.popovercustom {
+    max-width: 650px !important;
+}
+</style>
--- a/resources/assets/js/components/search/popovers/CaseNumber.vue
+++ b/resources/assets/js/components/search/popovers/CaseNumber.vue
@@ -6,6 +6,7 @@
            @closePopover="onClose"
            @savePopover="onOk"
            :title="info.title"
+            :autoShow="info.autoShow || false"
        >
            <template v-slot:body>
                <p>{{ info.detail }}</p>
@@ -17,8 +18,8 @@
                    >
                        <b-form-input
                            id="name-input"
-                            v-model="info.values.filterCases"
-                            :placeholder="$t('ID_CASE_NUMBER_FILTER_EG')"
+                            v-model="filter[0].value"
+                            :placeholder="$t('ID_CASE_NUMBER_FILTER_RANGE_EG')"
                            :state="valueState"
                            required
                        ></b-form-input>
@@ -36,11 +37,11 @@ export default {
    components: {
        SearchPopover,
    },
-    props: ["tag", "info"],
+    props: ["tag", "info", "filter"],
    data() {
        return {
            valueState: null,
-            showPopover: false,
+            showPopover: false
        };
    },
    methods: {
@@ -48,9 +49,9 @@ export default {
            this.showPopover = true;
        },
        checkFormValidity() {
-            const regex = /^((\d+?)|(\d+?)(?:\-(\d+?))?)(?:\, ((\d+?)|(\d+?)(?:\-(\d+?))?))*$/;
-            regex.test(this.info.values.filterCases);
-            this.valueState = regex.test(this.info.values.filterCases);
+            const regex = /^((\d+?)|(\d+?)(?:\-(\d+?))?)(?:\,((\d+?)|(\d+?)(?:\-(\d+?))?))*$/;
+            regex.test(this.filter[0].value);
+            this.valueState = regex.test(this.filter[0].value);
            return this.valueState;
        },
        handleSubmit() {
@@ -61,12 +62,8 @@ export default {
            }
            // Hide the modal manually
            this.$nextTick(() => {
-                this.$emit("updateSearchTag", {
-                    CaseNumber: {
-                        filterCases: self.info.values.filterCases.replace(/ /g, ""),
-                    }
-                });
-                self.$root.$emit("bv::hide::popover");
+                this.$emit("updateSearchTag", this.filter);
+                this.$root.$emit("bv::hide::popover");
            });
        },
        onOk() {
@@ -74,7 +71,7 @@ export default {
        },
        onClickTag(tag) {
            this.$root.$emit("bv::hide::popover");
-        }
+        },
    },
 };
 </script>
--- a/resources/assets/js/components/search/popovers/CaseTitle.vue
+++ b/resources/assets/js/components/search/popovers/CaseTitle.vue
@@ -4,6 +4,7 @@
            :target="tag"
            @savePopover="onOk"
            :title="info.title"
+            :autoShow="info.autoShow || false"
        >
        
            <template v-slot:body>
@@ -16,7 +17,7 @@
                    >
                        <b-form-input
                            id="name-input"
-                            v-model="info.values.caseTitle"
+                            v-model="filter[0].value"
                            :placeholder="$t('ID_CASE_TITLE_NAME')"
                            :state="valueState"
                            required
@@ -35,7 +36,7 @@ export default {
    components: {
        SearchPopover,
    },
-    props: ["tag", "info"],
+    props: ["tag", "info", "filter"],
    data() {
        return {
            title: "",
@@ -61,11 +62,7 @@ export default {
                return;
            }
            this.$nextTick(() => {
-                this.$emit("updateSearchTag", {
-                    CaseTitle: {
-                        caseTitle: self.info.values.caseTitle,
-                    }
-                });
+                this.$emit("updateSearchTag", this.filter);
                self.$root.$emit("bv::hide::popover");
            });
        },
--- a/resources/assets/js/components/search/popovers/CurrentUser.vue
+++ b/resources/assets/js/components/search/popovers/CurrentUser.vue
@@ -9,7 +9,7 @@
                        :invalid-feedback="$t('ID_PROCESS_IS_REQUIRED')"
                    >
                        <multiselect
-                            v-model="info.selectedOption"
+                            v-model="filter[0].options"
                            :options="users"
                            placeholder="Sselect one"
                            label="USR_FULLNAME"
@@ -39,7 +39,7 @@ export default {
        SearchPopover,
        Multiselect
    },
-    props: ["tag", "info"],
+    props: ["tag", "info", "filter"],
    data() {
        return {
            users: [],
@@ -82,12 +82,9 @@ export default {
         *  Form submit handler
         */
        handleSubmit() {
-            this.$emit("updateSearchTag", {
-                CurrentUser: {
-                    selectedOption: this.info.selectedOption,
-                    userId: this.info.selectedOption.USR_ID
-                }
-            });
+            this.filter[0].value = this.filter[0].options.USR_ID;
+            this.filter[0].label = this.filter[0].options.USR_FULLNAME;
+            this.$emit("updateSearchTag", this.filter);
            this.$root.$emit("bv::hide::popover");
        }
    }
--- a/resources/assets/js/components/search/popovers/DateFilter.vue
+++ b/resources/assets/js/components/search/popovers/DateFilter.vue
@@ -0,0 +1,69 @@
+<template>
+    <div id="">
+        <SearchPopover
+            :target="tag"
+            @savePopover="onOk"
+            :title="info.title"
+            :autoShow="info.autoShow || false"
+        >
+            <template v-slot:body>
+                <p>{{ info.detail }}</p>
+                <form ref="form" @submit.stop.prevent="handleSubmit">
+                    <div class="row">
+                        <div class="col">
+                            <b-form-group>
+                                <b-form-datepicker
+                                    id="from"
+                                    v-model="filter[0].value"
+                                    :placeholder="info.items[0].label"
+                                ></b-form-datepicker>
+                            </b-form-group>
+                        </div>
+                        <div class="col">
+                            <b-form-group>
+                                <b-form-datepicker
+                                    id="to"
+                                    v-model="filter[1].value"
+                                    :placeholder="info.items[1].label"
+                                ></b-form-datepicker>
+                            </b-form-group>
+                        </div>
+                    </div>
+                </form>
+            </template>
+        </SearchPopover>
+    </div>
+</template>
+
+<script>
+import SearchPopover from "./SearchPopover.vue";
+
+export default {
+    components: {
+        SearchPopover,
+    },
+    props: ["tag", "info", "filter"],
+    methods: {
+        /**
+         * Submit form handler
+         */
+        handleSubmit() {
+            this.$emit("updateSearchTag", this.filter);
+            this.$root.$emit("bv::hide::popover");
+        },
+        /**
+         * On ok event handler
+         */
+        onOk() {
+            this.handleSubmit();
+        },
+        /**
+         * On click tag event handler
+         */
+        onClickTag(tag) {
+            this.$root.$emit("bv::hide::popover");
+        },
+    },
+};
+</script>
+<style scoped></style>
--- a/resources/assets/js/components/search/popovers/ProcessName.vue
+++ b/resources/assets/js/components/search/popovers/ProcessName.vue
@@ -1,6 +1,11 @@
 <template>
    <div>
-        <SearchPopover :target="tag" @savePopover="onOk" :title="info.title">
+        <SearchPopover
+            :target="tag"
+            @savePopover="onOk"
+            :title="info.title"
+            :autoShow="info.autoShow || false"
+        >
            <template v-slot:body>
                <p>{{ info.detail }}</p>
                <form ref="form" @submit.stop.prevent="handleSubmit">
@@ -9,11 +14,11 @@
                        :invalid-feedback="$t('ID_PROCESS_IS_REQUIRED')"
                    >
                        <multiselect
-                            v-model="info.processOption"
+                            v-model="filter[0].options"
                            :options="processes"
-                            placeholder="Select one"
-                            label="PRO_TITLE"
-                            track-by="PRO_ID"
+                            :placeholder="info.items[0].placeholder"
+                            label="label"
+                            track-by="value"
                            :show-no-results="false"
                            @search-change="asyncFind"
                            :loading="isLoading"
@@ -37,13 +42,13 @@ import api from "./../../../api/index";
 export default {
    components: {
        SearchPopover,
-        Multiselect
+        Multiselect,
    },
-    props: ["tag", "info"],
+    props: ["tag", "info", "filter"],
    data() {
        return {
            processes: [],
-            isLoading: false
+            isLoading: false,
        };
    },
    methods: {
@@ -52,12 +57,18 @@ export default {
         * @param {string} query - string from the text field
         */
        asyncFind(query) {
+            let self = this;
            this.isLoading = true;
+            self.processes = [];
            api.filters
                .processList(query)
                .then((response) => {
-                    this.processes = response.data;
-                    this.countries = response;
+                    _.forEach(response.data, function(elem, key) {
+                        self.processes.push({
+                            label: elem.PRO_TITLE,
+                            value: elem.PRO_ID,
+                        });
+                    });
                    this.isLoading = false;
                })
                .catch((e) => {
@@ -82,15 +93,11 @@ export default {
         *  Form submit handler
         */
        handleSubmit() {
-            this.$emit("updateSearchTag", {
-                ProcessName: {
-                    processOption: this.info.processOption,
-                    process: this.info.processOption.PRO_ID,
-                }
-            });
+            this.filter[0].value = this.filter[0].options.value;
+            this.$emit("updateSearchTag", this.filter);
            this.$root.$emit("bv::hide::popover");
-        }
-    }
+        },
+    },
 };
 </script>
 <style src="vue-multiselect/dist/vue-multiselect.min.css"></style>
--- a/resources/assets/js/components/search/popovers/SearchPopover.vue
+++ b/resources/assets/js/components/search/popovers/SearchPopover.vue
@@ -3,11 +3,12 @@
        <slot name="target-item"></slot>

        <b-popover
-            :show.sync="popoverShow"
+            :show="autoShow"
            :target="target"
+            ref="popover"
            triggers="click"
            placement="bottom"
-            class="popovercustom"
+            class="popovercustom" 
        >
            <template #title>
                <b-button @click="onClose" class="close" aria-label="Close">
@@ -29,18 +30,14 @@
 </template>
 <script>
 export default {
-    props: ['target', "title"],
-    data() {
-        return {
-           popoverShow: false
-        };
-    },
+    props: ['target', "title", "autoShow"],
+
    methods: {
        /**
         * Close buton click handler 
         */
        onClose() {
-            this.popoverShow = false;
+            this.$refs.popover.$emit('close');
            this.$emit('closePopover');
        },
        /**
--- a/resources/assets/js/home/AdvancedSearch.vue
+++ b/resources/assets/js/home/AdvancedSearch.vue
@@ -10,7 +10,9 @@
            {{ message }}
        </b-alert>
        <button-fleft :data="newCase"></button-fleft>
-        <GenericFilter
+        <h5>{{$t('ID_ADVANCEDSEARCH')}}</h5>
+        
+        <AdvancedFilter
            :id="id"
            :name="name"
            :filters="filters"
@@ -82,7 +84,7 @@
 <script>
 import ButtonFleft from "../components/home/ButtonFleft.vue";
 import ModalNewRequest from "./ModalNewRequest.vue";
-import GenericFilter from "../components/search/GenericFilter";
+import AdvancedFilter from "../components/search/AdvancedFilter";
 import TaskCell from "../components/vuetable/TaskCell.vue";
 import api from "./../api/index";
 import { Event } from "vue-tables-2";
@@ -90,7 +92,7 @@ import { Event } from "vue-tables-2";
 export default {
    name: "AdvancedSearch",
    components: {
-        GenericFilter,
+        AdvancedFilter,
        ButtonFleft,
        ModalNewRequest,
        TaskCell
@@ -172,18 +174,16 @@ export default {
                dt,
                paged,
                limit = data.limit,
+                filters = {},
                start = data.page === 1 ? 0 : limit * (data.page - 1);
            paged = start + ',' + limit;
+            filters["paged"] = paged;
            return new Promise((resolutionFunc, rejectionFunc) => {
-                let filters = {};
-                _.forIn(this.filters, function(value, key) {
-                    filters = {...filters, ...value};
+                _.forIn(this.filters, function(item, key) {
+                    filters[item.filterVar] = item.value;
                });
                api.cases
-                    .search({
-                        filters,
-                        paged:paged
-                    })
+                    .search(filters)
                    .then((response) => {
                        dt = that.formatDataResponse(response.data.data);
                        resolutionFunc({
@@ -412,7 +412,7 @@ export default {
         * @param {string} message - message to be displayen in the body
         * @param {string} type - alert type
         */
-        showAlert(message, type) {
+        showAlert(message, type) {  
            this.message = message;
            this.variant = type || "info";
            this.dismissCountDown = this.dismissSecs;
--- a/resources/assets/js/home/Home.vue
+++ b/resources/assets/js/home/Home.vue
@@ -78,7 +78,7 @@ export default {
            sidebarWidth: "310px",
            pageId: null,
            pageName: null,
-            filters: {},
+            filters:  null,
        };
    },
    mounted() {
@@ -151,6 +151,7 @@ export default {
                this.pageId = item.item.id;
                this.pageName = item.item.title;
            } else {
+                this.filters = [];
                this.page = item.item.id || "MyCases";
            }
        },
@@ -226,7 +227,7 @@ export default {
            this.page = "advanced-search";
            this.pageId = null;
            this.pageName = null;
-            this.filters = {};
+            this.filters = [];
        },
        onUpdatePage(page) {
            this.lastPage = this.page;
--- a/resources/assets/js/home/MyCases.vue
+++ b/resources/assets/js/home/MyCases.vue
--- a/workflow/engine/content/translations/english/processmaker.en.po
+++ b/workflow/engine/content/translations/english/processmaker.en.po
--- a/workflow/engine/data/mysql/insert.sql
+++ b/workflow/engine/data/mysql/insert.sql
@@ -57138,12 +57138,14 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_ADD_DATA_PMTABLE','en','Add Data to PM table','2014-10-10') ,
 ( 'LABEL','ID_ADD_FIELD','en','Add field','2014-01-15') ,
 ( 'LABEL','ID_ADD_FILE','en','Add file','2020-06-11') ,
+( 'LABEL','ID_ADD_FILTER','en','Add Filter','2020-12-16') ,
 ( 'LABEL','ID_ADD_HORIZONTAL_LINE','en','Add horizontal line','2015-02-20') ,
 ( 'LABEL','ID_ADD_LICENSE','en','Please add a new license','2014-01-15') ,
 ( 'LABEL','ID_ADD_MESSAGE','en','Add message','2014-01-15') ,
 ( 'LABEL','ID_ADD_NOTE','en','Add Note','2014-01-15') ,
 ( 'LABEL','ID_ADD_PERMISSION_TO_ROLE','en','Add Permission To Role','2014-10-10') ,
 ( 'LABEL','ID_ADD_ROW','en','Add Row','2014-01-15') ,
+( 'LABEL','ID_ADD_SEARCH_FILTER_CRITERIA','en','Add Search Filter Criteria','2020-12-16') ,
 ( 'LABEL','ID_ADD_SUB_PROCESS','en','Add Sub-Process','2015-02-24') ,
 ( 'LABEL','ID_ADD_TASK','en','Add Task','2015-02-20') ,
 ( 'LABEL','ID_ADD_TEXT','en','Add Text','2015-02-20') ,
@@ -57307,6 +57309,13 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_BUILD_CACHE','en','Build Cache','2014-10-10') ,
 ( 'LABEL','ID_BUTTON','en','Button','2014-01-15') ,
 ( '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_PROCESS_NAME','en','Process Name','2020-12-16') ,
+( 'LABEL','ID_BY_TASK','en','By Task','2020-12-16') ,
+( 'LABEL','ID_BY_STATUS','en','By Status','2020-12-16') ,
+( 'LABEL','ID_BY_START_DATE','en','By Start Date','2020-12-16') ,
+( 'LABEL','ID_BY_FINISH_DATE','en','By Finish Date','2020-12-16') ,
 ( 'LABEL','ID_CACHE_BTN_BUILD','en','Build Cache','2014-01-15') ,
 ( 'LABEL','ID_CACHE_BTN_SETUP_PASSWRD','en','Setup Password','2014-01-15') ,
 ( 'LABEL','ID_CACHE_BTN_SETUP_SESSION','en','Delete older session files','2014-01-15') ,
@@ -57474,6 +57483,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_CASE_NO_CURRENT_TASKS_BECAUSE_CASE_ITS_COMPLETED','en','There are no current tasks because case {0}: {1} has COMPLETED status','2015-03-24') ,
 ( 'LABEL','ID_CASE_NUMBER','en','Case number','2015-09-15') ,
 ( 'LABEL','ID_CASE_NUMBER_CAPITALIZED','en','Case Number','2017-02-22') ,
+( 'LABEL','ID_CASE_NUMBER_FILTER_EG','en','e.g. 1-5, 8, 11-13','2020-12-16') ,
+( 'LABEL','ID_CASE_NUMBER_FILTER_RANGE_EG','en','e.g. 8','2020-12-16') ,
 ( 'LABEL','ID_CASE_OUTPUT_DOCUMENT_DOES_NOT_EXIST','en','This output document with {0}: {1} does not exist.','2016-07-28') ,
 ( 'LABEL','ID_CASE_PAUSED_SUCCESSFULLY','en','The Case {APP_NUMBER} was paused successfully and it will be unpaused on date {UNPAUSE_DATE}','2014-01-15') ,
 ( 'LABEL','ID_CASE_PAUSE_LABEL_NOTE','en','The case was paused due to:','2014-10-21') ,
@@ -57492,6 +57503,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_CASE_START','en','Start Case','2014-01-15') ,
 ( 'LABEL','ID_CASE_STOPPED_TRIGGER','en','The case has not stopped due to its trigger.','2015-01-29') ,
 ( 'LABEL','ID_CASE_TITLE','en','Case Title','2014-01-15') ,
+( 'LABEL','ID_CASE_TITLE_NAME','en','Case Title Name','2020-12-16') ,
 ( 'LABEL','ID_CASE_TRACKERS','en','Case trackers','2014-01-15') ,
 ( 'LABEL','ID_CASE_TRACKER_OBJECT_DOES_NOT_EXIST','en','The case tracker object with {0}: {1} does not exist.','2014-05-20') ,
 ( 'LABEL','ID_CASE_UNARHIVE','en','Case Unarhive','2015-09-15') ,
@@ -57533,6 +57545,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_CLASS_ALREADY_EXISTS','en','Class already exists','2014-01-15') ,
 ( 'LABEL','ID_CLASS_TABLE_DOESNT_EXIST','en','This Class Table doesn''t exist!','2014-01-15') ,
 ( 'LABEL','ID_CLEAR','en','Clear','2014-01-15') ,
+( 'LABEL','ID_CLEAN_ALL','en','Clean All','2020-12-16') ,
 ( 'LABEL','ID_CLEAN_WEBENTRIES','en','Clean web-entries','2020-11-10') ,
 ( 'LABEL','ID_CLEAN_WEBENTRIES_DESC','en','Clean web-entries','2020-11-10') ,
 ( 'LABEL','ID_CLEAR_CACHE','en','Clear Cache','2014-01-15') ,
@@ -57837,6 +57850,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_DELETE_REPORT_TABLE','en','Do you want to delete the selected report tables?','2014-01-15') ,
 ( 'LABEL','ID_DELETE_ROLE','en','Delete Role','2014-10-10') ,
 ( 'LABEL','ID_DELETE_ROUTES','en','Delete Routes','2015-02-20') ,
+( 'LABEL','ID_DELETE_SEARCH','en','Delete Search','2020-12-16') ,
 ( 'LABEL','ID_DELETE_SELECTED_ITEMS','en','Do you want to deleted selected({0}) items?','2014-01-15') ,
 ( 'LABEL','ID_DELETE_SELECTED_LOGO','en','Do you want to delete the selected logo?','2014-01-15') ,
 ( 'LABEL','ID_DELETE_SKIN','en','Delete Skin','2014-10-10') ,
@@ -58300,7 +58314,9 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_FRI','en','Fri','2014-01-15') ,
 ( 'LABEL','ID_FROM','en','From','2014-01-15') ,
 ( 'LABEL','ID_FROM_EMAIL','en','Sender Email','2017-02-21') ,
+( 'LABEL','ID_FROM_FINISH_DATE','en','From Finish Date','2020-12-16') ,
 ( 'LABEL','ID_FROM_NAME','en','Sender Name','2017-02-21') ;
+( 'LABEL','ID_FROM_START_DATE','en','From Start Date','2020-12-16') ,
 INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE )  VALUES 

 ( 'LABEL','ID_FTP_MONITOR_SETTINGS','en','FTP Monitor Settings','2014-01-15') ,
@@ -58413,6 +58429,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_HIDE','en','Hide','2014-01-15') ,
 ( 'LABEL','ID_HIDE_DIRS','en','Hide Dirs','2014-05-26') ,
 ( 'LABEL','ID_HIDE_PROCESS_INF','en','Hide Process Information','2014-01-15') ,
+( 'LABEL','ID_HIGH','en','High','2020-12-16') ,
 ( 'LABEL','ID_HISTORY','en','My Case History','2014-01-15') ,
 ( 'LABEL','ID_HISTORY_MESSAGES','en','My Message History','2017-02-21') ,
 ( 'LABEL','ID_HISTORY_MESSAGE_CASE','en','Messages History','2014-01-15') ,
@@ -58559,6 +58576,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_INVALID_APPLICATION_ID_MSG','en','An invalid application ID was stored for the session. <br/> This could have happened if you opened another case in a new tab or window. <br/> Please {0} the case.','2014-10-21') ,
 ( 'LABEL','ID_INVALID_APPLICATION_NUMBER','en','You have set a invalid Application Number','2014-01-15') ,
 ( 'LABEL','ID_INVALID_CASE_DELEGATION_INDEX','en','Invalid Case Delegation index for this user','2014-01-15') ,
+( 'LABEL','ID_INVALID_CASE_NUMBER_RANGE','en','Invalid case number range, use e.g. 1-5, 8, 11-13','2020-12-16') ,
 ( 'LABEL','ID_INVALID_DATA','en','Invalid data','2014-01-15') ,
 ( 'LABEL','ID_INVALID_END_HOURS','en','The following end hours rows are invalid:','2014-01-15') ,
 ( 'LABEL','ID_INVALID_EXTENSION','en','Invalid file extension!','2014-01-15') ,
@@ -58630,6 +58648,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_LASTNAME','en','Last Name','2014-01-15') ,
 ( 'LABEL','ID_LAST_EMPLOYEE','en','Last Employee','2014-01-15') ,
 ( 'LABEL','ID_LAST_LOGIN','en','Last Login','2014-01-15') ,
+( 'LABEL','ID_LAST_MODIFIED_DATE','en','Last-Modified Date','2020-12-16') ,
 ( 'LABEL','ID_LAST_MODIFY','en','Last Modified','2017-02-21') ,
 ( 'LABEL','ID_LAST_NAME','en','Last Name','2014-01-15') ,
 ( 'LABEL','ID_LAST_RUN_TIME','en','Last Run Time','2014-01-15') ;
@@ -58681,6 +58700,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_LOG_AGAIN','en','Please login again to apply the changes.','2014-01-15') ,
 ( 'LABEL','ID_LOG_CASE_SCHEDULER','en','Case Scheduler Log','2014-01-15') ,
 ( 'LABEL','ID_LOG_INFO','en','Log Information','2014-01-15') ,
+( 'LABEL','ID_LOW','en','Low','2020-12-16') ,
 ( 'LABEL','ID_MAFE_TRANSLATION_DIRECTORY','en','MAFE Translation Directory','2014-01-15') ,
 ( 'LABEL','ID_MAFE_0015b7e51c1ca4293041c429985ca323','en','The specified subform could not be found in the process.', NOW()) ,
 ( 'LABEL','ID_MAFE_0025301679e9722c3abd5914cfbc7dd7','en','Database connection edited successfully', NOW()) ,
@@ -60402,7 +60422,12 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_PLEASE_SELECT_PHOTO','en','Please select a photo','2014-01-15') ,
 ( 'LABEL','ID_PLEASE_SELECT_PLUGIN','en','Please select the plugin','2014-01-15') ,
 ( 'LABEL','ID_PLEASE_SELECT_PO_FILE','en','Please select a .po file','2014-01-15') ,
-( 'LABEL','ID_PLEASE_SELECT_UPGRADE_FILE','en','Please select the upgrade file','2014-01-15') ,
+( 'LABEL','ID_PLEASE_SELECT_THE_STATUS_FOR_THE_SEARCH','en','Please select the status for the search:','2020-12-16') ,
+( 'LABEL','ID_PLEASE_SELECT_UPGRADE_FILE','en','Please select the upgrade file','2014-01-15') ,º
+( 'LABEL','ID_PLEASE_SET_A_RANGE_OF_CASES_START_DATE_TO_SEARCH','en','Please set a range of cases Start Date to search:','2020-12-16') ,
+( 'LABEL','ID_PLEASE_SET_A_RANGE_OF_CASES_FINISH_DATE_TO_SEARCH','en','Please set a range of cases Finish Date to search:','2020-12-16') ,
+( 'LABEL','ID_PLEASE_SET_A_RANGE_TO_CASES_TO_SEARCH','en','Please set a range of cases to search:','2020-12-16') ,
+( 'LABEL','ID_PLEASE_SET_THE_CASE_NUMBER_TO_BE_SEARCHED','en','Please set the case number to be searched:','2020-12-16') ,
 ( 'LABEL','ID_PLEASE_SET_VALUE_DAYS_EXECUTION_TIME_FIELD','en','Please, set a value for the days in the Execution Time field.','2014-10-23') ,
 ( 'LABEL','ID_PLEASE_TRY_LATER','en','Please try later.','2016-04-08') ,
 ( 'LABEL','ID_PLEASE_WAIT','en','Please wait...','2014-01-15') ,
@@ -60829,6 +60854,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_SAVE_DYNAFORM_INFORMATION_BEFORE_PRINTING','en','Do you want to save the dynaform information before printing it?','2014-01-15') ,
 ( 'LABEL','ID_SAVE_GUIDE_POSITION','en','Save Line Position','2015-02-20') ,
 ( 'LABEL','ID_SAVE_NEW_STEP','en','Save New Step','2015-02-20') ,
+( 'LABEL','ID_SAVE_SEARCH','en','Save Search','2020-12-16') ,
 ( 'LABEL','ID_SAVE_SETTINGS','en','Save Settings','2014-01-15') ,
 ( 'LABEL','ID_SAVE_TASK_POSITION','en','Save Task Position','2015-02-20') ,
 ( 'LABEL','ID_SAVE_TASK_PROPERTIES','en','Save Task Properties','2015-02-20') ,
@@ -60854,6 +60880,11 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_SEARCHING_UNEXPECTED_ERROR','en','An unexpected error occurred while searching for your results. Error Code {0} and Please contact your administrator.','2019-05-03') ,
 ( 'LABEL','ID_SEARCHING_UNEXPECTED_ERROR_DEFAULT','en','An unexpected error occurred while searching for your results. Please contact your administrator.','2019-05-15') ,
 ( '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_FINISH_DATE','en','Search by Finish Date:','2020-12-16') ,
+( '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_FOR_USER','en','Search for user','2015-09-15') ,
 ( 'LABEL','ID_SEARCH_PATTERN','en','Search Pattern','2014-01-15') ,
 ( 'LABEL','ID_SEARCH_RESULT','en','Search results','2014-01-15') ,
@@ -61128,6 +61159,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE )  VALUES 

 ( 'LABEL','ID_TASK_IN_PROGRESS','en','Task in Progress','2014-01-15') ,
+( 'LABEL','ID_TASK_NAME','en','Task Name','2020-12-16') ,
 ( 'LABEL','ID_TASK_NOT_EXIST','en','The task with {0}: ''{1}'' does not exist.','2014-05-29') ,
 ( 'LABEL','ID_TASK_NOT_FOUND','en','Task not found for id: {0}','2014-05-21') ,
 ( 'LABEL','ID_TASK_NOT_RELATED','en','[Not related to a task]','2014-01-15') ,
@@ -61269,10 +61301,12 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_TOTAL_CASES','en','Total Cases','2014-01-15') ,
 ( 'LABEL','ID_TOTAL_CASES_REASSIGNED','en','Total Cases Reassigned','2014-01-15') ,
 ( 'LABEL','ID_TO_DO','en','To do','2014-01-15') ,
+( 'LABEL','ID_TO_FINISH_DATE','en','To Finish Date (Optional)','2020-12-16') ,
 ( 'LABEL','ID_TO_FLOAT','en','Replace the value converted to float','2014-01-15') ,
 ( 'LABEL','ID_TO_INTEGER','en','Replace the value converted to integer','2014-01-15') ,
 ( 'LABEL','ID_TO_REASSIGN','en','Reassign','2014-01-15') ,
 ( 'LABEL','ID_TO_REVISE','en','Review','2014-01-15') ,
+( 'LABEL','ID_TO_START_DATE','en','To Start Date (Optional)','2020-12-16') ,
 ( 'LABEL','ID_TO_STRING','en','Replace the value in quotes','2014-01-15') ,
 ( 'LABEL','ID_TO_URL','en','Replace the value with URL encoding','2014-01-15') ,
 ( 'LABEL','ID_TRANSFER_HISTORY','en','Transfer History','2014-01-15') ,
@@ -61529,6 +61563,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_VERSIONING','en','Versioning','2014-01-15') ,
 ( 'LABEL','ID_VERSION_HISTORY','en','Version History','2014-01-15') ,
 ( 'LABEL','ID_VERTICAL_LINE','en','Vertical Line','2014-01-15') ,
+( 'LABEL','ID_VERY_HIGH','en','Very High','2020-12-16') ,
+( 'LABEL','ID_VERY_LOW','en','Very Low','2020-12-16') ,
 ( 'LABEL','ID_VIEW','en','View','2014-01-15') ,
 ( 'LABEL','ID_VIEW_EDIT_PROFILE','en','View/Edit Profile','2014-01-15') ,
 ( 'LABEL','ID_VIEW_INFO','en','View Information','2014-01-15') ,