Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
citizen-science
symbai
Commits
dd9366ef
Commit
dd9366ef
authored
Jul 09, 2014
by
Dave Griffiths
Browse files
filter ui fixes
parent
1d585e74
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
android/assets/starwisp.scm
android/assets/starwisp.scm
+10
-6
No files found.
android/assets/starwisp.scm
View file @
dd9366ef
...
@@ -250,6 +250,8 @@
...
@@ -250,6 +250,8 @@
#t
r
))
#t
r
))
#f
ktv-list
))
#f
ktv-list
))
;; go through each dirty entity and stick the user id
;; on the end of the edit history lists - only for individuals
(
define
(
update-edit-history
db
table
user-id
)
(
define
(
update-edit-history
db
table
user-id
)
;; get dirty individual entities
;; get dirty individual entities
(
let
((
de
(
db-select
(
let
((
de
(
db-select
...
@@ -259,7 +261,6 @@
...
@@ -259,7 +261,6 @@
(
when
(
not
(
null?
de
))
(
when
(
not
(
null?
de
))
(
for-each
(
for-each
(
lambda
(
i
)
(
lambda
(
i
)
(
msg
i
)
(
let*
((
entity-id
(
vector-ref
i
0
))
(
let*
((
entity-id
(
vector-ref
i
0
))
(
dirty-items
(
dbg
(
get-entity-plain-for-sync
db
table
entity-id
))))
(
dirty-items
(
dbg
(
get-entity-plain-for-sync
db
table
entity-id
))))
(
when
(
not
(
null?
dirty-items
))
(
when
(
not
(
null?
dirty-items
))
...
@@ -558,7 +559,10 @@
...
@@ -558,7 +559,10 @@
(
list
(
list
"parent"
"varchar"
"="
(
get-setting-value
"current-village"
)))
(
list
(
list
"parent"
"varchar"
"="
(
get-setting-value
"current-village"
)))
(
list
(
list
"name"
"varchar"
)))))
(
list
(
list
"name"
"varchar"
)))))
(
msg
"UIF"
households
)
(
msg
"UIF"
households
)
(
update-individual-filter-inner
households
)))
(
list
;; clear contents...
(
update-widget
'linear-layout
(
get-id
"choose-pics"
)
'contents
'
())
(
update-individual-filter-inner
households
))))
(
define
(
update-individual-filter2
)
(
define
(
update-individual-filter2
)
...
@@ -1648,7 +1652,7 @@
...
@@ -1648,7 +1652,7 @@
(
filter-add!
(
make-filter
"gender"
"varchar"
"="
(
filter-add!
(
make-filter
"gender"
"varchar"
"="
(
spinner-choice
'
(
off
female
male
)
v
))))
(
spinner-choice
'
(
off
female
male
)
v
))))
(
if
(
get-current
'filter-switch
#f
)
(
if
(
get-current
'filter-switch
#f
)
(
list
(
update-individual-filter
)
)
'
())
(
update-individual-filter
)
'
())
))
))
(
medit-text
(
medit-text
'name
"normal"
'name
"normal"
...
@@ -1657,12 +1661,12 @@
...
@@ -1657,12 +1661,12 @@
(
filter-remove!
"name"
)
(
filter-remove!
"name"
)
(
filter-add!
(
make-filter
"name"
"varchar"
"like"
(
string-append
v
"%"
))))
(
filter-add!
(
make-filter
"name"
"varchar"
"like"
(
string-append
v
"%"
))))
(
if
(
get-current
'filter-switch
#f
)
(
if
(
get-current
'filter-switch
#f
)
(
list
(
update-individual-filter
)
)
'
()))
(
update-individual-filter
)
'
()))
)
)
(
mtoggle-button-scale
'filter-switch
(
mtoggle-button-scale
'filter-switch
(
lambda
(
v
)
(
lambda
(
v
)
(
set-current!
'filter-switch
(
not
(
zero?
v
)))
(
set-current!
'filter-switch
(
not
(
zero?
v
)))
'
())))
(
if
(
not
(
zero?
v
))
(
update-individual-filter
)
'
())))
)
(
horiz
(
horiz
(
medit-text
'quick-name
"normal"
(
medit-text
'quick-name
"normal"
...
@@ -1695,7 +1699,7 @@
...
@@ -1695,7 +1699,7 @@
(
set-current!
'choose-result
#f
)
(
set-current!
'choose-result
#f
)
(
activity-layout
activity
))
(
activity-layout
activity
))
(
lambda
(
activity
arg
)
(
lambda
(
activity
arg
)
(
list
(
update-individual-filter
(
list
)))
)
(
update-individual-filter
(
list
)))
(
lambda
(
activity
)
'
())
(
lambda
(
activity
)
'
())
(
lambda
(
activity
)
'
())
(
lambda
(
activity
)
'
())
(
lambda
(
activity
)
'
())
(
lambda
(
activity
)
'
())
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment