PMCORE-2511

resources/assets/js/api/Api.js

@@ -56,7 +56,8 @@ const services = {
     CHECK: "/light/{listType}/check",
     GET_NEXT_STEP: "/light/get-next-step/{app_uid}",
     REQUEST_SQLITE_DATABASE_TABLES: "/pmtable?offline=1",
-    REQUEST_SQLITE_DATABASE_TABLES_DATA: "/pmtable/offline/data?compress=false"
+    REQUEST_SQLITE_DATABASE_TABLES_DATA: "/pmtable/offline/data?compress=false",
+    MY_CASES: "/home/mycases"
 };
 
 export default {
@@ -109,5 +110,26 @@ export default {
                 "Authorization": `Bearer ` + credentials.accessToken
             }
         });
+    },
+    get(options) {
+        let service = options.service || "",
+            params = options.params || {},
+            keys = options.keys || {},
+            url,
+            credentials = window.config.SYS_CREDENTIALS,
+            workspace = window.config.SYS_WORKSPACE,
+            server = window.config.SYS_SERVER;
+        url = this.getUrl(_.extend(keys, credentials, { server }, { workspace }), service);
+
+        return axios({
+            method: "get",
+            url: url,
+            params,
+            headers: {
+                "Accept": "application/json",
+                "Content-Type": "application/json",
+                "Authorization": `Bearer ` + credentials.accessToken
+            }
+        });
     }
 };

resources/assets/js/api/Cases.js

@@ -1,32 +1,16 @@
 import axios from "axios";
 import headerData from "./../mocks/casesHeader.json";
