clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-06-01 19:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix total clock-time calculation in query table

Browse Source 
Fixes issue #6844
This commit is contained in:
Spyros Seimenis
2022-09-29 01:50:57 +03:00
committed by Tienson Qin
parent aa85b7bf18
commit e76f0d75ef
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/frontend/components/query_table.cljs
View File

@@ -127,7 +127,7 @@
[:tr.cursor
(for [column columns]
(let [title (if (and (= column :clock-time) (integer? clock-time-total))
(util/format "clock-time(total: %s)" (clock/minutes->days:hours:minutes
(util/format "clock-time(total: %s)" (clock/seconds->days:hours:minutes:seconds
clock-time-total))
(name column))]
(sortable-title title column sort-state (:block/uuid current-block))))]]

12
src/main/frontend/util/clock.cljs
View File

@@ -21,6 +21,18 @@
seconds (mod seconds 60)]
(util/format "%02d:%02d:%02d" hours minutes seconds)))
(defn seconds->days:hours:minutes:seconds
[seconds]
(let [days (quot (quot seconds 3600) 24)
hours (quot seconds 3600)
minutes (quot (- seconds (* hours 3600)) 60)
seconds (mod seconds 60)]
(util/format "%s%s%s%s"
(if (zero? days) "" (str days "d"))
(if (zero? hours) "" (str hours "h"))
(if (zero? minutes) "" (str minutes "m"))
(if (zero? seconds) "" (str seconds "s")))))
(defn minutes->days:hours:minutes
[minutes]
(let [days (quot (quot minutes 60) 24)