This commit is contained in:
2020-10-06 13:52:31 +00:00
parent 0c895f83b0
commit bf740b2b6c
21 changed files with 90 additions and 47 deletions

View File

@@ -11,12 +11,12 @@ const icons = {
powerpoint: "$ayiFilePowerpoint", powerpoint: "$ayiFilePowerpoint",
excel: "$ayiFileExcel", excel: "$ayiFileExcel",
csv: "$ayiFileCsv", csv: "$ayiFileCsv",
audio: "fa-file-audio", audio: "$ayiFileAudio",
video: "fa-file-video", video: "$ayiFileVidio",
archive: "$ayiFileArchive", archive: "$ayiFileArchive",
code: "fa-file-code", code: "$ayiFileCode",
text: "fa-file-alt", text: "$ayiFileAlt",
file: "fa-file" file: "$ayiFile"
}; };
const mimeTypes = { const mimeTypes = {
"image/gif": icons.image, "image/gif": icons.image,
@@ -316,7 +316,7 @@ export default {
case window.$gz.type.ServerJob: case window.$gz.type.ServerJob:
return "$ayiRobot"; return "$ayiRobot";
case window.$gz.type.AyaNova7Import: case window.$gz.type.AyaNova7Import:
return "fa-file-import"; return "$ayiFile-import";
case window.$gz.type.TrialSeeder: case window.$gz.type.TrialSeeder:
return "fa-seedling"; return "fa-seedling";
case window.$gz.type.Metrics: case window.$gz.type.Metrics:
@@ -351,7 +351,7 @@ export default {
" " + " " +
mimeType mimeType
); );
return "fa-file"; return "$ayiFile";
} }
if (!mimeType) { if (!mimeType) {
@@ -369,7 +369,7 @@ export default {
return iconFromExtension; return iconFromExtension;
} }
return "fa-file"; return "$ayiFile";
}, },
/////////////////////////////////////////////// ///////////////////////////////////////////////
// attempt to detect image extension name // attempt to detect image extension name

View File

@@ -316,7 +316,10 @@
</v-col> </v-col>
</v-row> </v-row>
<v-btn depressed tile @click="toggleReveal"> <v-btn depressed tile @click="toggleReveal">
Wiki<v-icon v-text="reveal ? '$ayiEyeSlash' : '$ayiEye'" right></v-icon Wiki<v-icon
v-text="reveal ? '$ayiEyeSlash' : '$ayiEye'"
right
></v-icon
></v-btn> ></v-btn>
</v-sheet> </v-sheet>
</template> </template>

View File

