Merge branch 'dev'

README.md

@@ -96,6 +96,10 @@ You can set the default folder location and date format in the plugin's settings
 For more information about the dateFormat settings, check the [TestDateFormats example](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestDateFormats.md) and [moment.js string format](https://momentjs.com/docs/#/parsing/string-format/). 
 
 ## Release Notes
+### v1.5.1
+- Fixed labels not shown in light theme
+- Enhanced error handling for searchType 'table'
+
 ### v1.5.0
 - New searchType 'table', searching records from a given table
 - New searchType 'dvField', searching the inline fields used with Dataview plugin

examples/ErrorMessages.md

@@ -1,6 +1,6 @@
 # Error Messages
 ## YAML
-Error parsing caused by the escaping character
+Error parsing caused by the escaping character --> YAMLParsError: Missing closing "quote"
 ``` tracker
 searchType: tag
 searchTarget: "\"
@@ -125,4 +125,14 @@ searchType: frontmatter, frontmatter
 searchTarget: bloodpressure[0], bloodpressure[1]
 line:
     titles: "Blood Pressure"
-``` 
+``` 
+
+## Table
+All dates are invalid, leads to an error message
+``` tracker
+searchType: table
+searchTarget: data/Tables[4][0], data/Tables[4][1]
+xDataset: 0
+line:
+	lineColor: none, yellow
+```

examples/TestTable.md

@@ -22,3 +22,22 @@ line:
     showLegend: true
     legendPosition: right
 ```
+
+## Tables with Defects
+``` tracker
+searchType: table
+searchTarget: data/Tables[2][0], data/Tables[2][1]
+xDataset: 0
+line:
+    lineColor: none, yellow
+```
+
+Wrong date format in Table
+``` tracker
+searchType: table
+searchTarget: data/Tables[3][0], data/Tables[3][1]
+xDataset: 0
+line:
+    lineColor: none, yellow
+```
+

examples/data/Tables.md

@@ -29,3 +29,28 @@
 | 2021-05-08 | 6.25 @ 5.55 | 
 | 2021-05-09 | 6.25 @ 5.45 | 
 | 2021-05-10 | 6.35 @ 5.75 | 
+
+## Tables with Defects
+More columns than need, graph still rendered
+
+ Date | Weight (kg) | 
+| - | - | - 
+| 2021-05-01 | 60.0 | 20.1 |
+ 2021-05-02 | 62.1 | 20.5 
+ | 2021-05-03 | 62.2 | 20.3 |
+
+The row with wrong date format will be skipped
+
+  Date | Weight (kg) | 
+| - | - | - 
+| not a date | 60.0 | 20.1 |
+ 2021-05-02 | 62.1 | 20.5 
+  | 2021-05-03 | 62.2 | 20.3 |
+
+All dates are invalid, leads to an error message
+
+  Date | Weight (kg) | 
+| - | - | - 
+| not a date | 60.0 | 20.1 |
+ not a date | 62.1 | 20.5 
+  | not a date | 62.2 | 20.3 |

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-tracker",
 	"name": "Tracker",
-	"version": "1.5.0",
+	"version": "1.5.1",
 	"minAppVersion": "0.9.12",
 	"description": "A plugin tracks occurrences and numbers in your notes",
 	"author": "pyrochlore",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "obsidian-tracker",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "A plugin tracks occurrences and numbers in your notes",
   "main": "main.js",
   "scripts": {

src/main.ts

@@ -473,7 +473,8 @@ export default class Tracker extends Plugin {
             let columnXDataset = xDatasetQuery.getAccessor(1);
             if (columnXDataset >= numColumns) continue;
             let xValues = [];
-
+
+            let indLine = 0;
             for (let tableLine of tableLines) {
                 let dataRow = helper.trimByChar(tableLine.trim(), "|");
                 let dataRowSplitted = dataRow.split("|");
@@ -494,11 +495,28 @@ export default class Tracker extends Plugin {
                         }
                     }
 
-                    xValues.push(date);
+                    if (date.isValid()) {
+                        xValues.push(date);
+                    }
+                    else {
+                        xValues.push(null);
+                    }
+
                 }
+                else {
+                    xValues.push(null);
+                }
+                indLine++;
             }
             // console.log(xValues);
 
+            if (xValues.every(v => v === null)) {
+                let errorMessage = "No valid X value found";
+                renderErrorMessage(canvas, errorMessage);
+                el.appendChild(canvas);
+                return;
+            }
+
             // get y data
             for (let yDatasetQuery of yDatasetQueries) {
                 let columnOfInterest = yDatasetQuery.getAccessor(1);
@@ -516,14 +534,16 @@ export default class Tracker extends Plugin {
                         if (splitted.length === 1) {
                             let value = parseFloat(splitted[0]);
                             if (Number.isNumber(value)) {
-                                this.addToDataMap(
-                                    dataMap,
-                                    xValues[indLine].format(
-                                        renderInfo.dateFormat
-                                    ),
-                                    yDatasetQuery,
-                                    value
-                                );
+                                if (indLine < xValues.length && xValues[indLine]) {
+                                    this.addToDataMap(
+                                        dataMap,
+                                        xValues[indLine].format(
+                                            renderInfo.dateFormat
+                                        ),
+                                        yDatasetQuery,
+                                        value
+                                    );
+                                }
                             }
                         } else if (
                             splitted.length > yDatasetQuery.getAccessor(2) &&
@@ -534,14 +554,16 @@ export default class Tracker extends Plugin {
                                 splitted[yDatasetQuery.getAccessor(2)].trim();
                             value = parseFloat(splittedPart);
                             if (Number.isNumber(value)) {
-                                this.addToDataMap(
-                                    dataMap,
-                                    xValues[indLine].format(
-                                        renderInfo.dateFormat
-                                    ),
-                                    yDatasetQuery,
-                                    value
-                                );
+                                if (indLine < xValues.length && xValues[indLine]) {
+                                    this.addToDataMap(
+                                        dataMap,
+                                        xValues[indLine].format(
+                                            renderInfo.dateFormat
+                                        ),
+                                        yDatasetQuery,
+                                        value
+                                    );
+                                }
                             }
                         }
                     }

src/rendering.ts

@@ -436,7 +436,7 @@ function renderYAxis(
     } else {
         yAxisLabel.attr(
             "y",
-            +yTickLength + maxTickLabelWidth + yAxisLabelSize.height / 2.0
+            +yTickLength + maxTickLabelWidth + yAxisLabelSize.height
         );
     }
     if (yAxisLabelColor) {

styles.css

@@ -1,7 +1,7 @@
 .theme-light {
     --color-title: #000000;
     --color-axis: #000000;
-    --font-axis-label: #000000;
+    --color-axis-label: #000000;
     --color-tick-label: #000000;
     --color-line: #000000;
 

versions.json

@@ -8,5 +8,6 @@
 	"1.3.0": "0.9.12",
 	"1.4.0": "0.9.12",
 	"1.4.1": "0.9.12",
-	"1.5.0": "0.9.12"
+	"1.5.0": "0.9.12",
+	"1.5.1": "0.9.12"
 }