From b80b0f25b1e6569e02b412abd4c0fa895f3598f6 Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Tue, 1 Jun 2021 19:58:39 +0000 Subject: [PATCH] PMCORE-3017-E --- resources/assets/js/api/Api.js | 8 -------- resources/assets/js/api/CaseNotes.js | 10 +++------- resources/assets/js/api/Cases.js | 11 ----------- resources/assets/js/home/CaseDetail.vue | 17 +++++++---------- .../assets/js/home/modal/ModalCancelCase.vue | 2 +- .../assets/js/home/modal/ModalClaimCase.vue | 6 ++++-- 6 files changed, 15 insertions(+), 39 deletions(-) diff --git a/resources/assets/js/api/Api.js b/resources/assets/js/api/Api.js index eb557e583..36cc4ec75 100644 --- a/resources/assets/js/api/Api.js +++ b/resources/assets/js/api/Api.js @@ -30,11 +30,7 @@ const services = { 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", @@ -195,12 +191,8 @@ export default { "Authorization": `Bearer ` + credentials.accessToken }, headers) }); -<<<<<<< HEAD - }, -======= }, ->>>>>>> 032cd35bb... PMCORE-3017 delete(options) { let service = options.service || "", id = options.id || {}, diff --git a/resources/assets/js/api/CaseNotes.js b/resources/assets/js/api/CaseNotes.js index 148580cfe..624210c17 100644 --- a/resources/assets/js/api/CaseNotes.js +++ b/resources/assets/js/api/CaseNotes.js @@ -5,8 +5,8 @@ export let caseNotes = { post(data) { var params = new FormData(); params.append('appUid', data.APP_UID); - params.append('noteText', data.COMMENT); - params.append('swSendMail', data.SEND_MAIL ? 1 : 0); + params.append('note_content', data.COMMENT); + params.append('send_mail', data.SEND_MAIL ? 1 : 0); _.each(data.FILES, (f) => { params.append("filesToUpload[]", f); @@ -14,11 +14,7 @@ export let caseNotes = { return Api.postFiles({ service: "POST_NOTE", - data: { - note_content: data.COMMENT, - send_mail: data.SEND_MAIL - }, - params, + data: params, headers:{ 'Content-Type': 'multipart/form-data' }, diff --git a/resources/assets/js/api/Cases.js b/resources/assets/js/api/Cases.js index 73eada778..63170d027 100644 --- a/resources/assets/js/api/Cases.js +++ b/resources/assets/js/api/Cases.js @@ -131,23 +131,12 @@ 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); - params.append('NOTIFY_CANCEL', data.SEND); - - 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 } diff --git a/resources/assets/js/home/CaseDetail.vue b/resources/assets/js/home/CaseDetail.vue index 849581e88..528d73ad8 100644 --- a/resources/assets/js/home/CaseDetail.vue +++ b/resources/assets/js/home/CaseDetail.vue @@ -224,10 +224,7 @@ export default { }) ) .then((response) => { - if ( - response.data.success === "success" && - response.data.message == "" - ) { + if (response.status === 200 ) { that.attachDocuments = false; that.dataAttachedDocuments.items = []; that.getCasesNotes(); @@ -416,7 +413,7 @@ export default { Api.caseNotes .get(this.dataCase) .then((response) => { - that.formatResponseCaseNotes(response.data.notes); + that.formatResponseCaseNotes(response.data.data); that.dataComments.noPerms = response.data.noPerms || 0; }) .catch((err) => { @@ -430,12 +427,12 @@ export default { n.id = _.random(1000000); notesArray.push({ user: that.nameFormatCases( - n.USR_FIRSTNAME, - n.USR_LASTNAME, - n.USR_USERNAME + n.usr_firstname, + n.usr_lastname, + n.usr_username ), - date: n.NOTE_DATE, - comment: n.NOTE_CONTENT, + date: n.note_date, + comment: n.note_content, data: n }); }); diff --git a/resources/assets/js/home/modal/ModalCancelCase.vue b/resources/assets/js/home/modal/ModalCancelCase.vue index 32cdb9d95..08f0b41e8 100644 --- a/resources/assets/js/home/modal/ModalCancelCase.vue +++ b/resources/assets/js/home/modal/ModalCancelCase.vue @@ -80,7 +80,7 @@ export default { SEND: this.$refs["send"].checked ? 1 : 0, })) .then((response) => { - if (response.data && response.data.status) { + if (response.status === 200) { that.$refs["modal-cancel-case"].hide(); that.$parent.$parent.page = "todo"; } diff --git a/resources/assets/js/home/modal/ModalClaimCase.vue b/resources/assets/js/home/modal/ModalClaimCase.vue index e052bc810..59267d840 100644 --- a/resources/assets/js/home/modal/ModalClaimCase.vue +++ b/resources/assets/js/home/modal/ModalClaimCase.vue @@ -33,7 +33,9 @@ import api from "./../../api/index"; export default { name: "ModalClaimCase", components: {}, - props: {}, + props: { + dataCase: Object, + }, mounted() {}, data() { return { @@ -53,7 +55,7 @@ export default { claimCase() { let that = this; api.cases.claim(this.data).then((response) => { - if (response.statusText == "OK") { + if (response.status === 200) { that.$refs["modal-claim-case"].hide(); that.$parent.$emit("onUpdateDataCase", { APP_UID: this.data.APP_UID,