clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-27 23:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: repeated tasks

Browse Source 
1. Don't show repeat kinds selection (.+, ++, +)
2. Fixed wrong time (no zero padding)
3. Fixed `.+` and `++` behaviors
This commit is contained in:
Tienson Qin
2020-11-05 16:52:07 +08:00
parent 230bd219a6
commit 0a5b88467b
5 changed files with 77 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
src/main/frontend/components/datetime.cljs
View File

@@ -44,7 +44,9 @@
[{:keys [num duration kind]}]
(let [show? (rum/react *show-repeater?)]
(if (or show? (and num duration kind))
[:div.flex.flex-row {:style {:height 32}}
[:div.flex.flex-row.justify-center {:style {:height 32}}
[:div.block.text-medium.mr-2.mt-1 {:style {:width 110}}
"Every"]
[:input#repeater-num.form-input.mt-1
{:style {:width 48}
:default-value num
@@ -52,29 +54,29 @@
(let [value (util/evalue event)]
(swap! *timestamp assoc-in [:repeater :num] value)))}]
(ui/select
(mapv
(fn [item]
(if (= (:label item) duration)
(assoc item :selected "selected")
item))
[{:label "h"}
{:label "d"}
{:label "w"}
{:label "m"}
{:label "y"}])
(fn [value]
(swap! *timestamp assoc-in [:repeater :duration] value)))
(ui/select
(mapv
(fn [item]
(if (= (:label item) kind)
(assoc item :selected "selected")
item))
[{:label ".+"}
{:label "+"}
{:label "++"}])
(fn [value]
(swap! *timestamp assoc-in [:repeater :kind] value)))
(mapv
(fn [item]
(if (= (:label item) duration)
(assoc item :selected "selected")
item))
[{:label "h"}
{:label "d"}
{:label "w"}
{:label "m"}
{:label "y"}])
(fn [value]
(swap! *timestamp assoc-in [:repeater :duration] value)))
;; (ui/select
;; (mapv
;; (fn [item]
;; (if (= (:label item) kind)
;; (assoc item :selected "selected")
;; item))
;; [{:label "++"}
;; {:label "+"}
;; {:label ".+"}])
;; (fn [value]
;; (swap! *timestamp assoc-in [:repeater :kind] value)))
[:a.ml-2.self-center {:on-click (fn []
(reset! *show-repeater? false)
@@ -85,7 +87,7 @@
(swap! *timestamp assoc :repeater
{:kind ".+"
:num 1
:duration "h"}))}
:duration "d"}))}
"Add repeater"])))
(defn clear-timestamp!
@@ -100,6 +102,8 @@
timestamp (if date
timestamp
(assoc timestamp :date (t/today)))
kind (if (= "w" (:duration repeater)) "++" ".+")
timestamp (assoc-in timestamp [:repeater :kind] kind)
text (repeated/timestamp-map->text timestamp)]
[:div.py-1.px-4 {:style {:min-width 300}}
[:p.text-sm.opacity-50.font-medium.mt-4 "Time:"]
@@ -110,21 +114,21 @@
[:p.mt-4
(ui/button "Submit"
:on-click (fn [e]
(util/stop e)
(let [block-data (state/get-timestamp-block)]
(let [{:keys [block typ show?]} block-data
block-id (or (:block/uuid (state/get-edit-block))
(:block/uuid block))
typ (or typ @commands/*current-command)]
(editor-handler/set-block-timestamp! block-id
typ
text)
(state/clear-edit!)
(when show?
(reset! show? false))))
(clear-timestamp!)
(state/set-editor-show-date-picker false)))]]))
:on-click (fn [e]
(util/stop e)
(let [block-data (state/get-timestamp-block)]
(let [{:keys [block typ show?]} block-data
block-id (or (:block/uuid (state/get-edit-block))
(:block/uuid block))
typ (or typ @commands/*current-command)]
(editor-handler/set-block-timestamp! block-id
typ
text)
(state/clear-edit!)
(when show?
(reset! show? false))))
(clear-timestamp!)
(state/set-editor-show-date-picker false)))]]))
(rum/defc date-picker < rum/reactive
{:init (fn [state]
@@ -163,8 +167,7 @@
(util/format "[[%s]]" journal)
format
nil)
(state/set-editor-show-date-picker false)
)
(state/set-editor-show-date-picker false))
(swap! *timestamp assoc :date date)))})
(when deadline-or-schedule?
(time-repeater))])))