From 4bc7b5822b2c69dfe918b18fb0c08cf3406d2958 Mon Sep 17 00:00:00 2001 From: Marius Peter Date: Thu, 20 Nov 2025 11:28:55 +0100 Subject: Reduce SQL requests for main Ferti page. --- handlers.rkt | 7 +++++-- views.rkt | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/handlers.rkt b/handlers.rkt index 7fcd004..da56161 100644 --- a/handlers.rkt +++ b/handlers.rkt @@ -31,10 +31,13 @@ (define ferti-recipe (find-ferti-recipe)) (define latest-measurement-hash (get-latest-nutrient-measurement-hash)) (define latest-target-hash (get-latest-nutrient-target-hash)) - (define latest-measurements (take* (get-nutrient-measurements) 10)) + (define latest-measurements (take (get-nutrient-measurements) 10)) (response/xexpr #:preamble #"" - (ferti-page ferti-recipe latest-measurement-hash latest-target-hash latest-measurements))) + (ferti-page ferti-recipe + latest-measurement-hash + latest-target-hash + latest-measurements))) (define (index _) (define user (get-current-user)) diff --git a/views.rkt b/views.rkt index 7e4f4d9..b661499 100644 --- a/views.rkt +++ b/views.rkt @@ -84,7 +84,7 @@ ;; Pages -(define (ferti-page measurements ferti-recipe) +(define (ferti-page ferti-recipe latest-measurement-hash latest-target-hash measurements) (page-template "Ferti" `((h1 ((class "display-1 mb-3")) "Ferti") @@ -112,8 +112,8 @@ (th ((class "text-end")) "Dernière Cible") (th ((class "text-end")) "Delta (%)")) ,@(for/list ([n (get-nutrients)]) - (define latest-target (get-latest-nutrient-target-value n)) - (define latest-measurement (get-latest-nutrient-measurement-value n)) + (define latest-measurement (hash-ref latest-measurement-hash n #f)) + (define latest-target (hash-ref latest-target-hash n #f)) (define delta-percentage (cond [(false? latest-target) #f] -- cgit v1.2.3