Merge branch 'fix_1.9.2'

pyrochlore · Jul 30, 2021 · c346a5f · c346a5f
2 parents 08c81e3 + dae713f
commit c346a5f
Show file tree

Hide file tree

Showing 40 changed files with 257 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -20,9 +20,13 @@ Version 1.9.0
 - Allow formatting evaluated expressions by a follwing format string ([examples](https://github.com/pyrochlore/obsidian-tracker/blob/master/examples/TestExpression.md))
 
 Version 1.9.1
-- Fixed errors on collecting time values from dvField
+- Fixed errors on collecting time values from `dvField`
 - Fixed errors on collecting wiki while fileCache.links is undefined
 
+Version 1.9.2
+- Allow using seconds in time values
+- Fixed error parsing `dvField`
+
 ## Usage
 
 1. Have some targets you want to track in daily notes.

diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
@@ -1,7 +1,11 @@
 # Release Notes
 
+## v1.9.2
+- Allow using seconds in time values
+- Fixed error parsing `dvField`
+
 ## v1.9.1
-- Fixed errors on collecting time values from dvField
+- Fixed errors on collecting time values from `dvField`
 - Fixed errors on collecting wiki while fileCache.links is undefined
 
 ## v1.9.0

diff --git a/examples/TestTimeValues.md b/examples/TestTimeValues.md
@@ -1,5 +1,7 @@
 # Test Time Values
 
+## From frontmatter
+Clock-In & Clock-Out from front matter
 ``` tracker
 searchType: frontmatter
 searchTarget: clock-in, clock-out
@@ -15,6 +17,7 @@ line:
 	showLegend: true
 ```
 
+Sleep time separated by / from front matter
 ``` tracker
 searchType: frontmatter
 searchTarget: sleep[0], sleep[1]
@@ -30,4 +33,38 @@ line:
 	showLegend: true
 ```
 
+## From dvField
+Clock-In & Clock-Out from dvField
+time granularity to one second
+``` tracker
+searchType: dvField
+searchTarget: clock-in, clock-out
+endDate: 2021-01-15
+folder: diary
+datasetName: Clock-In, Clock-Out
+line:
+    title: "Working Hours"
+    yAxisLabel: "Time (24h)"
+	reverseYAxis: true
+    lineColor: yellow, red
+    showPoint: true
+	showLegend: true
+```
+
+Sleep time separated by / from dvField
+``` tracker
+searchType: dvField
+searchTarget: sleep[0], sleep[1]
+endDate: 2021-01-15
+folder: diary
+valueShift: -24:00, 00:00
+datasetName: Sleep, WakeUp
+line:
+    title: "Sleep"
+    yAxisLabel: "Time (24h)"
+    lineColor: yellow, red
+    showPoint: true
+	showLegend: true
+```
+
 Please also check those search targets in markdown files under folder 'diary'.
diff --git a/examples/diary/2021-01-01.md b/examples/diary/2021-01-01.md
@@ -44,6 +44,11 @@ dataviewTarget1:: 48/29
 dataviewTarget2:: 29 @ 88
 dataviewTarget3:: 29, 88
 
+clock-in:: 10:45:29
+clock-out:: 20:51:29
+
+sleep:: 10:11 pm/7:5 am
+
 #sin:0.00000/0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452
 
 #sinsquare:0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907

diff --git a/examples/diary/2021-01-02.md b/examples/diary/2021-01-02.md
@@ -44,6 +44,11 @@ dataviewTarget1:: 25/5
 dataviewTarget2:: 5 @ 72
 dataviewTarget3:: 5, 72
 
+clock-in:: 8:7:5
+clock-out:: 20:10:5
+
+sleep:: 9:37 pm/7:57 am
+
 #sin:0.20791/0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106
 
 #sinsquare:0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451

diff --git a/examples/diary/2021-01-03.md b/examples/diary/2021-01-03.md
@@ -44,6 +44,11 @@ dataviewTarget1:: 12/14
 dataviewTarget2:: 14 @ 82
 dataviewTarget3:: 14, 82
 
+clock-in:: 10:49:14
+clock-out:: 16:33:14
+
+sleep:: 9:17 pm/6:48 am
+
 #sin:0.40674/0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603
 
 #sinsquare:0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000

diff --git a/examples/diary/2021-01-04.md b/examples/diary/2021-01-04.md
@@ -47,6 +47,11 @@ dataviewTarget1:: 43/29
 dataviewTarget2:: 29 @ 74
 dataviewTarget3:: 29, 74
 
+clock-in:: 10:41:29
+clock-out:: 20:52:29
+
+sleep:: 10:10 pm/6:37 am
+
 #sin:0.58779/0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314
 
 #sinsquare:0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226

diff --git a/examples/diary/2021-01-05.md b/examples/diary/2021-01-05.md
@@ -46,6 +46,11 @@ dataviewTarget1:: 86/24
 dataviewTarget2:: 24 @ 90
 dataviewTarget3:: 24, 90
 
+clock-in:: 9:1:24
+clock-out:: 18:57:24
+
+sleep:: 9:9 pm/5:57 am
+
 #sin:0.74314/0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779
 
 #sinsquare:0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549

diff --git a/examples/diary/2021-01-06.md b/examples/diary/2021-01-06.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 98/46
 dataviewTarget2:: 46 @ 75
 dataviewTarget3:: 46, 75
 
+clock-in:: 10:27:46
+clock-out:: 19:26:46
+
+sleep:: 10:30 pm/5:29 am
+
 #sin:0.86603/0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779/0.40674
 
 #sinsquare:0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543

diff --git a/examples/diary/2021-01-07.md b/examples/diary/2021-01-07.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 43/6
 dataviewTarget2:: 6 @ 77
 dataviewTarget3:: 6, 77
 
+clock-in:: 9:53:6
+clock-out:: 17:39:6
+
+sleep:: 10:53 pm/7:13 am
+
 #sin:0.95106/0.99452/0.99452/0.95106/0.86603/0.74314/0.58779/0.40674/0.20791
 
 #sinsquare:0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323

diff --git a/examples/diary/2021-01-08.md b/examples/diary/2021-01-08.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 39/25
 dataviewTarget2:: 25 @ 77
 dataviewTarget3:: 25, 77
 
+clock-in:: 8:5:25
+clock-out:: 16:5:25
+
+sleep:: 9:1 pm/6:56 am
+
 #sin:0.99452/0.99452/0.95106/0.86603/0.74314/0.58779/0.40674/0.20791/0.00000
 
 #sinsquare:0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000

diff --git a/examples/diary/2021-01-09.md b/examples/diary/2021-01-09.md
@@ -47,6 +47,11 @@ dataviewTarget1:: 37/36
 dataviewTarget2:: 36 @ 53
 dataviewTarget3:: 36, 53
 
+clock-in:: 8:37:36
+clock-out:: 17:9:36
+
+sleep:: 9:23 pm/5:51 am
+
 #sin:0.99452/0.95106/0.86603/0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791
 
 #sinsquare:0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323

diff --git a/examples/diary/2021-01-10.md b/examples/diary/2021-01-10.md
@@ -44,6 +44,11 @@ dataviewTarget1:: 4/10
 dataviewTarget2:: 10 @ 92
 dataviewTarget3:: 10, 92
 
+clock-in:: 10:25:10
+clock-out:: 17:55:10
+
+sleep:: 10:11 pm/5:31 am
+
 #sin:0.95106/0.86603/0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674
 
 #sinsquare:0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323/0.16543

diff --git a/examples/diary/2021-01-11.md b/examples/diary/2021-01-11.md
@@ -43,6 +43,11 @@ dataviewTarget1:: 97/19
 dataviewTarget2:: 19 @ 82
 dataviewTarget3:: 19, 82
 
+clock-in:: 9:42:19
+clock-out:: 20:35:19
+
+sleep:: 11:47 pm/6:8 am
+
 #sin:0.86603/0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779
 
 #sinsquare:0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323/0.16543/0.34549

diff --git a/examples/diary/2021-01-12.md b/examples/diary/2021-01-12.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 79/36
 dataviewTarget2:: 36 @ 66
 dataviewTarget3:: 36, 66
 
+clock-in:: 8:54:36
+clock-out:: 16:19:36
+
+sleep:: 11:23 pm/6:15 am
+
 #sin:0.74314/0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314
 
 #sinsquare:0.55226/0.34549/0.16543/0.04323/0.00000/0.04323/0.16543/0.34549/0.55226

diff --git a/examples/diary/2021-01-13.md b/examples/diary/2021-01-13.md
@@ -43,6 +43,11 @@ dataviewTarget1:: 87/46
 dataviewTarget2:: 46 @ 73
 dataviewTarget3:: 46, 73
 
+clock-in:: 8:1:46
+clock-out:: 17:0:46
+
+sleep:: 9:2 pm/6:37 am
+
 #sin:0.58779/0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603
 
 #sinsquare:0.34549/0.16543/0.04323/0.00000/0.04323/0.16543/0.34549/0.55226/0.75000

diff --git a/examples/diary/2021-01-14.md b/examples/diary/2021-01-14.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 43/5
 dataviewTarget2:: 5 @ 92
 dataviewTarget3:: 5, 92
 
+clock-in:: 8:53:5
+clock-out:: 17:19:5
+
+sleep:: 9:40 pm/7:25 am
+
 #sin:0.40674/0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106
 
 #sinsquare:0.16543/0.04323/0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451

diff --git a/examples/diary/2021-01-15.md b/examples/diary/2021-01-15.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 60/7
 dataviewTarget2:: 7 @ 81
 dataviewTarget3:: 7, 81
 
+clock-in:: 9:20:7
+clock-out:: 18:40:7
+
+sleep:: 11:14 pm/6:44 am
+
 #sin:0.20791/0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452
 
 #sinsquare:0.04323/0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907

diff --git a/examples/diary/2021-01-16.md b/examples/diary/2021-01-16.md
@@ -43,6 +43,11 @@ dataviewTarget1:: 17/21
 dataviewTarget2:: 21 @ 93
 dataviewTarget3:: 21, 93
 
+clock-in:: 9:54:21
+clock-out:: 18:3:21
+
+sleep:: 11:24 pm/6:40 am
+
 #sin:0.00000/-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452
 
 #sinsquare:0.00000/0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907

diff --git a/examples/diary/2021-01-17.md b/examples/diary/2021-01-17.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 46/38
 dataviewTarget2:: 38 @ 82
 dataviewTarget3:: 38, 82
 
+clock-in:: 8:3:38
+clock-out:: 16:23:38
+
+sleep:: 10:42 pm/6:30 am
+
 #sin:-0.20791/-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106
 
 #sinsquare:0.04323/0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451

diff --git a/examples/diary/2021-01-18.md b/examples/diary/2021-01-18.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 28/40
 dataviewTarget2:: 40 @ 81
 dataviewTarget3:: 40, 81
 
+clock-in:: 8:48:40
+clock-out:: 19:49:40
+
+sleep:: 9:10 pm/7:51 am
+
 #sin:-0.40674/-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603
 
 #sinsquare:0.16543/0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000

diff --git a/examples/diary/2021-01-19.md b/examples/diary/2021-01-19.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 73/8
 dataviewTarget2:: 8 @ 59
 dataviewTarget3:: 8, 59
 
+clock-in:: 8:30:8
+clock-out:: 17:42:8
+
+sleep:: 9:34 pm/7:2 am
+
 #sin:-0.58779/-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314
 
 #sinsquare:0.34549/0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226

diff --git a/examples/diary/2021-01-20.md b/examples/diary/2021-01-20.md
@@ -43,6 +43,11 @@ dataviewTarget1:: 64/0
 dataviewTarget2:: 0 @ 54
 dataviewTarget3:: 0, 54
 
+clock-in:: 9:30:0
+clock-out:: 20:13:0
+
+sleep:: 9:28 pm/7:58 am
+
 #sin:-0.74314/-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779
 
 #sinsquare:0.55226/0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549

diff --git a/examples/diary/2021-01-21.md b/examples/diary/2021-01-21.md
@@ -45,6 +45,11 @@ dataviewTarget1:: 88/41
 dataviewTarget2:: 41 @ 75
 dataviewTarget3:: 41, 75
 
+clock-in:: 9:4:41
+clock-out:: 19:29:41
+
+sleep:: 10:43 pm/6:37 am
+
 #sin:-0.86603/-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674
 
 #sinsquare:0.75000/0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543

diff --git a/examples/diary/2021-01-22.md b/examples/diary/2021-01-22.md
@@ -44,6 +44,11 @@ dataviewTarget1:: 36/0
 dataviewTarget2:: 0 @ 91
 dataviewTarget3:: 0, 91
 
+clock-in:: 9:32:0
+clock-out:: 20:27:0
+
+sleep:: 10:25 pm/5:12 am
+
 #sin:-0.95106/-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791
 
 #sinsquare:0.90451/0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323

diff --git a/examples/diary/2021-01-23.md b/examples/diary/2021-01-23.md
@@ -44,6 +44,11 @@ dataviewTarget1:: 45/27
 dataviewTarget2:: 27 @ 95
 dataviewTarget3:: 27, 95
 
+clock-in:: 10:36:27
+clock-out:: 19:31:27
+
+sleep:: 10:9 pm/7:30 am
+
 #sin:-0.99452/-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000
 
 #sinsquare:0.98907/0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000

diff --git a/examples/diary/2021-01-24.md b/examples/diary/2021-01-24.md
@@ -46,6 +46,11 @@ dataviewTarget1:: 63/23
 dataviewTarget2:: 23 @ 60
 dataviewTarget3:: 23, 60
 
+clock-in:: 8:1:23
+clock-out:: 18:9:23
+
+sleep:: 10:53 pm/5:33 am
+
 #sin:-0.99452/-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791
 
 #sinsquare:0.98907/0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323

diff --git a/examples/diary/2021-01-25.md b/examples/diary/2021-01-25.md
@@ -43,6 +43,11 @@ dataviewTarget1:: 88/12
 dataviewTarget2:: 12 @ 96
 dataviewTarget3:: 12, 96
 
+clock-in:: 9:52:12
+clock-out:: 17:55:12
+
+sleep:: 10:53 pm/6:3 am
+
 #sin:-0.95106/-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674
 
 #sinsquare:0.90451/0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323/0.16543

diff --git a/examples/diary/2021-01-26.md b/examples/diary/2021-01-26.md
@@ -44,6 +44,11 @@ dataviewTarget1:: 42/19
 dataviewTarget2:: 19 @ 93
 dataviewTarget3:: 19, 93
 
+clock-in:: 10:24:19
+clock-out:: 19:12:19
+
+sleep:: 11:36 pm/6:2 am
+
 #sin:-0.86603/-0.74314/-0.58779/-0.40674/-0.20791/-0.00000/0.20791/0.40674/0.58779
 
 #sinsquare:0.75000/0.55226/0.34549/0.16543/0.04323/0.00000/0.04323/0.16543/0.34549