re-factor / cleanup

This commit is contained in:
2022-01-11 22:08:38 +00:00
parent e871708b20
commit e0be8a7cfe
251 changed files with 14680 additions and 15693 deletions

View File

@@ -17,9 +17,9 @@
tile
color="primary"
group
@change="onViewChange"
mandatory
data-cy="viewChange"
@change="onViewChange"
>
<v-btn value="properties">
{{ $ay.t("ReportEditorProperties") }}
@@ -45,26 +45,26 @@
Helpers
</v-btn>
<v-btn value="rawData" v-if="reportData != null">
<v-btn v-if="reportData != null" value="rawData">
{{ $ay.t("ReportEditorData") }}
</v-btn>
</v-btn-toggle>
</v-col>
<v-col cols="12" v-show="view == 'edit'">
<v-col v-show="view == 'edit'" cols="12">
<div id="editContainer"></div>
</v-col>
<v-col cols="12" v-show="view == 'properties'">
<v-col v-show="view == 'properties'" cols="12">
<v-form ref="form">
<v-row>
<v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field
ref="name"
v-model="obj.name"
:readonly="formState.readOnly"
:label="$ay.t('ReportName')"
:rules="[form().required(this, 'name')]"
:error-messages="form().serverErrors(this, 'name')"
ref="name"
data-cy="name"
@input="fieldValueChanged('name')"
></v-text-field>
@@ -72,23 +72,23 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<gz-role-picker
:label="$ay.t('SelectRoles')"
v-model="obj.roles"
:readonly="formState.readOnly"
ref="roles"
v-model="obj.roles"
:label="$ay.t('SelectRoles')"
:readonly="formState.readOnly"
data-cy="roles"
:error-messages="form().serverErrors(this, 'roles')"
@input="fieldValueChanged('roles')"
limit-selection-to="inside"
@input="fieldValueChanged('roles')"
></gz-role-picker>
</v-col>
<v-col v-if="showIncludeDescendants" cols="12" sm="6" lg="4" xl="3">
<v-checkbox
ref="includeWoItemDescendants"
v-model="obj.includeWoItemDescendants"
:readonly="formState.readOnly"
:label="$ay.t('ReportIncludeAllWorkOrderItemDescendants')"
ref="includeWoItemDescendants"
data-cy="includeWoItemDescendants"
:error-messages="
form().serverErrors(this, 'includeWoItemDescendants')
@@ -98,13 +98,13 @@
</v-col>
<v-col cols="12" sm="6" lg="4" xl="3">
<v-select
ref="ayaType"
v-model="obj.aType"
:items="selectLists.coreAyaTypes"
item-text="name"
item-value="id"
:readonly="formState.readOnly"
:label="$ay.t('AyaType')"
ref="ayaType"
data-cy="ayaType"
:rules="[form().integerValid(this, 'aType')]"
:error-messages="form().serverErrors(this, 'aType')"
@@ -114,10 +114,10 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<v-checkbox
ref="active"
v-model="obj.active"
:readonly="formState.readOnly"
:label="$ay.t('Active')"
ref="active"
data-cy="active"
:error-messages="form().serverErrors(this, 'active')"
@change="fieldValueChanged('active')"
@@ -126,29 +126,29 @@
<v-col cols="12">
<v-textarea
ref="notes"
v-model="obj.notes"
:readonly="formState.readOnly"
:label="$ay.t('ReportNotes')"
:error-messages="form().serverErrors(this, 'notes')"
ref="notes"
data-cy="notes"
@input="fieldValueChanged('notes')"
auto-grow
@input="fieldValueChanged('notes')"
></v-textarea>
</v-col>
</v-row>
</v-form>
</v-col>
<v-col cols="12" v-show="view == 'pdfoptions'">
<v-col v-show="view == 'pdfoptions'" cols="12">
<v-form ref="formPDF">
<v-row>
<v-col cols="12" sm="6" lg="4" xl="3">
<v-checkbox
ref="displayHeaderFooter"
v-model="obj.displayHeaderFooter"
:readonly="formState.readOnly"
:label="$ay.t('ReportDisplayHeaderFooter')"
ref="displayHeaderFooter"
data-cy="displayHeaderFooter"
:error-messages="
form().serverErrors(this, 'displayHeaderFooter')
@@ -159,39 +159,39 @@
<v-col cols="12">
<v-textarea
ref="headerTemplate"
v-model="obj.headerTemplate"
:readonly="formState.readOnly"
:label="$ay.t('ReportHeaderTemplate')"
:error-messages="form().serverErrors(this, 'headerTemplate')"
ref="headerTemplate"
data-cy="headerTemplate"
@input="fieldValueChanged('headerTemplate', 'formPDF')"
auto-grow
@input="fieldValueChanged('headerTemplate', 'formPDF')"
></v-textarea>
</v-col>
<v-col cols="12">
<v-textarea
ref="footerTemplate"
v-model="obj.footerTemplate"
:readonly="formState.readOnly"
:label="$ay.t('ReportFooterTemplate')"
:error-messages="form().serverErrors(this, 'footerTemplate')"
ref="footerTemplate"
data-cy="footerTemplate"
@input="fieldValueChanged('footerTemplate', 'formPDF')"
auto-grow
@input="fieldValueChanged('footerTemplate', 'formPDF')"
></v-textarea>
</v-col>
<v-col cols="12" sm="6" lg="4" xl="3">
<v-select
ref="paperFormat"
v-model="obj.paperFormat"
:items="selectLists.PaperFormats"
item-text="name"
item-value="id"
:readonly="formState.readOnly"
:label="$ay.t('ReportPaperFormat')"
ref="paperFormat"
data-cy="paperFormat"
:error-messages="form().serverErrors(this, 'paperFormat')"
@input="fieldValueChanged('paperFormat', 'formPDF')"
@@ -200,10 +200,10 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<v-checkbox
ref="landscape"
v-model="obj.landscape"
:readonly="formState.readOnly"
:label="$ay.t('ReportLandscape')"
ref="landscape"
data-cy="landscape"
:error-messages="form().serverErrors(this, 'landscape')"
@change="fieldValueChanged('landscape', 'formPDF')"
@@ -212,13 +212,13 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field
ref="marginOptionsBottom"
v-model="obj.marginOptionsBottom"
:readonly="formState.readOnly"
:label="$ay.t('ReportMarginOptionsBottom')"
:error-messages="
form().serverErrors(this, 'marginOptionsBottom')
"
ref="marginOptionsBottom"
data-cy="marginOptionsBottom"
@input="fieldValueChanged('marginOptionsBottom', 'formPDF')"
></v-text-field>
@@ -226,11 +226,11 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field
ref="marginOptionsLeft"
v-model="obj.marginOptionsLeft"
:readonly="formState.readOnly"
:label="$ay.t('ReportMarginOptionsLeft')"
:error-messages="form().serverErrors(this, 'marginOptionsLeft')"
ref="marginOptionsLeft"
data-cy="marginOptionsLeft"
@input="fieldValueChanged('marginOptionsLeft', 'formPDF')"
></v-text-field>
@@ -238,13 +238,13 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field
ref="marginOptionsRight"
v-model="obj.marginOptionsRight"
:readonly="formState.readOnly"
:label="$ay.t('ReportMarginOptionsRight')"
:error-messages="
form().serverErrors(this, 'marginOptionsRight')
"
ref="marginOptionsRight"
data-cy="marginOptionsRight"
@input="fieldValueChanged('marginOptionsRight', 'formPDF')"
></v-text-field>
@@ -252,11 +252,11 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<v-text-field
ref="marginOptionsTop"
v-model="obj.marginOptionsTop"
:readonly="formState.readOnly"
:label="$ay.t('ReportMarginOptionsTop')"
:error-messages="form().serverErrors(this, 'marginOptionsTop')"
ref="marginOptionsTop"
data-cy="marginOptionsTop"
@input="fieldValueChanged('marginOptionsTop', 'formPDF')"
></v-text-field>
@@ -264,10 +264,10 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<v-checkbox
ref="preferCSSPageSize"
v-model="obj.preferCSSPageSize"
:readonly="formState.readOnly"
:label="$ay.t('ReportPreferCSSPageSize')"
ref="preferCSSPageSize"
data-cy="preferCSSPageSize"
:error-messages="form().serverErrors(this, 'preferCSSPageSize')"
@change="fieldValueChanged('preferCSSPageSize', 'formPDF')"
@@ -276,10 +276,10 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<v-checkbox
ref="printBackground"
v-model="obj.printBackground"
:readonly="formState.readOnly"
:label="$ay.t('ReportPrintBackground')"
ref="printBackground"
data-cy="printBackground"
:error-messages="form().serverErrors(this, 'printBackground')"
@change="fieldValueChanged('printBackground', 'formPDF')"
@@ -288,6 +288,7 @@
<v-col cols="12" sm="6" lg="4" xl="3">
<gz-decimal
ref="scale"
v-model="obj.scale"
:readonly="formState.readOnly"
:label="$ay.t('ReportScale')"
@@ -298,7 +299,6 @@
form().maxValueValid(this, 'scale', 2)
]"
:error-messages="form().serverErrors(this, 'scale')"
ref="scale"
data-cy="scale"
@input="fieldValueChanged('scale', 'formPDF')"
></gz-decimal>
@@ -318,6 +318,190 @@ const FORM_KEY = "ay-report-edit";
let JUST_DELETED = false;
let editor = null;
export default {
data() {
return {
reportData: null,
editAreaHeight: 300,
activeTab: "properties",
lastTab: "properties",
view: "edit",
editData: {
template: {
model: null,
state: null
},
style: {
model: null,
state: null
},
jsPrerender: {
model: null,
state: null
},
jsHelpers: {
model: null,
state: null
},
rawData: {
model: null,
state: null
}
},
obj: {
id: 0,
concurrency: 0,
name: "report",
includeWoItemDescendants: false,
active: true,
notes: "",
roles: 124927, //all except customers
aType: 0,
template: `<html>
<body>
{{#each ayReportData}}
<!-- Your template here see Help for details -->
<h2>{{ Name }}</h2>
{{/each}}
</body>
</html>`,
style: "",
jsPrerender: `async function ayPrepareData(ayData){
return ayData;
}`,
jsHelpers: "",
renderType: 0,
headerTemplate: null,
footerTemplate: null,
displayHeaderFooter: false,
paperFormat: 10,
landscape: false,
marginOptionsBottom: null,
marginOptionsLeft: null,
marginOptionsRight: null,
marginOptionsTop: null,
pageRanges: null,
preferCSSPageSize: false,
printBackground: false,
scale: 1 //Defaults to 1. Scale amount must be between 0.1 and 2.
},
formState: {
ready: false,
dirty: false,
valid: true,
readOnly: false,
loading: true,
errorBoxMessage: null,
appError: null,
serverError: {}
},
rights: window.$gz.role.defaultRightsObject(),
ayaType: window.$gz.type.Report,
rendering: false,
selectLists: {
PaperFormats: [
{ name: "-", id: 0 },
{ name: "A0", id: 1 },
{ name: "A1", id: 2 },
{ name: "A2", id: 3 },
{ name: "A3", id: 4 },
{ name: "A4", id: 5 },
{ name: "A5", id: 6 },
{ name: "A6", id: 7 },
{ name: "Ledger", id: 8 },
{ name: "Legal", id: 9 },
{ name: "Letter", id: 10 },
{ name: "Tabloid", id: 11 }
],
coreAyaTypes: []
}
};
},
computed: {
showIncludeDescendants: function() {
switch (this.obj.aType) {
case window.$gz.type.WorkOrderItem:
case window.$gz.type.WorkOrderItemExpense:
case window.$gz.type.WorkOrderItemLabor:
case window.$gz.type.WorkOrderItemLoan:
case window.$gz.type.WorkOrderItemPart:
case window.$gz.type.WorkOrderItemPartRequest:
case window.$gz.type.WorkOrderItemScheduledUser:
case window.$gz.type.WorkOrderItemTask:
case window.$gz.type.WorkOrderItemTravel:
case window.$gz.type.WorkOrderItemUnit:
case window.$gz.type.WorkOrderItemOutsideService:
case window.$gz.type.QuoteItem:
case window.$gz.type.QuoteItemExpense:
case window.$gz.type.QuoteItemLabor:
case window.$gz.type.QuoteItemLoan:
case window.$gz.type.QuoteItemPart:
case window.$gz.type.QuoteItemScheduledUser:
case window.$gz.type.QuoteItemTask:
case window.$gz.type.QuoteItemTravel:
case window.$gz.type.QuoteItemUnit:
case window.$gz.type.QuoteItemOutsideService:
case window.$gz.type.PMItem:
case window.$gz.type.PMItemExpense:
case window.$gz.type.PMItemLabor:
case window.$gz.type.PMItemLoan:
case window.$gz.type.PMItemPart:
case window.$gz.type.PMItemScheduledUser:
case window.$gz.type.PMItemTask:
case window.$gz.type.PMItemTravel:
case window.$gz.type.PMItemUnit:
case window.$gz.type.PMItemOutsideService:
return true;
default:
return false;
}
}
},
watch: {
formState: {
handler: function(val) {
if (this.formState.loading) {
return;
}
if (val.dirty && val.valid && !val.readOnly) {
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
} else {
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
}
//enable / disable RENDER button if it can be rendered (has data)
if (this.reportData != null) {
if (!val.dirty) {
//not disabling if invalid because that sometimes just means it needs to be re-run due to server error
//maybe more of an issue during development but for now it's annoying
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":render");
} else {
window.$gz.eventBus.$emit(
"menu-disable-item",
FORM_KEY + ":render"
);
}
}
if (!val.dirty && val.valid && !val.readOnly) {
window.$gz.eventBus.$emit(
"menu-enable-item",
FORM_KEY + ":duplicate"
);
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":new");
} else {
window.$gz.eventBus.$emit(
"menu-disable-item",
FORM_KEY + ":duplicate"
);
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":new");
}
},
deep: true
}
},
async created() {
const vm = this;
try {
@@ -455,191 +639,6 @@ export default {
//dispose all models and editor
editor && editor.dispose();
},
data() {
return {
reportData: null,
editAreaHeight: 300,
activeTab: "properties",
lastTab: "properties",
view: "edit",
editData: {
template: {
model: null,
state: null
},
style: {
model: null,
state: null
},
jsPrerender: {
model: null,
state: null
},
jsHelpers: {
model: null,
state: null
},
rawData: {
model: null,
state: null
}
},
obj: {
id: 0,
concurrency: 0,
name: "report",
includeWoItemDescendants: false,
active: true,
notes: "",
roles: 124927, //all except customers
aType: 0,
template: `<html>
<body>
{{#each ayReportData}}
<!-- Your template here see Help for details -->
<h2>{{ Name }}</h2>
{{/each}}
</body>
</html>`,
style: "",
jsPrerender: `async function ayPrepareData(ayData){
return ayData;
}`,
jsHelpers: "",
renderType: 0,
headerTemplate: null,
footerTemplate: null,
displayHeaderFooter: false,
paperFormat: 10,
landscape: false,
marginOptionsBottom: null,
marginOptionsLeft: null,
marginOptionsRight: null,
marginOptionsTop: null,
pageRanges: null,
preferCSSPageSize: false,
printBackground: false,
scale: 1 //Defaults to 1. Scale amount must be between 0.1 and 2.
},
formState: {
ready: false,
dirty: false,
valid: true,
readOnly: false,
loading: true,
errorBoxMessage: null,
appError: null,
serverError: {}
},
rights: window.$gz.role.defaultRightsObject(),
ayaType: window.$gz.type.Report,
rendering: false,
selectLists: {
PaperFormats: [
{ name: "-", id: 0 },
{ name: "A0", id: 1 },
{ name: "A1", id: 2 },
{ name: "A2", id: 3 },
{ name: "A3", id: 4 },
{ name: "A4", id: 5 },
{ name: "A5", id: 6 },
{ name: "A6", id: 7 },
{ name: "Ledger", id: 8 },
{ name: "Legal", id: 9 },
{ name: "Letter", id: 10 },
{ name: "Tabloid", id: 11 }
],
coreAyaTypes: []
}
};
},
watch: {
formState: {
handler: function(val) {
if (this.formState.loading) {
return;
}
if (val.dirty && val.valid && !val.readOnly) {
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
} else {
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
}
//enable / disable RENDER button if it can be rendered (has data)
if (this.reportData != null) {
if (!val.dirty) {
//not disabling if invalid because that sometimes just means it needs to be re-run due to server error
//maybe more of an issue during development but for now it's annoying
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":render");
} else {
window.$gz.eventBus.$emit(
"menu-disable-item",
FORM_KEY + ":render"
);
}
}
if (!val.dirty && val.valid && !val.readOnly) {
window.$gz.eventBus.$emit(
"menu-enable-item",
FORM_KEY + ":duplicate"
);
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":new");
} else {
window.$gz.eventBus.$emit(
"menu-disable-item",
FORM_KEY + ":duplicate"
);
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":new");
}
},
deep: true
}
},
computed: {
showIncludeDescendants: function() {
switch (this.obj.aType) {
case window.$gz.type.WorkOrderItem:
case window.$gz.type.WorkOrderItemExpense:
case window.$gz.type.WorkOrderItemLabor:
case window.$gz.type.WorkOrderItemLoan:
case window.$gz.type.WorkOrderItemPart:
case window.$gz.type.WorkOrderItemPartRequest:
case window.$gz.type.WorkOrderItemScheduledUser:
case window.$gz.type.WorkOrderItemTask:
case window.$gz.type.WorkOrderItemTravel:
case window.$gz.type.WorkOrderItemUnit:
case window.$gz.type.WorkOrderItemOutsideService:
case window.$gz.type.QuoteItem:
case window.$gz.type.QuoteItemExpense:
case window.$gz.type.QuoteItemLabor:
case window.$gz.type.QuoteItemLoan:
case window.$gz.type.QuoteItemPart:
case window.$gz.type.QuoteItemScheduledUser:
case window.$gz.type.QuoteItemTask:
case window.$gz.type.QuoteItemTravel:
case window.$gz.type.QuoteItemUnit:
case window.$gz.type.QuoteItemOutsideService:
case window.$gz.type.PMItem:
case window.$gz.type.PMItemExpense:
case window.$gz.type.PMItemLabor:
case window.$gz.type.PMItemLoan:
case window.$gz.type.PMItemPart:
case window.$gz.type.PMItemScheduledUser:
case window.$gz.type.PMItemTask:
case window.$gz.type.PMItemTravel:
case window.$gz.type.PMItemUnit:
case window.$gz.type.PMItemOutsideService:
return true;
default:
return false;
}
}
},
methods: {
onViewChange() {
const vm = this;
@@ -1028,7 +1027,7 @@ function generateMenu(vm) {
//
//
async function initForm(vm) {
await fetchTranslatedText(vm);
await fetchTranslatedText();
await populateSelectionLists(vm);
}
@@ -1036,7 +1035,7 @@ async function initForm(vm) {
//
// Ensures UI translated text is available
//
async function fetchTranslatedText(vm) {
async function fetchTranslatedText() {
await window.$gz.translation.cacheTranslations([
"ReportDesignReport",
"ReportName",
@@ -1081,7 +1080,7 @@ async function fetchReportData(vm) {
reportDataOptions["includeWoItemDescendants"] =
vm.obj.includeWoItemDescendants;
const res = await window.$gz.api.upsert("report/data", reportDataOptions);
if (!res.hasOwnProperty("data")) {
if (!Object.prototype.hasOwnProperty.call(res, "data")) {
return Promise.reject(res);
} else {
vm.reportData = res.data;