From a02b0493c18879b9b2e7329d84935364d86a7242 Mon Sep 17 00:00:00 2001 From: Rodrigo Quelca Date: Thu, 12 Aug 2021 19:53:32 +0000 Subject: [PATCH 1/5] PMCORE-3144: UI - Create the assigne row component --- .../js/admin/Modals/ModalDeleteCaseList.vue | 9 +- .../settings/customCaseList/Api/CaseList.js | 18 +- .../customCaseList/Api/Mocks/defaults.json | 300 +++++++++ .../settings/customCaseList/Api/Services.js | 4 +- .../customCaseList/CaseListSketch.vue | 605 ++++++++++++------ .../customCaseList/CustomCaseList.vue | 45 +- .../admin/settings/customCaseList/Tables.vue | 12 +- resources/assets/js/utils/utils.js | 354 ---------- .../translations/english/processmaker.en.po | 42 ++ workflow/engine/data/mysql/insert.sql | 8 + .../engine/methods/cases/casesListSetup.php | 2 + 11 files changed, 816 insertions(+), 583 deletions(-) create mode 100644 resources/assets/js/admin/settings/customCaseList/Api/Mocks/defaults.json diff --git a/resources/assets/js/admin/Modals/ModalDeleteCaseList.vue b/resources/assets/js/admin/Modals/ModalDeleteCaseList.vue index c88f394e7..2448a41a6 100644 --- a/resources/assets/js/admin/Modals/ModalDeleteCaseList.vue +++ b/resources/assets/js/admin/Modals/ModalDeleteCaseList.vue @@ -51,10 +51,11 @@ export default { this.$refs["modal-delete-list"].hide(); }, deleteCustomCaseList() { - api.deleteCaseList(this.data).then((response) => { - if (response.statusText == "OK") { - that.$refs["modal-pause-case"].hide(); - that.$parent.$refs["vueTable"].getData(); + let that = this; + api.deleteCaseList(this.data).then((response) => { + if (response.statusText === "OK") { + that.$refs["modal-delete-list"].hide(); + that.$parent.$refs["table"].getData(); } }); } diff --git a/resources/assets/js/admin/settings/customCaseList/Api/CaseList.js b/resources/assets/js/admin/settings/customCaseList/Api/CaseList.js index c41472048..889f9c753 100644 --- a/resources/assets/js/admin/settings/customCaseList/Api/CaseList.js +++ b/resources/assets/js/admin/settings/customCaseList/Api/CaseList.js @@ -1,7 +1,7 @@ import axios from "axios"; import Api from "../../../../api/Api"; import Services from "./Services"; - +import Defaults from "./Mocks/defaults.json"; class caseListApi extends Api { constructor(services) { // Here, it calls the parent class' constructor with lengths @@ -49,6 +49,22 @@ class caseListApi extends Api { } ); } + reportTables(data) { + return this.get({ + service: 'REPORT_TABLES', + params: data, + keys: {} + }); + } + getDefault(module){ + return Defaults[module] + } + createCaseList(data) { + return this.post({ + service: "CASE_LIST", + data: data + }); + } } let api = new caseListApi(Services); diff --git a/resources/assets/js/admin/settings/customCaseList/Api/Mocks/defaults.json b/resources/assets/js/admin/settings/customCaseList/Api/Mocks/defaults.json new file mode 100644 index 000000000..4b6b3832a --- /dev/null +++ b/resources/assets/js/admin/settings/customCaseList/Api/Mocks/defaults.json @@ -0,0 +1,300 @@ +{ + "inbox": [ + { + "field": "case_number", + "name": "Case #", + "type": "integer", + "source": "APPLICATION", + "typeSearch": "integer range", + "enableFilter": false, + "set": true + }, + { + "field": "case_title", + "name": "Case Title", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + }, + { + "field": "process_name", + "name": "Process Name", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + }, + { + "field": "task", + "name": "Task", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + }, + { + "field": "send_by", + "name": "**ID_SEND_BY**", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + }, + { + "field": "due_date", + "name": "Due Date", + "type": "date", + "source": "APPLICATION", + "typeSearch": "date range", + "enableFilter": false, + "set": true + }, + { + "field": "delegation_date", + "name": "Delegation Date", + "type": "date", + "source": "APPLICATION", + "typeSearch": "date range", + "enableFilter": false, + "set": true + }, + { + "field": "priority", + "name": "Priority", + "type": "string", + "source": "APPLICATION", + "typeSearch": "option", + "enableFilter": false, + "set": true + } + ], + "draft": [ + { + "field": "case_number", + "name": "Case #", + "type": "integer", + "source": "APPLICATION", + "typeSearch": "integer range", + "enableFilter": false, + "set": true + }, + { + "field": "case_title", + "name": "Case Title", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + }, + { + "field": "process_name", + "name": "Process Name", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + }, + { + "field": "task", + "name": "Task", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + } + ], + "paused": [ + { + "field": "case_number", + "name": "Case #", + "type": "integer", + "source": "APPLICATION", + "typeSearch": "integer range", + "enableFilter": false, + "set": true + }, + { + "field": "case_title", + "name": "Case Title", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + }, + { + "field": "process_name", + "name": "Process Name", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + }, + { + "field": "task", + "name": "Task", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + }, + { + "field": "send_by", + "name": "**ID_SEND_BY**", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + }, + { + "field": "due_date", + "name": "Due Date", + "type": "date", + "source": "APPLICATION", + "typeSearch": "date range", + "enableFilter": false, + "set": true + }, + { + "field": "delegation_date", + "name": "Delegation Date", + "type": "date", + "source": "APPLICATION", + "typeSearch": "date range", + "enableFilter": false, + "set": true + }, + { + "field": "priority", + "name": "Priority", + "type": "string", + "source": "APPLICATION", + "typeSearch": "option", + "enableFilter": false, + "set": true + } + ], + "inbox": [ + { + "field": "case_number", + "name": "Case #", + "type": "integer", + "source": "APPLICATION", + "typeSearch": "integer range", + "enableFilter": false, + "set": true + }, + { + "field": "case_title", + "name": "Case Title", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + }, + { + "field": "process_name", + "name": "Process Name", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + }, + { + "field": "task", + "name": "Task", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + }, + { + "field": "send_by", + "name": "**ID_SEND_BY**", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + }, + { + "field": "due_date", + "name": "Due Date", + "type": "date", + "source": "APPLICATION", + "typeSearch": "date range", + "enableFilter": false, + "set": true + }, + { + "field": "delegation_date", + "name": "Delegation Date", + "type": "date", + "source": "APPLICATION", + "typeSearch": "date range", + "enableFilter": false, + "set": true + }, + { + "field": "priority", + "name": "Priority", + "type": "string", + "source": "APPLICATION", + "typeSearch": "option", + "enableFilter": false, + "set": true + } + ], + "unassigned": [ + { + "field": "case_number", + "name": "Case #", + "type": "integer", + "source": "APPLICATION", + "typeSearch": "integer range", + "enableFilter": false, + "set": true + }, + { + "field": "case_title", + "name": "Case Title", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + }, + { + "field": "process_name", + "name": "Process Name", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + }, + { + "field": "task", + "name": "Task", + "type": "string", + "source": "APPLICATION", + "typeSearch": "search text", + "enableFilter": false, + "set": true + } + ] +} \ No newline at end of file diff --git a/resources/assets/js/admin/settings/customCaseList/Api/Services.js b/resources/assets/js/admin/settings/customCaseList/Api/Services.js index 2fee94841..e8eb7e5a0 100644 --- a/resources/assets/js/admin/settings/customCaseList/Api/Services.js +++ b/resources/assets/js/admin/settings/customCaseList/Api/Services.js @@ -2,5 +2,7 @@ export default { CASE_LIST_TODO: "/caseList/inbox", CASE_LIST_DRAFT: "/caseList/draft", CASE_LIST_UNASSIGNED: "/caseList/unassigned", - CASE_LIST_PAUSED: "/caseList/paused" + CASE_LIST_PAUSED: "/caseList/paused", + REPORT_TABLES: "/caseList/report-tables", + CASE_LIST: "/caseList" }; diff --git a/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue b/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue index 083af74f0..ed5c77a17 100644 --- a/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue +++ b/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue @@ -2,187 +2,257 @@
-
{{ $t("ID_NEW_CASES_LISTS") }}
- -
-
- - - - - - - - - {{ $t("ID_NEW_CASES_LISTS") }} ({{ module.title }}) + + + + + + - - - - - - - - - - - - - - - -
-
- - - -
-
- - - - - - -
+ + + + + + + + + + + + + + + +
+
+ + + + +
+
+ + + + - - - - - + -
+
+ + + + + + + +
-
- - + - - + + + + + +
+ + + + + + + +
+ + + +
+ -
+ + +
+ {{ + $t("ID_CANCEL") + }} + {{ + $t("ID_PREVIEW") + }} + {{ + $t("ID_SAVE") + }}
-
- - -
-
-
- Cancel - Preview - Save -
+
@@ -190,7 +260,7 @@ - diff --git a/resources/assets/js/admin/settings/customCaseList/CustomCaseList.vue b/resources/assets/js/admin/settings/customCaseList/CustomCaseList.vue index 1fbffd51a..b61263674 100644 --- a/resources/assets/js/admin/settings/customCaseList/CustomCaseList.vue +++ b/resources/assets/js/admin/settings/customCaseList/CustomCaseList.vue @@ -7,22 +7,13 @@
{{ $t("ID_CUSTOM_CASES_LISTS") }}
- - - + + - - - - - - - - - @@ -30,8 +21,9 @@
@@ -50,11 +42,30 @@ export default { data() { return { showSketch: false, - params: {} + params: {}, + tabModule: null, + tabs: [ + { + key: "inbox", + title: this.$i18n.t("TO_DO") + }, + { + key: "draft", + title: this.$i18n.t("ID_DRAFT") + }, + { + key: "unassigned", + title: this.$i18n.t("ID_UNASSIGNED") + }, + { + key: "paused", + title: this.$i18n.t("ID_PAUSED") + } + ] }; }, mounted() { - + this.tabModule= this.tabs[0]; }, methods: { onShowSketch (params) { @@ -63,6 +74,10 @@ export default { }, onCloseSketch (params) { this.showSketch = false; + }, + onInputTab(tabIndex){ + console.log(tabIndex); + this.tabModule= this.tabs[tabIndex]; } } }; diff --git a/resources/assets/js/admin/settings/customCaseList/Tables.vue b/resources/assets/js/admin/settings/customCaseList/Tables.vue index d5787e36e..b9c917579 100644 --- a/resources/assets/js/admin/settings/customCaseList/Tables.vue +++ b/resources/assets/js/admin/settings/customCaseList/Tables.vue @@ -49,12 +49,12 @@ export default { class: "btn-success", onClick: () => { this.$emit("showSketch", { - name: "Rocko", - description: "algo te texto", - tableUid: "1234", - iconList: 'far fa-calendar-alt', - iconColor: '#4287f5', - iconColorScreen:'#4287f5', + name: "", + description: "", + tableUid: "", + iconList: "far fa-check-circle", + iconColor: '#000000', + iconColorScreen: '#FFFFFF', type: this.module }); diff --git a/resources/assets/js/utils/utils.js b/resources/assets/js/utils/utils.js index 5c7e07158..6349ffd81 100644 --- a/resources/assets/js/utils/utils.js +++ b/resources/assets/js/utils/utils.js @@ -89,359 +89,5 @@ export default { } return obj; - }, - getData() { - return [{ - code: "ZW", - name: "Zimbabwe", - created_at: "2015-04-24T01:46:50.459583", - updated_at: "2015-04-24T01:46:50.459593", - uri: "http://api.lobbyfacts.eu/api/1/country/245", - id: 245 - }, { - code: "ZM", - name: "Zambia", - created_at: "2015-04-24T01:46:50.457459", - updated_at: "2015-04-24T01:46:50.457468", - uri: "http://api.lobbyfacts.eu/api/1/country/244", - id: 244 - }, { - code: "YE", - name: "Yemen", - created_at: "2015-04-24T01:46:50.454731", - updated_at: "2015-04-24T01:46:50.454741", - uri: "http://api.lobbyfacts.eu/api/1/country/243", - id: 243 - }, { - code: "EH", - name: "Western Sahara", - created_at: "2015-04-24T01:46:50.452002", - updated_at: "2015-04-24T01:46:50.452011", - uri: "http://api.lobbyfacts.eu/api/1/country/242", - id: 242 - }, { - code: "WF", - name: "Wallis & Futuna", - created_at: "2015-04-24T01:46:50.449346", - updated_at: "2015-04-24T01:46:50.449355", - uri: "http://api.lobbyfacts.eu/api/1/country/241", - id: 241 - }, { - code: "VN", - name: "Vietnam", - created_at: "2015-04-24T01:46:50.446644", - updated_at: "2015-04-24T01:46:50.446652", - uri: "http://api.lobbyfacts.eu/api/1/country/240", - id: 240 - }, { - code: "VE", - name: "Venezuela", - created_at: "2015-04-24T01:46:50.444031", - updated_at: "2015-04-24T01:46:50.444040", - uri: "http://api.lobbyfacts.eu/api/1/country/239", - id: 239 - }, { - code: "VU", - name: "Vanuatu", - created_at: "2015-04-24T01:46:50.441423", - updated_at: "2015-04-24T01:46:50.441433", - uri: "http://api.lobbyfacts.eu/api/1/country/238", - id: 238 - }, { - code: "UZ", - name: "Uzbekistan", - created_at: "2015-04-24T01:46:50.438748", - updated_at: "2015-04-24T01:46:50.438757", - uri: "http://api.lobbyfacts.eu/api/1/country/237", - id: 237 - }, { - code: "UY", - name: "Uruguay", - created_at: "2015-04-24T01:46:50.435761", - updated_at: "2015-04-24T01:46:50.435770", - uri: "http://api.lobbyfacts.eu/api/1/country/236", - id: 236 - }, { - code: "VI", - name: "United States Virgin Islands", - created_at: "2015-04-24T01:46:50.433229", - updated_at: "2015-04-24T01:46:50.433238", - uri: "http://api.lobbyfacts.eu/api/1/country/235", - id: 235 - }, { - code: "US", - name: "United States", - created_at: "2015-04-24T01:46:50.430335", - updated_at: "2015-04-24T01:46:50.430340", - uri: "http://api.lobbyfacts.eu/api/1/country/234", - id: 234 - }, { - code: "GB", - name: "United Kingdom", - created_at: "2015-04-24T01:46:50.427956", - updated_at: "2015-04-24T01:46:50.427961", - uri: "http://api.lobbyfacts.eu/api/1/country/233", - id: 233 - }, { - code: "AE", - name: "United Arab Emirates", - created_at: "2015-04-24T01:46:50.425383", - updated_at: "2015-04-24T01:46:50.425392", - uri: "http://api.lobbyfacts.eu/api/1/country/232", - id: 232 - }, { - code: "UA", - name: "Ukraine", - created_at: "2015-04-24T01:46:50.422970", - updated_at: "2015-04-24T01:46:50.422980", - uri: "http://api.lobbyfacts.eu/api/1/country/231", - id: 231 - }, { - code: "UG", - name: "Uganda", - created_at: "2015-04-24T01:46:50.419963", - updated_at: "2015-04-24T01:46:50.419968", - uri: "http://api.lobbyfacts.eu/api/1/country/230", - id: 230 - }, { - code: "TV", - name: "Tuvalu", - created_at: "2015-04-24T01:46:50.417896", - updated_at: "2015-04-24T01:46:50.417906", - uri: "http://api.lobbyfacts.eu/api/1/country/229", - id: 229 - }, { - code: "TC", - name: "Turks & Caicos Islands", - created_at: "2015-04-24T01:46:50.414854", - updated_at: "2015-04-24T01:46:50.414868", - uri: "http://api.lobbyfacts.eu/api/1/country/228", - id: 228 - }, { - code: "TM", - name: "Turkmenistan", - created_at: "2015-04-24T01:46:50.412601", - updated_at: "2015-04-24T01:46:50.412605", - uri: "http://api.lobbyfacts.eu/api/1/country/227", - id: 227 - }, { - code: "TR", - name: "Turkey", - created_at: "2015-04-24T01:46:50.411105", - updated_at: "2015-04-24T01:46:50.411110", - uri: "http://api.lobbyfacts.eu/api/1/country/226", - id: 226 - }, { - code: "TN", - name: "Tunisia", - created_at: "2015-04-24T01:46:50.409535", - updated_at: "2015-04-24T01:46:50.409539", - uri: "http://api.lobbyfacts.eu/api/1/country/225", - id: 225 - }, { - code: "TT", - name: "Trinidad & Tobago", - created_at: "2015-04-24T01:46:50.408030", - updated_at: "2015-04-24T01:46:50.408034", - uri: "http://api.lobbyfacts.eu/api/1/country/224", - id: 224 - }, { - code: "TO", - name: "Tonga", - created_at: "2015-04-24T01:46:50.406306", - updated_at: "2015-04-24T01:46:50.406311", - uri: "http://api.lobbyfacts.eu/api/1/country/223", - id: 223 - }, { - code: "TK", - name: "Tokelau", - created_at: "2015-04-24T01:46:50.404794", - updated_at: "2015-04-24T01:46:50.404799", - uri: "http://api.lobbyfacts.eu/api/1/country/222", - id: 222 - }, { - code: "TG", - name: "Togo", - created_at: "2015-04-24T01:46:50.403306", - updated_at: "2015-04-24T01:46:50.403310", - uri: "http://api.lobbyfacts.eu/api/1/country/221", - id: 221 - }, { - code: "TH", - name: "Thailand", - created_at: "2015-04-24T01:46:50.400840", - updated_at: "2015-04-24T01:46:50.400849", - uri: "http://api.lobbyfacts.eu/api/1/country/220", - id: 220 - }, { - code: "TZ", - name: "Tanzania", - created_at: "2015-04-24T01:46:50.397846", - updated_at: "2015-04-24T01:46:50.397855", - uri: "http://api.lobbyfacts.eu/api/1/country/219", - id: 219 - }, { - code: "TJ", - name: "Tajikistan", - created_at: "2015-04-24T01:46:50.394924", - updated_at: "2015-04-24T01:46:50.394933", - uri: "http://api.lobbyfacts.eu/api/1/country/218", - id: 218 - }, { - code: "TW", - name: "Taiwan", - created_at: "2015-04-24T01:46:50.391969", - updated_at: "2015-04-24T01:46:50.391978", - uri: "http://api.lobbyfacts.eu/api/1/country/217", - id: 217 - }, { - code: "SY", - name: "Syria", - created_at: "2015-04-24T01:46:50.389120", - updated_at: "2015-04-24T01:46:50.389124", - uri: "http://api.lobbyfacts.eu/api/1/country/216", - id: 216 - }, { - code: "CH", - name: "Switzerland", - created_at: "2015-04-24T01:46:50.386939", - updated_at: "2015-04-24T01:46:50.386943", - uri: "http://api.lobbyfacts.eu/api/1/country/215", - id: 215 - }, { - code: "SE", - name: "Sweden", - created_at: "2015-04-24T01:46:50.385345", - updated_at: "2015-04-24T01:46:50.385349", - uri: "http://api.lobbyfacts.eu/api/1/country/214", - id: 214 - }, { - code: "SZ", - name: "Swaziland", - created_at: "2015-04-24T01:46:50.383834", - updated_at: "2015-04-24T01:46:50.383838", - uri: "http://api.lobbyfacts.eu/api/1/country/213", - id: 213 - }, { - code: "SR", - name: "Suriname", - created_at: "2015-04-24T01:46:50.382073", - updated_at: "2015-04-24T01:46:50.382078", - uri: "http://api.lobbyfacts.eu/api/1/country/212", - id: 212 - }, { - code: "SD", - name: "Sudan", - created_at: "2015-04-24T01:46:50.380114", - updated_at: "2015-04-24T01:46:50.380119", - uri: "http://api.lobbyfacts.eu/api/1/country/211", - id: 211 - }, { - code: "LK", - name: "Sri Lanka", - created_at: "2015-04-24T01:46:50.378189", - updated_at: "2015-04-24T01:46:50.378195", - uri: "http://api.lobbyfacts.eu/api/1/country/210", - id: 210 - }, { - code: "ES", - name: "Spain", - created_at: "2015-04-24T01:46:50.376105", - updated_at: "2015-04-24T01:46:50.376109", - uri: "http://api.lobbyfacts.eu/api/1/country/209", - id: 209 - }, { - code: "SS", - name: "South Sudan", - created_at: "2015-04-24T01:46:50.373942", - updated_at: "2015-04-24T01:46:50.373946", - uri: "http://api.lobbyfacts.eu/api/1/country/208", - id: 208 - }, { - code: "KR", - name: "South Korea", - created_at: "2015-04-24T01:46:50.371790", - updated_at: "2015-04-24T01:46:50.371794", - uri: "http://api.lobbyfacts.eu/api/1/country/207", - id: 207 - }, { - code: "GS", - name: "South Georgia & The South Sandwish Islands", - created_at: "2015-04-24T01:46:50.369460", - updated_at: "2015-04-24T01:46:50.369465", - uri: "http://api.lobbyfacts.eu/api/1/country/206", - id: 206 - }, { - code: "ZA", - name: "South Africa", - created_at: "2015-04-24T01:46:50.367247", - updated_at: "2015-04-24T01:46:50.367252", - uri: "http://api.lobbyfacts.eu/api/1/country/205", - id: 205 - }, { - code: "SO", - name: "Somaliland", - created_at: "2015-04-24T01:46:50.362905", - updated_at: "2016-09-18T18:34:35.724427", - uri: "http://api.lobbyfacts.eu/api/1/country/204", - id: 204 - }, { - code: "SB", - name: "Solomon Islands", - created_at: "2015-04-24T01:46:50.360631", - updated_at: "2015-04-24T01:46:50.360635", - uri: "http://api.lobbyfacts.eu/api/1/country/203", - id: 203 - }, { - code: "SI", - name: "Slovenia", - created_at: "2015-04-24T01:46:50.358394", - updated_at: "2015-04-24T01:46:50.358399", - uri: "http://api.lobbyfacts.eu/api/1/country/202", - id: 202 - }, { - code: "SK", - name: "Slovakia", - created_at: "2015-04-24T01:46:50.356154", - updated_at: "2015-04-24T01:46:50.356158", - uri: "http://api.lobbyfacts.eu/api/1/country/201", - id: 201 - }, { - code: "SX", - name: "Sint Maarten", - created_at: "2015-04-24T01:46:50.353807", - updated_at: "2015-04-24T01:46:50.353811", - uri: "http://api.lobbyfacts.eu/api/1/country/200", - id: 200 - }, { - code: "SG", - name: "Singapore", - created_at: "2015-04-24T01:46:50.349354", - updated_at: "2015-04-24T01:46:50.349358", - uri: "http://api.lobbyfacts.eu/api/1/country/199", - id: 199 - }, { - code: "SL", - name: "Sierra Leone", - created_at: "2015-04-24T01:46:50.347186", - updated_at: "2015-04-24T01:46:50.347190", - uri: "http://api.lobbyfacts.eu/api/1/country/198", - id: 198 - }, { - code: "SC", - name: "Seychelles", - created_at: "2015-04-24T01:46:50.344980", - updated_at: "2015-04-24T01:46:50.344984", - uri: "http://api.lobbyfacts.eu/api/1/country/197", - id: 197 - }, { - code: "RS", - name: "Serbia", - created_at: "2015-04-24T01:46:50.342496", - updated_at: "2015-04-24T01:46:50.342501", - uri: "http://api.lobbyfacts.eu/api/1/country/196", - id: 196 - }]; } - } \ No newline at end of file diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index b78564129..94b09f855 100755 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -8537,6 +8537,12 @@ msgstr "Failure" msgid "FALSE" msgstr "FALSE" +# TRANSLATION +# LABEL/ID_FIELD +#: LABEL/ID_FIELD +msgid "Field" +msgstr "Field" + # TRANSLATION # LABEL/ID_FIELDS #: LABEL/ID_FIELDS @@ -9899,6 +9905,12 @@ msgstr "Hour(s)" msgid "HTML" msgstr "HTML" +# TRANSLATION +# LABEL/ID_ICON +#: LABEL/ID_ICON +msgid "Icon" +msgstr "Icon" + # TRANSLATION # LABEL/ID_IDENTIFIER_IMPORT_USER #: LABEL/ID_IDENTIFIER_IMPORT_USER @@ -19109,6 +19121,12 @@ msgstr "Memory Limit (MB)" msgid "Memory Limit value has to be either a positive integer or -1" msgstr "Memory Limit value has to be either a positive integer or -1" +# TRANSLATION +# LABEL/ID_MENU_COLOR +#: LABEL/ID_MENU_COLOR +msgid "Menu Color" +msgstr "Menu Color" + # TRANSLATION # LABEL/ID_MENU_NAME #: LABEL/ID_MENU_NAME @@ -24215,6 +24233,12 @@ msgstr "Scheduled Task ID" msgid "Schema" msgstr "Schema" +# TRANSLATION +# LABEL/ID_SCREEN_COLOR_ICON +#: LABEL/ID_SCREEN_COLOR_ICON +msgid "Screen Color Icon" +msgstr "Screen Color Icon" + # TRANSLATION # LABEL/ID_SCRIPT_TASK #: LABEL/ID_SCRIPT_TASK @@ -24851,6 +24875,12 @@ msgstr "Test SMTP Connection" msgid "Setup" msgstr "Setup" +# TRANSLATION +# LABEL/ID_SET_A_CASE_LIST_NAME +#: LABEL/ID_SET_A_CASE_LIST_NAME +msgid "Set a Case List Name" +msgstr "Set a Case List Name" + # TRANSLATION # LABEL/ID_SET_A_TABLE_NAME #: LABEL/ID_SET_A_TABLE_NAME @@ -25304,6 +25334,12 @@ msgstr "Some actor(s) is/are already assigned to task {0}" # TRANSLATION # LABEL/ID_SOME_FIELDS_REQUIRED #: LABEL/ID_SOME_FIELDS_REQUIRED +msgid "Some Text" +msgstr "Some Text" + +# TRANSLATION +# LABEL/ID_SOME_TEXT +#: LABEL/ID_SOME_TEXT msgid "Some Fields are required." msgstr "Some Fields are required." @@ -25313,6 +25349,12 @@ msgstr "Some Fields are required." msgid "Sort by" msgstr "Sort by" +# TRANSLATION +# LABEL/ID_SOURCE +#: LABEL/ID_SOURCE +msgid "Source" +msgstr "Source" + # TRANSLATION # LABEL/ID_SOUTHPANEL #: LABEL/ID_SOUTHPANEL diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 8e7848df6..699b93784 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -58265,6 +58265,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_FAILED_VALIDATION_IN_CLASS1','en','Failed Validation in class {CLASS}.','2014-01-15') , ( 'LABEL','ID_FAILURE','en','Failure','2014-01-15') , ( 'LABEL','ID_FALSE','en','FALSE','2014-01-15') , +( 'LABEL','ID_FIELD','en','Field','2021-08-10') , ( 'LABEL','ID_FIELDS','en','Fields','2014-01-15') , ( 'LABEL','ID_FIELDS_CHANGED_NUMBER','en','Fields changed','2014-01-15') , ( 'LABEL','ID_FIELDS_LIST','en','Fields handler','2014-01-15') , @@ -58500,6 +58501,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_HOUR_ABBREVIATE','en','Hr(s)','2020-10-02') , ( 'LABEL','ID_HOUR_HOURS','en','Hour(s)','2014-10-30') , ( 'LABEL','ID_HTML','en','HTML','2014-01-15') , +( 'LABEL','ID_ICON','en','Icon','2021-08-10') , ( 'LABEL','ID_IDENTIFIER_IMPORT_USER','en','Identifier for an imported user','2014-01-15') , ( 'LABEL','ID_IMAGE','en','Image','2014-01-15') , ( 'LABEL','ID_IMAGES_SELECTED','en','images selected','2014-01-15') , @@ -60070,6 +60072,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_MEMBER_OF','en','MEMBER OF','2014-01-15') , ( 'LABEL','ID_MEMORY_LIMIT','en','Memory Limit (MB)','2014-01-15') , ( 'LABEL','ID_MEMORY_LIMIT_VALIDATE','en','Memory Limit value has to be either a positive integer or -1','2017-04-05') , +( 'LABEL','ID_MENU_COLOR','en','Menu Color','2021-08-10') , ( 'LABEL','ID_MENU_NAME','en','Enterprise Manager','2014-10-17') , ( 'LABEL','ID_MESSAGE','en','Message','2014-01-15') , ( 'LABEL','ID_MESSAGES','en','Messages','2014-01-15') , @@ -60948,6 +60951,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_SCHEDULER_SUCCESS_UPDATE','en','Case Scheduler has been updated correctly.','2014-01-15') , ( 'LABEL','ID_SCHEDULER_TASK','en','Scheduled Task ID','2014-01-15') , ( 'LABEL','ID_SCHEMA','en','Schema','2014-01-15') , +( 'LABEL','ID_SCREEN_COLOR_ICON','en','Screen Color Icon','2021-08-10') , ( 'LABEL','ID_SCRIPT_TASK','en','Script Task','2015-10-19') , ( 'LABEL','ID_SCRIPT_TASK_ACTIVITY_ALREADY_REGISTERED','en','The Script-Task with {0}: "{1}" already registered','2016-08-01') , ( 'LABEL','ID_SEARCH','en','Search','2014-01-15') , @@ -61057,6 +61061,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_SETUP','en','Admin','2014-01-15') , ( 'LABEL','ID_SETUP_MAILCONF_TITLE','en','Test SMTP Connection','2014-01-15') , ( 'LABEL','ID_SETUP_WEBSERVICES','en','Setup','2014-01-15') , +( 'LABEL','ID_SET_A_CASE_LIST_NAME','en','Set a Case List Name','2021-08-10') , ( 'LABEL','ID_SET_A_TABLE_NAME','en','Set a Table Name','2014-01-15') , ( 'LABEL','ID_SET_COLUMNS','en','Set Columns','2014-10-10') , ( 'LABEL','ID_SET_MANAGER','en','Set Manager','2015-03-09') , @@ -61132,10 +61137,13 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_SMTP_ERROR_USERNAME_NOT_ACCEPTED','en','Username not accepted by the server','2014-10-21') , ( 'LABEL','ID_SMTP_FAILED_CONNECT_SERVER','en','Failed to connect to server','2014-02-12') , ( 'LABEL','ID_SNAP_GEOMETRY','en','Snap Geometry','2014-01-15') , + ( 'LABEL','ID_SOMETHING_WRONG','en','Something was wrong','2014-01-15') , ( 'LABEL','ID_SOME_ACTORS_ALREADY_ASSIGNED','en','Some actor(s) is/are already assigned to task {0}','2014-01-15') , ( 'LABEL','ID_SOME_FIELDS_REQUIRED','en','Some Fields are required.','2014-01-15') , +( 'LABEL','ID_SOME_TEXT','en','Some Text','2021-08-10') , ( 'LABEL','ID_SORT_BY','en','Sort by','2015-04-28') , +( 'LABEL','ID_SOURCE','en','Source','2021-08-10') , ( 'LABEL','ID_SOUTHPANEL','en','southPanel','2014-01-15') , ( 'LABEL','ID_SPECIFY_DELEGATION_INDEX','en','Please specify the delegation index','2014-01-15') , ( 'LABEL','ID_SPLIT_BUTTON','en','Split Button','2014-01-15') , diff --git a/workflow/engine/methods/cases/casesListSetup.php b/workflow/engine/methods/cases/casesListSetup.php index ef6c541c8..58d652fa2 100644 --- a/workflow/engine/methods/cases/casesListSetup.php +++ b/workflow/engine/methods/cases/casesListSetup.php @@ -2,6 +2,7 @@ use Eusebiu\JavaScript\Facades\ScriptVariables; use Illuminate\Support\Facades\View; use ProcessMaker\Core\System; +use ProcessMaker\Model\User; global $translation; global $RBAC; @@ -33,4 +34,5 @@ ScriptVariables::add('SYS_URI', SYS_URI); ScriptVariables::add('SYS_LANG', SYS_LANG); ScriptVariables::add('TRANSLATIONS', $translation); ScriptVariables::add('FORMATS', $conf->getFormats()); +ScriptVariables::add('userId', User::getId($_SESSION['USER_LOGGED'])); echo View::make('Views::admin.settings.customCasesList', compact("userCanAccess"))->render(); \ No newline at end of file From 9037eeab79f8d6ec9eda5278c9a91288b460e7ce Mon Sep 17 00:00:00 2001 From: Rodrigo Quelca Date: Fri, 13 Aug 2021 18:03:29 +0000 Subject: [PATCH 2/5] add edit mode --- package-lock.json | 5 + .../settings/customCaseList/Api/CaseList.js | 9 + .../settings/customCaseList/Api/Services.js | 3 +- .../customCaseList/CaseListSketch.vue | 195 +++++++++++++++--- .../admin/settings/customCaseList/Tables.vue | 14 +- 5 files changed, 197 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index b2750c39f..322624234 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3079,6 +3079,11 @@ "integrity": "sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU=", "dev": true }, + "downloadjs": { + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/downloadjs/-/downloadjs-1.4.7.tgz", + "integrity": "sha1-9p+W+UDg0FU9rCkROYZaPNAQHjw=" + }, "duplexify": { "version": "3.7.1", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", diff --git a/resources/assets/js/admin/settings/customCaseList/Api/CaseList.js b/resources/assets/js/admin/settings/customCaseList/Api/CaseList.js index 889f9c753..552e5dcaf 100644 --- a/resources/assets/js/admin/settings/customCaseList/Api/CaseList.js +++ b/resources/assets/js/admin/settings/customCaseList/Api/CaseList.js @@ -65,6 +65,15 @@ class caseListApi extends Api { data: data }); } + updateCaseList(data) { + return this.put({ + service: "PUT_CASE_LIST", + keys: { + id: data.id + }, + data: data + }); + } } let api = new caseListApi(Services); diff --git a/resources/assets/js/admin/settings/customCaseList/Api/Services.js b/resources/assets/js/admin/settings/customCaseList/Api/Services.js index e8eb7e5a0..e6cc594f4 100644 --- a/resources/assets/js/admin/settings/customCaseList/Api/Services.js +++ b/resources/assets/js/admin/settings/customCaseList/Api/Services.js @@ -4,5 +4,6 @@ export default { CASE_LIST_UNASSIGNED: "/caseList/unassigned", CASE_LIST_PAUSED: "/caseList/paused", REPORT_TABLES: "/caseList/report-tables", - CASE_LIST: "/caseList" + CASE_LIST: "/caseList", + PUT_CASE_LIST: "/caseList/{id}" }; diff --git a/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue b/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue index ed5c77a17..105522531 100644 --- a/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue +++ b/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue @@ -75,7 +75,7 @@ > - + +
+ + + +
- +
@@ -187,7 +198,7 @@ > + + +
@@ -280,9 +303,10 @@ export default { isSelectedCaseList: false, pmTablesOptions: [], checkedRows: [], + enabledFilterRows: [], closedRows: [], checkedRowsCaseList: [], - columns: ["selected", "name", "field", "type", "source"], + columns: ["selected", "name", "field", "type", "source", "action"], //data: utils.getData(), data: [], options: { @@ -291,11 +315,14 @@ export default { field: this.$i18n.t("ID_FIELD"), type: this.$i18n.t("ID_TYPE"), source: this.$i18n.t("ID_SOURCE"), + action: "", }, sortable: [], filterable: true, - columnsDisplay: { - type: "desktop", + perPage: 1000, + perPageValues: [], + texts: { + count: "", }, }, dataCaseList: [], @@ -339,10 +366,35 @@ export default { mounted() { this.defaultCaseList = Api.getDefault(this.module.key); this.dataCaseList = this.defaultCaseList; + if(this.params.id) { + this.editMode(); + } + }, methods: { + /** + * Edit mode handler + * prepare the datato be rendered + */ + editMode(){ + let that = this; + this.pmTable = { + label: this.params.tableName, + value: this.params.tableUid + } + this.data =this.params.columns.filter(elem => elem.set === false); + this.dataCaseList =this.params.columns.filter(elem => elem.set === true); + this.dataCaseList.forEach(function (value) { + if (value.enableFilter) { + that.enabledFilterRows.push(value.field); + } + + }); + }, + /** + * Select all checkbox handler into available pm tables column list + */ selectAllAtOnce() { - console.log("isSelected: ", this.isSelected); let length = this.data.length; this.isSelected = !this.isSelected; this.checkedRows = []; @@ -353,6 +405,9 @@ export default { } } }, + /** + * Select all checkbox handler into case list table + */ selectAllAtOnceCaseList() { let length = this.dataCaseList.length; this.isSelectedCaseList = !this.isSelectedCaseList; @@ -364,6 +419,9 @@ export default { } } }, + /** + * Unassign the selected columns from custm list + */ unassignSelected() { let temp; let length = this.checkedRowsCaseList.length; @@ -379,10 +437,19 @@ export default { } this.checkedRowsCaseList = []; }, + /** + * Unassign all columns from custom list + */ unassignAll() { this.data = [...this.data, ...this.dataCaseList]; + this.data.forEach(function (element) { + element.set = false; + }); this.dataCaseList = []; }, + /** + * Assign the selected row to custom list + */ assignSelected() { let temp; let length = this.checkedRows.length; @@ -396,24 +463,40 @@ export default { } this.checkedRows = []; }, + /** + * Assign all columns to custom list + */ assignAll() { this.dataCaseList = [...this.dataCaseList, ...this.data]; + this.dataCaseList.forEach(function (element) { + element.set = true; + }); this.data = []; }, + /** + * On select icon handler + */ onSelectIcon(data) { - console.log(data); - // this.params.iconList = data; + this.params.iconList = data; }, + /** + * On change color handler + */ onChangeColor(color) { - console.log(color); - this.menuColor = color; + this.params.iconColor = color; }, + /** + * On change color screen handler + */ + onChangeColorScreen(color) { + this.params.iconColorScreen = color; + }, + /** + * On Cancel event handler + */ onCancel() { this.$emit("closeSketch"); }, - onChange(e) { - console.log(e); - }, /** * Find asynchronously in the server * @param {string} query - string from the text field @@ -438,15 +521,23 @@ export default { this.isLoading = false; }) - .catch((e) => { + .catch((err) => { console.error(err); }); }, + /** + * On select event handler in multiselect component + * @param {object} option + */ onSelect(option) { this.checkedRows = []; this.data = option.fields; this.dataCaseList = this.defaultCaseList; }, + /** + * On remove row event handler + * @param {object} row + */ onRemoveRow(row) { var temp = this.dataCaseList.find((x) => x.field === row.field); if (temp) { @@ -457,6 +548,23 @@ export default { }); } }, + /** + * On remove row event handler + * @param {object} row + */ + onAddRow(row) { + var temp = this.data.find((x) => x.field === row.field); + if (temp) { + temp["set"] = true; + this.dataCaseList.push(temp); + this.data = this.data.filter((item) => { + return item.field != row.field; + }); + } + }, + /** + * On submit event handler + */ onSubmit() { this.isValidName = true; this.isValidTable = true; @@ -469,20 +577,53 @@ export default { return; } this.params.tableUid = this.pmTable.value; - this.params.columns = this.dataCaseList; + this.params.columns = [...this.preparePostColumns(this.dataCaseList), ...this.preparePostColumns(this.data)]; this.params.type = this.module.key; this.params.userId = window.config.userId; - Api.createCaseList(this.params) - .then((response) => { - this.$emit("closeSketch"); - - }) - .catch((e) => { - console.error(err); - }); - + if (this.params.id) { + delete this.params["tableName"]; + Api.updateCaseList(this.params) + .then((response) => { + this.$emit("closeSketch"); + + }) + .catch((err) => { + console.error(err); + }); + } else { + Api.createCaseList(this.params) + .then((response) => { + this.$emit("closeSketch"); + + }) + .catch((err) => { + console.error(err); + }); + } }, - onReset() {}, + /** + * Prepares columns data to be sended to the server + * @param {array} collection + */ + preparePostColumns(collection){ + let temp = []; + collection.forEach(function (value) { + temp.push({ + field: value.field, + enableFilter: value.enableFilter || false, + set: value.set || false + }) + }); + return temp; + }, + /** + * Tongle filter switcher + * @param {string} field + */ + onTongleFilter(field){ + let objIndex = this.dataCaseList.findIndex((obj => obj.field === field)); + this.dataCaseList[objIndex].enableFilter = !this.dataCaseList[objIndex].enableFilter + } }, }; diff --git a/resources/assets/js/admin/settings/customCaseList/Tables.vue b/resources/assets/js/admin/settings/customCaseList/Tables.vue index 10558a51d..d02c764e0 100644 --- a/resources/assets/js/admin/settings/customCaseList/Tables.vue +++ b/resources/assets/js/admin/settings/customCaseList/Tables.vue @@ -188,7 +188,19 @@ export default { }, editCustomCaseList(data) { - + this.$emit("showSketch", { + id: data.id, + name: data.name, + description: data.description, + tableUid: data.tableUid, + tableName: data.tableName, + iconList: data.iconList, + iconColor: data.iconColor, + iconColorScreen: data.iconColorScreen, + columns: data.columns, + enableFilter: data.enableFilter, + type: this.module + }); }, /** * Export the Custom Case List in a json From d7ae0fedb2c7900262b44a48cfbc3bacc6b18599 Mon Sep 17 00:00:00 2001 From: Rodrigo Quelca Date: Fri, 13 Aug 2021 19:14:07 +0000 Subject: [PATCH 3/5] add translations --- .../admin/settings/customCaseList/CaseListSketch.vue | 4 ++-- .../content/translations/english/processmaker.en.po | 12 ++++++++++++ workflow/engine/data/mysql/insert.sql | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue b/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue index 105522531..1231d477d 100644 --- a/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue +++ b/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue @@ -340,8 +340,8 @@ export default { name: this.$i18n.t("ID_NAME"), field: this.$i18n.t("ID_FIELD"), type: this.$i18n.t("ID_TYPE"), - typeOfSearching: "Type of Searching", - enableSearchFilter: "Enable Search Filter", + typeOfSearching: this.$i18n.t("ID_TYPE_OF_SEARCHING"), + enableSearchFilter: this.$i18n.t("ID_ENABLE_SEARCH_FILTER"), action: "", }, filterable: false, diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 94b09f855..cc85b4418 100755 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -7769,6 +7769,12 @@ msgstr "Enable Google Drive." msgid "Enable PM Gmail" msgstr "Enable PM Gmail" +# TRANSLATION +# LABEL/ID_ENABLE_SEARCH_FILTER +#: LABEL/ID_ENABLE_SEARCH_FILTER +msgid "Enable Search Filter" +msgstr "Enable Search Filter" + # TRANSLATION # LABEL/ID_ENABLE_USER #: LABEL/ID_ENABLE_USER @@ -26933,6 +26939,12 @@ msgstr "Tue" msgid "Type" msgstr "Type" +# TRANSLATION +# LABEL/ID_TYPE_OF_SEARCHING +#: LABEL/ID_TYPE_OF_SEARCHING +msgid "Type of Searching" +msgstr "Type of Searching" + # TRANSLATION # LABEL/ID_TYPE_PASSWORD #: LABEL/ID_TYPE_PASSWORD diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 699b93784..39b228bd0 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -58127,6 +58127,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_ENABLE_PLUGIN_TIP','en','Enable the selected add-on','2014-10-21') , ( 'LABEL','ID_ENABLE_PMDRIVE','en','Enable Google Drive.','2016-01-05') , ( 'LABEL','ID_ENABLE_PMGMAIL','en','Enable PM Gmail','2015-07-27') , +( 'LABEL','ID_ENABLE_SEARCH_FILTER','en','Enable Search Filter','2021-08-13') , ( 'LABEL','ID_ENABLE_USER','en','Enable User','2014-10-10') , ( 'LABEL','ID_ENABLE_VERSIONING','en','Enable Versioning','2014-01-15') , ( 'LABEL','ID_ENABLE_VIRTUAL_KEYBOARD','en','Enable Virtual Keyboard (Only uxmodern skin)','2014-01-15') , @@ -61446,6 +61447,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_TRYING_CANCEL','en','You are tying to cancel the current case. Please be aware this action cannot be undone','2020-12-01') , ( 'LABEL','ID_TUE','en','Tue','2014-01-15') , ( 'LABEL','ID_TYPE','en','Type','2014-01-15') , +( 'LABEL','ID_TYPE_OF_SEARCHING','en','Type of Searching','2021-08-13') , ( 'LABEL','ID_TYPE_PASSWORD','en','Type Password','2020-12-15') , ( 'LABEL','ID_TYPE_PROCESS','en','Process Type','2014-10-22') , ( 'LABEL','ID_TWICE_PER_DAY','en','Twice per day','2014-10-22') , From 9e59bbe59908fa6df53706e35737433bdff5d27b Mon Sep 17 00:00:00 2001 From: Rodrigo Quelca Date: Fri, 13 Aug 2021 19:23:44 +0000 Subject: [PATCH 4/5] fix code style --- .../assets/js/admin/settings/customCaseList/CaseListSketch.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue b/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue index 1231d477d..741574867 100644 --- a/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue +++ b/resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue @@ -307,7 +307,6 @@ export default { closedRows: [], checkedRowsCaseList: [], columns: ["selected", "name", "field", "type", "source", "action"], - //data: utils.getData(), data: [], options: { headings: { From 0d1a1399f9080eee1caf606ddcac3a9b98c2b571 Mon Sep 17 00:00:00 2001 From: Rodrigo Quelca Date: Fri, 13 Aug 2021 19:35:34 +0000 Subject: [PATCH 5/5] fix code style 2 --- .../assets/js/admin/settings/customCaseList/CustomCaseList.vue | 1 - workflow/engine/data/mysql/insert.sql | 1 - 2 files changed, 2 deletions(-) diff --git a/resources/assets/js/admin/settings/customCaseList/CustomCaseList.vue b/resources/assets/js/admin/settings/customCaseList/CustomCaseList.vue index b61263674..80aee5a37 100644 --- a/resources/assets/js/admin/settings/customCaseList/CustomCaseList.vue +++ b/resources/assets/js/admin/settings/customCaseList/CustomCaseList.vue @@ -76,7 +76,6 @@ export default { this.showSketch = false; }, onInputTab(tabIndex){ - console.log(tabIndex); this.tabModule= this.tabs[tabIndex]; } } diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 39b228bd0..c6ca49583 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -61138,7 +61138,6 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_SMTP_ERROR_USERNAME_NOT_ACCEPTED','en','Username not accepted by the server','2014-10-21') , ( 'LABEL','ID_SMTP_FAILED_CONNECT_SERVER','en','Failed to connect to server','2014-02-12') , ( 'LABEL','ID_SNAP_GEOMETRY','en','Snap Geometry','2014-01-15') , - ( 'LABEL','ID_SOMETHING_WRONG','en','Something was wrong','2014-01-15') , ( 'LABEL','ID_SOME_ACTORS_ALREADY_ASSIGNED','en','Some actor(s) is/are already assigned to task {0}','2014-01-15') , ( 'LABEL','ID_SOME_FIELDS_REQUIRED','en','Some Fields are required.','2014-01-15') ,