@@ -38,7 +38,11 @@ import {
faEye, faEye,
faEyeSlash, faEyeSlash,
faFan, faFan,
faFile,
faFileAlt,
faFileArchive, faFileArchive,
faFileAudio,
faFileCode,
faFileContract, faFileContract,
faFileCsv, faFileCsv,
faFileExcel, faFileExcel,
@@ -46,6 +50,7 @@ import {
faFileMedicalAlt, faFileMedicalAlt,
faFilePdf, faFilePdf,
faFilePowerpoint, faFilePowerpoint,
faFileVideo,
faFileWord, faFileWord,
faFolder, faFolder,
faHistory, faHistory,
@@ -111,7 +116,11 @@ library.add(
faEye, faEye,
faEyeSlash, faEyeSlash,
faFan, faFan,
faFile,
faFileAlt,
faFileArchive, faFileArchive,
faFileAudio,
faFileCode,
faFileContract, faFileContract,
faFileCsv, faFileCsv,
faFileExcel, faFileExcel,
@@ -119,6 +128,7 @@ library.add(
faFileMedicalAlt, faFileMedicalAlt,
faFilePdf, faFilePdf,
faFilePowerpoint, faFilePowerpoint,
faFileVideo,
faFileWord, faFileWord,
faFolder, faFolder,
faHistory, faHistory,
@@ -300,12 +310,36 @@ const CUSTOM_ICONS = {
icon: ["fas", "fan"] icon: ["fas", "fan"]
} }
}, },
ayiFile: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "file"]
}
},
ayiFileArchive: { ayiFileArchive: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {
icon: ["fas", "file-archive"] icon: ["fas", "file-archive"]
} }
}, },
ayiFileAlt: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "file-alt"]
}
},
ayiFileAudio: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "file-audio"]
}
},
ayiFileCode: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "file-code"]
}
},
ayiFileContract: { ayiFileContract: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {
@@ -348,6 +382,12 @@ const CUSTOM_ICONS = {
icon: ["fas", "file-powerpoint"] icon: ["fas", "file-powerpoint"]
} }
}, },
ayiFileVidio: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "file-vidio"]
}
},
ayiFileWord: { ayiFileWord: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {

View File

@@ -297,14 +297,14 @@ function generateMenu(vm) {
//Report not Print, print is a further option //Report not Print, print is a further option
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "Report", title: "Report",
icon: "fa-file-alt", icon: "$ayiFileAlt",
key: FORM_KEY + ":report", key: FORM_KEY + ":report",
vm: vm vm: vm
}); });
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "stub: Last report used", title: "stub: Last report used",
icon: "fa-file-alt", icon: "$ayiFileAlt",
key: FORM_KEY + ":report:STUBlastusedreportid", key: FORM_KEY + ":report:STUBlastusedreportid",
vm: vm vm: vm
}); });

View File

