Updates for showanswer.

common/lib/xmodule/xmodule/capa_module.py

@@ -70,10 +70,13 @@ class CapaFields(object):
     showanswer = String(display_name="Show Answer",
         help="Specifies when to show the answer to this problem. A default value can be set course-wide in Advanced Settings.",
         scope=Scope.settings, default="closed",
-        values=[{"display_name": "Always", "value": "always"},
+        values=[
+            {"display_name": "Always", "value": "always"},
             {"display_name": "Answered", "value": "answered"},
             {"display_name": "Attempted", "value": "attempted"},
             {"display_name": "Closed", "value": "closed"},
+            {"display_name": "Finished", "value": "finished"},
+            {"display_name": "Past Due", "value": "past_due"},
             {"display_name": "Never", "value": "never"}])
     force_save_button = Boolean(help="Whether to force the save button to appear on the page", scope=Scope.settings, default=False)
     rerandomize = Randomization(display_name="Randomization", help="Specifies whether variable inputs for this problem are randomized each time a student loads the problem. This only applies to problems that have randomly generated numeric variables. A default value can be set course-wide in Advanced Settings.",

common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml

@@ -3,7 +3,7 @@
 metadata:
     display_name: Circuit Schematic Builder
     rerandomize: never
-    showanswer: always
+    showanswer: finished
 data: |
   <problem >
     Please make a voltage divider that splits the provided voltage evenly.

common/lib/xmodule/xmodule/templates/problem/customgrader.yaml

@@ -2,7 +2,7 @@
 metadata:
     display_name: Custom Python-Evaluated Input
     rerandomize: never
-    showanswer: always
+    showanswer: finished
 data: |
   <problem>
   <p>

common/lib/xmodule/xmodule/templates/problem/empty.yaml

@@ -2,7 +2,7 @@
 metadata:
     display_name: Blank Common Problem
     rerandomize: never
-    showanswer: always
+    showanswer: finished
     markdown: ""
 data: |
   <problem>

common/lib/xmodule/xmodule/templates/problem/emptyadvanced.yaml

@@ -2,7 +2,7 @@
 metadata:
     display_name: Blank Advanced Problem
     rerandomize: never
-    showanswer: always
+    showanswer: finished
 data: |
   <problem>
   </problem>

common/lib/xmodule/xmodule/templates/problem/forumularesponse.yaml

@@ -2,7 +2,7 @@
 metadata:
     display_name: Math Expression Input
     rerandomize: never
-    showanswer: always
+    showanswer: finished
 data: |
   <problem>
   <p>

common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml

@@ -2,7 +2,7 @@
 metadata:
     display_name: Image Mapped Input
     rerandomize: never
-    showanswer: always
+    showanswer: finished
 data: |
   <problem>
   <p>

common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml

@@ -2,7 +2,7 @@
 metadata:
     display_name: Multiple Choice
     rerandomize: never
-    showanswer: always
+    showanswer: finished
     weight: ""
     attempts: ""
     markdown: 

common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml

@@ -2,7 +2,7 @@
 metadata:
     display_name: Numerical Input
     rerandomize: never
-    showanswer: always
+    showanswer: finished
     markdown: 
        "A numerical input problem accepts a line of text input from the
        student, and evaluates the input for correctness based on its

common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml

@@ -2,7 +2,7 @@
 metadata:
     display_name: Dropdown
     rerandomize: never
-    showanswer: always
+    showanswer: finished
     markdown: 
         "Dropdown problems give a limited set of options for students to respond with, and present those options
         in a format that encourages them to search for a specific answer rather than being immediately presented 

common/lib/xmodule/xmodule/templates/problem/string_response.yaml

@@ -2,7 +2,7 @@
 metadata:
     display_name: Text Input
     rerandomize: never
-    showanswer: always
+    showanswer: finished
     # Note, the extra newlines are needed to make the yaml parser add blank lines instead of folding
     markdown: 
         "A text input problem accepts a line of text from the