Merge branch 'fix_1.10.6'

luisgasco · Sep 12, 2021 · d5234f7 · d5234f7
2 parents c5644f6 + e69d751
commit d5234f7
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -38,6 +38,9 @@ Version 1.10.4
 Version 1.10.5
 - Allow using a relative date value in `initMonth` in the month view
 
+Version 1.10.6
+- Fixed the coloring for missing data in the month view
+
 ## !!! Breaking Changes !!!
 
 From version 1.9.0, template variables, e.g. '{{sum}}', are deprecated. Instead, Tracker provide operators (+, -, *, /, %) and functions (dataset(), sum(), maxStreak(), ......etc) to help us do data processing. For users having code blocks from previous version, please replace '{{sum}}' by '{{sum()}}' or '{{sum(1)}}' by '{{sum(dataset(1))}}'. More information about the new expressions could be found [here](https://github.com/pyrochlore/obsidian-tracker/blob/master/docs/Expressions.md).

diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
@@ -1,5 +1,8 @@
 # Release Notes
 
+## v1.10.6
+- Fixed the coloring for missing data in the month view
+
 ## v1.10.5
 - Allow using a relative date value in `initMonth` in the month view
 

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.10.5",
+	"version": "1.10.6",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.10.5",
+  "version": "1.10.6",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {

diff --git a/src/month.ts b/src/month.ts
@@ -602,7 +602,7 @@ function renderMonthDays(
             helper.dateToStr(curDate, renderInfo.dateFormat),
             renderInfo.dateFormat
         );
-        if (curDate.format("YYYY-MM-DD") === "2021-01-02") {
+        if (curDate.format("YYYY-MM-DD") === "2021-09-13") {
             logToConsole = false; // Change this to do dubugging
         }
 
@@ -640,7 +640,6 @@ function renderMonthDays(
         if (logToConsole) {
             console.log(dataset);
             console.log(helper.dateToStr(curDate, renderInfo.dateFormat));
-            console.log(dataset.getValue(window.moment("2021-01-02")));
             console.log(curValue);
         }
 
@@ -672,9 +671,11 @@ function renderMonthDays(
                 scaledValue = (curValue - yMin) / (yMax - yMin);
             }
         }
-        // console.log(yMin);
-        // console.log(yMax);
-        // console.log(scaledValue);
+        if (logToConsole) {
+            console.log(yMin);
+            console.log(yMax);
+            console.log(scaledValue);
+        }
 
         // streakIn and streakOut
         let nextValue = dataset.getValue(curDate, 1);
@@ -803,7 +804,7 @@ function renderMonthDays(
                             streakColor
                         )(d.scaledValue * 0.8 + 0.2);
                     } else {
-                        return streakColor;
+                        return "none";
                     }
                 }
                 return "none";
@@ -850,7 +851,7 @@ function renderMonthDays(
                             streakColor
                         )(d.scaledValue * 0.8 + 0.2);
                     } else {
-                        return streakColor;
+                        return "none";
                     }
                 }
                 return "none";
@@ -900,7 +901,7 @@ function renderMonthDays(
                         // console.log(scaledColor);
                         return scaledColor;
                     } else {
-                        return circleColor;
+                        return "none";
                     }
                 }
                 return "none";

diff --git a/versions.json b/versions.json
@@ -24,5 +24,6 @@
 	"1.10.2": "0.9.12",
 	"1.10.3": "0.9.12",
 	"1.10.4": "0.9.12",
-	"1.10.5": "0.9.12"
+	"1.10.5": "0.9.12",
+	"1.10.6": "0.9.12"
 }