Commit 5ad51470 authored by Dave Griffiths's avatar Dave Griffiths
Browse files

next buttons and default naming

parent 959e3a55
...@@ -706,14 +706,25 @@ ...@@ -706,14 +706,25 @@
(build-list-widget (build-list-widget
db "sync" 'households "household" "household" (lambda () (get-setting-value "current-village")) db "sync" 'households "household" "household" (lambda () (get-setting-value "current-village"))
(lambda () (lambda ()
;; autogenerate the name from the current ID (let ((name
(ktvlist-merge ;; if it's the first household - change the id...
household-ktvlist (if (zero? (length (db-filter-only
(list (ktv "name" "varchar" db "sync" "household"
(list (list "parent" "varchar" "="
(get-setting-value "current-village")))
(list (list "name" "varchar")))))
(string-append (string-append
(ktv-get (get-entity-by-unique db "sync" (get-setting-value "current-village")) "name") (ktv-get (get-entity-by-unique db "sync" (get-setting-value "current-village")) "name")
(get-setting-value "user-id") (get-setting-value "user-id")
(number->string (get/inc-setting "house-id")))))))) "gamehousehold")
(string-append
(ktv-get (get-entity-by-unique db "sync" (get-setting-value "current-village")) "name")
(get-setting-value "user-id")
(number->string (get/inc-setting "house-id"))))))
;; autogenerate the name from the current ID
(ktvlist-merge
household-ktvlist
(list (ktv "name" "varchar" name))))))
(mbutton 'villages (lambda () (list (start-activity "villages" 0 "")))) (mbutton 'villages (lambda () (list (start-activity "villages" 0 ""))))
...@@ -1027,6 +1038,9 @@ ...@@ -1027,6 +1038,9 @@
(horiz (horiz
(mtoggle-button-scale 'literate (lambda (v) (entity-set-value! "literate" "int" v) '())) (mtoggle-button-scale 'literate (lambda (v) (entity-set-value! "literate" "int" v) '()))
(mspinner 'education education-list (lambda (v) (entity-set-value! "education" "varchar" v) '()))) (mspinner 'education education-list (lambda (v) (entity-set-value! "education" "varchar" v) '())))
(mbutton 'next (lambda () (list (start-activity "family" 0 ""))))
(spacer 20)
) )
(lambda (activity arg) (lambda (activity arg)
(activity-layout activity)) (activity-layout activity))
...@@ -1094,7 +1108,10 @@ ...@@ -1094,7 +1108,10 @@
"residence-after-marriage" "varchar" "residence-after-marriage" "varchar"
(spinner-choice residence-list v)) '())) (spinner-choice residence-list v)) '()))
(medit-text 'num-siblings "numeric" (lambda (v) (entity-set-value! "num-siblings" "int" v) '())) (medit-text 'num-siblings "numeric" (lambda (v) (entity-set-value! "num-siblings" "int" v) '()))
(medit-text 'birth-order "numeric" (lambda (v) (entity-set-value! "birth-order" "int" v) '()))) (medit-text 'birth-order "numeric" (lambda (v) (entity-set-value! "birth-order" "int" v) '()))
(mbutton 'next (lambda () (list (start-activity "migration" 0 ""))))
(spacer 20)
)
(lambda (activity arg) (lambda (activity arg)
(activity-layout activity)) (activity-layout activity))
(lambda (activity arg) (lambda (activity arg)
...@@ -1171,6 +1188,8 @@ ...@@ -1171,6 +1188,8 @@
(medit-text 'num-residence-changes "numeric" (lambda (v) (entity-set-value! "num-residence-changes" "int" v) '())) (medit-text 'num-residence-changes "numeric" (lambda (v) (entity-set-value! "num-residence-changes" "int" v) '()))
(medit-text 'village-visits-month "numeric" (lambda (v) (entity-set-value! "village-visits-month" "int" v) '())) (medit-text 'village-visits-month "numeric" (lambda (v) (entity-set-value! "village-visits-month" "int" v) '()))
(medit-text 'village-visits-year "numeric" (lambda (v) (entity-set-value! "village-visits-year" "int" v) '())) (medit-text 'village-visits-year "numeric" (lambda (v) (entity-set-value! "village-visits-year" "int" v) '()))
(mbutton 'next (lambda () (list (start-activity "income" 0 ""))))
(spacer 20)
) )
(lambda (activity arg) (lambda (activity arg)
(activity-layout activity)) (activity-layout activity))
...@@ -1227,6 +1246,8 @@ ...@@ -1227,6 +1246,8 @@
(horiz (horiz
(medit-text 'visit-market "numeric" (lambda (v) (entity-set-value! "visit-market" "int" v) '())) (medit-text 'visit-market "numeric" (lambda (v) (entity-set-value! "visit-market" "int" v) '()))
(medit-text 'town-sell "numeric" (lambda (v) (entity-set-value! "town-sell" "int" v) '()))) (medit-text 'town-sell "numeric" (lambda (v) (entity-set-value! "town-sell" "int" v) '())))
(mbutton 'next (lambda () (list (start-activity "geneaology" 0 ""))))
(spacer 20)
) )
(lambda (activity arg) (lambda (activity arg)
(activity-layout activity)) (activity-layout activity))
...@@ -1337,7 +1358,9 @@ ...@@ -1337,7 +1358,9 @@
(build-person-selector 'father "id-father" (list) father-request-code)) (build-person-selector 'father "id-father" (list) father-request-code))
(build-list-widget (build-list-widget
db "sync" 'children "child" "child" (lambda () (get-current 'individual #f)) db "sync" 'children "child" "child" (lambda () (get-current 'individual #f))
(lambda () child-ktvlist))) (lambda () child-ktvlist))
(mbutton 'next (lambda () (list (start-activity "friendship" 0 ""))))
(spacer 20))
(lambda (activity arg) (lambda (activity arg)
(activity-layout activity)) (activity-layout activity))
(lambda (activity arg) (lambda (activity arg)
...@@ -1377,6 +1400,8 @@ ...@@ -1377,6 +1400,8 @@
(build-social-connection 'social-three "social-three" "friend" social-request-code-three #t) (build-social-connection 'social-three "social-three" "friend" social-request-code-three #t)
(build-social-connection 'social-four "social-four" "friend" social-request-code-four #f) (build-social-connection 'social-four "social-four" "friend" social-request-code-four #f)
(build-social-connection 'social-five "social-five" "friend" social-request-code-five #t) (build-social-connection 'social-five "social-five" "friend" social-request-code-five #t)
(mbutton 'next (lambda () (list (start-activity-goto "individual" 0 (get-current 'individual #f)))))
(spacer 20)
) )
(lambda (activity arg) (lambda (activity arg)
(activity-layout activity)) (activity-layout activity))
...@@ -1414,6 +1439,8 @@ ...@@ -1414,6 +1439,8 @@
(build-social-connection 'social-three "friendship-three" "friend" social-request-code-three #t) (build-social-connection 'social-three "friendship-three" "friend" social-request-code-three #t)
(build-social-connection 'social-four "friendship-four" "friend" social-request-code-four #f) (build-social-connection 'social-four "friendship-four" "friend" social-request-code-four #f)
(build-social-connection 'social-five "friendship-five" "friend" social-request-code-five #t) (build-social-connection 'social-five "friendship-five" "friend" social-request-code-five #t)
(mbutton 'next (lambda () (list (start-activity "social" 0 ""))))
(spacer 20)
) )
(lambda (activity arg) (lambda (activity arg)
(activity-layout activity)) (activity-layout activity))
...@@ -1456,7 +1483,10 @@ ...@@ -1456,7 +1483,10 @@
(list (list
(if (eqv? v 1) (soundfile-start-playback "/sdcard/symbai/test.3gp") (if (eqv? v 1) (soundfile-start-playback "/sdcard/symbai/test.3gp")
(soundfile-stop-playback))))) (soundfile-stop-playback)))))
)) )
(mbutton 'next (lambda () (list (start-activity "details" 0 ""))))
(spacer 20)
)
(lambda (activity arg) (lambda (activity arg)
(set-current! 'activity-title "Agreement") (set-current! 'activity-title "Agreement")
(activity-layout activity)) (activity-layout activity))
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
(list 'one (list "one" "" )) (list 'one (list "one" "" ))
(list 'two (list "two" "" )) (list 'two (list "two" "" ))
(list 'three (list "three" "" )) (list 'three (list "three" "" ))
(list 'next (list "Next" ))
(list 'village (list "Village" "" )) (list 'village (list "Village" "" ))
(list 'household (list "Household" "" )) (list 'household (list "Household" "" ))
(list 'households (list "Households" "" )) (list 'households (list "Households" "" ))
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
"one","one"," ",, "one","one"," ",,
"two","two"," ",, "two","two"," ",,
"three"," three"," ",, "three"," three"," ",,
"next","Next",,,
"village"," Village"," ",, "village"," Village"," ",,
"household"," Household"," ",, "household"," Household"," ",,
"households"," Households"," ",, "households"," Households"," ",,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment