This commit is contained in:
2020-04-02 20:16:28 +00:00
parent 7780c41117
commit e44362d6ff
7 changed files with 120 additions and 101 deletions

View File

@@ -92,7 +92,7 @@ const FORM_KEY = "adm-global-select-templates";
const API_BASE_URL = "PickList/Template/";
export default {
beforeRouteLeave(to, from, next) {
//var vm = this;
//let vm = this;
if (this.formState.dirty) {
window.$gz.dialog.confirmLeaveUnsaved().then(dialogResult => {
if (dialogResult == true) {
@@ -109,7 +109,7 @@ export default {
window.$gz.eventBus.$off("menu-click", clickHandler);
},
created() {
var vm = this;
let vm = this;
initForm(vm)
.then(() => {
@@ -165,7 +165,7 @@ export default {
}
//enable / disable save button
var canSave = val.dirty && val.valid && !val.readOnly;
let canSave = val.dirty && val.valid && !val.readOnly;
if (canSave) {
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
} else {
@@ -193,8 +193,8 @@ export default {
});
},
move: function(direction, index) {
var totalItems = this.workingArray.length;
var newIndex = 0;
let totalItems = this.workingArray.length;
let newIndex = 0;
//calculate new index
switch (direction) {
case "start":
@@ -239,7 +239,7 @@ export default {
this.getDataFromApi();
},
getDataFromApi() {
var vm = this;
let vm = this;
vm.formState.loading = true;
if (!vm.templateId || vm.templateId == 0) {
return;
@@ -257,7 +257,7 @@ export default {
} else {
vm.availableFields = res.data;
vm.fieldKeys = [];
for (var i = 0; i < res.data.length; i++) {
for (let i = 0; i < res.data.length; i++) {
vm.fieldKeys.push(res.data[i].tKey);
}
return window.$gz.translation.fetch(vm.fieldKeys);
@@ -294,21 +294,21 @@ export default {
});
},
submit() {
var vm = this;
var url = API_BASE_URL;
let vm = this;
let url = API_BASE_URL;
//clear any errors vm might be around from previous submit
window.$gz.form.deleteAllErrorBoxErrors(vm);
//Create template data object here....
//Note that server expects to see a string array of json template, not actual json
var newObj = {
let newObj = {
id: vm.templateId,
template: "[]"
};
//temporary array to hold template for later stringification
var temp = [];
for (var i = 0; i < vm.workingArray.length; i++) {
var ti = vm.workingArray[i];
let temp = [];
for (let i = 0; i < vm.workingArray.length; i++) {
let ti = vm.workingArray[i];
if (ti.include == true) {
temp.push({
fld: ti.key
@@ -339,14 +339,14 @@ export default {
});
},
remove() {
var vm = this;
let vm = this;
window.$gz.dialog.confirmGeneric("ResetToDefault").then(dialogResult => {
if (dialogResult == true) {
//do the delete
vm.formState.loading = true;
//No need to delete a new record, just abandon it...
if (vm.templateId && vm.templateId != 0) {
var url = API_BASE_URL + vm.templateId;
let url = API_BASE_URL + vm.templateId;
window.$gz.form.deleteAllErrorBoxErrors(vm);
window.$gz.api
@@ -382,7 +382,7 @@ function clickHandler(menuItem) {
if (!menuItem) {
return;
}
var m = window.$gz.menu.parseMenuItem(menuItem);
let m = window.$gz.menu.parseMenuItem(menuItem);
if (m.owner == FORM_KEY && !m.disabled) {
switch (m.key) {
case "save":
@@ -404,7 +404,7 @@ function clickHandler(menuItem) {
//
//
function generateMenu(vm) {
var menuOptions = {
let menuOptions = {
isMain: false,
icon: null,
title: window.$gz.translation.get("PickListTemplates"),
@@ -461,7 +461,7 @@ function initForm(vm) {
// Ensures UI translated text is available
//
function fetchTranslatedText(vm) {
var tKeysRequired = ["Include", "ResetToDefault"];
let tKeysRequired = ["Include", "ResetToDefault"];
return window.$gz.translation.fetch(tKeysRequired);
}
@@ -487,12 +487,12 @@ function synthesizeWorkingArray(vm) {
if (vm.obj.template == null) {
return;
}
var template = JSON.parse(vm.obj.template);
let template = JSON.parse(vm.obj.template);
//first, insert the templated fields into the working array so they are in current selected order
for (var i = 0; i < template.length; i++) {
var templateItem = template[i];
var afItem = window.$gz._.find(vm.availableFields, [
for (let i = 0; i < template.length; i++) {
let templateItem = template[i];
let afItem = window.$gz._.find(vm.availableFields, [
"fieldKey",
templateItem.fld
]);
@@ -509,8 +509,8 @@ function synthesizeWorkingArray(vm) {
}
//Now iterate all the available fields and insert the ones that were not in the current template
for (var i = 0; i < vm.availableFields.length; i++) {
var afItem = vm.availableFields[i];
for (let i = 0; i < vm.availableFields.length; i++) {
let afItem = vm.availableFields[i];
//skip the active column
if (afItem.isActiveColumn == true) {
continue;