PMCORE-3017

resources/assets/js/api/Api.js

@@ -5,7 +5,7 @@ const services = {
     AUTHENTICATE_USER: "/oauth2/token",
     USER_DATA: "/light/user/data",
     GET_MAIN_MENU_COUNTERS: "/light/counters",
-    GET_CASE_NOTES_LIST: "/light/case/{app_uid}/notes",
+    GET_NOTES: "/cases/{app_uid}/notes/paged?files={files}",
     GET_PROCESS_MAP: "/light/project/{prj_uid}/case/{app_uid}",
     GET_LIST_UNASSIGNED: "/light/unassigned{suffix}",
     GET_LISTS_PARTICIPATED: "/light/participated{suffix}",
@@ -22,15 +22,19 @@ const services = {
     UPLOAD_FILE: "/light/case/{app_uid}/upload/{app_doc_uid}",
     GET_CASE_INFO: "/light/{type}/case/{app_uid}",
     REQUEST_PAUSE_CASE: "/light/cases/{app_uid}/pause",
-    REQUEST_UNPAUSE_CASE: "/cases/{app_uid}/unpause",
+    UNPAUSE_CASE: "/cases/{app_uid}/unpause",
-    REQUEST_CANCEL_CASE: "/cases/{app_uid}/cancel",
+    CANCEL_CASE: "/cases/{app_uid}/cancel",
     REQUEST_SYS_CONFIG: "/light/config",
     REQUEST_SYS_CONFIG_V2: "/light/config?fileLimit=true",
     ROUTE_CASE: "/light/cases/{app_uid}/route-case",
-    CLAIM_CASE: "/light/case/{app_uid}/claim",
+    CLAIM_CASE: "/case/{app_uid}/claim",
     GET_FILE_VERSIONS: "/cases/{app_uid}/input-document/{app_doc_uid}/versions",
     REGISTER: "https:trial32.processmaker.com/syscolosa/en/neoclassic_pro/9893000714bdb2d52ecc317052629917/Trial_RequestPostMobile.php",
+<<<<<<< HEAD
     ADD_NOTE: "/case/{app_uid}/note",
+=======
+    POST_NOTE: "/case/{app_uid}/note",
+>>>>>>> 032cd35bb... PMCORE-3017
     LAST_OPEN_INDEX: "/light/lastopenindex/case/{app_uid}",
     REGISTER_WITH_GOOGLE_FAKE_URL: "fakeurl",
     SIGN_IN_TO_PM_WITH_GOOGLE: "/authentication/gmail",
@@ -149,6 +153,7 @@ export default {
             params = options.params || {},
             data = options.data || {},
             keys = options.keys || {},
+            headers = options.headers || {},
             url,
             credentials = window.config.SYS_CREDENTIALS,
             workspace = window.config.SYS_WORKSPACE,
@@ -160,13 +165,42 @@ export default {
             url: url,
             params,
             data,
-            headers: {
+            headers: _.extend({
                 "Accept": "application/json",
                 "Content-Type": "application/json",
                 "Authorization": `Bearer ` + credentials.accessToken
-            }
+            }, headers)
         });
+    },
+
+    postFiles(options) {
+        let service = options.service || "",
+            params = options.params || {},
+            data = options.data || {},
+            keys = options.keys || {},
+            headers = options.headers || {},
+            url,
+            credentials = window.config.SYS_CREDENTIALS,
+            workspace = window.config.SYS_WORKSPACE,
+            server = window.config.SYS_SERVER_API;
+        url = this.getUrl(_.extend(keys, credentials, { server }, { workspace }), service);
+
+        return axios({
+            method: "post",
+            url: url,
+            params,
+            data,
+            headers: _.extend({
+                "Accept": "application/json",
+                "Authorization": `Bearer ` + credentials.accessToken
+            }, headers)
+        });
+<<<<<<< HEAD
     },   
+=======
+    },
+
+>>>>>>> 032cd35bb... PMCORE-3017
     delete(options) {
         let service = options.service || "",
             id = options.id || {},
@@ -199,6 +233,34 @@ export default {
             server = window.config.SYS_SERVER_API;
         url = this.getUrl(_.extend(keys, credentials, { server }, { workspace }), service);
 
+        return axios({
+            method: "put",
+            url: url,
+            params,
+            data,
+            headers: {
+                "Accept": "application/json",
+                "Content-Type": "application/json",
+                "Authorization": `Bearer ` + credentials.accessToken
+            }
+        });
+    },
+    /**
+     * Put action in AXIOS
+     * @param {*} options 
+     * @returns 
+     */
+    update(options) {
+        let service = options.service || "",
+            params = options.params || {},
+            data = options.data || {},
+            keys = options.keys || {},
+            url,
+            credentials = window.config.SYS_CREDENTIALS,
+            workspace = window.config.SYS_WORKSPACE,
+            server = window.config.SYS_SERVER_API;
+        url = this.getUrl(_.extend(keys, credentials, { server }, { workspace }), service);
+
         return axios({
             method: "put",
             url: url,

resources/assets/js/api/CaseNotes.js

@@ -12,15 +12,40 @@ export let caseNotes = {
             params.append("filesToUpload[]", f);
         })
 
-        return Api.post({
+        return Api.postFiles({
-            service: "ADD_NOTE",
+            service: "POST_NOTE",
-            data:{
+            data: {
                 note_content: data.COMMENT,
-                send_mail: data.SEND_MAIL ? 1 : 0
+                send_mail: data.SEND_MAIL
+            },
+            params,
+            headers:{
+                'Content-Type': 'multipart/form-data'
             },
             keys: {
                 app_uid: data.APP_UID
             }
         });
     },
+    get(data) {
+        var params = new FormData();
+        params.append('appUid', data.APP_UID);
+        params.append('delIndex', data.DEL_INDEX);
+        params.append('pro', data.PRO_UID);
+        params.append('tas', data.TAS_UID);
+        params.append('start', "0");
+        params.append('limit', "30");
+        
+        return Api.get({
+            service: "GET_NOTES",
+            params:{
+                start: "0",
+                limit: "30",
+                files: true
+            },
+            keys: {
+                app_uid: data.APP_UID
+            }
+        });
+    }
 };

resources/assets/js/api/Cases.js

@@ -131,6 +131,7 @@ export let cases = {
             `cases/cases_Open?APP_UID=${data.APP_UID}&DEL_INDEX=${data.DEL_INDEX}&action=${data.ACTION}`);
     },
     cancel(data) {
+<<<<<<< HEAD
         var params = new URLSearchParams();
         params.append('action', 'cancelCase');
         params.append('NOTE_REASON', data.COMMENT);
@@ -139,6 +140,14 @@ export let cases = {
         return Api.put({
             service: "REQUEST_CANCEL_CASE",
             params: {},
+=======
+        return Api.update({
+            service: "CANCEL_CASE",
+            data: {
+                reason: data.COMMENT,
+                sendMail: data.SEND
+            },
+>>>>>>> 032cd35bb... PMCORE-3017
             keys: {
                 app_uid: data.APP_UID
             }
@@ -152,25 +161,35 @@ export let cases = {
             window.config.SYS_URI +
             `cases/ajaxListener`, params);
     },
+    /**
+     * Unpause case with endpoint
+     * @param {*} data 
+     * @returns 
+     */
     unpause(data) {
-        var params = new URLSearchParams();
+        return Api.update({
-        params.append('action', 'unpauseCase');
+            service: "UNPAUSE_CASE",
-        params.append('sApplicationUID', data.APP_UID);
+            data: {},
-        params.append('iIndex', data.DEL_INDEX);
-
-        return Api.put({
-            service: "REQUEST_UNPAUSE_CASE",
-            params: {},
             keys: {
                 app_uid: data.APP_UID
             }
         });
     },
+    /**
+     * Claim case with endpoint
+     * @param {*} data 
+     * @returns 
+     */
     claim(data) {
-        var params = new URLSearchParams();
+        return Api.update({
-        return axios.post(window.config.SYS_SERVER_AJAX +
+            service: "CLAIM_CASE",
-            window.config.SYS_URI +
+            data: {
-            `cases/cases_CatchExecute`, params);
+                index: data.DEL_INDEX
+            },
+            keys: {
+                app_uid: data.APP_UID
+            }
+        });
     },
     /**
      * Service to jump a case by it's number

resources/assets/js/home/CaseDetail.vue

@@ -413,8 +413,8 @@ export default {
 
     getCasesNotes() {
       let that = this;
-      Api.cases
+      Api.caseNotes
-        .casenotes(this.dataCase)
+        .get(this.dataCase)
         .then((response) => {
           that.formatResponseCaseNotes(response.data.notes);
           that.dataComments.noPerms = response.data.noPerms || 0;