full questions in income screen

android/assets/starwisp.scm

@@ -68,7 +68,6 @@
 (define married-list '(ever-married currently-married currently-single seperated))
 (define residence-list '(birthplace spouse-village))
 (define gender-list '(male female))
-(define occupation-list '(agriculture gathering labour cows fishing other))
 (define house-type-list '(concrete tin thatched other))
 
 (define social-types-list '(friendship knowledge prestige))
@@ -121,7 +120,12 @@
    (ktv "num-residence-changes" "int" 0)
    (ktv "village-visits-month" "int" 0)
    (ktv "village-visits-year" "int" 0)
-   (ktv "occupation" "varchar" "")
+   (ktv "occupation-agriculture" "int" 0)
+   (ktv "occupation-gathering" "int" 0)
+   (ktv "occupation-labour" "int" 0)
+   (ktv "occupation-cows" "int" 0)
+   (ktv "occupation-fishing" "int" 0)
+   (ktv "occupation-other" "varchar" "")
    (ktv "contribute" "int" 0)
    (ktv "own-land" "int" 0)
    (ktv "rent-land" "int" 0)
@@ -1090,16 +1094,24 @@
   (activity
    "income"
    (build-activity
-    (mspinner 'occupation occupation-list
-              (lambda (v) (entity-set-value! "occupation" "varchar"
-                                             (spinner-choice occupation-list v))
-                      '()))
+    (vert
+     (mtitle 'occupation)
+     (horiz
+      (mtoggle-button-scale 'occupation-agriculture (lambda (v) (entity-set-value! "occupation-agriculture" "int" v) '()))
+      (mtoggle-button-scale 'occupation-gathering (lambda (v) (entity-set-value! "occupation-gathering" "int" v) '()))
+      (mtoggle-button-scale 'occupation-labour (lambda (v) (entity-set-value! "occupation-labour" "int" v) '())))
+     (horiz
+      (mtoggle-button-scale 'occupation-cows (lambda (v) (entity-set-value! "occupation-cows" "int" v) '()))
+      (mtoggle-button-scale 'occupation-fishing (lambda (v) (entity-set-value! "occupation-fishing" "int" v) '()))
+      (medit-text 'occupation-other "normal" (lambda (v) (entity-set-value! "occupation-other" "varchar" v) '()))))
+
     (horiz
      (mtoggle-button-scale 'contribute (lambda (v) (entity-set-value! "contribute" "int" v) '()))
      (mtoggle-button-scale 'own-land (lambda (v) (entity-set-value! "own-land" "int" v) '())))
     (horiz
      (mtoggle-button-scale 'rent-land (lambda (v) (entity-set-value! "rent-land" "int" v) '()))
      (mtoggle-button-scale 'hire-land (lambda (v) (entity-set-value! "hire-land" "int" v) '())))
+    (mtext 'crops-detail)
     (build-list-widget
      db "sync" 'crops "crop" "crop" (lambda () (get-current 'individual #f))
      (lambda () crop-ktvlist))
@@ -1128,7 +1140,12 @@
       (mupdate-spinner-other 'house-type "house-type" house-type-list)
       (list
        (update-list-widget db "sync" "crop" "crop" (get-current 'individual #f))
-       (mupdate-spinner 'occupation "occupation" occupation-list)
+       (mupdate 'toggle-button 'occupation-agriculture "occupation-agriculture")
+       (mupdate 'toggle-button 'occupation-gathering "occupation-gathering")
+       (mupdate 'toggle-button 'occupation-labour "occupation-labour")
+       (mupdate 'toggle-button 'occupation-cows "occupation-cows")
+       (mupdate 'toggle-button 'occupation-fishing "occupation-fishing")
+       (mupdate 'edit-text 'occupation-other "occupation-other")
        (mupdate 'toggle-button 'contribute "contribute")
        (mupdate 'toggle-button 'own-land "own-land")
        (mupdate 'toggle-button 'rent-land "rent-land")

android/assets/translations.scm

 (define i18n-text
   (list
 
+
 (list 'test-num (list "1" "1" "1" "" ))
 (list 'test-text (list "I am test text" "I am test text" "I am test text" "" ))
 (list 'one (list "one" "" ))
@@ -163,34 +164,30 @@
 (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 'occupation (list "Occupation" "" ))
 (list 'occupation (list "Occupation" "" ))
-(list 'agriculture (list "Agriculture" "" ))
-(list 'gathering (list "Gathering" "" ))
-(list 'labour (list "Labour" "" ))
-(list 'cows (list "Cows" "" ))
-(list 'fishing (list "Fishing" "" ))
 (list 'num-people-in-house (list "People living in house" "" ))
-(list 'contribute (list "Contribute to family earnings?" "" ))
-(list 'own-land (list "Own land?" "" ))
-(list 'rent-land (list "Rent out your land?" "" ))
-(list 'hire-land (list "Hire land?" "" ))
+(list 'contribute (list "Do you contribute to the family earnings?" "" ))
+(list 'own-land (list "Do you own land?" "" ))
+(list 'rent-land (list "Do you rent out your land?" "" ))
+(list 'hire-land (list "Do you hire someone else's land to work on?" "" ))
+(list 'crops-detail (list "List the crops you grew last year:" ))
 (list 'crops (list "Crops" "" ))
 (list 'unit (list "Unit" "" ))
 (list 'quantity (list "Quantity" "" ))
 (list 'used-or-eaten (list "Used/Eaten" "" ))
 (list 'sold (list "Sold" "" ))
 (list 'seed (list "Seed (hybrid/local)" "" ))
-(list 'house-type (list "House type" "" ))
+(list 'house-type (list "Type of house" "" ))
 (list 'concrete (list "Concrete" "" ))
 (list 'tin (list "Tin" "" ))
 (list 'thatched (list "Thatched" "" ))
 (list 'loan (list "Outstanding loans" "" ))
-(list 'earning (list "One day's earnings" "" ))
+(list 'earning (list "How much do you earn for one day's labour?" "" ))
 (list 'in-the-home (list "In the home" "" ))
 (list 'radio (list "Radio" "" ))
 (list 'tv (list "TV" "" ))
 (list 'mobile (list "Mobile phone" "" ))
-(list 'visit-market (list "Tribal market visits" "" ))
-(list 'town-sell (list "Town or city visits" "" ))
+(list 'visit-market (list "How many times do you visit the tribal market?" "" ))
+(list 'town-sell (list "How many times a month do you visit your nearest city or town to buy or sell something?" "" ))
 (list 'default-crop-name (list "A crop" "" ))
 (list 'crop-name (list "Crop name" "" ))
 (list 'crop-unit (list "Crop unit" "" ))
@@ -246,6 +243,13 @@
 (list 'add-are-you-sure (list "Are you sure you want to add this individual?" ))
 (list 'gps-are-you-sure (list "Are you sure you want to record your current position?" ))
 (list 'gps-are-you-sure-2 (list "Please confirm again..." ))
-(list 'Current-village (list "Your current village" ))
+(list 'current-village (list "Your current village" ))
 (list 'num-children (list "Number of children" ))
+(list 'occupation-agriculture (list "Agriculture" ))
+(list 'occupation-gathering (list "Gathering" ))
+(list 'occupation-labour (list "Labour" ))
+(list 'occupation-cows (list "Cows" ))
+(list 'occupation-fishing (list "Fishing" ))
+(list 'occupation-other (list "Other" ))
+
 ))

translations.csv

@@ -160,34 +160,30 @@
 "village-visits-year"," Number of times you have visited another village in the last year (i.e. betwen last summer and this summer)"," ",,
 "occupation"," Occupation"," ",,
 "occupation"," Occupation"," ",,
-"agriculture"," Agriculture"," ",,
-"gathering"," Gathering"," ",,
-"labour"," Labour"," ",,
-"cows"," Cows"," ",,
-"fishing"," Fishing"," ",,
 "num-people-in-house"," People living in house"," ",,
-"contribute"," Contribute to family earnings?"," ",,
-"own-land"," Own land?"," ",,
-"rent-land"," Rent out your land?"," ",,
-"hire-land"," Hire land?"," ",,
+"contribute"," Do you contribute to the family earnings?"," ",,
+"own-land"," Do you own land?"," ",,
+"rent-land"," Do you rent out your land?"," ",,
+"hire-land"," Do you hire someone else's land to work on?"," ",,
+"crops-detail","List the crops you grew last year:",,,
 "crops"," Crops"," ",,
 "unit"," Unit"," ",,
 "quantity"," Quantity"," ",,
 "used-or-eaten"," Used/Eaten"," ",,
 "sold"," Sold"," ",,
 "seed"," Seed (hybrid/local)"," ",,
-"house-type"," House type"," ",,
+"house-type"," Type of house"," ",,
 "concrete"," Concrete"," ",,
 "tin"," Tin"," ",,
 "thatched"," Thatched"," ",,
 "loan"," Outstanding loans"," ",,
-"earning"," One day's earnings"," ",,
+"earning"," How much do you earn for one day's labour?"," ",,
 "in-the-home"," In the home"," ",,
 "radio"," Radio"," ",,
 "tv"," TV"," ",,
 "mobile"," Mobile phone"," ",,
-"visit-market"," Tribal market visits"," ",,
-"town-sell"," Town or city visits"," ",,
+"visit-market"," How many times do you visit the tribal market?"," ",,
+"town-sell","How many times a month do you visit your nearest city or town to buy or sell something?"," ",,
 "default-crop-name"," A crop"," ",,
 "crop-name"," Crop name"," ",,
 "crop-unit"," Crop unit"," ",,
@@ -243,5 +239,11 @@
 "add-are-you-sure","Are you sure you want to add this individual?",,,
 "gps-are-you-sure","Are you sure you want to record your current position?",,,
 "gps-are-you-sure-2","Please confirm again...",,,
-"Current-village","Your current village",,,
+"current-village","Your current village",,,
 "num-children","Number of children",,,
+"occupation-agriculture","Agriculture",,,
+"occupation-gathering","Gathering",,,
+"occupation-labour","Labour",,,
+"occupation-cows","Cows",,,
+"occupation-fishing","Fishing",,,
+"occupation-other","Other",,,