Merge pull request #70 from openstax/try-another-button

Try another button

Author: philschatz

api/tasks/4.json

@@ -9,6 +9,7 @@
       "is_completed": true,
       "correct_answer_id": "id2",
       "answer_id": "id1",
+      "has_recovery": true,
       "free_response": "four",
       "feedback_html": "Two apples and then <span data-math='2'>2</span> more apples is <strong>four</strong>",
       "content": {

src/api.coffee

@@ -71,7 +71,6 @@ apiHelper = (Actions, listenAction, successAction, httpMethod, pathMaker) ->
             msg = jqXhr.responseText
           Actions.FAILED(statusCode, msg, args...)
 
-
       $.ajax(url, opts)
       .then(resolved, rejected)
 
@@ -131,6 +130,9 @@ start = ->
   apiHelper TaskStepActions, TaskStepActions.complete, TaskStepActions.loaded, 'PUT', (id) ->
     url: "/api/steps/#{id}/completed"
 
+  apiHelper TaskStepActions, TaskStepActions.loadRecovery, TaskStepActions.loadedRecovery, 'PUT', (id) ->
+    url: "/api/steps/#{id}/recovery"
+
   apiHelper TaskStepActions, TaskStepActions.setFreeResponseAnswer, TaskStepActions.saved, 'PATCH', (id, free_response) ->
     url: "/api/steps/#{id}"
     payload: {free_response}

src/components/task-step/exercise-multiple-choice.cjsx

@@ -2,9 +2,11 @@ _ = require 'underscore'
 React = require 'react'
 katex = require 'katex'
 {TaskStepActions, TaskStepStore} = require '../../flux/task-step'
+{TaskActions} = require '../../flux/task'
 ArbitraryHtmlAndMath = require '../html'
 StepMixin = require './step-mixin'
 Question = require '../question'
+BS = require 'react-bootstrap'
 
 
 ExerciseFreeResponse = React.createClass
@@ -98,13 +100,32 @@ ExerciseReview = React.createClass
   onContinue: ->
     @props.onNextStep()
 
+  tryAnother: ->
+    task_id = TaskStepStore.getTaskId(@getId())
+    TaskStepActions.loadRecovery(@getId())
+    TaskActions.load(task_id)
+
+  canTryAnother: ->
+    step = TaskStepStore.get(@getId())
+    return step.has_recovery and step.correct_answer_id isnt step.answer_id
+
+  renderFooterButtons: ->
+    isDisabledClass = 'disabled' unless @isContinueEnabled()
+    continueButton = <BS.Button bsStyle="primary" className={isDisabledClass} onClick={@onContinue}>Continue</BS.Button>
+    tryAnotherButton = <BS.Button bsStyle="primary" onClick={@tryAnother}>Try Another</BS.Button> if @canTryAnother()
+    <span>
+      {tryAnotherButton}
+      {continueButton}
+    </span>
+
 
 module.exports = React.createClass
   displayName: 'Exercise'
 
   render: ->
     {id} = @props
-    {content, free_response, is_completed} = TaskStepStore.get(id)
+    step = TaskStepStore.get(id)
+    {id, content, free_response, is_completed} = step
     # TODO: Assumes 1 question.
     question = content.questions[0]
 

src/components/task-step/step-mixin.cjsx

@@ -1,7 +1,7 @@
 React = require 'react'
 BS = require 'react-bootstrap'
 
-{TaskStepStore} = require '../../flux/task-step'
+{TaskActions} = require '../../flux/task'
 {TaskStepActions, TaskStepStore} = require '../../flux/task-step'
 LoadableMixin = require '../loadable-mixin'
 
@@ -14,10 +14,18 @@ module.exports =
     store: TaskStepStore
     actions: TaskStepActions
 
-  renderLoaded: ->
+  renderGenericFooter: ->
     isDisabledClass = 'disabled' unless @isContinueEnabled()
+    continueButton = <BS.Button bsStyle="primary" className={isDisabledClass} onClick={@onContinue}>Continue</BS.Button>
+    <span>
+      {continueButton}
+    </span>
 
-    footer = <BS.Button bsStyle="primary" className={isDisabledClass} onClick={@onContinue}>Continue</BS.Button>
+  renderLoaded: ->
+    if @renderFooterButtons
+      footer = @renderFooterButtons()
+    else
+      footer = @renderGenericFooter()
 
     <BS.Panel bsStyle="default" className="task-step" footer={footer}>
       {@renderBody()}

src/components/task/index.cjsx

@@ -27,7 +27,7 @@ module.exports = React.createClass
       currentStep = 0
     else
       # Otherwise, start at the Overview page
-      currentStep = -1
+      currentStep = @getDefaultCurrentStep()
 
     {currentStep}
 
@@ -38,7 +38,10 @@ module.exports = React.createClass
     currentStep = -1
     for step, i in steps
       unless step.is_completed
-        currentStep = i
+        if i is 0
+          currentStep = -1
+        else
+          currentStep = i
         break
 
     currentStep

src/flux/helpers.coffee

@@ -68,6 +68,11 @@ CrudConfig = ->
     saved: (result, id) ->
       # id = result.id
       @_asyncStatus[id] = LOADED # TODO: Maybe make this SAVED
+
+      # If the specific type needs to do something else to the object:
+      obj = @_saved?(result, id)
+      result = obj if obj
+
       if result
         @_local[id] = result
         @_local[result.id] = result
@@ -79,7 +84,6 @@ CrudConfig = ->
       delete @_changed[id]
       delete @_errors[id]
       # If the specific type needs to do something else to the object:
-      @_saved?(result, id)
       @emitChange()
 
     create: (localId, attributes = {}) ->

src/flux/task-step.coffee

@@ -5,13 +5,19 @@ flux = require 'flux-react'
 
 TaskStepConfig =
 
+  _loaded: (obj, id) ->
+    if not obj.task_id
+      obj.task_id = @_local[id]?.task_id
+    obj
+
+  _saved: (obj, id) ->
+    obj.task_id = @_local[id].task_id
+    obj
+
   complete: (id) ->
     @_change(id, {is_completed: true})
     @emitChange()
 
-  completed: (empty, step) ->
-    # First arg is null and ignored because it was a PUT ./completed
-
   setAnswerId: (id, answer_id) ->
     @_change(id, {answer_id})
     @emitChange()
@@ -20,6 +26,13 @@ TaskStepConfig =
     @_change(id, {free_response})
     @emitChange()
 
+  loadRecovery: (id) ->
+    @emitChange()
+
+  loadedRecovery: (obj, id) ->
+    @clearChanged()
+    @emitChange()
+
   exports:
     isAnswered: (id) ->
       step = @_get(id)
@@ -29,6 +42,10 @@ TaskStepConfig =
           isAnswered = false
       isAnswered
 
+    getTaskId: (id) ->
+      step = @_get(id)
+      step.task_id
+
     getFreeResponse: (id) ->
       step = @_get(id)
       step.free_response

src/flux/task.coffee

@@ -19,7 +19,10 @@ TaskConfig =
     delete obj.steps
     @_steps[id] = steps
     for step in steps
+      #HACK: set the task_id so we have a link back to the task from the step
+      step.task_id = id
       TaskStepActions.loaded(step, step.id)
+    obj
 
     # explicit return obj to load onto @_local
     obj