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
9090da10
Commit
9090da10
authored
May 12, 2014
by
Dave Griffiths
Browse files
village amenity fixes
parent
97a3674c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
111 additions
and
66 deletions
+111
-66
android/assets/dbsync.scm
android/assets/dbsync.scm
+22
-12
android/assets/starwisp.scm
android/assets/starwisp.scm
+25
-8
android/assets/translations.csv
android/assets/translations.csv
+26
-26
android/assets/translations.scm
android/assets/translations.scm
+19
-10
translations.csv
translations.csv
+19
-10
No files found.
android/assets/dbsync.scm
View file @
9090da10
...
...
@@ -470,20 +470,30 @@
50
(
layout
'fill-parent
'wrap-content
1
'centre
5
)))
(
define
(
medit-text
id
type
fn
)
(
vert
(
text-view
0
(
mtext-lookup
id
)
30
(
layout
'wrap-content
'wrap-content
-1
'centre
0
))
(
edit-text
(
symbol->id
id
)
""
30
type
(
layout
'fill-parent
'wrap-content
-1
'centre
0
)
fn
)))
(
linear-layout
(
make-id
(
string-append
(
symbol->string
id
)
"-container"
))
'vertical
(
layout
'fill-parent
'wrap-content
1
'centre
20
)
(
list
0
0
0
0
)
(
list
(
text-view
0
(
mtext-lookup
id
)
30
(
layout
'wrap-content
'wrap-content
-1
'centre
0
))
(
edit-text
(
symbol->id
id
)
""
30
type
(
layout
'fill-parent
'wrap-content
-1
'centre
0
)
fn
))))
(
define
(
medit-text-scale
id
type
fn
)
(
vert
(
text-view
0
(
mtext-lookup
id
)
30
(
layout
'wrap-content
'wrap-content
1
'centre
0
))
(
edit-text
(
symbol->id
id
)
""
30
type
(
layout
'fill-parent
'wrap-content
1
'centre
0
)
fn
)))
(
linear-layout
(
make-id
(
string-append
(
symbol->string
id
)
"-container"
))
'vertical
(
layout
'fill-parent
'wrap-content
1
'centre
20
)
(
list
0
0
0
0
)
(
list
(
text-view
0
(
mtext-lookup
id
)
30
(
layout
'wrap-content
'wrap-content
1
'centre
0
))
(
edit-text
(
symbol->id
id
)
""
30
type
(
layout
'fill-parent
'wrap-content
1
'centre
0
)
fn
))))
(
define
(
mspinner
id
types
fn
)
(
vert
...
...
android/assets/starwisp.scm
View file @
9090da10
...
...
@@ -166,9 +166,9 @@
(
append
(
cond
((
get-current
'sync-on
#f
)
(
when
(
zero?
(
random
10
))
(
msg
"mangling..."
)
(
mangle-test!
db
"sync"
entity-types
))
;
(when (zero? (random 10))
;
(msg "mangling...")
;
(mangle-test! db "sync" entity-types))
(
msg
"one"
)
(
set-current!
'upload
0
)
(
set-current!
'download
0
)
...
...
@@ -529,9 +529,21 @@
(
let
((
id-text
(
symbol->string
id
)))
(
horiz-colour
(
if
shade
colour-one
colour-two
)
(
mtoggle-button-scale
id
(
lambda
(
v
)
(
entity-set-value!
id-text
"int"
v
)
'
()))
(
linear-layout
0
'vertical
(
layout
200
'wrap-content
-1
'left
0
)
(
list
0
0
0
0
)
(
list
(
text-view
(
symbol->id
id
)
(
mtext-lookup
id
)
30
(
layout
'wrap-content
'wrap-content
-1
'left
0
))
(
mtoggle-button-scale
(
string->symbol
(
string-append
id-text
"-in-village"
))
(
lambda
(
v
)
(
entity-set-value!
id-text
"int"
v
)
(
list
(
update-widget
'edit-text
(
get-id
(
string-append
id-text
"-closest-access-container"
))
(
if
(
eqv?
v
1
)
'hide
'show
)
0
))))))
(
medit-text-scale
(
string->symbol
(
string-append
id-text
"-closest-access"
))
"normal"
(
lambda
(
v
)
(
entity-set-value!
...
...
@@ -550,10 +562,15 @@
(
let
((
id-text
(
symbol->string
id
)))
(
append
(
list
(
mupdate
'toggle-button
id
id-text
)
(
mupdate
'toggle-button
(
string->symbol
(
string-append
id-text
"-in-village"
))
id-text
)
(
mupdate
'edit-text
(
string->symbol
(
string-append
id-text
"-closest-access"
))
(
string-append
id-text
"-closest-access"
)))
(
string-append
id-text
"-closest-access"
))
(
update-widget
'edit-text
(
get-id
(
string-append
id-text
"-closest-access-container"
))
(
if
(
eqv?
(
entity-get-value
id-text
)
1
)
'hide
'show
)
0
))
(
mupdate-gps
(
string->symbol
(
string-append
id-text
"-gps"
))
(
string-append
id-text
"-gps"
)))))
...
...
android/assets/translations.csv
View file @
9090da10
test-num,1,1,1,
test-text, I am test text, I am test text, I am test text,
test-num,1,1,1,
test-text, I am test text, I am test text, I am test text,
one, one, ,,
two, two, ,,
three, three, ,,
...
...
@@ -10,17 +10,17 @@ individual, Individual, ,,
individuals, Individuals, ,,
add-item-to-list,0, ,,
default-village-name, New village, ,,
title, Symbai, Symbai, Symbai,
sync, Sync, Sync, Sync,
languages, Choose language, Choose language, Choose language,
english, English, English, English,
khasi, Khasi, Khasi, Khasi,
hindi, Hindi, Hindi, Hindi,
user-id, Your user ID, User ID, User ID,
save, Save, Save, Save,
back, Back, Back, Back,
off, Off, Off, Off,
villages, Villages, Villages, Villages,
title, Symbai, Symbai, Symbai,
sync, Sync, Sync, Sync,
languages, Choose language, Choose language, Choose language,
english, English, English, English,
khasi, Khasi, Khasi, Khasi,
hindi, Hindi, Hindi, Hindi,
user-id, Your user ID, User ID, User ID,
save, Save, Save, Save,
back, Back, Back, Back,
off, Off, Off, Off,
villages, Villages, Villages, Villages,
list-empty, List empty, ,,
delete, Delete, ,,
delete-are-you-sure, Are you sure you want to delete this?, ,,
...
...
@@ -29,7 +29,7 @@ quick-name, New person name, ,,
quick-add, Quick add, ,,
find-individual, Find individual, ,,
filter, Filter, ,,
off, Off, Off, Off,
off, Off, Off, Off,
name, Name, ,,
sync-all, Sync me!, ,,
sync-syncall, Sync everything, ,,
...
...
@@ -40,9 +40,9 @@ email-local, Email local DB, ,,
debug, Debug, ,,
sync-back, Back, ,,
sync-prof, Profile, ,,
village-name, Village name, Village name, Village name,
block, Block, Block, Block,
district, District, District, District,
village-name, Village name, Village name, Village name,
block, Block, Block, Block,
district, District, District, District,
car, Accessible by car, ,,
household-list, Household list, ,,
amenities, Amenities, ,,
...
...
@@ -52,31 +52,31 @@ closest-access, Closest place of access, ,,
house-gps, GPS, ,,
toilet-gps, GPS, ,,
school, School, ,,
school-closest-access,
A
ccess, ,,
school-closest-access,
Closest a
ccess, ,,
school-gps, GPS, ,,
hospital, Hospital/Health care centre, ,,
hospital-closest-access,
A
ccess, ,,
hospital-closest-access,
Closest a
ccess, ,,
hospital-gps, GPS, ,,
post-office, Post Office, ,,
post-office-closest-access,
A
ccess, ,,
post-office-closest-access,
Closest a
ccess, ,,
post-office-gps, GPS, ,,
railway-station, Railway station, ,,
railway-station-closest-access,
A
ccess, ,,
railway-station-closest-access,
Closest a
ccess, ,,
railway-station-gps, GPS, ,,
state-bus-service, Inter-state bus service, ,,
state-bus-service-closest-access,
A
ccess, ,,
state-bus-service-closest-access,
Closest a
ccess, ,,
state-bus-service-gps, GPS, ,,
district-bus-service, Inter-village/district bus service, ,,
district-bus-service-closest-access,
A
ccess, ,,
district-bus-service-closest-access,
Closest a
ccess, ,,
district-bus-service-gps, GPS, ,,
panchayat, Village Panchayat Office, ,,
panchayat-closest-access,
A
ccess, ,,
panchayat-closest-access,
Closest a
ccess, ,,
panchayat-gps, GPS, ,,
NGO, Presence of NGO's working with them, ,,
NGO-closest-access,
A
ccess, ,,
NGO-closest-access,
Closest a
ccess, ,,
NGO-gps, GPS, ,,
market, Market, ,,
market-closest-access,
A
ccess, ,,
market-closest-access,
Closest a
ccess, ,,
market-gps, GPS, ,,
household-name, Household name, ,,
default-household-name, A household, ,,
...
...
android/assets/translations.scm
View file @
9090da10
...
...
@@ -11,7 +11,7 @@
(
list
'households
(
list
"Households"
""
))
(
list
'individual
(
list
"Individual"
""
))
(
list
'individuals
(
list
"Individuals"
""
))
(
list
'add-item-to-list
(
list
"
+
"
""
))
(
list
'add-item-to-list
(
list
"
0
"
""
))
(
list
'default-village-name
(
list
"New village"
""
))
(
list
'title
(
list
"Symbai"
"Symbai"
"Symbai"
""
))
(
list
'sync
(
list
"Sync"
"Sync"
"Sync"
""
))
...
...
@@ -54,32 +54,41 @@
(
list
'closest-access
(
list
"Closest place of access"
""
))
(
list
'house-gps
(
list
"GPS"
""
))
(
list
'toilet-gps
(
list
"GPS"
""
))
(
list
'school-in-village
(
list
"In Village"
))
(
list
'school
(
list
"School"
""
))
(
list
'school-closest-access
(
list
"
A
ccess"
""
))
(
list
'school-closest-access
(
list
"
Closest a
ccess"
""
))
(
list
'school-gps
(
list
"GPS"
""
))
(
list
'hospital-in-village
(
list
"In Village"
))
(
list
'hospital
(
list
"Hospital/Health care centre"
""
))
(
list
'hospital-closest-access
(
list
"
A
ccess"
""
))
(
list
'hospital-closest-access
(
list
"
Closest a
ccess"
""
))
(
list
'hospital-gps
(
list
"GPS"
""
))
(
list
'Post-office-in-village
(
list
"In Village"
))
(
list
'post-office
(
list
"Post Office"
""
))
(
list
'post-office-closest-access
(
list
"
A
ccess"
""
))
(
list
'post-office-closest-access
(
list
"
Closest a
ccess"
""
))
(
list
'post-office-gps
(
list
"GPS"
""
))
(
list
'railway-station-in-village
(
list
"In Village"
))
(
list
'railway-station
(
list
"Railway station"
""
))
(
list
'railway-station-closest-access
(
list
"
A
ccess"
""
))
(
list
'railway-station-closest-access
(
list
"
Closest a
ccess"
""
))
(
list
'railway-station-gps
(
list
"GPS"
""
))
(
list
'State-bus-service-in-village
(
list
"In Village"
))
(
list
'state-bus-service
(
list
"Inter-state bus service"
""
))
(
list
'state-bus-service-closest-access
(
list
"
A
ccess"
""
))
(
list
'state-bus-service-closest-access
(
list
"
Closest a
ccess"
""
))
(
list
'state-bus-service-gps
(
list
"GPS"
""
))
(
list
'District-bus-service-in-village
(
list
"In Village"
))
(
list
'district-bus-service
(
list
"Inter-village/district bus service"
""
))
(
list
'district-bus-service-closest-access
(
list
"
A
ccess"
""
))
(
list
'district-bus-service-closest-access
(
list
"
Closest a
ccess"
""
))
(
list
'district-bus-service-gps
(
list
"GPS"
""
))
(
list
'Panchayat-in-village
(
list
"In Village"
))
(
list
'panchayat
(
list
"Village Panchayat Office"
""
))
(
list
'panchayat-closest-access
(
list
"
A
ccess"
""
))
(
list
'panchayat-closest-access
(
list
"
Closest a
ccess"
""
))
(
list
'panchayat-gps
(
list
"GPS"
""
))
(
list
'NGO-in-village
(
list
"In Village"
))
(
list
'NGO
(
list
"Presence of NGO's working with them"
""
))
(
list
'NGO-closest-access
(
list
"
A
ccess"
""
))
(
list
'NGO-closest-access
(
list
"
Closest a
ccess"
""
))
(
list
'NGO-gps
(
list
"GPS"
""
))
(
list
'market-in-village
(
list
"In Village"
))
(
list
'market
(
list
"Market"
""
))
(
list
'market-closest-access
(
list
"
A
ccess"
""
))
(
list
'market-closest-access
(
list
"
Closest a
ccess"
""
))
(
list
'market-gps
(
list
"GPS"
""
))
(
list
'household-name
(
list
"Household name"
""
))
(
list
'default-household-name
(
list
"A household"
""
))
...
...
translations.csv
View file @
9090da10
...
...
@@ -8,7 +8,7 @@
"households"," Households"," ",,
"individual"," Individual"," ",,
"individuals"," Individuals"," ",,
"add-item-to-list",
"+"
," ",,
"add-item-to-list",
0
," ",,
"default-village-name"," New village"," ",,
"title"," Symbai"," Symbai"," Symbai"," "
"sync"," Sync"," Sync"," Sync"," "
...
...
@@ -51,32 +51,41 @@
"closest-access"," Closest place of access"," ",,
"house-gps"," GPS"," ",,
"toilet-gps"," GPS"," ",,
"school-in-village","In Village",,,
"school"," School"," ",,
"school-closest-access","
A
ccess"," ",,
"school-closest-access","
Closest a
ccess"," ",,
"school-gps"," GPS"," ",,
"hospital-in-village","In Village",,,
"hospital"," Hospital/Health care centre"," ",,
"hospital-closest-access","
A
ccess"," ",,
"hospital-closest-access","
Closest a
ccess"," ",,
"hospital-gps"," GPS"," ",,
"Post-office-in-village","In Village",,,
"post-office"," Post Office"," ",,
"post-office-closest-access","
A
ccess"," ",,
"post-office-closest-access","
Closest a
ccess"," ",,
"post-office-gps"," GPS"," ",,
"railway-station-in-village","In Village",,,
"railway-station"," Railway station"," ",,
"railway-station-closest-access","
A
ccess"," ",,
"railway-station-closest-access","
Closest a
ccess"," ",,
"railway-station-gps"," GPS"," ",,
"State-bus-service-in-village","In Village",,,
"state-bus-service"," Inter-state bus service"," ",,
"state-bus-service-closest-access","
A
ccess"," ",,
"state-bus-service-closest-access","
Closest a
ccess"," ",,
"state-bus-service-gps"," GPS"," ",,
"District-bus-service-in-village","In Village",,,
"district-bus-service"," Inter-village/district bus service"," ",,
"district-bus-service-closest-access","
A
ccess"," ",,
"district-bus-service-closest-access","
Closest a
ccess"," ",,
"district-bus-service-gps"," GPS"," ",,
"Panchayat-in-village","In Village",,,
"panchayat"," Village Panchayat Office"," ",,
"panchayat-closest-access","
A
ccess"," ",,
"panchayat-closest-access","
Closest a
ccess"," ",,
"panchayat-gps"," GPS"," ",,
"NGO-in-village","In Village",,,
"NGO"," Presence of NGO's working with them"," ",,
"NGO-closest-access","
A
ccess"," ",,
"NGO-closest-access","
Closest a
ccess"," ",,
"NGO-gps"," GPS"," ",,
"market-in-village","In Village",,,
"market"," Market"," ",,
"market-closest-access","
A
ccess"," ",,
"market-closest-access","
Closest a
ccess"," ",,
"market-gps"," GPS"," ",,
"household-name"," Household name"," ",,
"default-household-name"," A household"," ",,
...
...
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