-import startedData from "./../mocks/startedCasesFaker.js";
+import Api from "./Api.js";
-import inprogressData from "./../mocks/inprogressCases.json";
-import completedData from "./../mocks/completedCases.json";
-import supervisingData from "./../mocks/supervisingCases.json";
 
 export let cases = {
-    get(data) {
+    myCases(data) {
-        if (data.type == "STARTED_BY_ME") {
+        return Api.get({
-            return new Promise((resolutionFunc, rejectionFunc) => {
+            service: "MY_CASES",
-                resolutionFunc(startedData);
+            params: {
-            });
+                filter: data.filter
-        }
+            },
-        if (data.type == "IN_PROGRESS") {
+            keys: {}
-            return new Promise((resolutionFunc, rejectionFunc) => {
+        });
-                resolutionFunc(inprogressData);
-            });
-        }
-        if (data.type == "COMPLETED") {
-            return new Promise((resolutionFunc, rejectionFunc) => {
-                resolutionFunc(completedData);
-            });
-        }
-        if (data.type == "SUPERVISING") {
-            return new Promise((resolutionFunc, rejectionFunc) => {
-                resolutionFunc(supervisingData);
-            });
-        }
     },
     getPost(id) {
         return Client.get(`${resource}/${id}`);

resources/assets/js/home/MyCases.vue

@@ -20,7 +20,7 @@
         {{ props.row.PROCESS_NAME }}
       </div>
       <div slot="pending_taks" slot-scope="props">
-         <GroupedCell :data="props.row.PENDING_TASKS"/>
+        <GroupedCell :data="props.row.PENDING_TASKS" />
       </div>
       <div slot="status" slot-scope="props">{{ props.row.STATUS }}</div>
       <div slot="start_date" slot-scope="props">
@@ -54,7 +54,7 @@ export default {
     HeaderCounter,
     ButtonFleft,
     ModalNewRequest,
-    GroupedCell
+    GroupedCell,
   },
   props: {},
   data() {
@@ -62,7 +62,7 @@ export default {
       metrics: [],
       filter: "CASES_INBOX",
       allView: [],
-      filterHeader: "STARTED_BY_ME",
+      filterHeader: "STARTED",
       headers: [],
       newCase: {
         title: "New Case",
@@ -85,14 +85,14 @@ export default {
       tableData: [],
       options: {
         headings: {
-          case_number: "ID_CASE_NUMBER",
+          case_number: this.$i18n.t("ID_MYCASE_NUMBER"),
-          case_title: "ID_CASE_TITLE",
+          case_title: this.$i18n.t("ID_CASE_TITLE"),
-          process_name: "ID_PROCESS_NAME",
+          process_name: this.$i18n.t("ID_PROCESS_NAME"),
-          pending_taks: "PENDING_TASKS",
+          pending_taks: this.$i18n.t("PENDING_TASKS"),
-          status: "ID_STATUS",
+          status: this.$i18n.t("ID_CASESLIST_APP_STATUS"),
-          start_date: "ID_START_DATE",
+          start_date: this.$i18n.t("ID_START_DATE"),
-          finish_date: "ID_FINISH_DATE",
+          finish_date: this.$i18n.t("ID_FINISH_DATE"),
-          duration: "ID_DURATION",
+          duration: this.$i18n.t("ID_DURATION"),
           actions: "",
         },
         selectable: {
@@ -158,14 +158,14 @@ export default {
         dt;
       return new Promise((resolutionFunc, rejectionFunc) => {
         api.cases
-          .get({
+          .myCases({
-            type: that.filterHeader,
+            filter: that.filterHeader,
           })
           .then((response) => {
-            dt = that.formatDataResponse(response.data);
+            dt = that.formatDataResponse(response.data.data);
             resolutionFunc({
               data: dt,
-              count: response.total,
+              count: response.data.total,
             });
           })
           .catch((e) => {
@@ -184,10 +184,10 @@ export default {
           CASE_TITLE: v.APP_TITLE,
           PROCESS_NAME: v.PRO_TITLE,
           STATUS: v.APP_STATUS,
-          START_DATE: v.DEL_DELEGATE_DATE_LABEL,
+          START_DATE: v.APP_CREATE_DATE || "",
-          FINISH_DATE: v.DEL_DELEGATE_DATE_LABEL,
+          FINISH_DATE: v.APP_FINISH_DATE || "",
-          PENDING_TASKS: v.PENDING_TASKS,
+          PENDING_TASKS: [],
-          DURATION: v.DURATION_LABEL,
+          DURATION: v.DURATION,
         });
       });
       return data;
@@ -335,7 +335,7 @@ export default {
       let data = [],
         that = this,
         info = {
-          STARTED_BY_ME: {
+          STARTED: {
             icon: "fas fa-inbox",
             class: "btn-primary",
           },

resources/assets/js/mocks/casesHeader.json

@@ -1,6 +1,6 @@
 [
     {
-        "item": "STARTED_BY_ME",
+        "item": "STARTED",
         "name": "Started by Me",
         "count": 28
     },

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

@@ -52058,3 +52058,27 @@ msgstr "Custom settings"
 #: LABEL/ID_WEVE_MADE_IT_EASY_FOR_YOU
 msgid "We've made it easy for you to make the following requests"
 msgstr "We've made it easy for you to make the following requests"
+
+# TRANSLATION
+# LABEL/ID_MYCASE_NUMBER
+#: LABEL/ID_MYCASE_NUMBER
+msgid "Case #"
+msgstr "Case #"
+
+# TRANSLATION
+# LABEL/ID_PROCESS_NAME
+#: LABEL/ID_PROCESS_NAME
+msgid "Process Name"
+msgstr "Process Name"
+
+# TRANSLATION
+# LABEL/ID_DURATION
+#: LABEL/ID_DURATION
+msgid "Duration"
+msgstr "Duration"
+
+# TRANSLATION
+# LABEL/ID_PENDING_TASKS
+#: LABEL/ID_PENDING_TASKS
+msgid "Pending Tasks"
+msgstr "Pending Tasks"

workflow/engine/data/mysql/insert.sql

@@ -56866,6 +56866,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'JAVASCRIPT','ID_DONT_SAVE_XMLFORM','en','This form has not a submit action. Do you want to continue anyway?','2014-01-15') ,
 ( 'JAVASCRIPT','ID_DUPLICATE_CATEGORY_NAME','en','Duplicate category name.','2014-01-15') ,
 ( 'JAVASCRIPT','ID_DYNAFORMS','en','DynaForms','2014-01-15') ,
+( 'JAVASCRIPT','ID_DURATION','en','Duration','2020-12-04') ,
 ( 'JAVASCRIPT','ID_DYNAFORM_ASSIGN','en','You cannot delete this Dynaform while it is assigned to a step.','2014-01-15') ,
 ( 'JAVASCRIPT','ID_EDIT_STAGES_MAP','en','Edit Stages Map','2014-01-15') ,
 ( 'JAVASCRIPT','ID_EMAIL_INVALID','en','The mail is invalid','2014-01-15') ,
@@ -60129,6 +60130,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_MSSQL_SUCCESS_CONNECT','en','Successfully connected to MSSQL Server','2015-04-08') ,
 ( 'LABEL','ID_MSSQL_SUPPORT_OPTIONAL','en','MSSQL Support is optional.','2014-01-15') ,
 ( 'LABEL','ID_MULTIPLE_STARTING_TASKS','en','Multiple starting tasks in the process','2014-01-15') ,
+( 'LABEL','ID_MYCASE_NUMBER','en','Case #','2020-12-04') ,
 ( 'LABEL','ID_MYSQL_CREDENTIALS_WRONG','en','Connection Error: unable to connect to MySQL using provided credentials.','2014-01-15') ,
 ( 'LABEL','ID_MYSQL_ERROR','en','MySQL error: {0}','2014-01-15') ,
 ( 'LABEL','ID_MYSQL_SUCCESS_CONNECT','en','Successfully connected to MySQL Server','2015-04-08') ,
@@ -60355,6 +60357,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_PAUSING_CASE','en','Pausing Case','2014-01-15') ,
 ( 'LABEL','ID_PENDING','en','Pending','2014-01-15') ,
 ( 'LABEL','ID_PENDING_TASK','en','Pending Task / Not Executed','2014-01-15') ,
+( 'LABEL','ID_PENDING_TASKS','en','Pending Tasks','2020-12-04') ,
 ( 'LABEL','ID_PERFORM_TASK','en','Perform this Task','2014-01-15') ,
 ( 'LABEL','ID_PERIOD','en','Period','2014-01-15') ,
 ( 'LABEL','ID_PERIODICITY','en','Periodicity','2015-03-09') ,
@@ -60577,6 +60580,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_PROCESS_INFORMATION','en','Process Information','2014-01-15') ,
 ( 'LABEL','ID_PROCESS_IS_REQUIRED','en','Process field is required','2017-10-13') ,
 ( 'LABEL','ID_PROCESS_MAP','en','Process Map','2014-01-15') ,
+( 'LABEL','ID_PROCESS_NAME','en','Process Name','2020-12-04') ,
 ( 'LABEL','ID_PROCESS_NOCATEGORY','en','No Category','2014-01-15') ,
 ( 'LABEL','ID_PROCESS_NOT_EXIST','en','The report table ''{0}'' is related to a process not present in the workspace, import the related process first. To relate the report table to other process, open the process in the designer and import from there. The report table can''t be imported.','2016-03-08') ,
 ( 'LABEL','ID_PROCESS_NO_CATEGORY','en','No Category','2014-01-15') ,