@@ -87,14 +87,14 @@ function generateMenu(vm) {
// //Report not Print, print is a further option // //Report not Print, print is a further option
// menuOptions.menuItems.push({ // menuOptions.menuItems.push({
// title: "Report", // title: "Report",
// icon: "fa-file-alt", // icon: "$ayiFileAlt",
// key: FORM_KEY + ":report", // key: FORM_KEY + ":report",
// vm: vm // vm: vm
// }); // });
// menuOptions.menuItems.push({ // menuOptions.menuItems.push({
// title: "stub: Last report used", // title: "stub: Last report used",
// icon: "fa-file-alt", // icon: "$ayiFileAlt",
// key: FORM_KEY + ":report:STUBlastusedreportid", // key: FORM_KEY + ":report:STUBlastusedreportid",
// vm: vm // vm: vm
// }); // });

View File

@@ -15,7 +15,7 @@
v-model="uploadFiles" v-model="uploadFiles"
:label="$ay.t('Import')" :label="$ay.t('Import')"
accept=".ayrt" accept=".ayrt"
prepend-icon="fa-file-upload" prepend-icon="$ayiFile-upload"
multiple multiple
chips chips
></v-file-input> ></v-file-input>
@@ -135,14 +135,14 @@ function generateMenu(vm) {
// //Report not Print, print is a further option // //Report not Print, print is a further option
// menuOptions.menuItems.push({ // menuOptions.menuItems.push({
// title: "Report", // title: "Report",
// icon: "fa-file-alt", // icon: "$ayiFileAlt",
// key: FORM_KEY + ":report", // key: FORM_KEY + ":report",
// vm: vm // vm: vm
// }); // });
// menuOptions.menuItems.push({ // menuOptions.menuItems.push({
// title: "stub: Last report used", // title: "stub: Last report used",
// icon: "fa-file-alt", // icon: "$ayiFileAlt",
// key: FORM_KEY + ":report:STUBlastusedreportid", // key: FORM_KEY + ":report:STUBlastusedreportid",
// vm: vm // vm: vm
// }); // });

View File

@@ -622,7 +622,7 @@ function generateMenu(vm) {
//Report not Print, print is a further option //Report not Print, print is a further option
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "Report", title: "Report",
icon: "fa-file-alt", icon: "$ayiFileAlt",
key: FORM_KEY + ":report", key: FORM_KEY + ":report",
vm: vm vm: vm
}); });
@@ -632,7 +632,7 @@ function generateMenu(vm) {
if (lastReport != null) { if (lastReport != null) {
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: lastReport.name, title: lastReport.name,
icon: "fa-file-alt", icon: "$ayiFileAlt",
key: FORM_KEY + ":report:" + lastReport.id, key: FORM_KEY + ":report:" + lastReport.id,
vm: vm vm: vm
}); });
@@ -664,7 +664,7 @@ function generateMenu(vm) {
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "Export", title: "Export",
icon: "fa-file-download", icon: "$ayiFile-download",
href: href, href: href,
target: "_blank", target: "_blank",
key: FORM_KEY + ":export", key: FORM_KEY + ":export",

View File

@@ -15,7 +15,7 @@
v-model="uploadFiles" v-model="uploadFiles"
:label="$ay.t('Import')" :label="$ay.t('Import')"
accept="application/json" accept="application/json"
prepend-icon="fa-file-upload" prepend-icon="$ayiFile-upload"
multiple multiple
chips chips
></v-file-input> ></v-file-input>
@@ -135,14 +135,14 @@ function generateMenu(vm) {
// //Report not Print, print is a further option // //Report not Print, print is a further option
// menuOptions.menuItems.push({ // menuOptions.menuItems.push({
// title: "Report", // title: "Report",
// icon: "fa-file-alt", // icon: "$ayiFileAlt",
// key: FORM_KEY + ":report", // key: FORM_KEY + ":report",
// vm: vm // vm: vm
// }); // });
// menuOptions.menuItems.push({ // menuOptions.menuItems.push({
// title: "stub: Last report used", // title: "stub: Last report used",
// icon: "fa-file-alt", // icon: "$ayiFileAlt",
// key: FORM_KEY + ":report:STUBlastusedreportid", // key: FORM_KEY + ":report:STUBlastusedreportid",
// vm: vm // vm: vm
// }); // });

View File

@@ -695,7 +695,7 @@ function generateMenu(vm) {
//Report not Print, print is a further option //Report not Print, print is a further option
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "Report", title: "Report",
icon: "fa-file-alt", icon: "$ayiFileAlt",
key: FORM_KEY + ":report", key: FORM_KEY + ":report",
vm: vm vm: vm
}); });
@@ -705,7 +705,7 @@ function generateMenu(vm) {
if (lastReport != null) { if (lastReport != null) {
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: lastReport.name, title: lastReport.name,
icon: "fa-file-alt", icon: "$ayiFileAlt",
key: FORM_KEY + ":report:" + lastReport.id, key: FORM_KEY + ":report:" + lastReport.id,
vm: vm vm: vm
}); });

View File

@@ -228,14 +228,14 @@ function generateMenu(vm) {
//Report not Print, print is a further option //Report not Print, print is a further option
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "Report", title: "Report",
icon: "fa-file-alt", icon: "$ayiFileAlt",
key: FORM_KEY + ":report", key: FORM_KEY + ":report",
vm: vm vm: vm
}); });
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "stub: Last report used", title: "stub: Last report used",
icon: "fa-file-alt", icon: "$ayiFileAlt",
key: FORM_KEY + ":report:STUBlastusedreportid", key: FORM_KEY + ":report:STUBlastusedreportid",
vm: vm vm: vm
}); });

View File

@@ -425,7 +425,7 @@ function populateEventTypeList(vm) {
}, },
6: { 6: {
name: vm.$ay.t("EventAttachmentDownload"), name: vm.$ay.t("EventAttachmentDownload"),
icon: "fa-file-download" icon: "$ayiFile-download"
}, },
7: { 7: {
name: vm.$ay.t("EventLicenseFetch"), name: vm.$ay.t("EventLicenseFetch"),
@@ -445,7 +445,7 @@ function populateEventTypeList(vm) {
13: { name: vm.$ay.t("EventResetSerial"), icon: "fa-egg" }, 13: { name: vm.$ay.t("EventResetSerial"), icon: "fa-egg" },
13: { 13: {
name: vm.$ay.t("EventUtilityFileDownload"), name: vm.$ay.t("EventUtilityFileDownload"),
icon: "fa-file-download" icon: "$ayiFile-download"
} }
}; };
} }

