Commit c2181df9 authored by Dave Griffiths's avatar Dave Griffiths
Browse files

default social fixes, name display tweak

parent 1f024db1
...@@ -60,18 +60,18 @@ ...@@ -60,18 +60,18 @@
;;(display (db-all db "local" "app-settings"))(newline) ;;(display (db-all db "local" "app-settings"))(newline)
(define tribes-list '(not-set khasi other no-answered)) (define tribes-list '(not-set khasi no-answered other))
(define subtribe-list '(not-set khynriam pnar bhoi war other not-answered)) (define subtribe-list '(not-set khynriam pnar bhoi war not-answered other))
(define education-list '(not-set primary middle high secondary university not-answered)) (define education-list '(not-set primary middle high secondary university not-answered))
(define married-list '(not-set currently-married currently-single seperated not-answered)) (define married-list '(not-set currently-married currently-single seperated not-answered))
(define residence-list '(not-set birthplace spouse-village not-answered)) (define residence-list '(not-set birthplace spouse-village not-answered))
(define gender-list '(not-set male female not-answered)) (define gender-list '(not-set male female not-answered))
(define house-type-list '(not-set concrete tin thatched other not-answered)) (define house-type-list '(not-set concrete tin thatched not-answered other))
(define yesno-list '(not-set yes no not-answered)) (define yesno-list '(not-set yes no not-answered))
(define social-types-list '(knowledge prestige)) (define social-types-list '(knowledge prestige))
(define social-relationship-list '(not-set mother father sister brother spouse children co-wife spouse-mother spouse-father spouse-brother-wife spouse-sister-husband friend neighbour other not-answered)) (define social-relationship-list '(not-set mother father sister brother spouse children co-wife spouse-mother spouse-father spouse-brother-wife spouse-sister-husband friend neighbour not-answered other))
(define social-residence-list '(not-set same other not-answered)) (define social-residence-list '(not-set same not-answered other))
(define social-strength-list '(not-set daily weekly monthly less not-answered)) (define social-strength-list '(not-set daily weekly monthly less not-answered))
(define village-ktvlist (define village-ktvlist
...@@ -157,54 +157,54 @@ ...@@ -157,54 +157,54 @@
(ktv "town-sell" "int" -1) (ktv "town-sell" "int" -1)
(ktv "social-one" "varchar" "") (ktv "social-one" "varchar" "")
(ktv "social-one-nickname" "varchar" "") (ktv "social-one-nickname" "varchar" "")
(ktv "social-one-relationship" "varchar" "") (ktv "social-one-relationship" "varchar" "not-set")
(ktv "social-one-residence" "varchar" "") (ktv "social-one-residence" "varchar" "not-set")
(ktv "social-one-strength" "varchar" "") (ktv "social-one-strength" "varchar" "not-set")
(ktv "social-two" "varchar" "") (ktv "social-two" "varchar" "")
(ktv "social-two-nickname" "varchar" "") (ktv "social-two-nickname" "varchar" "")
(ktv "social-two-relationship" "varchar" "") (ktv "social-two-relationship" "varchar" "not-set")
(ktv "social-two-residence" "varchar" "") (ktv "social-two-residence" "varchar" "not-set")
(ktv "social-two-strength" "varchar" "") (ktv "social-two-strength" "varchar" "not-set")
(ktv "social-three" "varchar" "") (ktv "social-three" "varchar" "")
(ktv "social-three-nickname" "varchar" "") (ktv "social-three-nickname" "varchar" "")
(ktv "social-three-relationship" "varchar" "") (ktv "social-three-relationship" "varchar" "not-set")
(ktv "social-three-residence" "varchar" "") (ktv "social-three-residence" "varchar" "not-set")
(ktv "social-three-strength" "varchar" "") (ktv "social-three-strength" "varchar" "not-set")
(ktv "social-four" "varchar" "") (ktv "social-four" "varchar" "")
(ktv "social-four-nickname" "varchar" "") (ktv "social-four-nickname" "varchar" "")
(ktv "social-four-relationship" "varchar" "") (ktv "social-four-relationship" "varchar" "not-set")
(ktv "social-four-residence" "varchar" "") (ktv "social-four-residence" "varchar" "not-set")
(ktv "social-four-strength" "varchar" "") (ktv "social-four-strength" "varchar" "not-set")
(ktv "social-five" "varchar" "") (ktv "social-five" "varchar" "")
(ktv "social-five-nickname" "varchar" "") (ktv "social-five-nickname" "varchar" "")
(ktv "social-five-relationship" "varchar" "") (ktv "social-five-relationship" "varchar" "not-set")
(ktv "social-five-residence" "varchar" "") (ktv "social-five-residence" "varchar" "not-set")
(ktv "social-five-strength" "varchar" "") (ktv "social-five-strength" "varchar" "not-set")
(ktv "friendship-one" "varchar" "") (ktv "friendship-one" "varchar" "")
(ktv "friendship-one-nickname" "varchar" "") (ktv "friendship-one-nickname" "varchar" "")
(ktv "friendship-one-relationship" "varchar" "") (ktv "friendship-one-relationship" "varchar" "not-set")
(ktv "friendship-one-residence" "varchar" "") (ktv "friendship-one-residence" "varchar" "not-set")
(ktv "friendship-one-strength" "varchar" "") (ktv "friendship-one-strength" "varchar" "not-set")
(ktv "friendship-two" "varchar" "") (ktv "friendship-two" "varchar" "")
(ktv "friendship-two-nickname" "varchar" "") (ktv "friendship-two-nickname" "varchar" "")
(ktv "friendship-two-relationship" "varchar" "") (ktv "friendship-two-relationship" "varchar" "not-set")
(ktv "friendship-two-residence" "varchar" "") (ktv "friendship-two-residence" "varchar" "not-set")
(ktv "friendship-two-strength" "varchar" "") (ktv "friendship-two-strength" "varchar" "not-set")
(ktv "friendship-three" "varchar" "") (ktv "friendship-three" "varchar" "")
(ktv "friendship-three-nickname" "varchar" "") (ktv "friendship-three-nickname" "varchar" "")
(ktv "friendship-three-relationship" "varchar" "") (ktv "friendship-three-relationship" "varchar" "not-set")
(ktv "friendship-three-residence" "varchar" "") (ktv "friendship-three-residence" "varchar" "not-set")
(ktv "friendship-three-strength" "varchar" "") (ktv "friendship-three-strength" "varchar" "not-set")
(ktv "friendship-four" "varchar" "") (ktv "friendship-four" "varchar" "")
(ktv "friendship-four-nickname" "varchar" "") (ktv "friendship-four-nickname" "varchar" "")
(ktv "friendship-four-relationship" "varchar" "") (ktv "friendship-four-relationship" "varchar" "not-set")
(ktv "friendship-four-residence" "varchar" "") (ktv "friendship-four-residence" "varchar" "not-set")
(ktv "friendship-four-strength" "varchar" "") (ktv "friendship-four-strength" "varchar" "not-set")
(ktv "friendship-five" "varchar" "") (ktv "friendship-five" "varchar" "")
(ktv "friendship-five-nickname" "varchar" "") (ktv "friendship-five-nickname" "varchar" "")
(ktv "friendship-five-relationship" "varchar" "") (ktv "friendship-five-relationship" "varchar" "not-set")
(ktv "friendship-five-residence" "varchar" "") (ktv "friendship-five-residence" "varchar" "not-set")
(ktv "friendship-five-strength" "varchar" "") (ktv "friendship-five-strength" "varchar" "not-set")
)) ))
(define crop-ktvlist (define crop-ktvlist
...@@ -1118,10 +1118,6 @@ ...@@ -1118,10 +1118,6 @@
(mtext 'name-display) (mtext 'name-display)
(spacer 20) (spacer 20)
(mtext 'first-name-display) (mtext 'first-name-display)
(spacer 20)
(mtext 'family-display)
(spacer 20)
(mtext 'photo-id-display)
)) ))
(mtext 'last-editor) (mtext 'last-editor)
(horiz (horiz
...@@ -1177,10 +1173,8 @@ ...@@ -1177,10 +1173,8 @@
(update-widget 'text-view (get-id "last-social-editor") 'text (update-widget 'text-view (get-id "last-social-editor") 'text
(string-append "Last edit by " (history-get-last (entity-get-value "social-edit-history")))) (string-append "Last edit by " (history-get-last (entity-get-value "social-edit-history"))))
(mupdate 'edit-text 'individual-notes "notes") (mupdate 'edit-text 'individual-notes "notes")
(mupdate 'text-view 'name-display "name") (update-widget 'text-view (get-id "name-display") 'text (string-append "ID: " (entity-get-value "name")))
(mupdate 'text-view 'first-name-display "first-name") (update-widget 'text-view (get-id "first-name-display") 'text (string-append "Name: " (entity-get-value "first-name") " " (entity-get-value "family")))
(mupdate 'text-view 'family-display "family")
(mupdate 'text-view 'photo-id-display "photo-id")
(mupdate 'image-view 'photo "photo")))) (mupdate 'image-view 'photo "photo"))))
(lambda (activity) '()) (lambda (activity) '())
(lambda (activity) '()) (lambda (activity) '())
......
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