Add in progress text

This commit is contained in:
Vik Paruchuri
2013-07-19 16:43:01 -04:00
parent ca0cefd260
commit 2dd5338378
3 changed files with 27 additions and 3 deletions

View File

@@ -22,9 +22,20 @@ h2 {
section.combined-open-ended {
@include clearfix;
.status-container
.status-bar
{
.status-container
{
padding-bottom: 5px;
display: inline-block;
padding-right: 20px
}
.progress-container
{
padding-bottom: 5px;
display: inline-block;
}
}
.item-container
{

View File

@@ -37,6 +37,13 @@ HUMAN_TASK_TYPE = {
'peer_grading.conf' : "Peer Assessment",
}
HUMAN_STATES = {
'intitial' : "Not started.",
'assessing' : "Being scored.",
'intermediate_done' : "Scoring finished.",
'done' : "Complete."
}
# Default value that controls whether or not to skip basic spelling checks in the controller
# Metadata overrides this
SKIP_BASIC_CHECKS = False
@@ -291,6 +298,7 @@ class CombinedOpenEndedV1Module():
'accept_file_upload': self.accept_file_upload,
'location': self.location,
'legend_list': LEGEND_LIST,
'human_state': HUMAN_STATES.get(self.state,"Not started.")
}
return context

View File

@@ -1,7 +1,12 @@
<section id="combined-open-ended" class="combined-open-ended" data-location="${location}" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}" data-state="${state}" data-task-count="${task_count}" data-task-number="${task_number}" data-accept-file-upload = "${accept_file_upload}">
<h2>${display_name}</h2>
<div class="status-container">
${status|n}
<div class="status-bar">
<div class="status-container">
${status|n}
</div>
<div class="progress-container">
Progress: ${human_state}
</div>
</div>
<div class="item-container">