chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix report myspace - refs #2681

Browse Source
pull/2818/head
Alex Aragón 6 years ago
parent 9872439054
commit ed19fae5fe
5 changed files with 181 additions and 107 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 39
      assets/css/base.css
  2. 93
      assets/css/scss/_base.scss
  3. 2
      main/mySpace/index.php
  4. 133
      main/template/default/my_space/index.html.twig
  5. 21
      src/ThemeBundle/Resources/views/Macros/box.html.twig

39
assets/css/base.css
Unescape View File

@ -358,49 +358,10 @@
text-align: center;
}
.easypiechart {
position: relative;
text-align: center;
width: 120px;
height: 120px;
margin: 20px auto 10px auto;
}
#easypiechart-blue .percent {
color: #30a5ff;
}
#easypiechart-teal .percent {
color: #1ebfae;
}
#easypiechart-orange .percent {
color: #ffb53e;
}
#easypiechart-red .percent {
color: #ef4040;
}
.easypiechart .percent {
display: block;
position: absolute;
font-size: 26px;
top: 38px;
width: 120px;
}
.easypiechart-link {
padding-bottom: 5px;
padding-top: 5px;
display: inline-block;
width: 100%;
}
.item-report {
text-align: center;
min-height: 200px;
}
.item-report .panel-default {
background-color: #ededed;

93
assets/css/scss/_base.scss
Unescape View File

@ -1090,4 +1090,95 @@ footer {
/*** PLUGINS ***/
.row_selected {
background-color: #FFFFCC;
}
}
/*** REPORTS ***/
.item-report {
text-align: center;
}
.card-box{
.icon-big{
font-size: 2.5em;
min-height: 64px;
width: 65px;
height: 65px;
border-radius: 50%;
text-align: center;
vertical-align: middle;
margin-left: 25px;
i{
line-height: 66px;
color: #fff;
}
}
.icon-student {
background: #f1c435;
}
.icon-studentboss {
background: #4b73eb;
}
.icon-teachers {
background: #50bbc1;
}
.icon-humanresources {
background: #68ceeb;
}
.numbers{
text-align: left;
h2 {
font-size: 3.2em;
margin: 0;
padding: 0;
color: #666666;
}
}
}
.easy-donut{
.easypiechart {
position: relative;
text-align: center;
width: 120px;
height: 120px;
margin: 20px auto 10px auto;
.percent {
display: block;
position: absolute;
font-size: 26px;
top: 38px;
width: 120px;
}
}
.easypiechart-link {
padding-bottom: 5px;
padding-top: 5px;
display: inline-block;
width: 100%;
text-align: center;
}
}
#easypiechart-blue {
.percent {
color: #30a5ff;
}
}
#easypiechart-teal {
.percent {
color: #1ebfae;
}
}
#easypiechart-orange {
.percent {
color: #ffb53e;
}
}
#easypiechart-red{
.percent {
color: #ef4040;
}
}

2
main/mySpace/index.php
Unescape View File

@ -391,7 +391,7 @@ $view->assign('form', $form->returnForm());
$view->assign('actions', Display::toolbarAction('toolbar', [$actionsLeft, $actionsRight]));
$view->assign('title', get_lang('Students').' ('.$numberStudents.')');
$template = $view->get_template('my_space/index.tpl');
$template = $view->get_template('my_space/index.html.twig');
$content = $view->fetch($template);
$view->assign('content', $content);
$view->display_one_col_template();

133
main/template/default/my_space/index.html.twig
Unescape View File

