implement more group_by options

kalkih · Sep 5, 2022 · 1c180a8 · 1c180a8
1 parent 8e70381
commit 1c180a8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/src/buildConfig.js b/src/buildConfig.js
@@ -161,6 +161,15 @@ export default (config) => {
 
   // override points per hour to mach group_by function
   switch (conf.group_by) {
+    case 'year':
+      conf.points_per_hour = 1 / (24 * 7 * 365);
+      break;
+    case 'month':
+      conf.points_per_hour = 1 / (24 * 7 * 4); // cheating a bit, this is actually 4 weeks
+      break;
+    case 'week':
+      conf.points_per_hour = 1 / (24 * 7);
+      break;
     case 'date':
       conf.points_per_hour = 1 / 24;
       break;

diff --git a/src/main.js b/src/main.js
@@ -983,8 +983,24 @@ class MiniGraphCard extends LitElement {
   }
 
   getEndDate() {
-    const date = new Date();
+    let date = new Date();
+    let monday = new Date();
+    let last = new Date();
     switch (this.config.group_by) {
+      case 'year':
+        date = new Date(date.getFullYear() + 1, 1, 1);
+        date.setHours(0, 0, 0);
+        break;
+      case 'month':
+        date = new Date(date.getFullYear(), date.getMonth() + 1, 1);
+        date.setHours(0, 0, 0);
+        break;
+      case 'week':
+        monday = date.getDate() - date.getDay() + 1;
+        last = monday + 7;
+        date = new Date(date.setDate(last));
+        date.setHours(0, 0, 0);
+        break;
       case 'date':
         date.setDate(date.getDate() + 1);
         date.setHours(0, 0, 0);