Skip to content
Snippets Groups Projects
Commit 253094de authored by srosse's avatar srosse
Browse files

OO-722: beautify the assessment infos of portfolio course element

parent 3b734f15
No related branches found
No related tags found
No related merge requests found
<div class="o_course_run_scoreinfo"> #if ($hasScoreField || $hasPassedField)
#if ($hasScoreField)
<h4>$r.translate("score.title")</h4> <div class="panel panel-default o_personal">
<table> <div class="panel-heading">
<tbody> <h4 class="panel-title">$r.translate("score.title")</h4>
<tr> </div>
<td> <table class="table">
$r.translate("score.min"): <tbody>
</td> #if ($hasScoreField)
<td> <tr class="o_score_config_min">
$scoreMin <th>$r.translate("score.min")</th>
</td> <td>$scoreMin</td>
</tr> </tr>
<tr> <tr class="o_score_config_max">
<td> <th>$r.translate("score.max")</th>
$r.translate("score.max"): <td>$scoreMax</td>
</td> </tr>
<td> <tr class="o_score">
$scoreMax <th>$r.translate("score.yourscore")</th>
</td> <td>
</tr> #if($score)
<tr> $score
<td> #else
$r.translate("score.yourscore"): <div class="o_noinfo">$r.translate("score.noscore")</div>
</td> #end
<td> </td>
#if($score) </tr>
$score #end
#else
<div class="o_course_run_scoreinfo_noinfo">$r.translate("score.noscore")</div> #if ($hasPassedField)
#end #if ($passedCutValue)
</td> <tr class="o_cutval">
</tr> <th>$r.translate("passed.cut")</th>
</tbody> <td>$passedCutValue</td>
</table> </tr>
#end #end
<tr class="o_state #if ($hasPassedValue && $passed) o_passed #elseif($hasPassedValue && !$passed) o_failed #else o_unknown #end">
#if ($hasPassedField) <th>$r.translate("passed.yourpassed")</th>
<h4>$r.translate("passed.title")</h4> <td>
<table> #if($hasPassedValue && $passed)
<tbody> <i class="o_icon o_icon_passed"></i> $r.translate("map.passed")
#if ($passedCutValue) #elseif($hasPassedValue && !$passed)
<tr> <i class="o_icon o_icon_failed"></i> $r.translate("map.not.passed")
<td> #else
$r.translate("passed.cut"): <div class="o_noinfo">$r.translate("map.not.rated.yet")</div>
</td>
<td>
$passedCutValue
</td>
</tr>
#end #end
<tr> </td>
<td> </tr>
$r.translate("passed.yourpassed"):
</td>
<td>
#if($hasPassedValue && $passed == true)
<span class="o_state o_passed">$r.translate("map.passed")</span>
#elseif($hasPassedValue && $passed == false)
<span class="o_state o_failed"><i class="o_icon o_icon_failed"> </i> $r.translate("map.not.passed")</span>
#else
<div class="o_course_run_scoreinfo_noinfo">$r.translate("map.not.rated.yet")</div>
#end
</td>
</tr>
</tbody>
</table>
#end
#if ($hasCommentField)
<h4>$r.translate("map.comment")</h4>
#if ($comment)
$comment
#else
<div class="o_course_run_scoreinfo_noinfo">$r.translate("comment.nocomment")</div>
#end #end
#end </tbody>
</div> </table>
\ No newline at end of file </div>
#end
#if ($comment && !$comment.isEmpty())
<div class="panel panel-default o_comment">
<div class="panel-heading" data-toggle="collapse" data-target="#collapseComment">
<h4 class="panel-title">
<i id="collapseCommentToggler" class="o_icon o_icon-fw o_icon_close_togglebox"> </i> $r.translate("map.comment")</h4>
</div>
<div id="collapseComment" class="panel-collapse collapse in"><div class="panel-body">$comment</div></div>
</div>
<script type="text/javascript">
/* <![CDATA[ */
jQuery('#collapseComment').on('hide.bs.collapse', function () {
jQuery('#collapseCommentToggler').removeClass('o_icon_close_togglebox').addClass('o_icon_open_togglebox');
})
jQuery('#collapseComment').on('show.bs.collapse', function () {
jQuery('#collapseCommentToggler').removeClass('o_icon_open_togglebox').addClass('o_icon_close_togglebox');
})
/* ]]> */
</script>
#end
\ No newline at end of file
$r.render("infos") $r.render("assessmentInfos")
$r.render("assessmentInfos") $r.render("infos")
\ No newline at end of file \ No newline at end of file
...@@ -554,8 +554,8 @@ public class RepositoryEntryRuntimeController extends MainLayoutBasicController ...@@ -554,8 +554,8 @@ public class RepositoryEntryRuntimeController extends MainLayoutBasicController
if(event instanceof LeavingEvent) { if(event instanceof LeavingEvent) {
doClose(ureq); doClose(ureq);
} else if(event == Event.DONE_EVENT) { } else if(event == Event.DONE_EVENT) {
popToRoot(ureq).cleanUp(); popToRoot(ureq);
doRun(ureq, reSecurity); cleanUp();
} }
} else if(closeCtrl == source) { } else if(closeCtrl == source) {
if(event == Event.CANCELLED_EVENT || event == Event.DONE_EVENT || event == Event.CHANGED_EVENT) { if(event == Event.CANCELLED_EVENT || event == Event.DONE_EVENT || event == Event.CHANGED_EVENT) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment