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 templates using trans, format code

Browse Source
pull/3124/head
Julio 6 years ago
parent 8be91e6a5c
commit 4f3b5bfd6e
7 changed files with 89 additions and 49 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. 47
      public/main/inc/lib/tracking.lib.php
  2. 3
      public/main/mySpace/myStudents.php
  3. 39
      public/main/template/default/my_space/user_details.html.twig
  4. 16
      public/main/template/default/tracking/tracking_course_log.html.twig
  5. 1
      public/main/tracking/courseLog.php
  6. 9
      src/CoreBundle/Controller/ResourceController.php
  7. 13
      src/ThemeBundle/Resources/views/Macros/box.html.twig

47
public/main/inc/lib/tracking.lib.php
Unescape View File

@ -4,6 +4,7 @@
use Chamilo\CoreBundle\Entity\Course; use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\ExtraField as EntityExtraField; use Chamilo\CoreBundle\Entity\ExtraField as EntityExtraField;
use Chamilo\CoreBundle\Entity\Session as SessionEntity; use Chamilo\CoreBundle\Entity\Session as SessionEntity;
use Chamilo\CoreBundle\Framework\Container;
use Chamilo\UserBundle\Entity\User; use Chamilo\UserBundle\Entity\User;
use ChamiloSession as Session; use ChamiloSession as Session;
use CpChart\Cache as pCache; use CpChart\Cache as pCache;
@ -3778,6 +3779,21 @@ class Tracking
$course_code, $course_code,
$session_id = null $session_id = null
) { ) {
$a_course = api_get_course_info($course_code);
$repo = Container::getDocumentRepository();
$user = api_get_user_entity($student_id);
$course = api_get_course_entity($a_course['real_id']);
$session = api_get_session_entity($session_id);
//$group = api_get_group_entity(api_get_group_id());
$qb = $repo->getResourcesByCourseLinkedToUser($user, $course, $session);
$qb->select('count(resource)');
$count = $qb->getQuery()->getSingleScalarResult();
return $count;
// get the information of the course // get the information of the course
$a_course = api_get_course_info($course_code); $a_course = api_get_course_info($course_code);
if (!empty($a_course)) { if (!empty($a_course)) {
@ -3837,6 +3853,21 @@ class Tracking
return 0; return 0;
} }
$a_course = api_get_course_info($course_code);
$repo = Container::getStudentPublicationRepository();
$user = api_get_user_entity($student_id);
$course = api_get_course_entity($a_course['real_id']);
$session = api_get_session_entity($session_id);
//$group = api_get_group_entity(api_get_group_id());
$qb = $repo->getResourcesByCourseLinkedToUser($user, $course, $session);
$qb->select('count(resource)');
$count = $qb->getQuery()->getSingleScalarResult();
return $count;
$conditions = []; $conditions = [];
// Get the information of the course // Get the information of the course
@ -3891,7 +3922,21 @@ class Tracking
return 0; return 0;
} }
// Table definition. $a_course = api_get_course_info($courseCode);
$repo = Container::getForumPostRepository();
$user = api_get_user_entity($student_id);
$course = api_get_course_entity($a_course['real_id']);
$session = api_get_session_entity($session_id);
//$group = api_get_group_entity(api_get_group_id());
$qb = $repo->getResourcesByCourseLinkedToUser($user, $course, $session);
$qb->select('count(resource)');
$count = $qb->getQuery()->getSingleScalarResult();
return $count;
$tbl_forum_post = Database::get_course_table(TABLE_FORUM_POST); $tbl_forum_post = Database::get_course_table(TABLE_FORUM_POST);
$tbl_forum = Database::get_course_table(TABLE_FORUM); $tbl_forum = Database::get_course_table(TABLE_FORUM);

