admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-09-14 14:05:05 +00:00
parent 14adc5284f
commit 2a5cad343e
2 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ayanova/devdocs/todo.txt
View File

@@ -9,7 +9,9 @@ todo: need to be able to have a link system whereby a user can directly open a r
Maybe a report viewer page after all or phantom link with no page that just opens the report directly as if the user had gone through the objects edit form
Maybe even a report viewer URL that is based off the server and they never actually use the full client software?
meh
AyOpenObject type,recordid,reportid,
AyOpenObject type,recordid,reportid
idlist,datalist,filter?
todo: export from grid to xls, csv etc.

98
ayanova/src/views/ay-report-edit.vue
View File

@@ -152,7 +152,7 @@ export default {
vm.obj = vm.$route.params.obj;
window.$gz.form.setFormState({
vm: vm,
loading: false,
loading: false
});
} else {
await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
@@ -162,7 +162,7 @@ export default {
window.$gz.form.setFormState({
vm: vm,
loading: false,
loading: false
});
}
@@ -195,13 +195,13 @@ export default {
//Create the editor itself
editor = monaco.editor.create(document.getElementById("editContainer"), {
model: vm.editData.template.model,
model: vm.editData.template.model
});
//save the initial state because we're going to move away from it immediately
vm.editData.template.state = editor.saveViewState();
//change subscription
editor.onDidChangeModelContent((event) => {
editor.onDidChangeModelContent(event => {
const editorValue = editor.getValue();
// console.log("editorchange active tab=", vm.activeTab);
// console.log("editorchange, value of editor is", editorValue);
@@ -233,7 +233,7 @@ export default {
window.$gz.form.setFormState({
vm: vm,
dirty: false,
valid: true,
valid: true
});
generateMenu(vm);
@@ -270,24 +270,24 @@ export default {
editData: {
template: {
model: null,
state: null,
state: null
},
style: {
model: null,
state: null,
state: null
},
jsPrerender: {
model: null,
state: null,
state: null
},
jsHelpers: {
model: null,
state: null,
state: null
},
rawData: {
model: null,
state: null,
},
state: null
}
},
obj: {
id: 0,
@@ -322,7 +322,7 @@ export default {
Handlebars.registerHelper('loud', function (aString) {
return aString.toUpperCase()
})`,
renderType: 0,
renderType: 0
},
formState: {
ready: false,
@@ -332,16 +332,16 @@ Handlebars.registerHelper('loud', function (aString) {
loading: true,
errorBoxMessage: null,
appError: null,
serverError: {},
serverError: {}
},
rights: window.$gz.role.defaultRightsObject(),
ayaType: window.$gz.type.Report,
ayaType: window.$gz.type.Report
};
},
//WATCHERS
watch: {
formState: {
handler: function (val) {
handler: function(val) {
//,oldval is available here too if necessary
if (this.formState.loading) {
return;
@@ -381,8 +381,8 @@ Handlebars.registerHelper('loud', function (aString) {
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":new");
}
},
deep: true,
},
deep: true
}
},
methods: {
//alternate method, one editor with tabs example
@@ -474,13 +474,13 @@ Handlebars.registerHelper('loud', function (aString) {
}
});
},
canSave: function () {
canSave: function() {
return this.formState.valid && this.formState.dirty;
},
canDuplicate: function () {
canDuplicate: function() {
return this.formState.valid && !this.formState.dirty;
},
ayaTypes: function () {
ayaTypes: function() {
return window.$gz.type;
},
form() {
@@ -499,7 +499,7 @@ Handlebars.registerHelper('loud', function (aString) {
let vm = this;
window.$gz.form.setFormState({
vm: vm,
loading: true,
loading: true
});
if (!recordId) {
throw FORM_KEY + "::getDataFromApi -> Missing recordID!";
@@ -516,7 +516,7 @@ Handlebars.registerHelper('loud', function (aString) {
//notify not found error then navigate backwards
window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010"));
// navigate backwards
window.$gz._.delay(function () {
window.$gz._.delay(function() {
vm.$router.go(-1);
}, 2000);
}
@@ -531,7 +531,7 @@ Handlebars.registerHelper('loud', function (aString) {
vm: vm,
dirty: false,
valid: true,
loading: false,
loading: false
});
}
} catch (error) {
@@ -539,7 +539,7 @@ Handlebars.registerHelper('loud', function (aString) {
} finally {
window.$gz.form.setFormState({
vm: vm,
loading: false,
loading: false
});
}
},
@@ -558,7 +558,7 @@ Handlebars.registerHelper('loud', function (aString) {
try {
window.$gz.form.setFormState({
vm: vm,
loading: true,
loading: true
});
let url = "report/"; // + vm.$route.params.recordid;
//clear any errors vm might be around from previous submit
@@ -582,8 +582,8 @@ Handlebars.registerHelper('loud', function (aString) {
params: {
recordid: res.data.id,
obj: res.data, // Pass data object to new form
reportDataOptions: vm.$route.params.reportDataOptions,
},
reportDataOptions: vm.$route.params.reportDataOptions
}
});
} else {
//PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
@@ -594,7 +594,7 @@ Handlebars.registerHelper('loud', function (aString) {
window.$gz.form.setFormState({
vm: vm,
dirty: false,
valid: true,
valid: true
});
}
} catch (ex) {
@@ -602,7 +602,7 @@ Handlebars.registerHelper('loud', function (aString) {
} finally {
window.$gz.form.setFormState({
vm: vm,
loading: false,
loading: false
});
}
},
@@ -617,7 +617,7 @@ Handlebars.registerHelper('loud', function (aString) {
//do the delete
window.$gz.form.setFormState({
vm: vm,
loading: true,
loading: true
});
//No need to delete a new record, just abandon it...
if (vm.$route.params.recordid == 0) {
@@ -645,7 +645,7 @@ Handlebars.registerHelper('loud', function (aString) {
//Update the form status
window.$gz.form.setFormState({
vm: vm,
loading: false,
loading: false
});
window.$gz.errorHandler.handleFormError(error, vm);
}
@@ -657,7 +657,7 @@ Handlebars.registerHelper('loud', function (aString) {
}
window.$gz.form.setFormState({
vm: vm,
loading: true,
loading: true
});
let url = "report/duplicate/" + vm.$route.params.recordid;
@@ -673,8 +673,8 @@ Handlebars.registerHelper('loud', function (aString) {
name: "ay-report-edit",
params: {
recordid: res.data.id,
obj: res.data, // Pass data object to new form
},
obj: res.data // Pass data object to new form
}
});
}
} catch (ex) {
@@ -682,7 +682,7 @@ Handlebars.registerHelper('loud', function (aString) {
} finally {
window.$gz.form.setFormState({
vm: vm,
loading: false,
loading: false
});
}
},
@@ -725,7 +725,7 @@ Handlebars.registerHelper('loud', function (aString) {
window.$gz.form.setFormState({
vm: vm,
loading: true,
loading: true
});
let url = "report/render";
@@ -749,11 +749,11 @@ Handlebars.registerHelper('loud', function (aString) {
} finally {
window.$gz.form.setFormState({
vm: vm,
loading: false,
loading: false
});
}
},
},
}
}
};
//end of vue object
@@ -779,7 +779,7 @@ async function clickHandler(menuItem) {
case "new":
m.vm.$router.push({
name: "ay-report-edit",
params: { recordid: 0, new: true },
params: { recordid: 0, new: true }
});
break;
case "duplicate":
@@ -809,9 +809,9 @@ function generateMenu(vm) {
helpUrl: "form-ay-report-edit",
formData: {
ayaType: window.$gz.type.Report,
recordId: vm.$route.params.recordid,
recordId: vm.$route.params.recordid
},
menuItems: [],
menuItems: []
};
if (vm.rights.change) {
@@ -820,7 +820,7 @@ function generateMenu(vm) {
icon: "fa-save",
surface: true,
key: FORM_KEY + ":save",
vm: vm,
vm: vm
});
}
if (vm.reportData != null) {
@@ -829,7 +829,7 @@ function generateMenu(vm) {
icon: "fa-print",
key: FORM_KEY + ":render",
surface: true,
vm: vm,
vm: vm
});
}
@@ -839,7 +839,7 @@ function generateMenu(vm) {
icon: "fa-trash-alt",
surface: false,
key: FORM_KEY + ":delete",
vm: vm,
vm: vm
});
}
@@ -868,7 +868,7 @@ function generateMenu(vm) {
title: "New",
icon: "fa-plus",
key: FORM_KEY + ":new",
vm: vm,
vm: vm
});
}
@@ -877,7 +877,7 @@ function generateMenu(vm) {
title: "Duplicate",
icon: "fa-clone",
key: FORM_KEY + ":duplicate",
vm: vm,
vm: vm
});
}
@@ -893,7 +893,7 @@ function generateMenu(vm) {
href: href,
target: "_blank",
key: FORM_KEY + ":export",
vm: vm,
vm: vm
});
}
@@ -920,7 +920,7 @@ async function fetchTranslatedText(vm) {
"ReportEditorMobileWarning",
"ReportNotes",
"ReportTemplate",
"AuthorizationRoles",
"AuthorizationRoles"
]);
}