Merge branch 'feature/PMCORE-3049' of https://bitbucket.org/colosa/processmaker into feature/PMCORE-3263

resources/assets/js/api/Cases.js

@@ -212,7 +212,9 @@ export let cases = {
     unpause(data) {
         return Api.update({
             service: "UNPAUSE_CASE",
-            data: {},
+            data: {
+              index: data.DEL_INDEX
+            },
             keys: {
                 app_uid: data.APP_UID
             }

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

@@ -343,7 +343,7 @@ export default {
                     tagPrefix:  this.$i18n.t('ID_SEARCH_BY_CURRENT_USER'),
                     items:[
                         {
-                            id: "user",
+                            id: "sendBy",
                             value: "",
                             options: [],
                             placeholder: this.$i18n.t('ID_USER_NAME')

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

@@ -85,6 +85,7 @@ import CaseTitle from "./popovers/CaseTitle.vue";
 import ProcessName from "./popovers/ProcessName.vue";
 import DateFilter from "./popovers/DateFilter.vue";
 import TaskTitle from "./popovers/TaskTitle.vue";
+import CurrentUser from "./popovers/CurrentUser.vue";
 import api from "./../../api/index";
 
 export default {
@@ -97,6 +98,7 @@ export default {
     ProcessName,
     DateFilter,
     TaskTitle,
+    CurrentUser
   },
   data() {
     return {
@@ -147,13 +149,58 @@ export default {
                 return `${this.tagPrefix} ${data[0].value}`;
             },
             },
+            {
+                type: "DateFilter",
+                id: "delegationDate",
+                title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_DELEGATION_DATE')}`,
+                optionLabel: this.$i18n.t('ID_BY_DELEGATION_DATE'),
+                detail: this.$i18n.t('ID_PLEASE_SELECT_THE_DELEGATION_DATE_TO_BE_SEARCHED'),
+                tagText: "",
+                tagPrefix:  this.$i18n.t('ID_SEARCH_BY_DELEGATION_DATE'),
+                items:[
+                    {
+                        id: "delegateFrom",
+                        value: "",
+                        label: this.$i18n.t('ID_FROM_DELEGATION_DATE')
+                    },
+                    {
+                        id: "delegateTo",
+                        value: "",
+                        label: this.$i18n.t('ID_TO_DELEGATION_DATE')
+                    }
+                ],
+                makeTagText: function (params, data) {
+                    return  `${params.tagPrefix} ${data[0].value} - ${data[1].value}`;
+                }
+            },
+            {
+                type: "CurrentUser",
+                id: "bySendBy",
+                title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_BY_SEND_BY')}`,
+                optionLabel: this.$i18n.t('ID_BY_SEND_BY'),
+                detail: this.$i18n.t('ID_PLEASE_SELECT_USER_NAME_TO_BE_SEARCHED'),
+                placeholder: this.$i18n.t('ID_USER_NAME'),
+                tagText: "",
+                tagPrefix:  this.$i18n.t('ID_SEARCH_BY_SEND_BY'),
+                items:[
+                    {
+                        id: "sendBy",
+                        value: "",
+                        options: [],
+                        placeholder: this.$i18n.t('ID_USER_NAME')
+                    }
+                ],
+                makeTagText: function (params, data) {
+                    return  `${params.tagPrefix} : ${data[0].label || ''}`;
+                }
+            },
             {
             type: "TaskTitle",
             id: "taskTitle",
             title: `${this.$i18n.t("ID_FILTER")}: ${this.$i18n.t(
                 "ID_TASK_NAME"
             )}`,
-            optionLabel: this.$i18n.t("ID_TASK"),
+            optionLabel: this.$i18n.t("ID_BY_TASK"),
             detail: "",
             tagText: "",
             tagPrefix: this.$i18n.t("ID_SEARCH_BY_TASK_NAME"),

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

@@ -3089,6 +3089,12 @@ msgstr "By Case Title"
 msgid "By Current User"
 msgstr "By Current User"
 
+# TRANSLATION
+# LABEL/ID_BY_DELEGATION_DATE
+#: LABEL/ID_BY_DELEGATION_DATE
+msgid "By Delegation Date"
+msgstr "By Delegation Date"
+
 # TRANSLATION
 # LABEL/ID_BY_FINISH_DATE
 #: LABEL/ID_BY_FINISH_DATE
@@ -3137,6 +3143,12 @@ msgstr "By Start Date"
 msgid "By Role"
 msgstr "By Role"
 
+# TRANSLATION
+# LABEL/ID_BY_SEND_BY
+#: LABEL/ID_BY_SEND_BY
+msgid "By Send By"
+msgstr "By Send By"
+
 # TRANSLATION
 # LABEL/ID_CACHE_BTN_BUILD
 #: LABEL/ID_CACHE_BTN_BUILD
@@ -9125,6 +9137,12 @@ msgstr "From"
 msgid "Sender"
 msgstr "Sender"
 
+# TRANSLATION
+# LABEL/ID_FROM_DELEGATION_DATE
+#: LABEL/ID_FROM_DELEGATION_DATE
+msgid "From Delegation Date"
+msgstr "From Delegation Date"
+
 # TRANSLATION
 # LABEL/ID_FROM_EMAIL
 #: LABEL/ID_FROM_EMAIL
@@ -21641,6 +21659,12 @@ msgstr "Please select the plugin"
 msgid "Please select a .po file"
 msgstr "Please select a .po file"
 
+# TRANSLATION
+# LABEL/ID_PLEASE_SELECT_THE_DELEGATION_DATE_TO_BE_SEARCHED
+#: LABEL/ID_PLEASE_SELECT_THE_DELEGATION_DATE_TO_BE_SEARCHED
+msgid "Please select the Delegation Date to be searched:"
+msgstr "Please select the Delegation Date to be searched:"
+
 # TRANSLATION
 # LABEL/ID_PLEASE_SELECT_THE_STATUS_FOR_THE_SEARCH
 #: LABEL/ID_PLEASE_SELECT_THE_STATUS_FOR_THE_SEARCH
@@ -21653,6 +21677,12 @@ msgstr "Please select the status for the search:"
 msgid "Please select the upgrade file"
 msgstr "Please select the upgrade file"
 
+# TRANSLATION
+# LABEL/ID_PLEASE_SELECT_USER_NAME_TO_BE_SEARCHED
+#: LABEL/ID_PLEASE_SELECT_USER_NAME_TO_BE_SEARCHED
+msgid "Please select the user name to be searched:"
+msgstr "Please select the user name to be searched:"
+
 # TRANSLATION
 # LABEL/ID_PLEASE_SET_A_RANGE_OF_CASES_START_DATE_TO_SEARCH
 #: LABEL/ID_PLEASE_SET_A_RANGE_OF_CASES_START_DATE_TO_SEARCH
@@ -24359,6 +24389,12 @@ msgstr "Search by Case #:"
 msgid "Search by Case Title:"
 msgstr "Search by Case Title:"
 
+# TRANSLATION
+# LABEL/ID_SEARCH_BY_DELEGATION_DATE
+#: LABEL/ID_SEARCH_BY_DELEGATION_DATE
+msgid "Search by Delegation Date:"
+msgstr "Search by Delegation Date:"
+
 # TRANSLATION
 # LABEL/ID_SEARCH_BY_CURRENT_USER
 #: LABEL/ID_SEARCH_BY_CURRENT_USER
@@ -24389,6 +24425,12 @@ msgstr "Search by Process Category:"
 msgid "Search by Process Name:"
 msgstr "Search by Process Name:"
 
+# TRANSLATION
+# LABEL/ID_SEARCH_BY_SEND_BY
+#: LABEL/ID_SEARCH_BY_SEND_BY
+msgid "Search By Send By:"
+msgstr "Search By Send By:"
+
 # TRANSLATION
 # LABEL/ID_SEARCH_BY_START_DATE
 #: LABEL/ID_SEARCH_BY_START_DATE
@@ -26765,6 +26807,12 @@ msgstr "Total Cases"
 msgid "Total Cases Reassigned"
 msgstr "Total Cases Reassigned"
 
+# TRANSLATION
+# LABEL/ID_TO_DELEGATION_DATE
+#: LABEL/ID_TO_DELEGATION_DATE
+msgid "To Delegation Date"
+msgstr "To Delegation Date"
+
 # TRANSLATION
 # LABEL/ID_TO_DO
 #: LABEL/ID_TO_DO

workflow/engine/data/mysql/insert.sql

@@ -57321,12 +57321,14 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( '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_DELEGATION_DATE','en','By Delegation Date','2021-08-31') ,
 ( 'LABEL','ID_BY_FINISH_DATE','en','By Finish Date','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_SEND_BY','en','By Send By','2021-08-31') ,
 ( 'LABEL','ID_BY_STATUS','en','By Status','2020-12-16') ,
 ( 'LABEL','ID_BY_START_DATE','en','By Start Date','2020-12-16') ,
 ( 'LABEL','ID_CACHE_BTN_BUILD','en','Build Cache','2014-01-15') ,
@@ -58370,6 +58372,7 @@ 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_SENDER','en','Sender','2021-08-13') ,
+( 'LABEL','ID_FROM_DELEGATION_DATE','en','From Delegation Date','2021-08-31') ;
 ( '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') ,
@@ -60513,8 +60516,10 @@ 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_THE_DELEGATION_DATE_TO_BE_SEARCHED','en','Please select the Delegation Date to be searched:','2021-08-31') ,
 ( '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_SELECT_USER_NAME_TO_BE_SEARCHED','en','Please select the user name to be searched:','2021-08-31') ,
 ( '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') ,
@@ -60979,11 +60984,13 @@ 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_DELEGATION_DATE','en','Search by Delegation Date:','2021-08-31') ,
 ( '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_SEND_BY','en','Search By Send By:','2021-08-31') ,
 ( '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') ,
 ( 'LABEL','ID_SEARCH_BY_TASK_NAME','en','Search by Task Name:','2020-12-16') ,
@@ -61428,6 +61435,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_TOP','en','Top','2020-08-27') ,
 ( '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_DELEGATION_DATE','en','To Delegation Date','2021-08-31') ,
 ( 'LABEL','ID_TO_DO','en','To do','2014-01-15') ,
 ( 'LABEL','ID_TO_FLOAT','en','Replace the value converted to float','2014-01-15') ,
 ( 'LABEL','ID_TO_FINISH_DATE','en','To Finish Date','2021-02-08') ,