Applies all of the feedback for the new page

2024-04-14 22:29:01 -07:00
parent 6031f15246
commit 71b5b9864c
10 changed files with 74 additions and 53 deletions
--- a/src/clj/auto_ap/ssr/utils.clj
+++ b/src/clj/auto_ap/ssr/utils.clj
@@ -240,9 +240,10 @@
                                              (if date-range-value
                                                (-> (condp = date-range-value
                                                      "week"
-                                                      (assoc m
-                                                             start-date-key (time/plus (time/now) (time/days -7))
-                                                             end-date-key (time/now))
+                                                      (let [last-monday (atime/last-monday)]
+                                                        (assoc m
+                                                               start-date-key (time/plus last-monday (time/days -7))
+                                                               end-date-key last-monday))

                                                      "month"
                                                      (assoc m