View File

@@ -1092,7 +1092,7 @@ function generateMenu(vm) {
// //Report not Print, print is a further option // //Report not Print, print is a further option
// menuOptions.menuItems.push({ // menuOptions.menuItems.push({
// title: "Report", // title: "Report",
// icon: "fa-file-alt", // icon: "$ayiFileAlt",
// key: FORM_KEY + ":report", // key: FORM_KEY + ":report",
// vm: vm // vm: vm
// }); // });
@@ -1102,7 +1102,7 @@ function generateMenu(vm) {
// if (lastReport != null) { // if (lastReport != null) {
// menuOptions.menuItems.push({ // menuOptions.menuItems.push({
// title: lastReport.name, // title: lastReport.name,
// icon: "fa-file-alt", // icon: "$ayiFileAlt",
// key: FORM_KEY + ":report:" + lastReport.id, // key: FORM_KEY + ":report:" + lastReport.id,
// vm: vm // vm: vm
// }); // });
@@ -1134,7 +1134,7 @@ function generateMenu(vm) {
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "Export", title: "Export",
icon: "fa-file-download", icon: "$ayiFile-download",
href: href, href: href,
target: "_blank", target: "_blank",
key: FORM_KEY + ":export", key: FORM_KEY + ":export",

View File

@@ -699,7 +699,7 @@ function generateMenu(vm) {
//Report not Print, print is a further option //Report not Print, print is a further option
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "Report", title: "Report",
icon: "fa-file-alt", icon: "$ayiFileAlt",
key: FORM_KEY + ":report", key: FORM_KEY + ":report",
vm: vm vm: vm
}); });
@@ -709,7 +709,7 @@ function generateMenu(vm) {
if (lastReport != null) { if (lastReport != null) {
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: lastReport.name, title: lastReport.name,
icon: "fa-file-alt", icon: "$ayiFileAlt",
key: FORM_KEY + ":report:" + lastReport.id, key: FORM_KEY + ":report:" + lastReport.id,
vm: vm vm: vm
}); });

View File

@@ -217,14 +217,14 @@ function generateMenu(vm) {
//Report not Print, print is a further option //Report not Print, print is a further option
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "Report", title: "Report",
icon: "fa-file-alt", icon: "$ayiFileAlt",
key: FORM_KEY + ":report", key: FORM_KEY + ":report",
vm: vm vm: vm
}); });
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "stub: Last report used", title: "stub: Last report used",
icon: "fa-file-alt", icon: "$ayiFileAlt",
key: FORM_KEY + ":report:STUBlastusedreportid", key: FORM_KEY + ":report:STUBlastusedreportid",
vm: vm vm: vm
}); });

View File

@@ -278,14 +278,14 @@ function generateMenu(vm) {
// //Report not Print, print is a further option // //Report not Print, print is a further option
// menuOptions.menuItems.push({ // menuOptions.menuItems.push({
// title: "Report", // title: "Report",
// icon: "fa-file-alt", // icon: "$ayiFileAlt",
// key: FORM_KEY + ":report", // key: FORM_KEY + ":report",
// vm: vm // vm: vm
// }); // });
// menuOptions.menuItems.push({ // menuOptions.menuItems.push({
// title: "stub: Last report used", // title: "stub: Last report used",
// icon: "fa-file-alt", // icon: "$ayiFileAlt",
// key: FORM_KEY + ":report:STUBlastusedreportid", // key: FORM_KEY + ":report:STUBlastusedreportid",
// vm: vm // vm: vm
// }); // });

View File

@@ -675,7 +675,7 @@ function generateMenu(vm) {
// //Report not Print, print is a further option // //Report not Print, print is a further option
// menuOptions.menuItems.push({ // menuOptions.menuItems.push({
// title: "Report", // title: "Report",
// icon: "fa-file-alt", // icon: "$ayiFileAlt",
// key: FORM_KEY + ":report", // key: FORM_KEY + ":report",
// vm: vm // vm: vm
// }); // });
@@ -685,7 +685,7 @@ function generateMenu(vm) {
// if (lastReport != null) { // if (lastReport != null) {
// menuOptions.menuItems.push({ // menuOptions.menuItems.push({
// title: lastReport.name, // title: lastReport.name,
// icon: "fa-file-alt", // icon: "$ayiFileAlt",
// key: FORM_KEY + ":report:" + lastReport.id, // key: FORM_KEY + ":report:" + lastReport.id,
// vm: vm // vm: vm
// }); // });

View File

@@ -181,14 +181,14 @@ function generateMenu(vm) {
// //Report not Print, print is a further option // //Report not Print, print is a further option
// menuOptions.menuItems.push({ // menuOptions.menuItems.push({
// title: "Report", // title: "Report",
// icon: "fa-file-alt", // icon: "$ayiFileAlt",
// key: FORM_KEY + ":report", // key: FORM_KEY + ":report",
// vm: vm // vm: vm
// }); // });
// menuOptions.menuItems.push({ // menuOptions.menuItems.push({
// title: "stub: Last report used", // title: "stub: Last report used",
// icon: "fa-file-alt", // icon: "$ayiFileAlt",
// key: FORM_KEY + ":report:STUBlastusedreportid", // key: FORM_KEY + ":report:STUBlastusedreportid",
// vm: vm // vm: vm
// }); // });

View File

@@ -79,7 +79,7 @@
<template v-slot:[`item.actions`]="{ item }"> <template v-slot:[`item.actions`]="{ item }">
<v-btn icon :href="item.url"> <v-btn icon :href="item.url">
<v-icon small class="mr-2"> <v-icon small class="mr-2">
fa-file-download $ayiFile-download
</v-icon> </v-icon>
</v-btn> </v-btn>
</template></v-data-table </template></v-data-table

View File

@@ -19,7 +19,7 @@
<template v-slot:[`item.actions`]="{ item }"> <template v-slot:[`item.actions`]="{ item }">
<v-btn icon :href="item.url"> <v-btn icon :href="item.url">
<v-icon small class="mr-2"> <v-icon small class="mr-2">
fa-file-download $ayiFile-download
</v-icon> </v-icon>
</v-btn> </v-btn>
</template></v-data-table </template></v-data-table

View File

@@ -708,7 +708,7 @@ function generateMenu(vm) {
//Report not Print, print is a further option //Report not Print, print is a further option
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "Report", title: "Report",
icon: "fa-file-alt", icon: "$ayiFileAlt",
key: FORM_KEY + ":report", key: FORM_KEY + ":report",
vm: vm vm: vm
}); });
@@ -718,7 +718,7 @@ function generateMenu(vm) {
if (lastReport != null) { if (lastReport != null) {
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: lastReport.name, title: lastReport.name,
icon: "fa-file-alt", icon: "$ayiFileAlt",
key: FORM_KEY + ":report:" + lastReport.id, key: FORM_KEY + ":report:" + lastReport.id,
vm: vm vm: vm
}); });

View File

@@ -136,7 +136,7 @@ function generateMenu(vm) {
//Report not Print, print is a further option //Report not Print, print is a further option
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "Report", title: "Report",
icon: "fa-file-alt", icon: "$ayiFileAlt",
key: FORM_KEY + ":report", key: FORM_KEY + ":report",
vm: vm vm: vm
}); });
@@ -146,7 +146,7 @@ function generateMenu(vm) {
if (lastReport != null) { if (lastReport != null) {
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: lastReport.name, title: lastReport.name,
icon: "fa-file-alt", icon: "$ayiFileAlt",
key: FORM_KEY + ":report:" + lastReport.id, key: FORM_KEY + ":report:" + lastReport.id,
vm: vm vm: vm
}); });