Skip to content

Commit

Permalink
update data, landing page, and exit survey
Browse files Browse the repository at this point in the history
  • Loading branch information
mizzao committed Jun 17, 2014
1 parent 046051e commit 6a4a704
Show file tree
Hide file tree
Showing 8 changed files with 1,639 additions and 11 deletions.
14 changes: 12 additions & 2 deletions client/index.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,17 @@ Router.map ->
# TODO remove this when EventedMind/iron-router#607 is merged
@setLayout(null)
@render()
@route 'exitsurvey',
@route 'exitsurvey/tutorial',
template: "tutorialSurvey"
layoutTemplate: 'defaultContainer'
onBeforeAction: (pause) ->
unless TurkServer.inExitSurvey()
@render("loadError")
pause()
@route 'exitsurvey/posttask',
template: "postTaskSurvey"
layoutTemplate: 'defaultContainer'
# TODO deny if not in survey

Meteor.startup ->
Session.setDefault("taskView", 'events')
Expand All @@ -75,8 +80,9 @@ Meteor.startup ->
Deps.autorun ->
Router.go("/mapper") if TurkServer.inExperiment()

# TODO generalize this based on batch
Deps.autorun ->
Router.go("/exitsurvey") if TurkServer.inExitSurvey()
Router.go("/exitsurvey/posttask") if TurkServer.inExitSurvey()

###
Window sizing warning
Expand Down Expand Up @@ -124,6 +130,10 @@ Deps.autorun ->
Templates and helpers
###

Template.home.landingTemplate = ->
# TODO make this dynamic based on batch
Template.taskLanding

Template.mapper.rendered = ->
# Set initial active tab when state changes
@comp = Deps.autorun ->
Expand Down
20 changes: 15 additions & 5 deletions client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,25 @@
<template name="home">
<div class="container fill-height">
<div class="jumbotron fill-height scroll-vertical">
{{> tut_welcome_recruiting}}

<p>After completing this HIT, you will gain a qualification for crisis mapping tasks where you will collaborate with other workers and earn from $6 to $15 an hour.</p>

<p>Accept the HIT to complete the tutorial, which will take about 10 minutes.</p>
{{> landingTemplate}}
</div>
</div>
</template>

<template name="taskLanding">
<p>This is the task for the Crisis Mapping Project.</p>

<p>Accept the HIT to join the project. You will first complete a quick tutorial, as in the previous qualification task. Then, you will join a collaborative crisis mapping session with other users, where you earn from $6 to $15 an hour as a bonus.</p>
</template>

<template name="recruitingLanding">
{{> tut_welcome_recruiting}}

<p>After completing this HIT, you will gain a qualification for crisis mapping tasks where you will collaborate with other workers and earn from $6 to $15 an hour.</p>

<p>Accept the HIT to complete the tutorial, which will take about 10 minutes.</p>
</template>

<template name="defaultContainer">
<div class="container fill-height scroll-vertical">
{{> yield}}
Expand Down
2 changes: 1 addition & 1 deletion client/meta/exitsurvey.coffee
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Template.exitsurvey.events =
Template.tutorialSurvey.events =
"submit form": (e, tmpl) ->
e.preventDefault()

Expand Down
41 changes: 40 additions & 1 deletion client/meta/exitsurvey.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<template name="exitsurvey">
<template name="tutorialSurvey">
<form class="well survey">
<fieldset>
<legend>Please briefly answer the questions below.</legend>
Expand Down Expand Up @@ -41,3 +41,42 @@
</fieldset>
</form>
</template>

<template name="postTaskSurvey">
<form class="well survey">
<legend>Please briefly answer the questions below.</legend>

<div class="form-group">
<label>How did you approach the overall crisis mapping problem?</label>
<textarea class="form-control" name="approach" placeholder="Type something…" required></textarea>
</div>

<div class="form-group">
<label>Did you specialize in doing any type of work in particular?</label>
<textarea class="form-control" name="specialize" placeholder="Type something…" required></textarea>
</div>

<div class="form-group">
<label>Did your team discuss any strategies for tackling the problem? Were these strategies effective?</label>
<textarea class="form-control" name="teamwork" placeholder="Type something…" required></textarea>
</div>

<div class="form-group">
<label>Did you work with anyone else specifically on certain tasks?</label>
<textarea class="form-control" name="workwith" placeholder="Type something…" required></textarea>
</div>

<div class="form-group">
<label>Did you or anyone else take charge of organizing other team members?</label>
<textarea class="form-control" name="leadership" placeholder="Type something…" required></textarea>
</div>

<div class="form-group">
<label>Did you experience any bugs with the interface? If so, please describe them.</label>
<textarea class="form-control" name="bugs" placeholder="Type something…" required></textarea>
<span class="help-block">If you encountered any bugs, please include your operating system and browser in the description.</span>
</div>

<button type="submit" class="btn btn-primary">Submit HIT</button>
</form>
</template>
1 change: 0 additions & 1 deletion private/PabloPh_UN_cleaned.csv

This file was deleted.

Loading

0 comments on commit 6a4a704

Please sign in to comment.