3
public/main/mySpace/myStudents.php
Unescape View File

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use Chamilo\CourseBundle\Entity\CLpCategory; use Chamilo\CourseBundle\Entity\CLpCategory;
@ -107,7 +108,7 @@ $nameTools = get_lang('Learner details');
if (!empty($details)) { if (!empty($details)) {
if ('user_course' === $origin) { if ('user_course' === $origin) {
if (empty($cidReq)) { if (empty($cidReq) && $courseInfo) {
$interbreadcrumb[] = [ $interbreadcrumb[] = [
'url' => api_get_path(WEB_COURSE_PATH).$courseInfo['directory'], 'url' => api_get_path(WEB_COURSE_PATH).$courseInfo['directory'],
'name' => $courseInfo['title'], 'name' => $courseInfo['title'],

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

@ -28,11 +28,11 @@
{{ display.reporting_user_details(user) }} {{ display.reporting_user_details(user) }}
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
{{ display.card_widget('FirstLoginInPlatform'|get_lang, user.first_connection, 'calendar') }} {{ display.card_widget('First login in platform'|trans, user.first_connection, 'calendar') }}
{{ display.card_widget('LatestLoginInPlatform'|get_lang, user.last_connection, 'calendar') }} {{ display.card_widget('Latest login in platform'|trans, user.last_connection, 'calendar') }}
{% if user.legal %} {% if user.legal %}
{{ display.card_widget('LegalAccepted'|get_lang, user.legal.datetime, 'gavel', user.legal.icon) }} {{ display.card_widget('Legal accepted'|trans, user.legal.datetime, 'gavel', user.legal.icon) }}
{% endif %} {% endif %}
</div> </div>
</div> </div>
@ -53,23 +53,23 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="easy-donut"> <div class="easy-donut">
<div id="easypiechart-blue" title="{{ 'Progress'|get_lang }}" class="easypiechart" <div id="easypiechart-blue" title="{{ 'Progress'|trans }}" class="easypiechart"
data-percent="{{ user.student_progress }}"> data-percent="{{ user.student_progress }}">
<span class="percent">{{ user.student_progress }}%</span> <span class="percent">{{ user.student_progress }}%</span>
</div> </div>
<div class="easypiechart-legend"> <div class="easypiechart-legend">
{{ 'ScormAndLPProgressTotalAverage'|get_lang }} {{ 'Average progress in courses'|trans }}
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="easy-donut"> <div class="easy-donut">
<div id="easypiechart-red" title="{{ 'Score'|get_lang }}" class="easypiechart" <div id="easypiechart-red" title="{{ 'Score'|trans }}" class="easypiechart"
data-percent="{{ user.student_score }}"> data-percent="{{ user.student_score }}">
<span class="percent">{{ user.student_score }} </span> <span class="percent">{{ user.student_score }} </span>
</div> </div>
<div class="easypiechart-legend"> <div class="easypiechart-legend">
{{ 'ScormAndLPTestTotalAverage'|get_lang }} {{ 'Average progress in courses'|trans }}
</div> </div>
</div> </div>
</div> </div>
@ -82,7 +82,7 @@
<i class="fa fa-globe" aria-hidden="true"></i> <i class="fa fa-globe" aria-hidden="true"></i>
{{ user.tools.links }} {{ user.tools.links }}
<div class="box-name"> <div class="box-name">
{{ 'LinksDetails'|get_lang }} {{ 'Links accessed'|trans }}
</div> </div>
</div> </div>
</div> </div>
@ -94,24 +94,22 @@
<i class="fa fa-download" aria-hidden="true"></i> <i class="fa fa-download" aria-hidden="true"></i>
{{ user.tools.documents }} {{ user.tools.documents }}
<div class="box-name"> <div class="box-name">
{{ 'DocumentsDetails'|get_lang }} {{ 'Documents'|trans }}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="card box-widget"> <div class="card box-widget">
<div class="card-body"> <div class="card-body">
<div class="stat-widget-five"> <div class="stat-widget-five">
<i class="fa fa-pencil" aria-hidden="true"></i> <i class="fa fa-pencil" aria-hidden="true"></i>
{{ user.tools.tasks }} {{ user.tools.tasks }}
<div class="box-name"> <div class="box-name">
{{ 'Student_publication'|get_lang }} {{ 'Assignments'|trans }}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="card box-widget"> <div class="card box-widget">
@ -120,19 +118,18 @@
<i class="fa fa-comments-o" aria-hidden="true"></i> <i class="fa fa-comments-o" aria-hidden="true"></i>
{{ user.tools.messages }} {{ user.tools.messages }}
<div class="box-name"> <div class="box-name">
{{ 'NumberOfPostsForThisUser'|get_lang }} {{ 'Number of posts for this user'|trans }}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="card box-widget"> <div class="card box-widget">
<div class="card-body"> <div class="card-body">
<div class="stat-widget-five"> <div class="stat-widget-five">
<i class="fa fa-paper-plane" aria-hidden="true"></i> <i class="fa fa-paper-plane" aria-hidden="true"></i>
{{ user.tools.upload_documents }} {{ user.tools.upload_documents }}
<div class="box-name"> <div class="box-name">
{{ 'UploadedDocuments'|get_lang }} {{ 'Uploaded documents'|trans }}
</div> </div>
</div> </div>
</div> </div>
@ -146,11 +143,11 @@
{% if user.tools.chat_connection != '' %} {% if user.tools.chat_connection != '' %}
{{ user.tools.chat_connection }} {{ user.tools.chat_connection }}
{% else %} {% else %}
{{ 'NotRegistered'|get_lang }} {{ 'Not Registered'|trans }}
{% endif %} {% endif %}
</span> </span>
<div class="box-name"> <div class="box-name">
{{ 'ChatLastConnection'|get_lang }} {{ 'Latest chat connection'|trans }}
</div> </div>
</div> </div>
</div> </div>
@ -159,13 +156,13 @@
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
{{ display.card_widget('FirstLoginInPlatform'|get_lang, user.first_connection, 'calendar') }} {{ display.card_widget('First login in platform'|trans, user.first_connection, 'calendar') }}
{{ display.card_widget('LatestLoginInPlatform'|get_lang, user.last_connection, 'calendar') }} {{ display.card_widget('Latest login in platform'|trans, user.last_connection, 'calendar') }}
{% if(user.time_spent_course) %} {% if(user.time_spent_course) %}
{{ display.card_widget('TimeSpentInTheCourse'|get_lang, user.time_spent_course, 'clock-o') }} {{ display.card_widget('Time spent in the course'|trans, user.time_spent_course, 'clock-o') }}
{% endif %} {% endif %}
{% if user.legal %} {% if user.legal %}
{{ display.card_widget('LegalAccepted'|get_lang, user.legal.datetime, 'gavel', user.legal.icon) }} {{ display.card_widget('Legal accepted'|trans, user.legal.datetime, 'gavel', user.legal.icon) }}
{% endif %} {% endif %}
</div> </div>
</div> </div>

16
public/main/template/default/tracking/tracking_course_log.html.twig
Unescape View File

@ -111,7 +111,7 @@ window.onload = function() {
<i class="fa fa-graduation-cap" aria-hidden="true"></i> <i class="fa fa-graduation-cap" aria-hidden="true"></i>
</span> </span>
<div class="tracking-info"> <div class="tracking-info">
<div class="tracking-text"> {{ "NumberOfUsers"|get_lang }}</div> <div class="tracking-text"> {{ "Number of users"|trans }}</div>
<div class="tracking-number"> <div class="tracking-number">
{{ number_students }} {{ number_students }}
</div> </div>
@ -126,7 +126,7 @@ window.onload = function() {
<i class="fa fa-book" aria-hidden="true"></i> <i class="fa fa-book" aria-hidden="true"></i>
</span> </span>
<div class="tracking-info"> <div class="tracking-info">
<div class="tracking-text"> {{ "CourseProgress"|get_lang }}</div> <div class="tracking-text"> {{ "Course progress"|trans }}</div>
<div class="tracking-number"> <div class="tracking-number">
{{ students_completed_lp }}/{{ number_students }} {{ students_completed_lp }}/{{ number_students }}
</div> </div>
@ -141,7 +141,7 @@ window.onload = function() {
<i class="fa fa-heartbeat" aria-hidden="true"></i> <i class="fa fa-heartbeat" aria-hidden="true"></i>
</span> </span>
<div class="tracking-info"> <div class="tracking-info">
<div class="tracking-text"> {{ "ExerciseAverage"|get_lang }}</div> <div class="tracking-text"> {{ "Exercise average"|trans }}</div>
<div class="tracking-number"> <div class="tracking-number">
{{ students_test_score }}% {{ students_test_score }}%
</div> </div>
@ -156,7 +156,7 @@ window.onload = function() {
<i class="fa fa-id-card-o" aria-hidden="true"></i> <i class="fa fa-id-card-o" aria-hidden="true"></i>
</span> </span>
<div class="tracking-info"> <div class="tracking-info">
<div class="tracking-text"> {{ "CountCertificates"|get_lang }}</div> <div class="tracking-text"> {{ "Certificates count"|trans }}</div>
<div class="tracking-number"> <div class="tracking-number">
{{ certificate_count }}/{{ number_students }} {{ certificate_count }}/{{ number_students }}
</div> </div>
@ -170,7 +170,7 @@ window.onload = function() {
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<div class="tracking-chart"> <div class="tracking-chart">
<h4 class="tracking-box-title">{{ 'PercentileScoresDistribution'|get_lang }}</h4> <h4 class="tracking-box-title">{{ 'Percentile scores distribution'|trans }}</h4>
<canvas id="chart-score"></canvas> <canvas id="chart-score"></canvas>
</div> </div>
</div> </div>
@ -179,7 +179,7 @@ window.onload = function() {
<div class="col-md-4"> <div class="col-md-4">
<div class="panel panel-default tracking-top-student"> <div class="panel panel-default tracking-top-student">
<div class="panel-body"> <div class="panel-body">
<h4 class="tracking-box-title">{{ 'OutstandingStudents'|get_lang }}</h4> <h4 class="tracking-box-title">{{ 'Outstanding students'|trans }}</h4>
<ul class="list-top"> <ul class="list-top">
{% for student in top_students %} {% for student in top_students %}
{% set counter = counter + 1 %} {% set counter = counter + 1 %}
@ -211,7 +211,7 @@ window.onload = function() {
{% endfor %} {% endfor %}
</ul> </ul>
<span class="tracking-box-legend"> <span class="tracking-box-legend">
{{ 'ProgressObtainedFromLPProgressAndTestsAverage'|get_lang }} {{ 'Note: This progress is obtained through a combination of progress in the learning paths and average scores in the tests'|trans }}
</span> </span>
</div> </div>
</div> </div>
@ -219,7 +219,7 @@ window.onload = function() {
<div class="col-md-4"> <div class="col-md-4">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<h4 class="tracking-box-title">{{ "TotalTimeSpentInTheCourse"|get_lang }}</h4> <h4 class="tracking-box-title">{{ "Total time spent in the course"|trans }}</h4>
<canvas id="chart-access"></canvas> <canvas id="chart-access"></canvas>
</div> </div>
</div> </div>

1
public/main/tracking/courseLog.php
Unescape View File

@ -1,4 +1,5 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Component\Utils\ChamiloApi; use Chamilo\CoreBundle\Component\Utils\ChamiloApi;

9
src/CoreBundle/Controller/ResourceController.php
Unescape View File

@ -533,8 +533,8 @@ class ResourceController extends AbstractResourceController implements CourseCon
'@ChamiloTheme/Resource/disk_space.html.twig', '@ChamiloTheme/Resource/disk_space.html.twig',
[ [
'resourceNode' => $resourceNode, 'resourceNode' => $resourceNode,
'labels' => ($labels), 'labels' => $labels,
'data' => ($data), 'data' => $data,
] ]
); );
} }
@ -849,10 +849,11 @@ class ResourceController extends AbstractResourceController implements CourseCon
/** /**
* Gets a document when calling route resources_document_get_file. * Gets a document when calling route resources_document_get_file.
* 1 * * 1 *.
*
* @throws \League\Flysystem\FileNotFoundException * @throws \League\Flysystem\FileNotFoundException
* @deprecated
* *
* @deprecated
*/ */
public function getDocumentAction(Request $request): Response public function getDocumentAction(Request $request): Response
{ {

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

@ -54,7 +54,6 @@
</li> </li>
{% endmacro %} {% endmacro %}
{% macro card_collapse(name, item, expanded = 'true') %} {% macro card_collapse(name, item, expanded = 'true') %}
{% autoescape false %} {% autoescape false %}
<div class="card"> <div class="card">
@ -111,7 +110,6 @@
</ul> </ul>
</div> </div>
</div> </div>
<div class="description"> <div class="description">
{{ subitem.description }} {{ subitem.description }}
{{ subitem.last_post_text }} {{ subitem.last_post_text }}
@ -122,13 +120,10 @@
{{ "PostsPendingModeration"|trans }}: {{ subitem.moderation }} {{ "PostsPendingModeration"|trans }}: {{ subitem.moderation }}
</span> </span>
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -397,7 +392,6 @@
{% endautoescape %} {% endautoescape %}
{% endmacro %} {% endmacro %}
{% macro box_widget(name, content, icon) %} {% macro box_widget(name, content, icon) %}
<div class="card box-widget"> <div class="card box-widget">
<div class="card-body"> <div class="card-body">
@ -438,6 +432,7 @@
{% endmacro %} {% endmacro %}
{% macro reporting_user_details(user) %} {% macro reporting_user_details(user) %}
{% autoescape false %}
<div class="parameters"> <div class="parameters">
<dl class="dl-horizontal"> <dl class="dl-horizontal">
{% if user.status %} {% if user.status %}
@ -472,11 +467,12 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
{% endautoescape %}
{% endmacro %} {% endmacro %}
{% macro reporting_user_box(user) %} {% macro reporting_user_box(user) %}
{% autoescape false %}
{% import _self as display %} {% import _self as display %}
<div class="user"> <div class="user">
<div class="avatar"> <div class="avatar">
<img width="128px" src="{{ user.avatar }}" class="img-responsive"> <img width="128px" src="{{ user.avatar }}" class="img-responsive">
@ -491,8 +487,7 @@
</h3> </h3>
<p class="email">{{ user.email }}</p> <p class="email">{{ user.email }}</p>
</div> </div>
{{ display.reporting_user_details(user) }} {{ display.reporting_user_details(user) }}
</div> </div>
{% endautoescape %}
{% endmacro %} {% endmacro %}

Write Preview
Loading…
Cancel
Save