diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/crop-requirement.rkt | 1 | ||||
| -rw-r--r-- | models/fertilizer-product.rkt | 3 | ||||
| -rw-r--r-- | models/nutrient-measurement.rkt | 13 | ||||
| -rw-r--r-- | models/nutrient-target.rkt | 5 |
4 files changed, 8 insertions, 14 deletions
diff --git a/models/crop-requirement.rkt b/models/crop-requirement.rkt index 4176ae4..fd11b06 100644 --- a/models/crop-requirement.rkt +++ b/models/crop-requirement.rkt @@ -31,7 +31,6 @@ (values id profile (if (sql-null? crop-id) #f crop-id) nutrient-values))) (define crop-requirement-id? exact-nonnegative-integer?) - (define crop-requirement-or-id/c (or/c crop-requirement? crop-requirement-id?)) (define (->cr-id cr-or-id) diff --git a/models/fertilizer-product.rkt b/models/fertilizer-product.rkt index cd86e2e..1ada2cd 100644 --- a/models/fertilizer-product.rkt +++ b/models/fertilizer-product.rkt @@ -11,7 +11,7 @@ [get-fertilizer-products (-> (listof fertilizer-product?))] [get-fertilizer-product (->* () - (#:id (or/c #f exact-nonnegative-integer?) #:canonical-name (or/c #f string?)) + (#:id exact-nonnegative-integer? #:canonical-name string?) (or/c fertilizer-product? #f))] [get-fertilizer-product-values (-> fertilizer-product-or-id/c nutrient-value-hash/c)] [get-fertilizer-product-value @@ -47,7 +47,6 @@ (~a v #:max-width 6 #:align 'right))))) (define fertilizer-product-id? exact-nonnegative-integer?) - (define fertilizer-product-or-id/c (or/c fertilizer-product? fertilizer-product-id?)) (define (->fp-id fp-or-id) diff --git a/models/nutrient-measurement.rkt b/models/nutrient-measurement.rkt index 1f8bd7b..fd797e9 100644 --- a/models/nutrient-measurement.rkt +++ b/models/nutrient-measurement.rkt @@ -9,9 +9,7 @@ [create-nutrient-measurement! (-> string? nutrient-value-hash/c nutrient-measurement?)] [get-nutrient-measurements (-> (listof nutrient-measurement?))] [get-nutrient-measurement - (->* () - (#:id exact-nonnegative-integer? #:date string?) - (or/c nutrient-measurement? #f))] + (->* () (#:id exact-nonnegative-integer? #:date string?) (or/c nutrient-measurement? #f))] [get-nutrient-measurement-values (-> nutrient-measurement-or-id/c nutrient-value-hash/c)] [get-nutrient-measurement-value (-> nutrient-measurement-or-id/c nutrient? maybe-nutrient-value?)] @@ -40,7 +38,6 @@ (~a v #:max-width 6 #:align 'right))))) (define nutrient-measurement-id? exact-nonnegative-integer?) - (define nutrient-measurement-or-id/c (or/c nutrient-measurement? nutrient-measurement-id?)) (define (->nm-id nm-or-id) @@ -54,10 +51,12 @@ (or (get-nutrient-measurement #:date measurement-date) (with-tx - (query-exec (current-conn) (insert #:into nutrient_measurements #:set [measurement_date ,measurement-date])) + (query-exec (current-conn) + (insert #:into nutrient_measurements #:set [measurement_date ,measurement-date])) (define nm-id - (query-value (current-conn) - (select id #:from nutrient_measurements #:where (= measurement_date ,measurement-date)))) + (query-value + (current-conn) + (select id #:from nutrient_measurements #:where (= measurement_date ,measurement-date)))) (query-exec (current-conn) (insert #:into nutrient_value_sets #:set [nutrient_measurement_id ,nm-id])) (define nvs-id diff --git a/models/nutrient-target.rkt b/models/nutrient-target.rkt index ccc4f1f..b84ab5f 100644 --- a/models/nutrient-target.rkt +++ b/models/nutrient-target.rkt @@ -9,9 +9,7 @@ [create-nutrient-target! (-> string? nutrient-value-hash/c nutrient-target?)] [get-nutrient-targets (-> (listof nutrient-target?))] [get-nutrient-target - (->* () - (#:id (or/c #f exact-nonnegative-integer?) #:date (or/c #f string?)) - (or/c nutrient-target? #f))] + (->* () (#:id exact-nonnegative-integer? #:date string?) (or/c nutrient-target? #f))] [get-nutrient-target-values (-> nutrient-target-or-id/c nutrient-value-hash/c)] [get-nutrient-target-value (-> nutrient-target-or-id/c nutrient? maybe-nutrient-value?)] [get-latest-nutrient-target-value (-> nutrient? maybe-nutrient-value?)] @@ -36,7 +34,6 @@ (~a v #:max-width 6 #:align 'right))))) (define nutrient-target-id? exact-nonnegative-integer?) - (define nutrient-target-or-id/c (or/c nutrient-target? nutrient-target-id?)) (define (->nt-id nt-or-id) |