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-08-10 18:56:52 +00:00
parent fd40b893a5
commit fff19e390a
2 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ayanova/src/components/gz-data-table.vue
View File

@@ -737,7 +737,7 @@ function buildRecords(listData, columndefinitions) {
column.i != 0 column.i != 0
) { ) {
//yes so provide the ot (openable type) info needed for the grid to make this openable //yes so provide the ot (openable type) info needed for the grid to make this openable
// console.log("Openable type:", column); // console.log("Openable type:", column);
switch (column.v) { switch (column.v) {
//Not openable types //Not openable types
case 18: //DataListView case 18: //DataListView

45
ayanova/src/views/adm-global-logo.vue
View File

@@ -7,10 +7,7 @@
<v-row> <v-row>
<gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error> <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
<v-col cols="12"> <v-col cols="12">
<img :src="test()" /> <img class="grey lighten-2" :src="smallUrl" />
</v-col>
<v-col cols="12">
<img :src="imageUrl('small')" />
<v-file-input <v-file-input
v-model="uploadSmall" v-model="uploadSmall"
accept="image/*" accept="image/*"
@@ -22,7 +19,7 @@
}}</v-btn> }}</v-btn>
</v-col> </v-col>
<v-col cols="12" class="mt-10"> <v-col cols="12" class="mt-10">
<img class="mt-10 grey lighten-2" :src="imageUrl('medium')" /> <img class="mt-10 grey lighten-2" :src="mediumUrl" />
<v-file-input <v-file-input
v-model="uploadMedium" v-model="uploadMedium"
accept="image/*" accept="image/*"
@@ -34,7 +31,7 @@
}}</v-btn> }}</v-btn>
</v-col> </v-col>
<v-col cols="12" class="mt-10"> <v-col cols="12" class="mt-10">
<img class="mt-10 grey lighten-2" :src="imageUrl('large')" /> <img class="mt-10 grey lighten-2" :src="largeUrl" />
<v-file-input <v-file-input
v-model="uploadLarge" v-model="uploadLarge"
accept="image/*" accept="image/*"
@@ -73,6 +70,9 @@ export default {
//NOTE: this would normally be in getDataFromAPI but this form doesn't really need that function so doing it here //NOTE: this would normally be in getDataFromAPI but this form doesn't really need that function so doing it here
//modify the menu as necessary //modify the menu as necessary
generateMenu(vm); generateMenu(vm);
vm.smallUrl = `${window.$gz.api.logoUrl("small")}?x=${Date.now()}`;
vm.mediumUrl = `${window.$gz.api.logoUrl("medium")}?x=${Date.now()}`;
vm.largeUrl = `${window.$gz.api.logoUrl("large")}?x=${Date.now()}`;
vm.formState.loading = false; vm.formState.loading = false;
} catch (err) { } catch (err) {
@@ -85,6 +85,9 @@ export default {
uploadSmall: null, uploadSmall: null,
uploadMedium: null, uploadMedium: null,
uploadLarge: null, uploadLarge: null,
mediumUrl: null,
largeUrl: null,
smallUrl: null,
formState: { formState: {
ready: false, ready: false,
dirty: false, dirty: false,
@@ -99,9 +102,6 @@ export default {
}; };
}, },
methods: { methods: {
test() {
return "https://www.ayanova.com/images/AyaNovaIcon32.png";
},
imageUrl(size) { imageUrl(size) {
return window.$gz.api.logoUrl(size); return window.$gz.api.logoUrl(size);
}, },
@@ -122,25 +122,24 @@ export default {
default: default:
return; return;
} }
// let fileData = [];
// for (let i = 0; i < vm.uploadFiles.length; i++) {
// let f = vm.uploadFiles[i];
// fileData.push({ name: f.name, lastModified: f.lastModified });
// }
// let at = {
// ayaId: vm.ayaId,
// ayaType: vm.ayaType,
// files: vm.uploadFiles,
// fileData: JSON.stringify(fileData), //note this is required for an array or it will come to the server as a string [object,object]
// notes: vm.notes ? vm.notes : ""
// };
try { try {
let res = await window.$gz.api.uploadLogo(fileData, size); let res = await window.$gz.api.uploadLogo(fileData, size);
if (res.error) { if (res.error) {
window.$gz.errorHandler.handleFormError(res.error); window.$gz.errorHandler.handleFormError(res.error);
} else { } else {
// vm.uploadFiles = []; switch (size) {
// vm.updateDisplayList(res.data); case "small":
vm.smallUrl = `${window.$gz.api.logoUrl(size)}?x=${Date.now()}`;
break;
case "medium":
vm.mediumUrl = `${window.$gz.api.logoUrl(size)}?x=${Date.now()}`;
break;
case "large":
vm.largeUrl = `${window.$gz.api.logoUrl(size)}?x=${Date.now()}`;
break;
default:
return;
}
} }
} catch (error) { } catch (error) {
window.$gz.errorHandler.handleFormError(error); window.$gz.errorHandler.handleFormError(error);