From 5018a227b42870f0ce3198d81d4f5d7c7458dffa Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 25 Feb 2022 20:08:26 +0000
Subject: [PATCH]

---
 ayanova/src/components/dash-base.vue          |  3 +-
 .../components/dash-labor-hours-personal.vue  | 18 ++++---
 .../src/components/dash-today-reminders.vue   | 52 ++++++++++---------
 ayanova/src/components/dash-today-reviews.vue | 52 ++++++++++---------
 .../components/dash-today-scheduled-wo.vue    | 52 ++++++++++---------
 5 files changed, 94 insertions(+), 83 deletions(-)

diff --git a/ayanova/src/components/dash-base.vue b/ayanova/src/components/dash-base.vue
index f8daf207..d5af0f31 100644
--- a/ayanova/src/components/dash-base.vue
+++ b/ayanova/src/components/dash-base.vue
@@ -1,5 +1,6 @@
 <template>
-  <v-sheet color="white" elevation="4" height="300px" style="overflow: hidden;">
+  <!-- <v-sheet color="white" elevation="4" height="400px" style="overflow: scroll;"> -->
+  <v-sheet color="white" height="420px" style="overflow: auto;" elevation="4">
     <slot name="dash-title">
       <v-toolbar flat dense>
         <template v-if="showMoreButton">
diff --git a/ayanova/src/components/dash-labor-hours-personal.vue b/ayanova/src/components/dash-labor-hours-personal.vue
index c5af127d..2a34f101 100644
--- a/ayanova/src/components/dash-labor-hours-personal.vue
+++ b/ayanova/src/components/dash-labor-hours-personal.vue
@@ -23,7 +23,7 @@
 
         <gz-chart-line
           :width="400"
-          :height="240"
+          :height="330"
           :chart-data="chartData"
           :options="timeLineChartOptions"
         />
@@ -46,6 +46,7 @@
             </v-card-title>
 
             <v-card-text style="height: 500px;">
+              {{ settings }}
               <v-select
                 v-model="localSettings.dateRange"
                 :items="selectLists.dateFilterTokens"
