From 10397d11888503c9cc6bc373dbabefa2ca1595da Mon Sep 17 00:00:00 2001
From: Ralf Bauer <Ralf@Bauer-NSU.de>
Date: Sat, 3 Jun 2023 15:07:12 +0200
Subject: [PATCH] changed chart options

---
 webapp/src/components/BarChart.vue      |  2 +-
 webapp/src/components/CalendarChart.vue | 22 +++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/webapp/src/components/BarChart.vue b/webapp/src/components/BarChart.vue
index 77b9b16e..28d3ee54 100644
--- a/webapp/src/components/BarChart.vue
+++ b/webapp/src/components/BarChart.vue
@@ -62,7 +62,7 @@ export default defineComponent({
             energy.forEach((x: any[]) => {
                 var d = new Date(x[0] + 2000, x[1] - 1, x[2], x[3]);
                 if ((d >= start) && (d <= end)) {
-                    data.push([d, (x[4] - old_energy) * 1000])
+                    data.push([d, Math.round((x[4] - old_energy) * 1000)])
                 }
                 old_energy = x[4]
             })
diff --git a/webapp/src/components/CalendarChart.vue b/webapp/src/components/CalendarChart.vue
index 2cb77bb2..b32f4fde 100644
--- a/webapp/src/components/CalendarChart.vue
+++ b/webapp/src/components/CalendarChart.vue
@@ -12,21 +12,14 @@
 import { defineComponent, type PropType, h } from 'vue';
 import type { DatabaseStatus } from "@/types/DatabaseStatus";
 import { GChart } from 'vue-google-charts';
-//import { DatetimeFormat } from 'vue-i18n';
 
 var data: any;
 export const type = 'Calendar';
 export const options = {
-    legend: {
-        position: 'none'
+    calendar: {
+        cellSize: 22,
+        daysOfWeek: 'MTWTFSS',
     },
-    hAxis: {
-        format: 'dd.MM.YY HH:mm',
-        slantedText: true
-    },
-    vAxis: {
-        format: '# Wh'
-    }
 };
 export default defineComponent({
     components: {
@@ -42,7 +35,7 @@ export default defineComponent({
                 options,
                 type,
                 settings: {
-                    packages: ['calendar']
+                    packages: ['calendar'],
                 }
             });
     },
@@ -78,14 +71,9 @@ export default defineComponent({
                 }
                 last_energy = x[4]
                 d = new Date(x[0] + 2000, x[1] - 1, x[2], x[3])
-                a = [d, ((last_energy - old_energy) * 1000).toFixed(0)]
+                a = [d, Math.round((last_energy - old_energy) * 1000)]
             })
             data.push(a)
-
-            // var date_formatter = new google.visualization.DateFormat({
-            //     pattern: "dd.MM.YY HH:mm"
-            // });
-            // date_formatter.format(data, 0);
         }
     }
 });