Skip to content

Commit

Permalink
Merge branch 'branching' of github.com:SEL-Columbia/dokomoforms into …
Browse files Browse the repository at this point in the history
…branching
  • Loading branch information
vr2262 committed Aug 18, 2015
2 parents 7cea839 + e0f109d commit e27c016
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion dokomoforms/static/cache.appcache
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CACHE MANIFEST
# Version 1439927415
# Version 1439928854

/static/persona.js
#/static/lib.js
Expand Down
12 changes: 7 additions & 5 deletions tests/branch-heaven-fixture.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,24 +56,26 @@
buckets=[
models.construct_bucket(
bucket_type='integer',
bucket='(1, 2]'
bucket='(, 2]'
),
],

nodes=[
models.construct_survey_node(
node=models.construct_node(
title={
'English': 'integer sub node (nested)'
'English': 'date sub node (nested)'
},
type_constraint='integer',
type_constraint='date',
),
sub_surveys=[
models.SubSurvey(
buckets=[
models.construct_bucket(
bucket_type='integer',
bucket='(3, 5]'
bucket_type='date',
bucket=(
'(2011-01-01, 2014-01-02]'
)
),
],

Expand Down

0 comments on commit e27c016

Please sign in to comment.