@@ -116,6 +117,9 @@ export default {
           xAxes: [
             {
               type: "time",
+              time: {
+                unit: this.settings.unit
+              },
               gridLines: {
                 drawOnChartArea: false
               }
@@ -140,9 +144,9 @@ export default {
       return {
         datasets: [
           {
-            label: this.$ay.t("BillableHours"),
+            label: this.$ay.t("WorkOrderItemLaborServiceRateQuantity"),
             borderColor: Palette.color.soft_deep_blue,
-            backgroundColor: Palette.color.soft_deep_blue,
+            //backgroundColor: Palette.color.soft_deep_blue,
             fill: false,
             radius: 0,
             hoverRadius: 10,
@@ -239,7 +243,7 @@ ORDER BY timeframe ASC
         if (res.error) {
           this.errorMessage = res.error;
         } else {
-          console.log(res);
+          // console.log(res);
           this.obj = res.data;
         }
       } catch (error) {
@@ -307,7 +311,8 @@ async function fetchTranslatedText() {
     "DateRangePreviousYearLastMonth",
     "DateRangePreviousYearNextMonth",
     "TimeSpanDays",
-    "TimeSpanMonths"
+    "TimeSpanMonths",
+    "WorkOrderItemLaborServiceRateQuantity"
   ]);
 }
 
@@ -321,10 +326,9 @@ function populateSelectionLists(vm) {
       { name: vm.$ay.t("DateRangeToday"), id: "*today*" },
       { name: vm.$ay.t("DateRangeLastWeek"), id: "*lastweek*" },
       { name: vm.$ay.t("DateRangeThisWeek"), id: "*thisweek*" },
-      { name: vm.$ay.t("DateRangeNextWeek"), id: "*nextweek*" },
+
       { name: vm.$ay.t("DateRangeLastMonth"), id: "*lastmonth*" },
       { name: vm.$ay.t("DateRangeThisMonth"), id: "*thismonth*" },
-      { name: vm.$ay.t("DateRangeNextMonth"), id: "*nextmonth*" },
       { name: vm.$ay.t("DateRange14DayWindow"), id: "*14daywindow*" },
       { name: vm.$ay.t("DateRangePast"), id: "*past*" },
       { name: vm.$ay.t("DateRangeLastYear"), id: "*lastyear*" }, //prior year from jan to dec
diff --git a/ayanova/src/components/dash-today-reminders.vue b/ayanova/src/components/dash-today-reminders.vue
index 6154e4c5..241efddd 100644
--- a/ayanova/src/components/dash-today-reminders.vue
+++ b/ayanova/src/components/dash-today-reminders.vue
@@ -10,31 +10,33 @@
     v-on="$listeners"
   >
     <template slot="main">
-      <v-calendar
-        ref="calendar"
-        color="primary"
-        type="day"
-        hide-header
-        :now="now"
-        :interval-count="intervalCount"
-        :first-time="startAt"
-        :events="events"
-        :event-color="getEventColor"
-        :locale="languageName"
-        @click:event="showEvent"
-      >
-        <template v-slot:event="{ event, eventSummary }">
-          <div>
-            <!-- eslint-disable vue/no-v-html -->
-            <span
-              :class="event.textColor + '--text'"
-              v-html="eventSummary()"
-            /><v-icon v-if="!event.editable" x-small :color="event.textColor">
-              $ayiLock</v-icon
-            >
-          </div>
-        </template>
-      </v-calendar>
+      <v-sheet height="345">
+        <v-calendar
+          ref="calendar"
+          color="primary"
+          type="day"
+          hide-header
+          :now="now"
+          :interval-count="intervalCount"
+          :first-time="startAt"
+          :events="events"
+          :event-color="getEventColor"
+          :locale="languageName"
+          @click:event="showEvent"
+        >
+          <template v-slot:event="{ event, eventSummary }">
+            <div>
+              <!-- eslint-disable vue/no-v-html -->
+              <span
+                :class="event.textColor + '--text'"
+                v-html="eventSummary()"
+              /><v-icon v-if="!event.editable" x-small :color="event.textColor">
+                $ayiLock</v-icon
+              >
+            </div>
+          </template>
+        </v-calendar>
+      </v-sheet>
     </template>
   </gz-dash>
 </template>
diff --git a/ayanova/src/components/dash-today-reviews.vue b/ayanova/src/components/dash-today-reviews.vue
index 41a1d273..11d389cf 100644
--- a/ayanova/src/components/dash-today-reviews.vue
+++ b/ayanova/src/components/dash-today-reviews.vue
@@ -9,31 +9,33 @@
     v-on="$listeners"
   >
     <template slot="main">
-      <v-calendar
-        ref="rvwcalendar"
-        color="primary"
-        type="day"
-        hide-header
-        :now="now"
-        :interval-count="intervalCount"
-        :first-time="startAt"
-        :events="events"
-        :event-color="getEventColor"
-        :locale="languageName"
-        @click:event="showEvent"
-      >
-        <template v-slot:event="{ event, eventSummary }">
-          <div>
-            <!-- eslint-disable vue/no-v-html -->
-            <span
-              :class="event.textColor + '--text'"
-              v-html="eventSummary()"
-            /><v-icon v-if="!event.editable" x-small :color="event.textColor">
-              $ayiLock</v-icon
-            >
-          </div>
-        </template>
-      </v-calendar>
+      <v-sheet height="345">
+        <v-calendar
+          ref="rvwcalendar"
+          color="primary"
+          type="day"
+          hide-header
+          :now="now"
+          :interval-count="intervalCount"
+          :first-time="startAt"
+          :events="events"
+          :event-color="getEventColor"
+          :locale="languageName"
+          @click:event="showEvent"
+        >
+          <template v-slot:event="{ event, eventSummary }">
+            <div>
+              <!-- eslint-disable vue/no-v-html -->
+              <span
+                :class="event.textColor + '--text'"
+                v-html="eventSummary()"
+              /><v-icon v-if="!event.editable" x-small :color="event.textColor">
+                $ayiLock</v-icon
+              >
+            </div>
+          </template>
+        </v-calendar>
+      </v-sheet>
     </template>
   </gz-dash>
 </template>
diff --git a/ayanova/src/components/dash-today-scheduled-wo.vue b/ayanova/src/components/dash-today-scheduled-wo.vue
index 6562f5e7..7c94885a 100644
--- a/ayanova/src/components/dash-today-scheduled-wo.vue
+++ b/ayanova/src/components/dash-today-scheduled-wo.vue
@@ -10,31 +10,33 @@
     v-on="$listeners"
   >
     <template slot="main">
-      <v-calendar
-        ref="calendar"
-        color="primary"
-        type="day"
-        hide-header
-        :now="now"
-        :interval-count="intervalCount"
-        :first-time="startAt"
-        :events="events"
-        :event-color="getEventColor"
-        :locale="languageName"
-        @click:event="showEvent"
-      >
-        <template v-slot:event="{ event, eventSummary }">
-          <div>
-            <!-- eslint-disable vue/no-v-html -->
-            <span
-              :class="event.textColor + '--text'"
-              v-html="eventSummary()"
-            /><v-icon v-if="!event.editable" x-small :color="event.textColor">
-              $ayiLock</v-icon
-            >
-          </div>
-        </template>
-      </v-calendar>
+      <v-sheet height="345">
+        <v-calendar
+          ref="calendar"
+          color="primary"
+          type="day"
+          hide-header
+          :now="now"
+          :interval-count="intervalCount"
+          :first-time="startAt"
+          :events="events"
+          :event-color="getEventColor"
+          :locale="languageName"
+          @click:event="showEvent"
+        >
+          <template v-slot:event="{ event, eventSummary }">
+            <div>
+              <!-- eslint-disable vue/no-v-html -->
+              <span
+                :class="event.textColor + '--text'"
+                v-html="eventSummary()"
+              /><v-icon v-if="!event.editable" x-small :color="event.textColor">
+                $ayiLock</v-icon
+              >
+            </div>
+          </template>
+        </v-calendar>
+      </v-sheet>
     </template>
   </gz-dash>
 </template>