Skip to content
This repository was archived by the owner on Jun 7, 2023. It is now read-only.

Commit 803ed94

Browse files
committed
Bug fix - duplicated check for notimer
1 parent ff70b07 commit 803ed94

1 file changed

Lines changed: 18 additions & 29 deletions

File tree

runestone/timed/timedassessment.py

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ def visit_timed_node(self, node):
6868
else:
6969
node.runestone_options["noresult"] = ""
7070

71-
node.runestone_options["noresult"] = ""
72-
7371
if "timedfeedback" in node.runestone_options:
7472
node.runestone_options["timedfeedback"] = "data-timedfeedback=true"
7573
else:
@@ -80,25 +78,16 @@ def visit_timed_node(self, node):
8078
else:
8179
node.runestone_options["notimer"] = ""
8280

83-
node.runestone_options["timedfeedback"] = ""
84-
8581
if "nofeedback" in node.runestone_options:
8682
node.runestone_options["nofeedback"] = "data-no-feedback"
8783
else:
8884
node.runestone_options["nofeedback"] = ""
8985

90-
if "notimer" in node.runestone_options:
91-
node.runestone_options["notimer"] = "data-no-timer"
92-
else:
93-
node.runestone_options["notimer"] = ""
94-
9586
if "fullwidth" in node.runestone_options:
9687
node.runestone_options["fullwidth"] = "data-fullwidth"
9788
else:
9889
node.runestone_options["fullwidth"] = ""
9990

100-
node.runestone_options["fullwidth"] = ""
101-
10291
if "nopause" in node.runestone_options:
10392
node.runestone_options["nopause"] = "data-no-pause"
10493
else:
@@ -126,13 +115,13 @@ def depart_timed_node(self, node):
126115

127116
class TimedDirective(RunestoneIdDirective):
128117
"""
129-
.. timed:: identifier
130-
:timelimit: Number of minutes student has to take the timed assessment--if not provided, no time limit
131-
:noresult: Boolean, doesn't display score
132-
:timedfeedback: Boolean, Show feedback even in timed mode
133-
:notimer: Boolean, doesn't show timer
134-
:nopause: Boolean do not show a pause button
135-
:fullwidth: Boolean, allows the items in the timed assessment to take the full width of the screen...
118+
.. timed:: identifier
119+
:timelimit: Number of minutes student has to take the timed assessment--if not provided, no time limit
120+
:noresult: Boolean, doesn't display score
121+
:timedfeedback: Boolean, Show feedback even in timed mode
122+
:notimer: Boolean, doesn't show timer
123+
:nopause: Boolean do not show a pause button
124+
:fullwidth: Boolean, allows the items in the timed assessment to take the full width of the screen...
136125
137126
"""
138127

@@ -152,17 +141,17 @@ class TimedDirective(RunestoneIdDirective):
152141

153142
def run(self):
154143
"""
155-
process the timed directive and generate html for output.
156-
:param self:
157-
:return:
158-
.. timed:: identifier
159-
:timelimit: Number of minutes student has to take the timed assessment--if not provided, no time limit
160-
:noresult: Boolean, doesn't display score
161-
:timedfeedback: Boolean, show feedback
162-
:notimer: Boolean, doesn't show timer
163-
:fullwidth: Boolean, allows the items in the timed assessment to take the full width of the screen
164-
...
165-
"""
144+
process the timed directive and generate html for output.
145+
:param self:
146+
:return:
147+
.. timed:: identifier
148+
:timelimit: Number of minutes student has to take the timed assessment--if not provided, no time limit
149+
:noresult: Boolean, doesn't display score
150+
:timedfeedback: Boolean, show feedback
151+
:notimer: Boolean, doesn't show timer
152+
:fullwidth: Boolean, allows the items in the timed assessment to take the full width of the screen
153+
...
154+
"""
166155
super(TimedDirective, self).run()
167156
self.assert_has_content() # make sure timed has something in it
168157

0 commit comments

Comments
 (0)