Merge remote-tracking branch 'origin/master'

# Conflicts:
#	manifest.json
#	package.json
#	versions.json

manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "simple-time-tracker",
     "name": "Super Simple Time Tracker",
-    "version": "0.1.5",
+    "version": "0.1.6",
     "minAppVersion": "0.15.0",
     "description": "Multi-purpose time trackers for your notes!",
     "author": "Ellpeck",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "simple-time-tracker",
-    "version": "0.1.5",
+    "version": "0.1.6",
     "description": "Multi-purpose time trackers for your notes!",
     "main": "main.js",
     "scripts": {

src/tracker.ts

@@ -204,6 +204,12 @@ function formatTimestamp(timestamp: number, settings: SimpleTimeTrackerSettings)
 function formatDuration(totalTime: number): string {
     let duration = moment.duration(totalTime);
     let ret = "";
+	if (duration.years() > 0)
+		ret += duration.years() + "y ";
+	if (duration.months() > 0)
+		ret += duration.months() + "m ";
+	if (duration.days() > 0)
+		ret += duration.days() + "d ";
     if (duration.hours() > 0)
         ret += duration.hours() + "h ";
     if (duration.minutes() > 0)

test-vault/.obsidian/plugins/simple-time-tracker/main.js

@@ -259,6 +259,12 @@ function formatTimestamp(timestamp, settings) {
 function formatDuration(totalTime) {
   let duration = import_obsidian2.moment.duration(totalTime);
   let ret = "";
+  if (duration.years() > 0)
+    ret += duration.years() + "y ";
+  if (duration.months() > 0)
+    ret += duration.months() + "m ";
+  if (duration.days() > 0)
+    ret += duration.days() + "d ";
   if (duration.hours() > 0)
     ret += duration.hours() + "h ";
   if (duration.minutes() > 0)

test-vault/.obsidian/plugins/simple-time-tracker/manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "simple-time-tracker",
 	"name": "Super Simple Time Tracker",
-	"version": "0.1.5",
+	"version": "0.1.6",
 	"minAppVersion": "0.15.0",
 	"description": "Multi-purpose time trackers for your notes!",
 	"author": "Ellpeck",

test-vault/duration_accumulation_test.md

@@ -0,0 +1,11 @@
+# Notes
+More notes for my cool project! This note shows that we can correctly display accumulated time that lasts longer than a 24 hour day! 
+
+```simple-time-tracker
+{"entries":[
+{"name":"test","startTime":1596265200,"endTime":1627887600,"subEntries":null},
+{"name":"test","startTime":1627801200,"endTime":1633158000,"subEntries":null},
+{"name":"test","startTime":1659337200,"endTime":1659423600,"subEntries":null},
+{"name":"test","startTime":1664627410,"endTime":1664631605,"subEntries":null}
+]}
+```

versions.json

@@ -5,5 +5,6 @@
     "0.1.2": "0.15.0",
     "0.1.3": "0.15.0",
     "0.1.4": "0.15.0",
-    "0.1.5": "0.15.0"
+    "0.1.5": "0.15.0",
+	"0.1.6": "0.15.0"
 }