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

Merge student homepage progress PR 1668. Fix issues with double language variables. Factorize calls to api_get_configuration_value()

Browse Source
pull/2487/head
Yannick Warnier 9 years ago
parent 096d2b000a
commit 5c6eb5c721
8 changed files with 43 additions and 57 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. 51
      main/inc/lib/userportal.lib.php
  2. 12
      main/lang/brazilian/trad4all.inc.php
  3. 7
      main/lang/catalan/trad4all.inc.php
  4. 11
      main/lang/english/trad4all.inc.php
  5. 4
      main/lang/french/trad4all.inc.php
  6. 4
      main/lang/german/trad4all.inc.php
  7. 9
      main/lang/spanish/trad4all.inc.php

51
main/inc/lib/userportal.lib.php
Unescape View File

@ -1150,6 +1150,13 @@ class IndexManager
$sessionCount = 0; $sessionCount = 0;
$courseCount = 0; $courseCount = 0;
// Student info code check (shows student progress information on
// courses list
$studentInfo = api_get_configuration_value('course_student_info');
$studentInfoProgress = (!empty($studentInfo['progress']) && $studentInfo['progress'] === true);
$studentInfoScore = (!empty($studentInfo['score']) && $studentInfo['score'] === true);
$studentInfoCertificate = (!empty($studentInfo['certificate']) && $studentInfo['certificate'] === true);
// If we're not in the history view... // If we're not in the history view...
if (!isset($_GET['history'])) { if (!isset($_GET['history'])) {
// Display special courses. // Display special courses.
@ -1167,12 +1174,9 @@ class IndexManager
//Course option (show student progress) //Course option (show student progress)
//This code will add new variables (Progress, Score, Certificate) //This code will add new variables (Progress, Score, Certificate)
if (isset(api_get_configuration_value('course_student_info')['progress']) || if ($studentInfoProgress || $studentInfoScore || $studentInfoCertificate) {
isset(api_get_configuration_value('course_student_info')['score']) ||
isset(api_get_configuration_value('course_student_info')['certificate'])) {
foreach ($specialCourses as $key => $specialCourseInfo) { foreach ($specialCourses as $key => $specialCourseInfo) {
if (isset(api_get_configuration_value('course_student_info')['progress']) && if ($studentInfoProgress) {
api_get_configuration_value('course_student_info')['progress'] === true) {
$progress = Tracking::get_avg_student_progress( $progress = Tracking::get_avg_student_progress(
$user_id, $user_id,
$specialCourseInfo['course_code'] $specialCourseInfo['course_code']
@ -1180,8 +1184,7 @@ class IndexManager
$specialCourses[$key]['student_info']['progress'] = ($progress === false)? null : $progress; $specialCourses[$key]['student_info']['progress'] = ($progress === false)? null : $progress;
} }
if (isset(api_get_configuration_value('course_student_info')['score']) && if ($studentInfoScore) {
api_get_configuration_value('course_student_info')['score'] === true) {
$percentage_score = Tracking::get_avg_student_score( $percentage_score = Tracking::get_avg_student_score(
$user_id, $user_id,
$specialCourseInfo['course_code'], $specialCourseInfo['course_code'],
@ -1190,8 +1193,7 @@ class IndexManager
$specialCourses[$key]['student_info']['score'] = $percentage_score; $specialCourses[$key]['student_info']['score'] = $percentage_score;
} }
if (isset(api_get_configuration_value('course_student_info')['certificate']) && if ($studentInfoCertificate) {
api_get_configuration_value('course_student_info')['certificate'] === true) {
$category = Category::load( $category = Category::load(
null, null,
null, null,
@ -1216,8 +1218,7 @@ class IndexManager
foreach ($courses['in_category'] as $key1 => $value) { foreach ($courses['in_category'] as $key1 => $value) {
if (isset($courses['in_category'][$key1]['courses'])) { if (isset($courses['in_category'][$key1]['courses'])) {
foreach ($courses['in_category'][$key1]['courses'] as $key2 => $courseInCatInfo) { foreach ($courses['in_category'][$key1]['courses'] as $key2 => $courseInCatInfo) {
if (isset(api_get_configuration_value('course_student_info')['progress']) && if ($studentInfoProgress) {
api_get_configuration_value('course_student_info')['progress'] === true) {
$progress = Tracking::get_avg_student_progress( $progress = Tracking::get_avg_student_progress(
$user_id, $user_id,
$courseInCatInfo['course_code'] $courseInCatInfo['course_code']
@ -1225,8 +1226,7 @@ class IndexManager
$courses['in_category'][$key1]['courses'][$key2]['student_info']['progress'] = ($progress === false)? null : $progress; $courses['in_category'][$key1]['courses'][$key2]['student_info']['progress'] = ($progress === false)? null : $progress;
} }
if (isset(api_get_configuration_value('course_student_info')['score']) && if ($studentInfoScore) {
api_get_configuration_value('course_student_info')['score'] === true) {
$percentage_score = Tracking::get_avg_student_score( $percentage_score = Tracking::get_avg_student_score(
$user_id, $user_id,
$specialCourseInfo['course_code'], $specialCourseInfo['course_code'],
@ -1235,8 +1235,7 @@ class IndexManager
$courses['in_category'][$key1]['courses'][$key2]['student_info']['score'] = $percentage_score; $courses['in_category'][$key1]['courses'][$key2]['student_info']['score'] = $percentage_score;
} }
if (isset(api_get_configuration_value('course_student_info')['certificate']) && if ($studentInfoCertificate) {
api_get_configuration_value('course_student_info')['certificate'] === true) {
$category = Category::load( $category = Category::load(
null, null,
null, null,
@ -1259,8 +1258,7 @@ class IndexManager
} }
} }
foreach ($courses['not_category'] as $key => $courseNotInCatInfo) { foreach ($courses['not_category'] as $key => $courseNotInCatInfo) {
if (isset(api_get_configuration_value('course_student_info')['progress']) && if ($studentInfoProgress) {
api_get_configuration_value('course_student_info')['progress'] === true) {
$progress = Tracking::get_avg_student_progress( $progress = Tracking::get_avg_student_progress(
$user_id, $user_id,
$courseNotInCatInfo['course_code'] $courseNotInCatInfo['course_code']
@ -1268,8 +1266,7 @@ class IndexManager
$courses['not_category'][$key]['student_info']['progress'] = ($progress === false)? null : $progress; $courses['not_category'][$key]['student_info']['progress'] = ($progress === false)? null : $progress;
} }
if (isset(api_get_configuration_value('course_student_info')['score']) && if ($studentInfoScore) {
api_get_configuration_value('course_student_info')['score'] === true) {
$percentage_score = Tracking::get_avg_student_score( $percentage_score = Tracking::get_avg_student_score(
$user_id, $user_id,
$courseNotInCatInfo['course_code'], $courseNotInCatInfo['course_code'],
@ -1278,8 +1275,7 @@ class IndexManager
$courses['not_category'][$key]['student_info']['score'] = $percentage_score; $courses['not_category'][$key]['student_info']['score'] = $percentage_score;
} }
if (isset(api_get_configuration_value('course_student_info')['certificate']) && if ($studentInfoCertificate) {
api_get_configuration_value('course_student_info')['certificate'] === true) {
$category = Category::load( $category = Category::load(
null, null,
null, null,
@ -1425,11 +1421,8 @@ class IndexManager
//Course option (show student progress) //Course option (show student progress)
//This code will add new variables (Progress, Score, Certificate) //This code will add new variables (Progress, Score, Certificate)
if (isset(api_get_configuration_value('course_student_info')['progress']) || if ($studentInfoProgress || $studentInfoScore || $studentInfoCertificate) {
isset(api_get_configuration_value('course_student_info')['score']) || if ($studentInfoProgress) {
isset(api_get_configuration_value('course_student_info')['certificate'])) {
if (isset(api_get_configuration_value('course_student_info')['progress']) &&
api_get_configuration_value('course_student_info')['progress'] === true) {
$progress = Tracking::get_avg_student_progress( $progress = Tracking::get_avg_student_progress(
$user_id, $user_id,
$course['course_code'], $course['course_code'],
@ -1439,8 +1432,7 @@ class IndexManager
$course_session['student_info']['progress'] = ($progress === false)? null : $progress; $course_session['student_info']['progress'] = ($progress === false)? null : $progress;
} }
if (isset(api_get_configuration_value('course_student_info')['score']) && if ($studentInfoScore) {
api_get_configuration_value('course_student_info')['score'] === true) {
$percentage_score = Tracking::get_avg_student_score( $percentage_score = Tracking::get_avg_student_score(
$user_id, $user_id,
$course['course_code'], $course['course_code'],
@ -1450,8 +1442,7 @@ class IndexManager
$course_session['student_info']['score'] = $percentage_score; $course_session['student_info']['score'] = $percentage_score;
} }
if (isset(api_get_configuration_value('course_student_info')['certificate']) && if ($studentInfoCertificate) {
api_get_configuration_value('course_student_info')['certificate'] === true) {
$category = Category::load( $category = Category::load(
null, null,
null, null,

12
main/lang/brazilian/trad4all.inc.php
Unescape View File

@ -7861,8 +7861,16 @@ $SkillFromCourseXDeletedSinceThen = "Esta habilidade foi obtida através do curs
$SaveAndAddNewItem = "Salvar e adicionar novo item"; $SaveAndAddNewItem = "Salvar e adicionar novo item";
$AnnouncementChooseRecipientsDescription = "Por padrão, este anúncio será enviado a todos os usuários. Mas você também pode selecionar outros destinatários."; $AnnouncementChooseRecipientsDescription = "Por padrão, este anúncio será enviado a todos os usuários. Mas você também pode selecionar outros destinatários.";
$ChooseRecipients = "Escolha destinatários"; $ChooseRecipients = "Escolha destinatários";
$StudentCourseProgressX = "Progresso: %s%"; $StudentCourseProgressX = "Progresso: %s %%";
$SessionDurationNotStartedMaxX = "Esta sessão tem uma duração máxima de %s dias."; $SessionDurationNotStartedMaxX = "Esta sessão tem uma duração máxima de %s dias.";
$StudentCourseScoreX = "Pontuação: %s%"; $StudentCourseScoreX = "Pontuação: %s %%";
$StudentCourseCertificateX = "Certificado: %s"; $StudentCourseCertificateX = "Certificado: %s";
$ConfigureExerciseVisibilityInCourseTitle = "Habilitar para ignorar a configuração do Exercício invisível na sessão em um nível de curso básico";
$ConfigureExerciseVisibilityInCourseComment = "Para habilitar a configuração da invisibilidade exercício em sessão na camada de base para passar pela configuração global. Se não for definido o parâmetro Global é usado.";
$ExerciseInvisibleInSessionTitle = "Exercer invisível na Sessão";
$ExerciseInvisibleInSessionComment = "Se um exercício é visível no curso base, então ele aparece invisível na sessão. Se um exercício é invisível no curso básico, então ele não aparece na sessão.";
$Ongoing = "Em progresso";
$Unclosed = "Não fechado";
$AttemptStillOngoingPleaseWait = "Tentativa ainda em curso. Por favor, espere.";
$MarkAttemptAsClosed = "Marcar tentativa como fechada";
?> ?>

7
main/lang/catalan/trad4all.inc.php
Unescape View File

@ -7986,9 +7986,6 @@ $Colors = "Colors";
$DesignWithBadgeStudio = "Dissenyar amb Badge Studio"; $DesignWithBadgeStudio = "Dissenyar amb Badge Studio";
$DesignWithBadgeStudioComment = "Utilitzi Badge Studio per crear la seva pròpia insígnia dins de la seva plataforma"; $DesignWithBadgeStudioComment = "Utilitzi Badge Studio per crear la seva pròpia insígnia dins de la seva plataforma";
$YouAlreadySentThisFile = "Ja va enviar aquest o un altre arxiu amb el mateix nom. Si us plau assegureu-vos d'enviar cada arxiu una sola vegada."; $YouAlreadySentThisFile = "Ja va enviar aquest o un altre arxiu amb el mateix nom. Si us plau assegureu-vos d'enviar cada arxiu una sola vegada.";
$StudentCourseProgress = "Progrés: %s%"; $StudentCourseProgressX = "Progrés: %s %%";
$StudentCourseScore = "Puntuació: %s%"; $StudentCourseScoreX = "Puntuació: %s %%";
$StudentCourseCertificate = "Certificat: %s";
$MyCourseProgressTitle = "Mostra progrés del curs a l'estudiant";
$MyCourseProgressTemplateComment = "En activar aquesta opció se'ls mostraran als estudiants el progrés dels seus cursos a la pàgina 'Els meus cursos'.";
?> ?>

11
main/lang/english/trad4all.inc.php
Unescape View File

@ -2653,7 +2653,7 @@ Best Regards,
%s Team"; %s Team";
$MailCronCourseExpirationReminderSubject = "Urgent: %s course expiration reminder"; $MailCronCourseExpirationReminderSubject = "Urgent: %s course expiration reminder";
$ExerciseAndLearningPath = "Exercise and learning path"; $ExerciseAndLearningPath = "Exercise and learning path";
$LearningPathGradebookWarning = "Warning: It is possible to use, in the gradebook, tests that are part of learning paths. If the learning path itself is already included, this test might be part of the gradebook already. The learning paths evaluation is made on the basis of a progress percentage, while the evaluation on tests is made on the basis of a score. Survey evaluation is based on whether the user has answered (1) or not (0). Make sure you test your combinations of gradebook evaluations to avoid mind-blogging situations."; $LearningPathGradebookWarning = "Warning: It is possible to use, in the gradebook, tests that are part of learning paths. If the learning path itself is already included, this test might be part of the gradebook already. The learning paths evaluation is made on the basis of a progress percentage, while the evaluation on tests is made on the basis of a score. Survey evaluation is based on whether the user has answered (1) or not (0). Make sure you test your combinations of gradebook evaluations to avoid mind-boggling situations.";
$ChooseEitherDurationOrTimeLimit = "Choose either duration or time limit"; $ChooseEitherDurationOrTimeLimit = "Choose either duration or time limit";
$ClearList = "Clear the chat"; $ClearList = "Clear the chat";
$SessionBanner = "Session banner"; $SessionBanner = "Session banner";
@ -7963,11 +7963,6 @@ $OnlyUsersFromCourseSession = "Only users from one course in a session";
$ServerXForwardedForInfo = "If the server is behind a proxy or firewall (and only in those cases), it might be using the X_FORWARDED_FOR HTTP header to show the remote user IP (yours, in this case)."; $ServerXForwardedForInfo = "If the server is behind a proxy or firewall (and only in those cases), it might be using the X_FORWARDED_FOR HTTP header to show the remote user IP (yours, in this case).";
$GeolocalizationCoordinates = "Geolocalization by coordinates"; $GeolocalizationCoordinates = "Geolocalization by coordinates";
$ExportUsersOfACourse = "Export users of a course"; $ExportUsersOfACourse = "Export users of a course";
$StudentCourseProgressX = "Progress: %s%";
$StudentCourseScoreX = "Rating: %s%";
$StudentCourseCertificateX = "Certificate: %s";
$MyCourseProgressTitle = "Show course progress to student";
$MyCourseProgressTemplateComment = "By activating this option, the students will see their course progress in the page 'My Courses'.";
$PauseRecordingAudio = "Pause recording"; $PauseRecordingAudio = "Pause recording";
$PlayRecordingAudio = "Resume recording"; $PlayRecordingAudio = "Resume recording";
$YourSessionTimeHasExpired = "You are already registered but your allowed access time has expired."; $YourSessionTimeHasExpired = "You are already registered but your allowed access time has expired.";
@ -7982,9 +7977,9 @@ $SkillFromCourseXDeletedSinceThen = "This skill was obtained through course %s w
$SaveAndAddNewItem = "Save and add new item"; $SaveAndAddNewItem = "Save and add new item";
$AnnouncementChooseRecipientsDescription = "By default, this announcement will be sent to all users. But you can also select others recipients."; $AnnouncementChooseRecipientsDescription = "By default, this announcement will be sent to all users. But you can also select others recipients.";
$ChooseRecipients = "Choose recipients"; $ChooseRecipients = "Choose recipients";
$StudentCourseProgressX = "Progress: %s%"; $StudentCourseProgressX = "Progress: %s %%";
$SessionDurationNotStartedMaxX = "This session has a maximum duration of %s days."; $SessionDurationNotStartedMaxX = "This session has a maximum duration of %s days.";
$StudentCourseScoreX = "Score: %s%"; $StudentCourseScoreX = "Score: %s %%";
$StudentCourseCertificateX = "Certificate: %s"; $StudentCourseCertificateX = "Certificate: %s";
$ConfigureExerciseVisibilityInCourseTitle = "Enable to bypass the configuration of Exercise invisible in session at a base course level"; $ConfigureExerciseVisibilityInCourseTitle = "Enable to bypass the configuration of Exercise invisible in session at a base course level";
$ConfigureExerciseVisibilityInCourseComment = "To enable the configuration of the exercise invisibility in session in the base course to by pass the global configuration. If not set the global parameter is used."; $ConfigureExerciseVisibilityInCourseComment = "To enable the configuration of the exercise invisibility in session in the base course to by pass the global configuration. If not set the global parameter is used.";

4
main/lang/french/trad4all.inc.php
Unescape View File

@ -7924,9 +7924,9 @@ $SkillFromCourseXDeletedSinceThen = "Cette compétence a été obtenue au traver
$SaveAndAddNewItem = "Enregister et ajouter un nouvel élément"; $SaveAndAddNewItem = "Enregister et ajouter un nouvel élément";
$AnnouncementChooseRecipientsDescription = "Cette annonce sera envoyée à tous les utilisateurs par défaut, mais vous pouvez également sélectionner d'autres destinataires."; $AnnouncementChooseRecipientsDescription = "Cette annonce sera envoyée à tous les utilisateurs par défaut, mais vous pouvez également sélectionner d'autres destinataires.";
$ChooseRecipients = "Sélectionnez les destinataires"; $ChooseRecipients = "Sélectionnez les destinataires";
$StudentCourseProgressX = "Progrès: %s %"; $StudentCourseProgressX = "Progrès: %s %%";
$SessionDurationNotStartedMaxX = "Cette session a une durée maximale de %s jours."; $SessionDurationNotStartedMaxX = "Cette session a une durée maximale de %s jours.";
$StudentCourseScoreX = "Score: %s %"; $StudentCourseScoreX = "Score: %s %%";
$StudentCourseCertificateX = "Certificat: %s"; $StudentCourseCertificateX = "Certificat: %s";
$ConfigureExerciseVisibilityInCourseTitle = "Permet de supasser la configuration de Exercice invisible dans la session au niveau de chaque cours de base."; $ConfigureExerciseVisibilityInCourseTitle = "Permet de supasser la configuration de Exercice invisible dans la session au niveau de chaque cours de base.";
$ConfigureExerciseVisibilityInCourseComment = "Permet de définir la configuration du paramètre invisible dans la session au niveau du cours de base afin de surpasser la configuration global. Si le paramètre n'est pas mis dans le cours de base, c'est la valeur du paramètre global qui est utilisé."; $ConfigureExerciseVisibilityInCourseComment = "Permet de définir la configuration du paramètre invisible dans la session au niveau du cours de base afin de surpasser la configuration global. Si le paramètre n'est pas mis dans le cours de base, c'est la valeur du paramètre global qui est utilisé.";

4
main/lang/german/trad4all.inc.php
Unescape View File

@ -7680,8 +7680,8 @@ $SkillFromCourseXDeletedSinceThen = "Diese Fertigkeit wurde durch Kurs %s erworb
$SaveAndAddNewItem = "Speichern und neues Element hinzufügen"; $SaveAndAddNewItem = "Speichern und neues Element hinzufügen";
$AnnouncementChooseRecipientsDescription = "Standardmäßig wird diese Ankündigung an alle Benutzer gesendet. Aber Sie können auch andere Empfänger auswählen."; $AnnouncementChooseRecipientsDescription = "Standardmäßig wird diese Ankündigung an alle Benutzer gesendet. Aber Sie können auch andere Empfänger auswählen.";
$ChooseRecipients = "Empfänger auswählen"; $ChooseRecipients = "Empfänger auswählen";
$StudentCourseProgressX = "Fortschritt: %s%"; $StudentCourseProgressX = "Fortschritt: %s %%";
$SessionDurationNotStartedMaxX = "Diese Sitzung hat eine maximale Dauer von %s Tagen."; $SessionDurationNotStartedMaxX = "Diese Sitzung hat eine maximale Dauer von %s Tagen.";
$StudentCourseScoreX = "Ergebnis: %s%"; $StudentCourseScoreX = "Ergebnis: %s %%";
$StudentCourseCertificateX = "Zertifikat: %s"; $StudentCourseCertificateX = "Zertifikat: %s";
?> ?>

9
main/lang/spanish/trad4all.inc.php
Unescape View File

@ -7978,11 +7978,6 @@ $OnlyUsersFromCourseSession = "Solo usuarios de un curso en una sesión";
$ServerXForwardedForInfo = "Si su servidor está detrás de un reverse proxy o un firewall (y únicamente en estos casos), podría usar la cabecera HTTP X_FORWARDED_FOR para mostrar la dirección IP del usuario distante (usted, en este caso)."; $ServerXForwardedForInfo = "Si su servidor está detrás de un reverse proxy o un firewall (y únicamente en estos casos), podría usar la cabecera HTTP X_FORWARDED_FOR para mostrar la dirección IP del usuario distante (usted, en este caso).";
$GeolocalizationCoordinates = "Geolocalización por coordenadas"; $GeolocalizationCoordinates = "Geolocalización por coordenadas";
$ExportUsersOfACourse = "Exportar usuarios de un curso"; $ExportUsersOfACourse = "Exportar usuarios de un curso";
$StudentCourseProgress = "Progreso: %s%";
$StudentCourseScore = "Puntuación: %s%";
$StudentCourseCertificate = "Certificado: %s";
$MyCourseProgressTitle = "Mostrar progreso del curso al estudiante";
$MyCourseProgressTemplateComment = "Al activar esta opción se les mostrarán a los estudiantes el progreso de sus cursos en la página 'Mis cursos'.";
$PauseRecordingAudio = "Pausar grabación"; $PauseRecordingAudio = "Pausar grabación";
$PlayRecordingAudio = "Reanudar grabación"; $PlayRecordingAudio = "Reanudar grabación";
$YourSessionTimeHasExpired = "Usted ya está registrado pero su periodo de permanencia en este curso ya expiró."; $YourSessionTimeHasExpired = "Usted ya está registrado pero su periodo de permanencia en este curso ya expiró.";
@ -7997,9 +7992,9 @@ $SkillFromCourseXDeletedSinceThen = "Esta competencia fue adquirida a través de
$SaveAndAddNewItem = "Guardar y agregar nuevo elemento"; $SaveAndAddNewItem = "Guardar y agregar nuevo elemento";
$AnnouncementChooseRecipientsDescription = "De forma predeterminada, este anuncio será enviado a todos los usuarios. Pero también puede seleccionar otros destinatarios."; $AnnouncementChooseRecipientsDescription = "De forma predeterminada, este anuncio será enviado a todos los usuarios. Pero también puede seleccionar otros destinatarios.";
$ChooseRecipients = "Elegir destinatarios"; $ChooseRecipients = "Elegir destinatarios";
$StudentCourseProgressX = "Progreso: %s %"; $StudentCourseProgressX = "Progreso: %s %%";
$SessionDurationNotStartedMaxX = "Esta sesión tiene una duración máxima de %s días."; $SessionDurationNotStartedMaxX = "Esta sesión tiene una duración máxima de %s días.";
$StudentCourseScoreX = "Nota: %s %"; $StudentCourseScoreX = "Nota: %s %%";
$StudentCourseCertificateX = "Certificado: %s"; $StudentCourseCertificateX = "Certificado: %s";
$ConfigureExerciseVisibilityInCourseTitle = "Permitir ignorar la configuración de un ejercicio invisible en la sesión a nivel del curso base"; $ConfigureExerciseVisibilityInCourseTitle = "Permitir ignorar la configuración de un ejercicio invisible en la sesión a nivel del curso base";
$ConfigureExerciseVisibilityInCourseComment = "Activar la configuración de invisibilidad de los ejercicios en la sesión desde el curso base. Si no está configurado, se usa el parámetro global."; $ConfigureExerciseVisibilityInCourseComment = "Activar la configuración de invisibilidad de los ejercicios en la sesión desde el curso base. Si no está configurado, se usa el parámetro global.";

Write Preview
Loading…
Cancel
Save