fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix observations CR in FE

Browse Source
This commit is contained in:
Henry Jordan
2021-09-06 20:07:48 +00:00
parent 11183e2231
commit aab8827b6e
12 changed files with 148 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
resources/assets/js/admin/Modals/ModalImport.vue
View File

@@ -124,13 +124,22 @@ export default {
this.caseListDuplicate = false;
this.$refs["modal-import"].show();
},
/**
* Close table
*/
close() {
this.pmTableNoFields = false;
},
/**
* Hide modal import
*/
hide() {
this.caseListDuplicate = false;
this.$refs["modal-import"].hide();
},
/**
* Get the custom list case API
*/
importCustomCaseList() {
let that = this;
this.data.file = this.fileCaseList;
@@ -162,6 +171,9 @@ export default {
console.error(e);
});
},
/**
* Continue import custom case list
*/
continueImport() {
let that = this;
this.data.file = this.fileCaseList;

30
resources/assets/js/admin/settings/customCaseList/Api/CaseList.js
View File

@@ -36,6 +36,11 @@ class caseListApi extends Api {
keys: {}
});
}
/**
* Service delete case list
* @param {*} data
* @returns
*/
deleteCaseList(data) {
return axios.delete(
window.config.SYS_SERVER_API +
@@ -49,6 +54,11 @@ class caseListApi extends Api {
}
);
}
/**
* Service return report tables
* @param {*} data
* @returns
*/
reportTables(data) {
return this.get({
service: 'REPORT_TABLES',
@@ -56,6 +66,11 @@ class caseListApi extends Api {
keys: {}
});
}
/**
* Service default columns
* @param {*} type
* @returns
*/
getDefault(type){
return this.get({
service: 'DEFAULT_COLUMNS',
@@ -64,12 +79,22 @@ class caseListApi extends Api {
}
});
}
/**
* Service create case list
* @param {*} data
* @returns
*/
createCaseList(data) {
return this.post({
service: "CASE_LIST",
data: data
});
}
/**
* Service update case list
* @param {*} data
* @returns
*/
updateCaseList(data) {
return this.put({
service: "PUT_CASE_LIST",
@@ -79,6 +104,11 @@ class caseListApi extends Api {
data: data
});
}
/**
* Service import case list
* @param {*} data
* @returns
*/
importCaseList(data) {
let formData = new FormData();
formData.append('file_content', data.file);

3
resources/assets/js/admin/settings/customCaseList/CaseListSketch.vue
View File

@@ -387,7 +387,6 @@ export default {
if(this.params.id) {
this.editMode();
}
},
methods: {
/**
@@ -412,7 +411,6 @@ export default {
}
return info;
},
/**
* Edit mode handler
* prepare the datato be rendered
@@ -429,7 +427,6 @@ export default {
if (value.enableFilter) {
that.enabledFilterRows.push(value.field);
}
});
},
/**

10
resources/assets/js/admin/settings/customCaseList/CustomCaseList.vue
View File

@@ -16,7 +16,6 @@
</b-tab>
</b-tabs>
</b-container>
</div>
</div>
<div class="container" v-if="showSketch">
@@ -68,13 +67,22 @@ export default {
this.tabModule= this.tabs[0];
},
methods: {
/**
* Show sketch
*/
onShowSketch (params) {
this.showSketch = true;
this.params = params;
},
/**
* Close sketch
*/
onCloseSketch (params) {
this.showSketch = false;
},
/**
* On change input
*/
onInputTab(tabIndex){
this.tabModule= this.tabs[tabIndex];
}

8
resources/assets/js/components/dataViews/vueCardView/VueCardViewMixins.js
View File

@@ -24,8 +24,8 @@ export default {
.then((data) => {
that.data = data.data;
})
.catch(() => {
.catch((e) => {
console.error(e);
});
},
/**
@@ -43,8 +43,8 @@ export default {
that.loadMore = that.$t("ID_NO_MORE_INFORMATION");
}
})
.catch(() => {
.catch((e) => {
console.error(e);
});
},
/**

8
resources/assets/js/components/dataViews/vueListView/VueListViewMixins.js
View File

@@ -24,8 +24,8 @@ export default {
.then((data) => {
that.data = data.data;
})
.catch(() => {
.catch((e) => {
console.error(e);
});
},
/**
@@ -43,8 +43,8 @@ export default {
that.loadMore = that.$t("ID_NO_MORE_INFORMATION");
}
})
.catch(() => {
.catch((e) => {
console.error(e);
});
},
/**

28
resources/assets/js/components/iconPicker/IconPicker.vue
View File

@@ -10,11 +10,11 @@
<div class="rip-search">
<div class="rip-input">
<label for="ripSearch" style="display: none;"
>Search for Icon</label
>{{$t("ID_SEARCH_FOR_ICON")}}</label
>
<input
id="ripSearch"
placeholder="Search for Icon"
:placeholder="$t('ID_SEARCH_FOR_ICON')"
v-model="searchText"
@input="searchTextChanged"
/>
@@ -29,14 +29,14 @@
</div>
<div class="rip-icons" v-show="!loading">
<h4 class="icon-title">
Regular Icons
{{$t('ID_REGULAR_ICONS')}}
</h4>
<p
style="text-align: center;"
v-if="regularIcons.length <= 0"
>
<i class="fas fa-eye-slash"></i>
Sorry, No icons found!
{{$t('ID_SORRY_NO_ICONS')}}
</p>
<ul class="rip-row" v-if="regularIcons.length > 0">
<li
@@ -58,14 +58,14 @@
</li>
</ul>
<h4 class="icon-title">
Brand Icons
{{$t('ID_BRAND_ICONS')}}
</h4>
<p
style="text-align: center;"
v-if="brandIcons.length <= 0"
>
<i class="fas fa-eye-slash"></i>
Sorry, No Brand icons found!
{{$t('ID_BRAND_ICONS_NOT_FOUND')}}
</p>
<ul class="rip-row" v-if="brandIcons.length > 0">
<li
@@ -87,14 +87,14 @@
</li>
</ul>
<h4 class="icon-title">
Solid Icons
{{$t('ID_SOLID_ICONS')}}
</h4>
<p
style="text-align: center;"
v-if="solidIcons.length <= 0"
>
<i class="fas fa-eye-slash"></i>
Sorry, No Solid icons found!
{{$t('ID_SOLID_ICONS_NOT_FOUND')}}
</p>
<ul class="rip-row" v-if="solidIcons.length > 0">
<li
@@ -170,19 +170,31 @@ export default {
},
},
methods: {
/**
* Handler select icon
*/
selectIcon(icon, type) {
this.icon = `${type} fa-${icon}`;
this.popUpActive = false;
this.$emit("selected", this.icon);
},
/**
* Handler search text changed
*/
searchTextChanged() {
this.searchIcon(this.searchText);
},
/**
* Set default icons
*/
setDefaultIcons() {
this.allIcons.brand = ripIcons.brand;
this.allIcons.regular = ripIcons.regular;
this.allIcons.solid = ripIcons.solid;
},
/**
* Serach icons handler
*/
searchIcon(txt) {
this.loading = true;
if (txt && txt.length > 0) {

2
resources/assets/js/components/vuetable/SettingsPopover.vue
View File

@@ -99,7 +99,6 @@ export default {
onSave() {
let sels;
sels = _.clone(this.localSelected);
//this.$root.$emit("bv::hide::popover");
this.$emit("onUpdateColumnSettings", sels);
},
/**
@@ -121,7 +120,6 @@ export default {
return val.search(txt) != -1;
});
this.results = opts;
},
/**

6
resources/assets/js/home/Home.vue
View File

@@ -530,9 +530,15 @@ export default {
if (index !== -1) advSearch.child.splice(index, 1);
}
},
/**
* Update filters handler
*/
onUpdateFilters(filters) {
this.filters = filters;
},
/**
* Service to get Highlight
*/
getHighlight() {
let that = this;
if (that.menu.length > 0) {

17
resources/assets/js/home/modal/ModalReassignCase.vue
View File

@@ -87,13 +87,22 @@ export default {
classBtn(cls) {
return "btn v-btn-request " + cls;
},
/**
* Show modal
*/
show() {
this.getUsersReassign();
this.$refs["modal-reassign-case"].show();
},
/**
* Button cancel
*/
cancel() {
this.$refs["modal-reassign-case"].hide();
},
/**
* Service to get user reassign
*/
getUsersReassign() {
let that = this;
api.cases.getUserReassign(this.data).then((response) => {
@@ -114,6 +123,9 @@ export default {
}
});
},
/**
* Service reassign case
*/
reassignCase() {
let that = this;
this.data.userSelected = this.userSelected;
@@ -137,7 +149,4 @@ export default {
},
},
};
</script>
<style>
</style>
</script>

44
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -53179,4 +53179,46 @@ msgstr "Case Thread Title"
# LABEL/ID_NO_MORE_INFORMATION
#: LABEL/ID_NO_MORE_INFORMATION
msgid "No more Information to Load"
msgstr "No more Information to Load"
msgstr "No more Information to Load"
# TRANSLATION
# LABEL/ID_SEARCH_FOR_ICON
#: LABEL/ID_SEARCH_FOR_ICON
msgid "Search for icon"
msgstr "Search for icon"
# TRANSLATION
# LABEL/ID_REGULAR_ICONS
#: LABEL/ID_REGULAR_ICONS
msgid "Regular icons"
msgstr "Regular icons"
# TRANSLATION
# LABEL/ID_SORRY_NO_ICONS
#: LABEL/ID_SORRY_NO_ICONS
msgid "Sorry, No icons found!"
msgstr "Sorry, No icons found!"
# TRANSLATION
# LABEL/ID_BRAND_ICONS
#: LABEL/ID_BRAND_ICONS
msgid "Brand Icons"
msgstr "Brand Icons"
# TRANSLATION
# LABEL/ID_BRAND_ICONS_NOT_FOUND
#: LABEL/ID_BRAND_ICONS_NOT_FOUND
msgid "Sorry, No Brand icons found!"
msgstr "Sorry, No Brand icons found!"
# TRANSLATION
# LABEL/ID_SOLID_ICONS
#: LABEL/ID_SOLID_ICONS
msgid "Solid icons"
msgstr "Solid icons"
# TRANSLATION
# LABEL/ID_SOLID_ICONS_NOT_FOUND
#: LABEL/ID_SOLID_ICONS_NOT_FOUND
msgid "Sorry, No Solid icons found!"
msgstr "Sorry, No Solid icons found!"

7
workflow/engine/data/mysql/insert.sql
View File

@@ -57312,6 +57312,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ) VALUES
( 'LABEL','ID_BREAK_DW_PROCESS','en','were lost by a connection problem.','2014-01-15') ,
( 'LABEL','ID_BRAND_ICONS','en','Brand Icons','2020-08-06') ,
( 'LABEL','ID_BRAND_ICONS_NOT_FOUND','en','Sorry, No Brand icons found!','2020-08-06') ,
( 'LABEL','ID_BROWSE','en','Browse','2014-01-15') ,
( 'LABEL','ID_BROWSER_NOT_SUPPORTED','en','This browser is not supported.','2014-01-15') ,
( 'LABEL','ID_BROWSE_LIBRARY','en','Browse Library','2014-01-15') ,
@@ -60813,6 +60815,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_REFRESH_TIME_SECONDS','en','Counters Refresh Time (seconds)','2020-01-30') ,
( 'LABEL','ID_REFRESH_VIEW','en','Refresh view','2014-01-15') ,
( 'LABEL','ID_REGENERATE','en','Regenerate','2014-01-15') ,
( 'LABEL','ID_REGULAR_ICONS','en','Regular icons','2021-08-06') ,
( 'LABEL','ID_REGENERATE_DATA_REPORT','en','Regenerate Data Report','2014-01-15') ,
( 'LABEL','ID_REGISTRY_CANNOT_BE_UPDATED','en','The registry cannot be updated!','2014-05-21') ,
( 'LABEL','ID_RELATED_GROUPS','en','Related Groups','2015-03-30') ,
@@ -60995,6 +60998,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_SEARCH_BY_STATUS','en','Search by Status:','2020-12-22') ,
( 'LABEL','ID_SEARCH_BY_TASK_NAME','en','Search by Task Name:','2020-12-16') ,
( 'LABEL','ID_SEARCH_FOR_USER','en','Search for user','2015-09-15') ,
( 'LABEL','ID_SEARCH_FOR_ICON','en','Search for user','2021-09-06') ,
( 'LABEL','ID_SEARCH_PATTERN','en','Search Pattern','2014-01-15') ,
( 'LABEL','ID_SEARCH_RESULT','en','Search results','2014-01-15') ,
( 'LABEL','ID_SEARCH_USER','en','Username','2014-01-15') ,
@@ -61165,8 +61169,11 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( '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_SORRY_NO_ICONS','en','Sorry, No icons found!','2021-08-06') ,
( 'LABEL','ID_SOURCE','en','Source','2021-08-10') ,
( 'LABEL','ID_SOUTHPANEL','en','southPanel','2014-01-15') ,
( 'LABEL','ID_SOLID_ICONS','en','Solid icons','2021-08-06') ,
( 'LABEL','ID_SOLID_ICONS_NOT_FOUND','en','Sorry, No Solid icons found!','2021-08-06') ,
( 'LABEL','ID_SPECIFY_DELEGATION_INDEX','en','Please specify the delegation index','2014-01-15') ,
( 'LABEL','ID_SPLIT_BUTTON','en','Split Button','2014-01-15') ,
( 'LABEL','ID_SQL_ESCAPE','en','Replace the value for use in SQL sentences','2014-01-15') ,