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

Update from 1.11.x + fix twig templates

Browse Source
pull/2944/head
Julio Montoya 6 years ago
parent 6e0f6edb09
commit 151e691390
9 changed files with 206 additions and 6 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. 2
      main/inc/lib/myspace.lib.php
  2. 2
      main/template/default/my_space/accessoverview.html.twig
  3. 9
      main/template/default/my_space/course_summary.html.twig
  4. 3
      main/template/default/my_space/index.html.twig
  5. 99
      main/template/default/my_space/partials/tracking_course_overview.html.twig
  6. 78
      main/template/default/my_space/partials/tracking_user_overview.html.twig
  7. 8
      main/template/default/my_space/user_details.html.twig
  8. 8
      main/template/default/my_space/user_summary.html.twig
  9. 3
      main/template/default/my_space/works_in_session_report.html.twig

2
main/inc/lib/myspace.lib.php
Unescape View File

@ -1905,7 +1905,7 @@ class MySpace
$courseId = api_get_course_int_id($course_code);
$table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
$sql = "SELECT exe_result, exe_weighting
$sql = "SELECT score, max_score
FROM $table
WHERE
c_id = $courseId AND

2
main/template/default/my_space/accessoverview.html.twig
Unescape View File

@ -31,6 +31,4 @@
});
});
</script>
{% endautoescape %}

9
main/template/default/my_space/course_summary.html.twig
Unescape View File

@ -1,3 +1,7 @@
{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
{% block content %}
{% autoescape false %}
<div class="summary-legend">
{{ table }}
</div>
@ -18,4 +22,7 @@
trackColor: '#f2f2f2'
});
});
</script>
</script>
{% endautoescape %}
{% endblock %}

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

@ -1,5 +1,5 @@
{% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
{% autoescape false %}
<div class="search-student">
{{ form }}
</div>
@ -294,3 +294,4 @@
});
});
</script>
{% endautoescape %}

99
main/template/default/my_space/partials/tracking_course_overview.html.twig
Unescape View File

@ -0,0 +1,99 @@
{% import '@ChamiloTheme/Macros/box.html.twig' as display %}
{% set content %}
<div class="summary-course" id="summary-{{ data.id }}">
<div class="row">
<div class="col-md-2">
<div class="course">
<h4 class="title">{{ data.title }}</h4>
<div class="image">
<img src="{{ data.image_small }}" class="img-responsive"/>
</div>
<div class="info">
{% if data.course_code %}
<p><strong>{{ 'WantedCourseCode'|get_lang }}</strong><br>{{ data.course_code }}</p>
{% endif %}
{% if data.category %}
<p><strong>{{ 'CourseFaculty'|get_lang }}</strong><br>{{ data.category }}</p>
{% endif %}
</div>
</div>
</div>
<div class="col-md-2">
<div class="state">
<div class="stat-text">
<i class="fa fa-clock-o" aria-hidden="true"></i> {{ data.time_spent }}
</div>
<div class="stat-heading">
{{ 'TimeSpentInTheCourse'|get_lang }}
</div>
</div>
<div class="state">
<div class="stat-text">
{{ data.total_score }}
</div>
<div class="stat-heading">
{{ 'TotalExercisesScoreObtained'|get_lang }}
</div>
</div>
</div>
<div class="col-md-4">
<div class="list-donut">
<div class="easy-donut">
<div class="easypiechart-blue easypiechart" title="{{ 'Progress'|get_lang }}" data-percent="{{ data.avg_progress }}">
<span class="percent">{{ data.avg_progress }}%</span>
</div>
<div class="easypiechart-legend">
{{ 'AvgStudentsProgress'|get_lang }}
</div>
</div>
<div class="easy-donut">
<div class="easypiechart-red easypiechart" title="{{ 'Progress'|get_lang }}" data-percent="{{ data.avg_score }}">
<span class="percent">{{ data.avg_score }}%</span>
</div>
<div class="easypiechart-legend">
{{ 'AvgCourseScore'|get_lang }}
</div>
</div>
</div>
</div>
<div class="col-md-4">
<dl class="dl-horizontal list-info">
<dt>
<span title="{{ 'TotalNumberOfMessages'|get_lang }}">{{ 'TotalNumberOfMessages'|get_lang }}</span>
</dt>
<dd>
<span class="text-color"><i class="fa fa-comments" aria-hidden="true"></i></span>
<span class="text-color">{{ data.number_message }}</span>
</dd>
<dt>
<span title="{{ 'TotalNumberOfAssignments'|get_lang }}">{{ 'TotalNumberOfAssignments'|get_lang }}</span>
</dt>
<dd>
<span class="text-color"><i class="fa fa-pencil" aria-hidden="true"></i></span>
<span class="text-color">{{ data.number_assignments }}</span>
</dd>
<dt>
<span title="{{ 'TotalExercisesAnswered'|get_lang }}">{{ 'TotalExercisesAnswered'|get_lang }}</span>
</dt>
<dd>
<span class="text-color"><i class="fa fa-file-text" aria-hidden="true"></i></span>
<span class="text-color">{{ data.questions_answered }}</span>
</dd>
<dt>
<span title="{{ 'LatestLogin'|get_lang }}">{{ 'LatestLogin'|get_lang }}</span>
</dt>
<dd>
<span class="text-color"><i class="fa fa-clock-o" aria-hidden="true"></i></span>
<span class="text-color">{{ data.last_login }}</span>
</dd>
</dl>
</div>
</div>
</div>
{% endset %}
{% autoescape false %}
{{ display.panel('',content ,'') }}
{% endautoescape %}

78
main/template/default/my_space/partials/tracking_user_overview.html.twig
Unescape View File

@ -0,0 +1,78 @@
{% autoescape false %}
<div class="summary-height">
<div class="summary">
<div class="summary-body">
<div id="summary-user-{{ item.id }}" class="summary-item">
<div class="icon">
<img src="{{ item.avatar }}" class="img-circle">
</div>
<div class="user">
<a title="{{ item.complete_name }}" href="{{ _p.web }}main/social/profile.php?u={{ item.id }}" class="name">
{{ item.complete_name }}
</a>
<div class="username">{{ item.username }}</div>
</div>
<div class="summary-course">
{% if item.course %}
{% for course in item.course %}
<div id="course-{{ course.real_id }}" class="course-item">
<div class="course-info">
<h5><a title="{{ 'Course'|get_lang }} - {{ course.title }}" href="{{ _p.web ~ 'main/mySpace/myStudents.php?details=true' ~ _p.web_cid_query ~ '&course=' ~ course.code ~ '&origin=tracking_course&id_session=0&student=' ~ item.id }}" target="_blank">{{ course.title }}</a></h5>
<span class="code">{{ course.code }}</span>
</div>
<div class="box time-spent" data-toggle="tooltip" data-placement="top" title="{{ 'CourseTimeInfo'|get_lang }}">
<i class="fa fa-clock-o" aria-hidden="true"></i>
{{ course.time_spent }}
</div>
<div class="box" data-toggle="tooltip" data-placement="top" title="{{ 'AvgStudentsProgress'|get_lang }}">
<span class="kt-badge student-progress">
{{ course.student_progress }} %
</span>
</div>
<div class="box" data-toggle="tooltip" data-placement="top" title="{{ 'AvgCourseScore'|get_lang }}">
<span class="kt-badge student-score">
{{ course.student_score }}
</span>
</div>
<div class="box" data-toggle="tooltip" data-placement="top" title="{{ 'TotalNumberOfMessages'|get_lang }}">
<span class="kt-badge student-message">
{{ course.student_message }}
</span>
</div>
<div class="box" data-toggle="tooltip" data-placement="top" title="{{ 'TotalNumberOfAssignments'|get_lang }}">
<span class="kt-badge student-assignments">
{{ course.student_assignments }}
</span>
</div>
<div class="box">
<span class="kt-badge student-exercises" data-toggle="tooltip" data-placement="top" title="{{ 'TotalExercisesScoreObtained'|get_lang }}">
{{ course.student_assignments }}
</span>
</div>
<div class="box">
<span class="kt-badge questions-answered" data-toggle="tooltip" data-placement="top" title="{{ 'TotalExercisesAnswered'|get_lang }}">
{{ course.questions_answered }}
</span>
</div>
<div class="box box-date" data-toggle="tooltip" data-placement="top" title="{{ 'LatestLogin'|get_lang }}">
{% if course.last_connection %}
<span class="kt-badge last-connection">
{{ course.last_connection }}
</span>
{% endif %}
</div>
</div>
{% endfor %}
{% else %}
<div class="alert alert-warning" role="alert">
{{ 'HaveNoCourse'|get_lang }}
</div>
{% endif %}
</div>
</div>
</div>
</div>
</div>
{% endautoescape %}

8
main/template/default/my_space/user_details.html.twig
Unescape View File

@ -1,5 +1,10 @@
{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
{% block content %}
{% import 'macro/macro.tpl'|get_template as display %}
{% autoescape false %}
{% if title %}
<h2 class="details-title"><img src="{{ 'course.png'|icon(32) }}"> {{ title }}</h2>
{% endif %}
@ -197,3 +202,6 @@
});
});
</script>
{% autoescape false %}
{% endblock %}

8
main/template/default/my_space/user_summary.html.twig
Unescape View File

@ -1,3 +1,7 @@
{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
{% block content %}
{% autoescape false %}
<script>
$(function(){
$('[data-toggle="tooltip"]').tooltip();
@ -42,5 +46,7 @@
</li>
</ul>
</div>
{{ table }}
{{ table }}
{% endautoescape %}
{% endblock %}

3
main/template/default/my_space/works_in_session_report.html.twig
Unescape View File

@ -1,3 +1,4 @@
{% autoescape false %}
{{ form }}
{% if session %}
@ -31,3 +32,5 @@
</table>
</div>
{% endif %}
{% endautoescape %}
Write Preview
Loading…
Cancel
Save