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

Internal - Fix legacy code, use resources

Browse Source
pull/3464/head
Julio Montoya 5 years ago
parent 50b9c091e4
commit 68c9e3a645
8 changed files with 60 additions and 38 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. 9
      public/main/course_progress/index.php
  2. 22
      public/main/gradebook/lib/be/attendancelink.class.php
  3. 2
      public/main/gradebook/lib/be/learnpathlink.class.php
  4. 11
      public/main/gradebook/lib/be/studentpublicationlink.class.php
  5. 2
      public/main/inc/lib/attendance.lib.php
  6. 10
      public/main/inc/lib/document.lib.php
  7. 8
      public/main/lp/learnpath.class.php
  8. 24
      public/main/template/default/course_progress/progress.html.twig

9
public/main/course_progress/index.php
Unescape View File

@ -108,8 +108,8 @@ $attendance = new Attendance();
$attendance_list = $attendance->get_attendances_list();
$attendance_select = [];
$attendance_select[0] = get_lang('Select an attendance');
foreach ($attendance_list as $attendance_id => $attendance_data) {
$attendance_select[$attendance_id] = $attendance_data['name'];
foreach ($attendance_list as $attendanceEntity) {
$attendance_select[$attendanceEntity->getIid()] = $attendanceEntity->getName();
}
$token = Security::get_token();
@ -117,11 +117,11 @@ $url_token = '&sec_token='.$token;
$user_info = api_get_user_info();
$params = '&'.api_get_cidreq();
if (isset($_POST['action']) && 'thematic_delete_select' == $_POST['action']) {
if (isset($_POST['action']) && 'thematic_delete_select' === $_POST['action']) {
$action = 'thematic_delete_select';
}
if (isset($_GET['isStudentView']) && 'true' == $_GET['isStudentView']) {
if (isset($_GET['isStudentView']) && 'true' === $_GET['isStudentView']) {
$action = 'thematic_details';
}
@ -651,7 +651,6 @@ switch ($action) {
$content = $tpl->fetch($thematicLayout);
break;
case 'thematic_list':
$interbreadcrumb[] = ['url' => '#', 'name' => get_lang('Thematic control')];
$actionLeft = '<a href="index.php?'.api_get_cidreq().'&action=thematic_add'.$url_token.'">'.
Display::return_icon(

22
public/main/gradebook/lib/be/attendancelink.class.php
Unescape View File

@ -1,4 +1,5 @@
<?php
/* For licensing terms, see /license.txt */
/**
@ -46,23 +47,28 @@ class AttendanceLink extends AbstractLink
if (empty($this->course_code)) {
return [];
}
$tbl_attendance = $this->get_attendance_table();
$sessionId = $this->get_session_id();
$repo = \Chamilo\CoreBundle\Framework\Container::getStudentPublicationRepository();
$qb = $repo->getResourcesByCourse(api_get_course_entity($this->course_id), api_get_session_entity($sessionId));
$qb->andWhere('resource.active = 1');
$links = $qb->getQuery()->getResult();
/*$tbl_attendance = $this->get_attendance_table();
$sql = 'SELECT att.iid, att.name, att.attendance_qualify_title
FROM '.$tbl_attendance.' att
WHERE
att.c_id = '.$this->course_id.' AND
att.active = 1 AND
att.session_id = '.$sessionId;
$result = Database::query($sql);*/
$result = Database::query($sql);
while ($data = Database::fetch_array($result)) {
if (isset($data['attendance_qualify_title']) && '' != $data['attendance_qualify_title']) {
$cats[] = [$data['iid'], $data['attendance_qualify_title']];
/** @var \Chamilo\CourseBundle\Entity\CAttendance $link */
foreach ($links as $link) {
$title = $link->getAttendanceQualifyTitle();
if (!empty($title)) {
$cats[] = [$link->getIid(), $title];
} else {
$cats[] = [$data['iid'], $data['name']];
$cats[] = [$link->getIid(), $link->getName()];
}
}
@ -139,7 +145,7 @@ class AttendanceLink extends AbstractLink
if (!(array_key_exists($data['user_id'], $students))) {
if (0 != $attendance['attendance_qualify_max']) {
$students[$data['user_id']] = $data['score'];
$rescount++;
++$rescount;
$sum += $data['score'] / $attendance['attendance_qualify_max'];
$sumResult += $data['score'];
if ($data['score'] > $bestResult) {

2
public/main/gradebook/lib/be/learnpathlink.class.php
Unescape View File

@ -46,7 +46,7 @@ class LearnpathLink extends AbstractLink
$cats = [];
while ($data = Database::fetch_array($result)) {
$cats[] = [$data['id'], $data['name']];
$cats[] = [$data['iid'], $data['name']];
}
return $cats;

11
public/main/gradebook/lib/be/studentpublicationlink.class.php
Unescape View File

@ -97,20 +97,25 @@ class StudentPublicationLink extends AbstractLink
//Only show works from the session
//AND has_properties != ''
$links = Container::getStudentPublicationRepository()
$repo = Container::getStudentPublicationRepository();
$qb = $repo->getResourcesByCourse(api_get_course_entity($this->course_id), $session);
$qb->andWhere("resource.filetype = 'folder' AND resource.active = true");
$links = $qb->getQuery()->getResult();
/*$links = Container::getStudentPublicationRepository()
->findBy([
'cId' => $this->course_id,
'active' => true,
'filetype' => 'folder',
'session' => $session,
]);
]);*/
foreach ($links as $data) {
$work_name = $data->getTitle();
if (empty($work_name)) {
$work_name = basename($data->getUrl());
}
$cats[] = [$data->getId(), $work_name];
$cats[] = [$data->getIid(), $work_name];
}
$cats = isset($cats) ? $cats : [];

2
public/main/inc/lib/attendance.lib.php
Unescape View File

@ -28,7 +28,7 @@ class Attendance
* @param int $courseId
* @param int $sessionId
*
* @return array attendances list
* @return CAttendance[]
*/
public function get_attendances_list($courseId = 0, $sessionId = 0)
{

10
public/main/inc/lib/document.lib.php
Unescape View File

@ -1595,19 +1595,15 @@ class DocumentManager
$sessionId,
$is_preview = false
) {
$user_id = intval($user_id);
$user_id = (int) $user_id;
$tbl_document = Database::get_course_table(TABLE_DOCUMENT);
$course_id = $courseInfo['real_id'];
$document_id = self::get_default_certificate_id(
$course_id,
$sessionId
);
$document_id = self::get_default_certificate_id($course_id, $sessionId);
$my_content_html = null;
if ($document_id) {
$sql = "SELECT path FROM $tbl_document
WHERE c_id = $course_id AND iid = $document_id";
WHERE iid = $document_id";
$rs = Database::query($sql);
$new_content = '';
$all_user_info = [];

8
public/main/lp/learnpath.class.php
Unescape View File

@ -10374,6 +10374,14 @@ EOD;
$this->categoryId = (int) $categoryId;
$table = Database::get_course_table(TABLE_LP_MAIN);
$lp_id = $this->get_id();
if (empty($categoryId)) {
$this->categoryId = null;
$sql = "UPDATE $table SET category_id = NULL WHERE iid = $lp_id";
Database::query($sql);
return true;
}
$sql = "UPDATE $table SET category_id = ".$this->categoryId."
WHERE iid = $lp_id";
Database::query($sql);

24
public/main/template/default/course_progress/progress.html.twig
Unescape View File

@ -46,7 +46,6 @@
}
</script>
{% if data is not empty %}
{% set tutor = is_granted('ROLE_TEACHER') %}
<div id="course-progress" class="thematic">
@ -99,7 +98,7 @@
<div class="alert alert-info" role="alert">{{ 'There is no thematic plan for now' | trans }}</div>
</div>
{% else %}
{% for plan in item.plans %}ssss
{% for plan in item.plans %}
<h5>{{ plan.title }}</h5>
{{ plan.description }}
{% endfor %}
@ -121,7 +120,9 @@
{% if item.advances is not empty %}
{% for advance in item.advances %}
<tr>
<td style="width: 90%" class="thematic_advance_content" id="thematic_advance_content_id_{{ advance.iid }}">
<td style="width: 90%"
class="thematic_advance_content"
id="thematic_advance_content_id_{{ advance.iid }}">
<div id="thematic_advance_{{ advance.id }}">
<strong>{{ advance.startDate | format_date }}</strong>
{{ advance.content }}
@ -131,12 +132,14 @@
<div id="thematic_advance_tools_{{ advance.id }}" class="thematic_advance_actions">
<div class="btn-group btn-group-sm">
<a class="btn btn-default btn-sm"
href="index.php?{{ course_url_params }}&action=thematic_advance_edit&thematic_id={{ item.iid }}&thematic_advance_id={{ advance.id }}" title="{{ 'Edit' |trans }}">
href="index.php?{{ course_url_params }}&action=thematic_advance_edit&thematic_id={{ item.iid }}&thematic_advance_id={{ advance.id }}"
title="{{ 'Edit' |trans }}">
<i class="fa fa-pen" aria-hidden="true"></i>
</a>
<a class="btn btn-default btn-sm"
onclick="javascript:if(!confirm('{{ 'Are you sure to delete' | trans }}')) return false;"
href="index.php?{{ course_url_params }}&action=thematic_advance_delete&thematic_id={{ item.iid }}&thematic_advance_id={{ advance.id }}" title="{{ 'Delete' |trans }}">
href="index.php?{{ course_url_params }}&action=thematic_advance_delete&thematic_id={{ item.iid }}&thematic_advance_id={{ advance.id }}"
title="{{ 'Delete' |trans }}">
<i class="fa fa-trash" aria-hidden="true"></i>
</a>
</div>
@ -151,16 +154,21 @@
{% set color = "background-color:#FFFFFF;" %}
{% endif %}
{% if tutor %}
<td style="width: 10%; {{ color }}" id="td_done_thematic_{{ advance.id }}">
<td
style="width: 10%; {{ color }}"
id="td_done_thematic_{{ advance.id }}">
{% set check = "" %}
{% if item.last_done == advance.id %}
{% set check = "checked" %}
{% endif %}
<input type="radio" class="done_thematic"
<input
type="radio"
class="done_thematic"
id="done_thematic_{{ advance.id }}"
name="done_thematic"
value="{{ advance.id }}" {{ check }}
onclick="updateDoneThematicAdvance(this.value); ">
onclick="updateDoneThematicAdvance(this.value);"
/>
{% else %}
</td>
{% endif %}

Write Preview
Loading…
Cancel
Save