[Racket] Ferti hydroponic nutrient solver, redux.
Minor formlet updates.
formlets.rkt
@@ -10,6 +10,7 @@
10
10
"models/nutrient-measurement.rkt"
11
11
"models/fertilizer-product.rkt"
12
12
"models/crop.rkt"
13
Added:
"models/crop-rotation.rkt"
13
14
"models/crop-requirement.rkt")
14
15
15
16
(define (measurements-formlet #:value [nm #f])
@@ -40,7 +41,7 @@
40
41
(define (rotation-formlet #:date [date-string #f])
41
42
(formlet* (#%# `(div ((class "mb-3"))
42
43
(h5 "Date de l'assolement")
43
Removed:
,{=>* (date-formlet #:date date-string) rotation-date*})
44
Added:
,{=>* (date-formlet #:value date-string) rotation-date*})
44
45
`(div ((class "mb-3"))
45
46
(h5 "Répartition des cultures (%)")
46
47
,@(for/list ([requirement (get-crop-requirements)])
@@ -57,18 +58,16 @@
57
58
id*)
58
59
`(div ((class "mb-3"))
59
60
(h5 "Nom de référence")
60
Removed:
,{=>*
61
Removed:
(required-string-input #:value (if fp
62
Removed:
(fertilizer-product-name fp)
63
Removed:
""))
64
Removed:
canonical-name*})
61
Added:
,(=>* (required-string-input #:value (if fp
62
Added:
(fertilizer-product-name fp)
63
Added:
""))
64
Added:
canonical-name*))
65
65
`(div ((class "mb-3"))
66
66
(h5 "Nom de marque")
67
Removed:
,{=>*
68
Removed:
(required-string-input #:value (if fp
69
Removed:
(fertilizer-brand-name fp)
70
Removed:
""))
71
Removed:
brand-name*})
67
Added:
,(=>* (required-string-input #:value (if fp
68
Added:
(fertilizer-brand-name fp)
69
Added:
""))
70
Added:
brand-name*))
72
71
`(div ((class "mb-3"))
73
72
(h5 "Valeurs de l'intrant")
74
73
,@(for/list ([n (get-nutrients)])
@@ -115,7 +114,7 @@
115
114
(div ((class "form-floating mb-3")) ,{=> percentage-input requirement-percentage} ,input-label)
116
115
(cons requirement requirement-percentage)))
117
116
118
Removed:
(define (date-formlet #:date [date-string #f])
117
Added:
(define (date-formlet #:value [date-string #f])
119
118
(to-string (required (input #:type "date"
120
119
#:value (or date-string (date->iso8601 (today)))
121
120
#:attributes '((class "form-control") [required "required"])))))
@@ -130,7 +129,6 @@
130
129
[id ,id]
131
130
[name ,id]
132
131
[value ,(number->string value)]
133
Removed:
[step "0.1"]
134
132
[placeholder ,(nutrient-french-name nutrient)]))))))
135
133
(define input-label
136
134
`(label ((for ,id