Skip to content
Snippets Groups Projects
Commit 5f90929c authored by Myriam Delaruelle's avatar Myriam Delaruelle
Browse files

Student percentage

parent e965e9fd
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
lang/en/format_iena.php
+ 2
− 0
View file @ 5f90929c
......@@ -90,5 +90,7 @@ By definition an unnamed section is displayed as <strong>section [N]</strong>.';
$string['status2']="Activity completed and passed";
$string['status3']="Activity completed but not passed";
$string["send_message_title"]="Sending a message to {{nb_results}} people";
$string['display_course_infos']="Show/hide course information";
$string['my_progress']="My progress in the course: ";
lang/fr/format_iena.php
+ 5
− 2
View file @ 5f90929c
......@@ -87,7 +87,10 @@ By definition an unnamed section is displayed as <strong>section [N]</strong>.';
$string['caption']="Légende";
$string['status0']="Activité non complétée";
$string['status1']="Activité complétée";
$string['status2']="Activité complétée au dessus de la note";
$string['status3']="Activité complétée en dessous de la note";
$string['status2']="Activité complétée et validée";
$string['status3']="Activité complétée non validée";
$string["send_message_title"]="Envoi d'un message à {{nb_results}} personnes";
$string['display_course_infos']="Afficher/Masquer les informations du cours";
$string['my_progress']="Ma progression dans le cours : ";
renderer.php
+ 1
− 2
View file @ 5f90929c
......@@ -527,6 +527,7 @@ class format_iena_renderer extends format_topics_renderer{
/* Passer le calcul de complétion de la classe course_format_iena_completion à part à la vue qui fait le header permet de ne pas récupérer deux fois les mêmes informations. */
$header = new view_course_header($nameSections, $idSections, $course, $cpl);
$course_infos= $header->create_view($cpl);
//$course_infos=$header->get_data($cpl);
echo $this->render_from_template('format_iena/course-header', $course_infos);
......@@ -759,8 +760,6 @@ class format_iena_renderer extends format_topics_renderer{
}
array_push($sections['sections'], $thissection);
array_push($nameSections, $thissection->name);
array_push($idSections, $thissection->id);
......
styles.css
+ 71
− 10
View file @ 5f90929c
......@@ -301,7 +301,7 @@ ul.nav.navbar-nav.ml-auto {
/* Bottom header */
.iena-course-header-bottom {
margin-bottom: 1.6rem;
margin-bottom: 0;
}
/* Toggler */
......@@ -323,22 +323,30 @@ ul.nav.navbar-nav.ml-auto {
/* Progress detail */
.iean-progress-header .iena-progress-label, .iean-progress-header .progress-wrapper{
.iena-progress-header .iena-progress-label, .iena-progress-header .progress-wrapper{
display: inline-block;
}
.iean-progress-header .progress{
.iena-progress-header .progress{
width: 200px;
background-color:white;
}
.iena-progress-header{
background-color: #eaeaea;
padding: 10px;
margin-bottom: 20px;
}
.progress-wrapper{
vertical-align: 8%;
}
.iena-h-prog-sect{
margin-left: 10px;
margin-left: 5px!important;
padding-left: 20px;
margin-top: 20px;
margin-top: 7px;
border-left: 1px solid lightgrey;
}
......@@ -350,6 +358,32 @@ ul.nav.navbar-nav.ml-auto {
clear: both;
}
.iena-progress-legend #caption-iena{
margin-top: 10px;
}
.iena-progress-legend #caption-iena .caption-status{
margin-right: 0;
display: block;
margin-bottom: 5px;
cursor: default;
}
.iena-progress-legend #caption-iena .caption-status .pointer-help{
width: 1rem;
height: 1rem;
vertical-align: middle;
border-radius: 10px;
}
.iena-progress-legend #caption-iena .caption-status .pointer-help .icon-progress{
line-height: 17px;
}
/* Section progression block */
/* Section progression name and % */
......@@ -369,7 +403,7 @@ ul.nav.navbar-nav.ml-auto {
}
.iena-h-prog-name{
display: block;
font-size: large;
font-size: initial;
}
.btn-outline-success.iena-h-prog-name:before {
/*content:'';
......@@ -397,8 +431,12 @@ ul.nav.navbar-nav.ml-auto {
border-color: #009085 !important;
}
.details-progress{
padding-left: 0!important;
}
.details-progress .section-progress{
margin-bottom: 1rem;
margin-bottom: 0.5rem;
}
......@@ -415,6 +453,15 @@ ul.nav.navbar-nav.ml-auto {
font-size: small;
}
.details-progress:target::before{
display: none!important;
}
.details-progress:before{
display: none!important;
}
/* Represent a course module link as a bullet */
.iena-h-prog-mod-item {
border-radius: 1.5rem;
......@@ -434,6 +481,16 @@ ul.nav.navbar-nav.ml-auto {
/* margin-top: .4rem;*/
}
.section-progress .iena-h-prog-mod-item{
height: 1rem;
width: 1rem;
min-width: 1rem;
}
.section-progress .iena-prog-bubble .icon-progress{
line-height: 17px;
}
.iena-prog-bubble .icon-progress{
line-height: 25px;
......@@ -482,12 +539,12 @@ ul.nav.navbar-nav.ml-auto {
left: -85px;
background-color: #333;
color: #fafafa;
padding: 0 15px;
padding: 0 5px;
width: 200px;
height: 2.5rem;
line-height: 2.5rem;
border-radius: 0.15rem;
font-size: 1rem;
font-size: 0.9rem;
text-align: center;
overflow: hidden;
}
......@@ -609,6 +666,10 @@ th.th-rotate > div > span {
font-size: x-large;
}
.section-progress span.icon-progress::after, .iena-progress-legend span.icon-progress::after{
font-size: small;
}
#first-column-head, #iena-select-all {
......
templates/course-header.mustache
+ 47
− 31
View file @ 5f90929c
<div class="iena-course-header">
{{#student}}
<!--<a href="#" class="btn btn-outline-primary iena-course-h-total" onclick="iena_toggle_course_header(event)">Ma progression : {{progress_total}}%</a>-->
<div class="iean-progress-header">
<h5 class="iena-progress-label"> Ma progression dans le cours : </h5>
<div class="progress-wrapper">
<div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="{{progress_total}}" style="width:{{progress_total}}%" aria-valuemin="0" aria-valuemax="100"> {{progress_total}}%</div>
<div class="iena-progress-header">
<div>
<h4 class="iena-progress-label">{{# str }} my_progress, format_iena {{/ str}}</h4>
<div class="progress-wrapper">
<div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="{{progress_total}}" style="width:{{progress_total}}%" aria-valuemin="0" aria-valuemax="100"> {{progress_total}}%</div>
</div>
</div>
<a class="iena-progress-label" data-toggle="collapse" href="#progress-details" role="button" aria-expanded="false" aria-controls="progress-details"> <i class="fa fa-search-plus"></i> </a>
</div>
<a class="iena-progress-label" data-toggle="collapse" href="#progress-details" role="button" aria-expanded="false" aria-controls="progress-details"> <i class="fa fa-search-plus"></i> </a>
</div>
<div class="iena-course-header-bottom" id="iena-h-bottom" aria-expanded="false" style="">
<div class="iena-h-prog-sect collapse" id="progress-details">
<div class="details-progress">
{{#progress_sections}}
<div class="section-progress">
<a href="#section-{{id}}" class="iena-h-prog-name">{{name}}</a>
<div class="progress-wrapper">
<div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="{{completion}}" style="width:{{completion}}%" aria-valuemin="0" aria-valuemax="100"></div>
<div class="iena-course-header-bottom" id="iena-h-bottom" aria-expanded="false" style="">
<div class="iena-h-prog-sect collapse row" id="progress-details">
<div class="details-progress col-md-7">
{{#progress_sections}}
<div class="section-progress">
<a href="#section-{{id}}" class="iena-h-prog-name">{{name}}</a>
<div class="progress-wrapper">
<div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="{{completion}}" style="width:{{completion}}%" aria-valuemin="0" aria-valuemax="100"></div>
</div>
<div class="iena-prog-label">{{completion}}%</strong> terminé</div>
</div>
<div class="iena-prog-bubbles">
{{#modules}}
</div>
<div class="iena-prog-label">{{completion}}%</strong> terminé</div>
</div>
<div class="iena-prog-bubbles">
{{#modules}}
<!-- <a href="{{url}}" class="iena-h-prog-mod-item iena-g-prog-{{completion}}"><span>{{name}}</span></a> -->
<div class="iena-prog-bubble iena-h-prog-mod-item state-{{completion}}">
<!-- <a href="{{url}}" class="iena-h-prog-mod-item iena-g-prog-{{completion}}"><span>{{name}}</span></a> -->
<div class="iena-prog-bubble iena-h-prog-mod-item state-{{completion}}">
<span class="icon-progress"></span>
<a href="{{url}}" class="iena-prog-link">
<span class="popover-module">{{name}}</span>
</a>
</div>
{{/modules}}
</div>
<span class="icon-progress"></span>
<a href="{{url}}" class="iena-prog-link">
<span class="popover-module">{{name}}</span>
</a>
</div>
{{/modules}}
{{/progress_sections}}
</div>
<div class="col-md-5 iena-progress-legend">
<div id="caption-iena"><h5>{{# str }} caption, format_iena {{/ str}}</h5>
<div class="">
<div class="caption-status"><div class="pointer-help state-0"><span class="icon-progress"></span></div> <span class="caption-title"> {{# str }} status0, format_iena {{/ str}}</span></div>
<div class="caption-status"><div class="pointer-help state-1"><span class="icon-progress"></span></div> <span class="caption-title">{{# str }} status1, format_iena {{/ str}}</span></div>
<div class="caption-status"><div class="pointer-help state-2"><span class="icon-progress"></span></div> <span class="caption-title">{{# str }} status2, format_iena {{/ str}}</span></div>
<div class="caption-status"><div class="pointer-help state-3"><span class="icon-progress"></span></div> <span class="caption-title">{{# str }} status3, format_iena {{/ str}}</span></div>
</div>
</div>
{{/progress_sections}}
</div>
</div>
</div>
</div>
{{/student}}
......
templates/suivi.mustache
+ 6
− 6
View file @ 5f90929c
......@@ -121,13 +121,13 @@
<div class="alert alert-danger">Messages non envoyés</div>
{{/msg_failure}}
<div id="caption-iena"><h5>{{# str }} caption, format_iena {{/ str}}</h5>
<div class="">
<div class="caption-status"><div class="pointer-help state-0"><span class="icon-progress"></span></div> <span class="caption-title"> {{# str }} status0, format_iena {{/ str}}</span></div>
<div class="caption-status"><div class="pointer-help state-1"><span class="icon-progress"></span></div> <span class="caption-title">{{# str }} status1, format_iena {{/ str}}</span></div>
<div class="caption-status"><div class="pointer-help state-2"><span class="icon-progress"></span></div> <span class="caption-title">{{# str }} status2, format_iena {{/ str}}</span></div>
<div class="caption-status"><div class="pointer-help state-3"><span class="icon-progress"></span></div> <span class="caption-title">{{# str }} status3, format_iena {{/ str}}</span></div>
</div>
<div class="">
<div class="caption-status"><div class="pointer-help state-0"><span class="icon-progress"></span></div> <span class="caption-title"> {{# str }} status0, format_iena {{/ str}}</span></div>
<div class="caption-status"><div class="pointer-help state-1"><span class="icon-progress"></span></div> <span class="caption-title">{{# str }} status1, format_iena {{/ str}}</span></div>
<div class="caption-status"><div class="pointer-help state-2"><span class="icon-progress"></span></div> <span class="caption-title">{{# str }} status2, format_iena {{/ str}}</span></div>
<div class="caption-status"><div class="pointer-help state-3"><span class="icon-progress"></span></div> <span class="caption-title">{{# str }} status3, format_iena {{/ str}}</span></div>
</div>
</div>
<div id="partial-table">
......
view/view_course_header.php
+ 0
− 3
View file @ 5f90929c
......@@ -326,14 +326,11 @@ class view_course_header {
}
}
}
else {
}
$course_data['student']=true;
}
$course_data['summary']=$COURSE->summary;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment