From 5c9b64d00556e94160886ad77b45da92c3aed973 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 10 Apr 2020 21:05:16 +0000
Subject: [PATCH]

---
 ayanova/src/views/ay-history.vue | 53 ++++++++++++++++++++++----------
 ayanova/src/views/widget.vue     |  4 ---
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/ayanova/src/views/ay-history.vue b/ayanova/src/views/ay-history.vue
index 8ed9a11a..d6ef3895 100644
--- a/ayanova/src/views/ay-history.vue
+++ b/ayanova/src/views/ay-history.vue
@@ -47,7 +47,7 @@ export default {
   data() {
     return {
       obj: [],
-      eventTypes: [],
+      eventTypes: {},
       lastOffset: 0,
       formState: {
         ready: false,
@@ -115,7 +115,7 @@ export default {
                 languageName,
                 hour12
               );
-              temp[i].index = i; //TODO: PAGING
+              for (let i = 0; i < vm.eventTypes.length; i) temp[i].index = i; //TODO: PAGING
             }
 
             vm.obj = temp; //TODO: PAGING
@@ -196,21 +196,40 @@ function initForm(vm) {
 //
 //
 function populateSelectionLists(vm) {
-  vm.eventTypes.push(
-    ...[
-      { name: vm.$ay.t("EventDeleted"), id: 0 },
-      { name: vm.$ay.t("EventCreated"), id: 1 },
-      { name: vm.$ay.t("EventRetrieved"), id: 2 },
-      { name: vm.$ay.t("EventModified"), id: 3 },
-      { name: vm.$ay.t("EventAttachmentCreate"), id: 4 },
-      { name: vm.$ay.t("EventAttachmentDelete"), id: 5 },
-      { name: vm.$ay.t("EventAttachmentDownload"), id: 6 },
-      { name: vm.$ay.t("EventLicenseFetch"), id: 7 },
-      { name: vm.$ay.t("EventLicenseTrialRequest"), id: 8 },
-      { name: vm.$ay.t("EventServerStateChange"), id: 9 },
-      { name: vm.$ay.t("EventSeedDatabase"), id: 10 }
-    ]
-  );
+  vm.eventTypes = {
+    0: { name: vm.$ay.t("EventDeleted"), icon: "fa-trash-alt" },
+    1: { name: vm.$ay.t("EventCreated"), icon: "fa-plus" },
+    2: {
+      name: vm.$ay.t("EventRetrieved"),
+      icon: "fa-arrow-circle-down"
+    },
+    3: { name: vm.$ay.t("EventModified"), icon: "fa-save" },
+    4: {
+      name: vm.$ay.t("EventAttachmentCreate"),
+      icon: "fa-plus"
+    },
+    5: {
+      name: vm.$ay.t("EventAttachmentDelete"),
+      icon: "fa-trash-alt"
+    },
+    6: {
+      name: vm.$ay.t("EventAttachmentDownload"),
+      icon: "fa-arrow-circle-down"
+    },
+    7: {
+      name: vm.$ay.t("EventLicenseFetch"),
+      icon: "fa-ticket-alt"
+    },
+    8: {
+      name: vm.$ay.t("EventLicenseTrialRequest"),
+      icon: "fa-arrow-circle-down"
+    },
+    9: {
+      name: vm.$ay.t("EventServerStateChange"),
+      icon: "fa-plus"
+    },
+    10: { name: vm.$ay.t("EventSeedDatabase"), icon: "fa-plus" }
+  };
 }
 
 //////////////////////////////////////////////////////////
diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue
index db2ac251..a503f442 100644
--- a/ayanova/src/views/widget.vue
+++ b/ayanova/src/views/widget.vue
@@ -662,10 +662,6 @@ function generateMenu(vm) {
     });
   }
 
-  //todo: get the last used report from the vuex form state and
-  //insert it here if it exists.
-  //was going to do multiple but that's a lot of fuckery and space eating
-
   if (vm.rights.change) {
     menuOptions.menuItems.push({
       title: vm.$ay.t("New"),