Commit 4c891cb6 authored by Dave Griffiths's avatar Dave Griffiths

social split into friendship

parent f98cd416
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<activity android:name="foam.symbai.IncomeActivity" android:configChanges="orientation"></activity> <activity android:name="foam.symbai.IncomeActivity" android:configChanges="orientation"></activity>
<activity android:name="foam.symbai.GeneaologyActivity" android:configChanges="orientation"></activity> <activity android:name="foam.symbai.GeneaologyActivity" android:configChanges="orientation"></activity>
<activity android:name="foam.symbai.SocialActivity" android:configChanges="orientation"></activity> <activity android:name="foam.symbai.SocialActivity" android:configChanges="orientation"></activity>
<activity android:name="foam.symbai.FriendshipActivity" android:configChanges="orientation"></activity>
<activity android:name="foam.symbai.AgreementActivity" android:configChanges="orientation"></activity> <activity android:name="foam.symbai.AgreementActivity" android:configChanges="orientation"></activity>
<activity android:name="foam.symbai.IndividualChooserActivity" android:configChanges="orientation"></activity> <activity android:name="foam.symbai.IndividualChooserActivity" android:configChanges="orientation"></activity>
<activity android:name="foam.symbai.SyncActivity" android:configChanges="orientation"></activity> <activity android:name="foam.symbai.SyncActivity" android:configChanges="orientation"></activity>
......
...@@ -217,8 +217,8 @@ ...@@ -217,8 +217,8 @@
(define (sync-files server-list) (define (sync-files server-list)
(let ((local-list (dir-list "/sdcard/symbai/files/"))) (let ((local-list (dir-list "/sdcard/symbai/files/")))
;; search for all local files in server list ;; search for all local files in server list
(dbg (crop (crop
(append (append
(foldl (foldl
(lambda (file r) (lambda (file r)
;; send files not present ;; send files not present
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
'() '()
server-list)) server-list))
;; restrict the number of uploads each time round ;; restrict the number of uploads each time round
2)))) 2)))
(define (start-sync-files) (define (start-sync-files)
(list (list
...@@ -253,7 +253,12 @@ ...@@ -253,7 +253,12 @@
(string-append "file-list") (string-append "file-list")
(string-append url "fn=file-list") (string-append url "fn=file-list")
(lambda (file-list) (lambda (file-list)
(dbg (sync-files file-list)))))) (let ((r (sync-files file-list)))
(when (not (null? r))
(set-current! 'upload 0)
(debug! "Found a mismatch with files on raspberry pi - fixing..."))
r)))))
;; spit all dirty entities to server ;; spit all dirty entities to server
(define (spit db table entities) (define (spit db table entities)
...@@ -370,6 +375,7 @@ ...@@ -370,6 +375,7 @@
(lambda (id) (lambda (id)
(when (not (in-list? id server-ids)) (when (not (in-list? id server-ids))
(msg "can't find " id " in server data, marking dirty") (msg "can't find " id " in server data, marking dirty")
(debug! "Have an entity here not on raspberry pi - marking for upload...")
;; mark those not present as dirty for next spit cycle ;; mark those not present as dirty for next spit cycle
(update-entity-dirtify db table id))) (update-entity-dirtify db table id)))
ids))) ids)))
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
(define gender-list '(male female)) (define gender-list '(male female))
(define house-type-list '(concrete tin thatched other)) (define house-type-list '(concrete tin thatched other))
(define social-types-list '(friendship knowledge prestige)) (define social-types-list '(knowledge prestige))
(define social-relationship-list '(mother father sister brother spouse children co-wife spouse-mother spouse-father spouse-brother-wife spouse-sister-husband friend neighbour other)) (define social-relationship-list '(mother father sister brother spouse children co-wife spouse-mother spouse-father spouse-brother-wife spouse-sister-husband friend neighbour other))
(define social-residence-list '(same other)) (define social-residence-list '(same other))
(define social-strength-list '(daily weekly monthly less)) (define social-strength-list '(daily weekly monthly less))
...@@ -139,6 +139,56 @@ ...@@ -139,6 +139,56 @@
(ktv "mobile" "int" 0) (ktv "mobile" "int" 0)
(ktv "visit-market" "int" 0) (ktv "visit-market" "int" 0)
(ktv "town-sell" "int" 0) (ktv "town-sell" "int" 0)
(ktv "social-one" "varchar" "")
(ktv "social-one-nickname" "varchar" "")
(ktv "social-one-relationship" "varchar" "")
(ktv "social-one-residence" "varchar" "")
(ktv "social-one-strength" "varchar" "")
(ktv "social-two" "varchar" "")
(ktv "social-two-nickname" "varchar" "")
(ktv "social-two-relationship" "varchar" "")
(ktv "social-two-residence" "varchar" "")
(ktv "social-two-strength" "varchar" "")
(ktv "social-three" "varchar" "")
(ktv "social-three-nickname" "varchar" "")
(ktv "social-three-relationship" "varchar" "")
(ktv "social-three-residence" "varchar" "")
(ktv "social-three-strength" "varchar" "")
(ktv "social-four" "varchar" "")
(ktv "social-four-nickname" "varchar" "")
(ktv "social-four-relationship" "varchar" "")
(ktv "social-four-residence" "varchar" "")
(ktv "social-four-strength" "varchar" "")
(ktv "social-five" "varchar" "")
(ktv "social-five-nickname" "varchar" "")
(ktv "social-five-relationship" "varchar" "")
(ktv "social-five-residence" "varchar" "")
(ktv "social-five-strength" "varchar" "")
(ktv "friendship-one" "varchar" "")
(ktv "friendship-one-nickname" "varchar" "")
(ktv "friendship-one-relationship" "varchar" "")
(ktv "friendship-one-residence" "varchar" "")
(ktv "friendship-one-strength" "varchar" "")
(ktv "friendship-two" "varchar" "")
(ktv "friendship-two-nickname" "varchar" "")
(ktv "friendship-two-relationship" "varchar" "")
(ktv "friendship-two-residence" "varchar" "")
(ktv "friendship-two-strength" "varchar" "")
(ktv "friendship-three" "varchar" "")
(ktv "friendship-three-nickname" "varchar" "")
(ktv "friendship-three-relationship" "varchar" "")
(ktv "friendship-three-residence" "varchar" "")
(ktv "friendship-three-strength" "varchar" "")
(ktv "friendship-four" "varchar" "")
(ktv "friendship-four-nickname" "varchar" "")
(ktv "friendship-four-relationship" "varchar" "")
(ktv "friendship-four-residence" "varchar" "")
(ktv "friendship-four-strength" "varchar" "")
(ktv "friendship-five" "varchar" "")
(ktv "friendship-five-nickname" "varchar" "")
(ktv "friendship-five-relationship" "varchar" "")
(ktv "friendship-five-residence" "varchar" "")
(ktv "friendship-five-strength" "varchar" "")
)) ))
(define crop-ktvlist (define crop-ktvlist
...@@ -486,6 +536,17 @@ ...@@ -486,6 +536,17 @@
(build-small-person-selector id key (list) request-code) (build-small-person-selector id key (list) request-code)
(vert (vert
(horiz (horiz
(linear-layout
0 'vertical (layout 'fill-parent 'wrap-content 1 'centre 20) (list 0 0 0 0)
(list
(text-view 0 (mtext-lookup 'social-nickname)
30 (layout 'wrap-content 'wrap-content 1 'centre 0))
(edit-text (make-id (string-append id-text "-nickname")) "" 30 "normal"
(layout 'fill-parent 'wrap-content 1 'centre 0)
(lambda (v)
(entity-set-value! (string-append key "-nickname") "varchar" v)
'()))))
(mspinner-other-vert (mspinner-other-vert
(string->symbol (string-append id-text "-relationship")) (string->symbol (string-append id-text "-relationship"))
'social-relationship 'social-relationship
...@@ -493,24 +554,26 @@ ...@@ -493,24 +554,26 @@
(lambda (v) (lambda (v)
(entity-set-value! (string-append key "-relationship") "varchar" (entity-set-value! (string-append key "-relationship") "varchar"
(spinner-choice social-relationship-list v)) (spinner-choice social-relationship-list v))
'())) '())))
(horiz
(mspinner-other-vert (mspinner-other-vert
(string->symbol (string-append id-text "-residence")) (string->symbol (string-append id-text "-residence"))
'social-residence 'social-residence
social-residence-list social-residence-list
(lambda (v) (lambda (v)
(entity-set-value! (string-append key "-residence") "varchar" (entity-set-value! (string-append key "-residence") "varchar"
(spinner-choice social-residence-list v)) '()))) (spinner-choice social-residence-list v)) '()))
(vert (vert
(text-view 0 (mtext-lookup 'social-strength) (text-view 0 (mtext-lookup 'social-strength)
30 (layout 'wrap-content 'wrap-content 1 'centre 10)) 30 (layout 'wrap-content 'wrap-content 1 'centre 10))
(spinner (spinner
(make-id (string-append id-text "-strength-spinner")) (make-id (string-append id-text "-strength-spinner"))
(map mtext-lookup social-strength-list) (map mtext-lookup social-strength-list)
(layout 'wrap-content 'wrap-content 1 'centre 0) (layout 'wrap-content 'wrap-content 1 'centre 0)
(lambda (v) (lambda (v)
(entity-set-value! (string-append key "-strength") "varchar" (entity-set-value! (string-append key "-strength") "varchar"
(spinner-choice social-strength-list v)) '())))))))) (spinner-choice social-strength-list v)) '())))))))))
(define (social-connection-return request-code key choose-code) (define (social-connection-return request-code key choose-code)
(when (eqv? request-code choose-code) (when (eqv? request-code choose-code)
...@@ -529,6 +592,10 @@ ...@@ -529,6 +592,10 @@
(string-append key "-residence") (string-append key "-residence")
social-residence-list) social-residence-list)
(list (list
(mupdate
'edit-text
(string->symbol (string-append id-text "-nickname"))
(string-append key "-nickname"))
(mupdate-spinner (mupdate-spinner
(string->symbol (string-append id-text "-strength")) (string->symbol (string-append id-text "-strength"))
(string-append key "-strength") (string-append key "-strength")
...@@ -791,7 +858,7 @@ ...@@ -791,7 +858,7 @@
(lambda (activity arg) (lambda (activity arg)
(activity-layout activity)) (activity-layout activity))
(lambda (activity arg) (lambda (activity arg)
(set-current! 'activity-title "Household List") (set-current! 'activity-title "Households")
(append (append
(update-top-bar) (update-top-bar)
(list (update-list-widget (list (update-list-widget
...@@ -888,8 +955,10 @@ ...@@ -888,8 +955,10 @@
(mbutton-scale 'income-button (lambda () (list (start-activity "income" 0 ""))))) (mbutton-scale 'income-button (lambda () (list (start-activity "income" 0 "")))))
(horiz (horiz
(mbutton-scale 'geneaology-button (lambda () (list (start-activity "geneaology" 0 "")))) (mbutton-scale 'geneaology-button (lambda () (list (start-activity "geneaology" 0 ""))))
(mbutton-scale 'social-button (lambda () (list (start-activity "social" 0 ""))))) (mbutton-scale 'friendship-button (lambda () (list (start-activity "friendship" 0 "")))))
(mbutton-scale 'move-button (lambda () (list (start-activity "move" 0 "")))) (horiz
(mbutton-scale 'social-button (lambda () (list (start-activity "social" 0 ""))))
(mbutton-scale 'move-button (lambda () (list (start-activity "move" 0 "")))))
(spacer 20) (spacer 20)
(delete-button)) (delete-button))
...@@ -944,7 +1013,7 @@ ...@@ -944,7 +1013,7 @@
(lambda (activity arg) (lambda (activity arg)
(activity-layout activity)) (activity-layout activity))
(lambda (activity arg) (lambda (activity arg)
(set-current! 'activity-title "Individual details") (set-current! 'activity-title "Details")
(append (append
(update-top-bar) (update-top-bar)
(mupdate-spinner-other 'tribe "tribe" tribes-list) (mupdate-spinner-other 'tribe "tribe" tribes-list)
...@@ -1012,7 +1081,7 @@ ...@@ -1012,7 +1081,7 @@
(lambda (activity arg) (lambda (activity arg)
(activity-layout activity)) (activity-layout activity))
(lambda (activity arg) (lambda (activity arg)
(set-current! 'activity-title "Individual family") (set-current! 'activity-title "Family")
(append (append
(update-top-bar) (update-top-bar)
(update-person-selector db "sync" 'spouse "id-spouse") (update-person-selector db "sync" 'spouse "id-spouse")
...@@ -1062,7 +1131,7 @@ ...@@ -1062,7 +1131,7 @@
(lambda (activity arg) (lambda (activity arg)
(activity-layout activity)) (activity-layout activity))
(lambda (activity arg) (lambda (activity arg)
(set-current! 'activity-title "Move individual") (set-current! 'activity-title "Move")
(set-current! 'move-household-list (build-array-from-names db "sync" "household")) (set-current! 'move-household-list (build-array-from-names db "sync" "household"))
(append (append
(update-top-bar) (update-top-bar)
...@@ -1089,7 +1158,7 @@ ...@@ -1089,7 +1158,7 @@
(lambda (activity arg) (lambda (activity arg)
(activity-layout activity)) (activity-layout activity))
(lambda (activity arg) (lambda (activity arg)
(set-current! 'activity-title "Individual migration") (set-current! 'activity-title "Migration")
(append (append
(update-top-bar) (update-top-bar)
(list (list
...@@ -1145,7 +1214,7 @@ ...@@ -1145,7 +1214,7 @@
(lambda (activity arg) (lambda (activity arg)
(activity-layout activity)) (activity-layout activity))
(lambda (activity arg) (lambda (activity arg)
(set-current! 'activity-title "Individual income") (set-current! 'activity-title "Income")
;; reset after crop entity ;; reset after crop entity
(entity-init! db "sync" "individual" (get-entity-by-unique db "sync" (get-current 'individual #f))) (entity-init! db "sync" "individual" (get-entity-by-unique db "sync" (get-current 'individual #f)))
(append (append
...@@ -1256,7 +1325,7 @@ ...@@ -1256,7 +1325,7 @@
(activity-layout activity)) (activity-layout activity))
(lambda (activity arg) (lambda (activity arg)
;; reset after child entity ;; reset after child entity
(set-current! 'activity-title "Individual geneaology") (set-current! 'activity-title "Geneaology")
(entity-init! db "sync" "individual" (get-entity-by-unique db "sync" (get-current 'individual #f))) (entity-init! db "sync" "individual" (get-entity-by-unique db "sync" (get-current 'individual #f)))
(append (append
(update-top-bar) (update-top-bar)
...@@ -1288,7 +1357,7 @@ ...@@ -1288,7 +1357,7 @@
(lambda (activity arg) (lambda (activity arg)
(activity-layout activity)) (activity-layout activity))
(lambda (activity arg) (lambda (activity arg)
(set-current! 'activity-title "Individual social network") (set-current! 'activity-title "Social network")
(append (append
(update-top-bar) (update-top-bar)
(list (list
...@@ -1310,12 +1379,45 @@ ...@@ -1310,12 +1379,45 @@
(social-connection-return requestcode "social-five" social-request-code-five) (social-connection-return requestcode "social-five" social-request-code-five)
'())) '()))
(activity
"friendship"
(build-activity
(build-social-connection 'social-one "friendship-one" "friend" social-request-code-one #t)
(build-social-connection 'social-two "friendship-two" "friend" social-request-code-two #f)
(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-five "friendship-five" "friend" social-request-code-five #t)
)
(lambda (activity arg)
(activity-layout activity))
(lambda (activity arg)
(set-current! 'activity-title "Frienships")
(append
(update-top-bar)
(update-social-connection db "sync" 'social-one "friendship-one" "friend" social-request-code-one)
(update-social-connection db "sync" 'social-two "friendship-two" "friend" social-request-code-two)
(update-social-connection db "sync" 'social-three "friendship-three" "friend" social-request-code-three)
(update-social-connection db "sync" 'social-four "friendship-four" "friend" social-request-code-four)
(update-social-connection db "sync" 'social-five "friendship-five" "friend" social-request-code-five)))
(lambda (activity) '())
(lambda (activity) '())
(lambda (activity) '())
(lambda (activity) '())
(lambda (activity requestcode resultcode)
(social-connection-return requestcode "friendship-one" social-request-code-one)
(social-connection-return requestcode "friendship-two" social-request-code-two)
(social-connection-return requestcode "friendship-three" social-request-code-three)
(social-connection-return requestcode "friendship-four" social-request-code-four)
(social-connection-return requestcode "friendship-five" social-request-code-five)
'()))
(activity (activity
"agreement" "agreement"
(build-activity (build-activity
) )
(lambda (activity arg) (lambda (activity arg)
(set-current! 'activity-title "Individual agreement") (set-current! 'activity-title "Agreement")
(activity-layout activity)) (activity-layout activity))
(lambda (activity arg) '()) (lambda (activity arg) '())
(lambda (activity) '()) (lambda (activity) '())
...@@ -1382,7 +1484,7 @@ ...@@ -1382,7 +1484,7 @@
(list))))))))) (list)))))))))
)) ))
(lambda (activity arg) (lambda (activity arg)
(set-current! 'activity-title "Individual chooser") (set-current! 'activity-title "Chooser")
(activity-layout activity)) (activity-layout activity))
(lambda (activity arg) (lambda (activity arg)
(list (update-individual-filter (list)))) (list (update-individual-filter (list))))
......
(define i18n-text (define i18n-text
(list (list
(list 'test-num (list "1" "1" "1" "" )) (list 'test-num (list "1" "1" "1" "" ))
(list 'test-text (list "I am test text" "I am test text" "I am test text" "" )) (list 'test-text (list "I am test text" "I am test text" "I am test text" "" ))
(list 'one (list "one" "" )) (list 'one (list "one" "" ))
...@@ -111,6 +109,7 @@ ...@@ -111,6 +109,7 @@
(list 'details-button (list "Details" "" )) (list 'details-button (list "Details" "" ))
(list 'family-button (list "Family" "Family/Clan" )) (list 'family-button (list "Family" "Family/Clan" ))
(list 'migration-button (list "Migration" "" )) (list 'migration-button (list "Migration" "" ))
(list 'friendship-button (list "Friendship" ))
(list 'income-button (list "Income" "" )) (list 'income-button (list "Income" "" ))
(list 'geneaology-button (list "Geneaology" "" )) (list 'geneaology-button (list "Geneaology" "" ))
(list 'social-button (list "Social" "" )) (list 'social-button (list "Social" "" ))
...@@ -161,7 +160,7 @@ ...@@ -161,7 +160,7 @@
(list 'place-of-birth (list "Place of birth" "" )) (list 'place-of-birth (list "Place of birth" "" ))
(list 'num-residence-changes (list "Number of time place of residence changed since birth" "" )) (list 'num-residence-changes (list "Number of time place of residence changed since birth" "" ))
(list 'village-visits-month (list "Number of times you have visited another village in the last month" "" )) (list 'village-visits-month (list "Number of times you have visited another village in the last month" "" ))
(list 'village-visits-year (list "Number of times you have visited another village in the last year (i.e. betwen last summer and this summer)" "" )) (list 'village-visits-year (list "Number of times you have visited another village in the last year (i.e. between last summer and this summer)" "" ))
(list 'occupation (list "Occupation" "" )) (list 'occupation (list "Occupation" "" ))
(list 'occupation (list "Occupation" "" )) (list 'occupation (list "Occupation" "" ))
(list 'num-people-in-house (list "People living in house" "" )) (list 'num-people-in-house (list "People living in house" "" ))
...@@ -209,7 +208,8 @@ ...@@ -209,7 +208,8 @@
(list 'social-three (list "Three" "" )) (list 'social-three (list "Three" "" ))
(list 'social-four (list "Four" "" )) (list 'social-four (list "Four" "" ))
(list 'social-five (list "Five" "" )) (list 'social-five (list "Five" "" ))
(list 'social-relationship (list "Relationship" "" )) (list 'social-nickname (list "Name" ))
(list 'social-relationship (list "Relation" "" ))
(list 'social-residence (list "Residence" "" )) (list 'social-residence (list "Residence" "" ))
(list 'social-strength (list "Strength" "" )) (list 'social-strength (list "Strength" "" ))
(list 'mother (list "Mother" "" )) (list 'mother (list "Mother" "" ))
......
...@@ -72,6 +72,7 @@ public class starwisp extends StarwispActivity ...@@ -72,6 +72,7 @@ public class starwisp extends StarwispActivity
ActivityManager.RegisterActivity("income",IncomeActivity.class); ActivityManager.RegisterActivity("income",IncomeActivity.class);
ActivityManager.RegisterActivity("geneaology",GeneaologyActivity.class); ActivityManager.RegisterActivity("geneaology",GeneaologyActivity.class);
ActivityManager.RegisterActivity("social",SocialActivity.class); ActivityManager.RegisterActivity("social",SocialActivity.class);
ActivityManager.RegisterActivity("friendship",FriendshipActivity.class);
ActivityManager.RegisterActivity("individual-chooser",IndividualChooserActivity.class); ActivityManager.RegisterActivity("individual-chooser",IndividualChooserActivity.class);
ActivityManager.RegisterActivity("sync",SyncActivity.class); ActivityManager.RegisterActivity("sync",SyncActivity.class);
ActivityManager.RegisterActivity("crop",CropActivity.class); ActivityManager.RegisterActivity("crop",CropActivity.class);
......
...@@ -107,6 +107,7 @@ ...@@ -107,6 +107,7 @@
"details-button"," Details"," ",, "details-button"," Details"," ",,
"family-button"," Family","Family/Clan",, "family-button"," Family","Family/Clan",,
"migration-button"," Migration"," ",, "migration-button"," Migration"," ",,
"friendship-button","Friendship",,,
"income-button"," Income"," ",, "income-button"," Income"," ",,
"geneaology-button"," Geneaology"," ",, "geneaology-button"," Geneaology"," ",,
"social-button"," Social"," ",, "social-button"," Social"," ",,
...@@ -205,7 +206,8 @@ ...@@ -205,7 +206,8 @@
"social-three"," Three"," ",, "social-three"," Three"," ",,
"social-four"," Four"," ",, "social-four"," Four"," ",,
"social-five"," Five"," ",, "social-five"," Five"," ",,
"social-relationship"," Relationship"," ",, "social-nickname","Name",,,
"social-relationship"," Relation"," ",,
"social-residence"," Residence"," ",, "social-residence"," Residence"," ",,
"social-strength"," Strength"," ",, "social-strength"," Strength"," ",,
"mother"," Mother"," ",, "mother"," Mother"," ",,
......
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