From 55754b18dd63d2ff1343b1ac7c0f72f417b7af5f Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Fri, 11 Dec 2020 19:36:41 +0000 Subject: [PATCH] feature/PMCORE-2545 update --- resources/assets/js/api/Cases.js | 6 + .../js/components/cases/AttachedDocuments.vue | 92 -------------- .../js/components/cases/CaseSummary.vue | 107 ---------------- .../js/components/cases/IoDocuments.vue | 114 ------------------ .../home/caseDetail/CaseComment.vue | 14 ++- .../home/caseDetail/CaseComments.vue | 18 ++- .../home/caseDetail/CaseSummary.vue | 2 +- resources/assets/js/home/AdvancedSearch.vue | 1 - resources/assets/js/home/CaseDetail.vue | 28 ++++- resources/assets/js/home/Draft.vue | 15 +-- resources/assets/js/home/Home.vue | 16 ++- resources/assets/js/home/Paused.vue | 12 +- resources/assets/js/home/Todo.vue | 17 +-- resources/assets/js/home/Unassigned.vue | 49 +++++++- .../assets/js/home/modal/ModalClaimCase.vue | 74 ++++++++++++ .../engine/content/languages/translation.en | 2 +- .../translations/english/processmaker.en.po | 6 + workflow/engine/data/mysql/insert.sql | 1 + 18 files changed, 227 insertions(+), 347 deletions(-) delete mode 100644 resources/assets/js/components/cases/AttachedDocuments.vue delete mode 100644 resources/assets/js/components/cases/CaseSummary.vue delete mode 100644 resources/assets/js/components/cases/IoDocuments.vue create mode 100644 resources/assets/js/home/modal/ModalClaimCase.vue diff --git a/resources/assets/js/api/Cases.js b/resources/assets/js/api/Cases.js index 8cf43fd3b..bd0793142 100644 --- a/resources/assets/js/api/Cases.js +++ b/resources/assets/js/api/Cases.js @@ -127,6 +127,12 @@ export let cases = { window.config.SYS_URI + `cases/cases_Ajax`, params); }, + claim(data) { + var params = new URLSearchParams(); + return axios.post(window.config.SYS_SERVER + + window.config.SYS_URI + + `cases/cases_CatchExecute`, params); + }, /** * Service to jump a case by it's number * @param {object} dt diff --git a/resources/assets/js/components/cases/AttachedDocuments.vue b/resources/assets/js/components/cases/AttachedDocuments.vue deleted file mode 100644 index 8990d9cf7..000000000 --- a/resources/assets/js/components/cases/AttachedDocuments.vue +++ /dev/null @@ -1,92 +0,0 @@ - - - - - \ No newline at end of file diff --git a/resources/assets/js/components/cases/CaseSummary.vue b/resources/assets/js/components/cases/CaseSummary.vue deleted file mode 100644 index d8229d27f..000000000 --- a/resources/assets/js/components/cases/CaseSummary.vue +++ /dev/null @@ -1,107 +0,0 @@ - - - - - \ No newline at end of file diff --git a/resources/assets/js/components/cases/IoDocuments.vue b/resources/assets/js/components/cases/IoDocuments.vue deleted file mode 100644 index 82000f5a9..000000000 --- a/resources/assets/js/components/cases/IoDocuments.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - - - \ No newline at end of file diff --git a/resources/assets/js/components/home/caseDetail/CaseComment.vue b/resources/assets/js/components/home/caseDetail/CaseComment.vue index d679276ed..084a49651 100644 --- a/resources/assets/js/components/home/caseDetail/CaseComment.vue +++ b/resources/assets/js/components/home/caseDetail/CaseComment.vue @@ -4,7 +4,7 @@ avatar @@ -29,6 +29,18 @@ export default { data() { return {}; }, + computed: { + path() { + if (this.data) { + return ( + window.config.SYS_SERVER + + window.config.SYS_URI + + `users/users_ViewPhotoGrid?pUID=${this.data.data.USR_UID}` + ); + } + return ""; + }, + }, methods: { classBtn(cls) { return "btn v-btn-request " + cls; diff --git a/resources/assets/js/components/home/caseDetail/CaseComments.vue b/resources/assets/js/components/home/caseDetail/CaseComments.vue index 5be75cc69..43de5bacf 100644 --- a/resources/assets/js/components/home/caseDetail/CaseComments.vue +++ b/resources/assets/js/components/home/caseDetail/CaseComments.vue @@ -15,7 +15,7 @@ avatar @@ -44,7 +44,7 @@ > - @@ -68,6 +68,15 @@ export default { data() { return {}; }, + computed: { + pathImgOwner() { + return ( + window.config.SYS_SERVER + + window.config.SYS_URI + + `users/users_ViewPhotoGrid?pUID=${window.config.USR_UID}` + ); + }, + }, methods: { classBtn(cls) { return "btn v-btn-request " + cls; @@ -91,4 +100,9 @@ export default { .v-check-comment { padding-right: 20px; } + +.v-img-fluid { + max-width: 30px; + height: auto; +} \ No newline at end of file diff --git a/resources/assets/js/components/home/caseDetail/CaseSummary.vue b/resources/assets/js/components/home/caseDetail/CaseSummary.vue index 1b863ac3d..29b3bfcf0 100644 --- a/resources/assets/js/components/home/caseDetail/CaseSummary.vue +++ b/resources/assets/js/components/home/caseDetail/CaseSummary.vue @@ -65,7 +65,7 @@