From f2d1070a7e601149344b6b91b84c7de3564e7179 Mon Sep 17 00:00:00 2001 From: tiye Date: Tue, 26 Dec 2023 00:47:44 +0800 Subject: [PATCH] temp fix for week error --- calcit.cirru | 30 +----------------------------- compact.cirru | 6 +----- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/calcit.cirru b/calcit.cirru index afa28dc..a464e1f 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -2865,35 +2865,7 @@ |n $ %{} :Expr (:at 1677346351618) (:by |B1y7Rc-Zz) :data $ {} |T $ %{} :Leaf (:at 1677346355200) (:by |B1y7Rc-Zz) (:text |week-date) - |b $ %{} :Expr (:at 1677346357166) (:by |B1y7Rc-Zz) - :data $ {} - |T $ %{} :Leaf (:at 1677346357166) (:by |B1y7Rc-Zz) (:text |if) - |b $ %{} :Expr (:at 1677346357166) (:by |B1y7Rc-Zz) - :data $ {} - |T $ %{} :Leaf (:at 1677346357166) (:by |B1y7Rc-Zz) (:text |and) - |b $ %{} :Expr (:at 1677346357166) (:by |B1y7Rc-Zz) - :data $ {} - |T $ %{} :Leaf (:at 1677346357166) (:by |B1y7Rc-Zz) (:text |=) - |b $ %{} :Leaf (:at 1677346357166) (:by |B1y7Rc-Zz) (:text |month) - |h $ %{} :Leaf (:at 1677346357166) (:by |B1y7Rc-Zz) (:text |11) - |h $ %{} :Expr (:at 1677346357166) (:by |B1y7Rc-Zz) - :data $ {} - |T $ %{} :Leaf (:at 1677346357166) (:by |B1y7Rc-Zz) (:text |>) - |b $ %{} :Expr (:at 1677346357166) (:by |B1y7Rc-Zz) - :data $ {} - |T $ %{} :Leaf (:at 1677346357166) (:by |B1y7Rc-Zz) (:text |.!date) - |b $ %{} :Leaf (:at 1677346357166) (:by |B1y7Rc-Zz) (:text |now) - |h $ %{} :Leaf (:at 1677346357166) (:by |B1y7Rc-Zz) (:text |25) - |h $ %{} :Expr (:at 1677346357166) (:by |B1y7Rc-Zz) - :data $ {} - |T $ %{} :Leaf (:at 1677346357166) (:by |B1y7Rc-Zz) (:text |.!week) - |b $ %{} :Expr (:at 1677346357166) (:by |B1y7Rc-Zz) - :data $ {} - |T $ %{} :Leaf (:at 1677346357166) (:by |B1y7Rc-Zz) (:text |.!subtract) - |b $ %{} :Leaf (:at 1677346357166) (:by |B1y7Rc-Zz) (:text |now) - |h $ %{} :Leaf (:at 1677346357166) (:by |B1y7Rc-Zz) (:text |7) - |l $ %{} :Leaf (:at 1677346357166) (:by |B1y7Rc-Zz) (:text "|\"day") - |l $ %{} :Leaf (:at 1677346381204) (:by |B1y7Rc-Zz) (:text |now) + |X $ %{} :Leaf (:at 1703522843408) (:by |B1y7Rc-Zz) (:text |now) |T $ %{} :Expr (:at 1557586164005) (:by |B1y7Rc-Zz) :data $ {} |T $ %{} :Leaf (:at 1557586164005) (:by |B1y7Rc-Zz) (:text |{}) diff --git a/compact.cirru b/compact.cirru index 6cf6815..023dd73 100644 --- a/compact.cirru +++ b/compact.cirru @@ -433,11 +433,7 @@ :data $ let now $ dayjs month $ .!month now - week-date $ if - and (= month 11) - > (.!date now) 25 - .!week $ .!subtract now 7 "\"day" - , now + week-date now {} :year $ .!year now :week $ .!week week-date