@ -5,11 +5,7 @@
{{ form }}
</div>
<div class="page-header">
<h4>
{{ 'Overview' | get_lang }}
</h4>
</div>
<h4>{{ 'Overview' | get_lang }}</h4>
<div class="view-global-followed">
<div class="row">
@ -19,20 +15,19 @@
{% endset %}
{% set content %}
<div class="row">
<div class="col-xs-5">
<div class="col-sm-5">
<div class="icon-big icon-student text-center">
<i class="fa fa-graduation-cap" aria-hidden="true"></i>
</div>
</div>
<div class="col-xs-7">
<div class="col-sm-7">
<div class="numbers">
<h2>{{ students }}</h2>
</div>
</div>
</div>
{% endset %}
{{ macro.panel(title, content) }}
{{ macro.panel_box(title, content) }}
</div>
<div class="col-lg-3 col-sm-3">
{% set title %}
@ -42,20 +37,19 @@
{% endset %}
{% set content %}
<div class="row">
<div class="col-xs-5">
<div class="col-sm-5">
<div class="icon-big icon-studentboss text-center">
<i class="fa fa-address-book" aria-hidden="true"></i>
</div>
</div>
<div class="col-xs-7">
<div class="col-sm-7">
<div class="numbers">
<h2>{{ studentbosses }}</h2>
</div>
</div>
</div>
{% endset %}
{{ macro.panel(title, content) }}
{{ macro.panel_box(title, content) }}
</div>
<div class="col-lg-3 col-sm-3">
{% set title %}
@ -63,20 +57,19 @@
{% endset %}
{% set content %}
<div class="row">
<div class="col-xs-5">
<div class="col-sm-5">
<div class="icon-big icon-teachers text-center">
<i class="fa fa-book" aria-hidden="true"></i>
</div>
</div>
<div class="col-xs-7">
<div class="col-sm-7">
<div class="numbers">
<h2>{{ numberTeachers }}</h2>
</div>
</div>
</div>
{% endset %}
{{ macro.panel(title, content) }}
{{ macro.panel_box(title, content) }}
</div>
<div class="col-lg-3 col-sm-3">
{% set title %}
@ -86,19 +79,19 @@
{% endset %}
{% set content %}
<div class="row">
<div class="col-xs-5">
<div class="col-sm-5">
<div class="icon-big icon-humanresources text-center">
<i class="fa fa-user" aria-hidden="true"></i>
</div>
</div>
<div class="col-xs-7">
<div class="col-sm-7">
<div class="numbers">
<h2>{{ humanresources }}</h2>
</div>
</div>
</div>
{% endset %}
{{ macro.panel(title, content) }}
{{ macro.panel_box(title, content) }}
</div>
</div>
</div>
@ -112,16 +105,18 @@
<span class="percent">{{ total_user }}</span>
</div>
<div class="easypiechart-link">
<a class="btn btn-default" href="{{ _p.web_main }}mySpace/users.php">
<a class="btn btn-outline-secondary" href="{{ _p.web_main }}mySpace/users.php">
{{ 'FollowedUsers' | get_lang }}
</a>
</div>
</div>
{% if _u.status == 1 %}
<a href="{{ _p.web_main }}admin/dashboard_add_users_to_user.php?user={{ _u.id }}" class="btn btn-default btn-sm">
<i class="fa fa-plus" aria-hidden="true"></i>
</a>
{% if app.user is not null and is_granted('IS_AUTHENTICATED_FULLY') %}
<div class="text-center">
<a href="{{ _p.web_main }}admin/dashboard_add_users_to_user.php?user={{ _u.id }}" class="btn btn-outline-secondary btn-sm">
<i class="fa fa-plus" aria-hidden="true"></i>
</a>
</div>
{% endif %}
</div>
<div class="col-lg-3 col-sm-3">
@ -130,15 +125,17 @@
<span class="percent">{{ stats.courses }}</span>
</div>
<div class="easypiechart-link">
<a class="btn btn-default" href="{{ _p.web_main }}mySpace/course.php">
<a class="btn btn-outline-secondary" href="{{ _p.web_main }}mySpace/course.php">
{{ 'AssignedCourses' | get_lang }}
</a>
</div>
</div>
{% if _u.status == 1 %}
<a href="{{ _p.web_main }}mySpace/course.php" class="btn btn-default btn-sm">
<i class="fa fa-plus" aria-hidden="true"></i>
</a>
{% if app.user is not null and is_granted('IS_AUTHENTICATED_FULLY') %}
<div class="text-center">
<a href="{{ _p.web_main }}mySpace/course.php" class="btn btn-outline-secondary btn-sm">
<i class="fa fa-plus" aria-hidden="true"></i>
</a>
</div>
{% endif %}
</div>
<div class="col-lg-3 col-sm-3">
@ -147,13 +144,15 @@
<span class="percent">{{ stats.assigned_courses }}</span>
</div>
<div class="easypiechart-link">
<a class="btn btn-default" href="{{ _p.web_main }}mySpace/course.php?follow">{{ 'FollowedCourses' | get_lang }}</a>
<a class="btn btn-outline-secondary" href="{{ _p.web_main }}mySpace/course.php?follow">{{ 'FollowedCourses' | get_lang }}</a>
</div>
</div>
{% if _u.status == 1 %}
<a href="{{ _p.web_main }}mySpace/course.php?follow" class="btn btn-default btn-sm">
<i class="fa fa-plus" aria-hidden="true"></i>
</a>
{% if app.user is not null and is_granted('IS_AUTHENTICATED_FULLY') %}
<div class="text-center">
<a href="{{ _p.web_main }}mySpace/course.php?follow" class="btn btn-outline-secondary btn-sm">
<i class="fa fa-plus" aria-hidden="true"></i>
</a>
</div>
{% endif %}
</div>
<div class="col-lg-3 col-sm-3">
@ -162,115 +161,117 @@
<span class="percent">{{ stats.session_list |length }}</span>
</div>
<div class="easypiechart-link">
<a class="btn btn-default" href="{{ _p.web_main }}mySpace/session.php">{{ 'FollowedSessions' | get_lang }}</a>
<a class="btn btn-outline-secondary" href="{{ _p.web_main }}mySpace/session.php">{{ 'FollowedSessions' | get_lang }}</a>
</div>
</div>
{% if _u.status == 1 %}
<a href="{{ _p.web_main }}admin/dashboard_add_sessions_to_user.php?user={{ _u.id }}" class="btn btn-default btn-sm">
<i class="fa fa-plus" aria-hidden="true"></i>
</a>
{% if app.user is not null and is_granted('IS_AUTHENTICATED_FULLY') %}
<div class="text-center">
<a href="{{ _p.web_main }}admin/dashboard_add_sessions_to_user.php?user={{ _u.id }}" class="btn btn-outline-secondary btn-sm">
<i class="fa fa-plus" aria-hidden="true"></i>
</a>
</div>
{% endif %}
</div>
</div>
{% endset %}
{{ macro.panel('', content) }}
</div>
<div class="page-header">
<h4>
{{ title }}
</h4>
</div>
<h4>{{ title }}</h4>
<div class="report-section">
<div class="row">
<div class="col-lg-3 col-sm-3">
<div class="item-report">
{% set title %}
{% set subtitle %}
{{ 'AverageCoursePerStudent' | get_lang }}
{% endset %}
{% set content %}
<div class="item-report-number">
{{ report.AverageCoursePerStudent }}
</div>
{% endset %}
{{ macro.panel(title, content) }}
<p>{{ 'AverageCoursePerStudent' | get_lang }}</p>
{{ macro.panel_box('', content, subtitle) }}
</div>
</div>
<div class="col-lg-3 col-sm-3">
<div class="item-report">
{% set title %}
{% set subtitle %}
{{ 'InactivesStudents' | get_lang }}
{% endset %}
{% set content %}
<div class="item-report-number">
{{ report.InactivesStudents }}
</div>
{% endset %}
{{ macro.panel(title, content) }}
<p>{{ 'InactivesStudents' | get_lang }}</p>
{{ macro.panel_box('', content, subtitle) }}
</div>
</div>
<div class="col-lg-3 col-sm-3">
<div class="item-report">
{% set title %}
{% set subtitle %}
{{ 'AverageTimeSpentOnThePlatform' | get_lang }}
{% endset %}
{% set content %}
<div class="item-report-number">
{{ report.AverageTimeSpentOnThePlatform }}
</div>
{% endset %}
{{ macro.panel(title, content) }}
<p>{{ 'AverageTimeSpentOnThePlatform' | get_lang }}</p>
{{ macro.panel_box('', content, subtitle) }}
</div>
</div>
<div class="col-lg-3 col-sm-3">
<div class="item-report">
{% set title %}
{% set subtitle %}
{{ 'AverageProgressInLearnpath' | get_lang }}
{% endset %}
{% set content %}
<div class="item-report-number">
{{ report.AverageProgressInLearnpath }}
</div>
{% endset %}
{{ macro.panel(title, content) }}
<p>{{ 'AverageProgressInLearnpath' | get_lang }}</p>
{{ macro.panel_box('', content, subtitle) }}
</div>
</div>
<div class="col-lg-3 col-sm-3">
<div class="item-report">
{% set title %}
{% set subtitle %}
{{ 'AvgCourseScore' | get_lang }}
{% endset %}
{% set content %}
<div class="item-report-number">
{{ report.AvgCourseScore }}
</div>
{% endset %}
{{ macro.panel(title, content) }}
<p>{{ 'AvgCourseScore' | get_lang }}</p>
{{ macro.panel_box('', content, subtitle) }}
</div>
</div>
<div class="col-lg-3 col-sm-3">
<div class="item-report">
{% set title %}
{% set subtitle %}
{{ 'AveragePostsInForum' | get_lang }}
{% endset %}
{% set content %}
<div class="item-report-number">
{{ report.AveragePostsInForum }}
</div>
{% endset %}
{{ macro.panel(title, content) }}
<p> {{ 'AveragePostsInForum' | get_lang }}</p>
{{ macro.panel_box('', content, subtitle) }}
</div>
</div>
<div class="col-lg-3 col-sm-3">
<div class="item-report">
{% set title %}
{% set subtitle %}
{{ 'AverageAssignments' | get_lang }}
{% endset %}
{% set content %}
<div class="item-report-number">
{{ report.AverageAssignments }}
</div>
{% endset %}
{{ macro.panel(title, content) }}
<p> {{ 'AverageAssignments' | get_lang }}</p>
{{ macro.panel_box('', content, subtitle) }}
</div>
</div>
</div>

21
src/ThemeBundle/Resources/views/Macros/box.html.twig
Unescape View File

@ -156,6 +156,27 @@
{% endautoescape %}
{% endmacro %}
{% macro panel_box(title, content, subtitle) %}
{% autoescape false %}
<div class="card card-box">
<div class="card-body">
{% if subtitle is empty %}
<h6 class="card-title">{{ title }}</h6>
{% endif %}
{{ content }}
{% if subtitle %}
<div class="card-text">
{{ subtitle }}
</div>
{% endif %}
</div>
</div>
{% endautoescape %}
{% endmacro %}
{% macro panel(header, content, title, footer, subtitle, top_image) %}
{% autoescape false %}
<div class="card mt-3 mb-3">

Write Preview
Loading…
Cancel
Save