|
@@ -10,7 +10,7 @@
|
|
|
"config.rkt") ; load configuration file
|
|
"config.rkt") ; load configuration file
|
|
|
|
|
|
|
|
(define prog-name "proposal_database.rkt")
|
|
(define prog-name "proposal_database.rkt")
|
|
|
-(define prog-version "v0.3.1")
|
|
|
|
|
|
|
+(define prog-version "v0.3.2")
|
|
|
|
|
|
|
|
|
|
|
|
|
; give us the date in YYYY-MM-DD format
|
|
; give us the date in YYYY-MM-DD format
|
|
@@ -64,7 +64,7 @@
|
|
|
(displayln (string-append prog-name
|
|
(displayln (string-append prog-name
|
|
|
" ("
|
|
" ("
|
|
|
prog-version
|
|
prog-version
|
|
|
- "). Copyright 2019-2020, 2022-2025 George C. Privon.")))
|
|
|
|
|
|
|
+ "). Copyright 2019-2020, 2022-2026 George C. Privon.")))
|
|
|
|
|
|
|
|
; decide whether to use singular or plural "proposal" based on the number of proposals
|
|
; decide whether to use singular or plural "proposal" based on the number of proposals
|
|
|
(define (proposal-plurals Nprop)
|
|
(define (proposal-plurals Nprop)
|
|
@@ -293,11 +293,15 @@ resultdate TEXT DEFAULT '')")
|
|
|
(define Nprop (query-value conn (string-append get_prop_count_base
|
|
(define Nprop (query-value conn (string-append get_prop_count_base
|
|
|
"WHERE status='submitted' AND solicitation='"
|
|
"WHERE status='submitted' AND solicitation='"
|
|
|
(vector-ref call-entry 1)
|
|
(vector-ref call-entry 1)
|
|
|
|
|
+ "' AND organization='"
|
|
|
|
|
+ (vector-ref call-entry 0)
|
|
|
"'")))
|
|
"'")))
|
|
|
(define Nprop-PI
|
|
(define Nprop-PI
|
|
|
(query-value conn (string-append get_prop_count_base
|
|
(query-value conn (string-append get_prop_count_base
|
|
|
"WHERE status='submitted' AND solicitation='"
|
|
"WHERE status='submitted' AND solicitation='"
|
|
|
(vector-ref call-entry 1)
|
|
(vector-ref call-entry 1)
|
|
|
|
|
+ "' AND organization='"
|
|
|
|
|
+ (vector-ref call-entry 0)
|
|
|
"' AND PI LIKE '%"
|
|
"' AND PI LIKE '%"
|
|
|
PIname
|
|
PIname
|
|
|
"%'")))
|
|
"%'")))
|