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

Minor - fix test report URL

Browse Source
pull/3064/head
Julio 6 years ago
parent d37774dc63
commit 50baa51e4c
11 changed files with 49 additions and 59 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. 8
      public/main/exercise/admin.php
  2. 11
      public/main/exercise/exercise_report.php
  3. 4
      public/main/exercise/exercise_show.php
  4. 2
      public/main/exercise/live_stats.php
  5. 11
      public/main/exercise/overview.php
  6. 2
      public/main/exercise/stats.php
  7. 4
      public/main/extra/myStudents.php
  8. 2
      public/main/inc/lib/exercise.lib.php
  9. 2
      public/main/mySpace/myStudents.php
  10. 2
      src/SkillBundle/Entity/SkillRelItem.php
  11. 8
      src/ThemeBundle/Resources/views/Mailer/Exercise/result_alert_body.html.twig

8
public/main/exercise/admin.php
Unescape View File

@ -231,7 +231,7 @@ if (!empty($clone_question) && !empty($objExercise->id)) {
Display::addFlash(Display::return_message(get_lang('Item copied')));
header('Location: admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id.'&page='.$page);
header('Location: admin.php?'.api_get_cidreq().'&id='.$objExercise->id.'&page='.$page);
exit;
}
@ -258,7 +258,7 @@ if (api_is_in_gradebook()) {
$interbreadcrumb[] = ['url' => 'exercise.php?'.api_get_cidreq(), 'name' => get_lang('Tests')];
if (isset($_GET['newQuestion']) || isset($_GET['editQuestion'])) {
$interbreadcrumb[] = [
'url' => 'admin.php?exerciseId='.$objExercise->id.'&'.api_get_cidreq(),
'url' => 'admin.php?id='.$objExercise->id.'&'.api_get_cidreq(),
'name' => $objExercise->selectTitle(true),
];
} else {
@ -321,10 +321,10 @@ if ($inATest) {
echo Display::url(
Display::return_icon('test_results.png', get_lang('Results and feedback'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id
api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.api_get_cidreq().'&id='.$objExercise->id
);
echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'.
echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&id='.$objExercise->id.'">'.
Display::return_icon('settings.png', get_lang('Edit test name and settings'), '', ICON_SIZE_MEDIUM).'</a>';
$maxScoreAllQuestions = 0;

11
public/main/exercise/exercise_report.php
Unescape View File

@ -1,11 +1,10 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Exercise list: This script shows the list of exercises for administrators and students.
*
* @package chamilo.exercise
*
* @author Julio Montoya <gugli100@gmail.com> jqgrid integration
* Modified by hubert.borderiou (question category)
*
@ -13,8 +12,6 @@
*/
require_once __DIR__.'/../inc/global.inc.php';
// Setting the tabs
$this_section = SECTION_COURSES;
$htmlHeadXtra[] = api_get_jqgrid_js();
$filter_user = isset($_REQUEST['filter_by_user']) ? (int) $_REQUEST['filter_by_user'] : null;
@ -305,7 +302,7 @@ if (isset($_REQUEST['comments']) &&
Database::query($sql);
if (empty($origin)) {
header('Location: '.api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?exerciseId='.$exercise_id.'&'.api_get_cidreq());
header('Location: '.api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?id='.$exercise_id.'&'.api_get_cidreq());
exit;
}
@ -399,7 +396,7 @@ if (($is_allowedToEdit || $is_tutor || api_is_coach()) &&
$exe_id,
api_get_utc_datetime()
);
header('Location: exercise_report.php?'.api_get_cidreq().'&exerciseId='.$exercise_id);
header('Location: exercise_report.php?'.api_get_cidreq().'&id='.$exercise_id);
exit;
}
}
@ -833,7 +830,7 @@ $gridJs = Display::grid_js(
var dateFormat = $( "#datepicker_start" ).datepicker( "option", "dateFormat" );
var selectedDate = $.datepicker.formatDate(dateFormat, dateTypeVar);
if (confirm("<?php echo convert_double_quote_to_single(get_lang('Are you sure you want to clean results for this test before the selected date ?')).' '; ?>" + selectedDate)) {
self.location.href = "exercise_report.php?<?php echo api_get_cidreq(); ?>&exerciseId=<?php echo $exercise_id; ?>&delete_before_date="+dateForBDD+"&sec_token=<?php echo $token; ?>";
self.location.href = "exercise_report.php?<?php echo api_get_cidreq(); ?>&id=<?php echo $exercise_id; ?>&delete_before_date="+dateForBDD+"&sec_token=<?php echo $token; ?>";
}
}
}

4
public/main/exercise/exercise_show.php
Unescape View File

@ -972,7 +972,7 @@ if ($isFeedbackAllowed && $origin != 'learnpath' && $origin != 'student_progress
if (in_array($origin, ['tracking_course', 'user_course', 'correct_exercise_in_lp'])) {
$formUrl = api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.api_get_cidreq().'&';
$formUrl .= http_build_query([
'exerciseId' => $exercise_id,
'id' => $exercise_id,
'filter' => 2,
'comments' => 'update',
'exeid' => $id,
@ -989,7 +989,7 @@ if ($isFeedbackAllowed && $origin != 'learnpath' && $origin != 'student_progress
} else {
$formUrl = api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.api_get_cidreq().'&';
$formUrl .= http_build_query([
'exerciseId' => $exercise_id,
'id' => $exercise_id,
'filter' => 1,
'comments' => 'update',
'exeid' => $id,

2
public/main/exercise/live_stats.php
Unescape View File

@ -108,7 +108,7 @@ $(function() {
</script>
<?php
$actions = '<a href="exercise_report.php?exerciseId='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">'.
$actions = '<a href="exercise_report.php?id='.intval($_GET['exerciseId']).'&'.api_get_cidreq().'">'.
Display::return_icon('back.png', get_lang('Go back to the questions list'), '', ICON_SIZE_MEDIUM).'</a>';
echo $actions = Display::div($actions, ['class' => 'actions']);

11
public/main/exercise/overview.php
Unescape View File

@ -1,24 +1,17 @@
<?php
/* For licensing terms, see /license.txt */
use ChamiloSession as Session;
/* For licensing terms, see /license.txt */
/**
* Exercise preview.
*
* @package chamilo.exercise
*
* @author Julio Montoya <gugli100@gmail.com>
*/
require_once __DIR__.'/../inc/global.inc.php';
$current_course_tool = TOOL_QUIZ;
// Clear the exercise session just in case
Exercise::cleanSessionVariables();
$this_section = SECTION_COURSES;
$js = '<script>'.api_get_language_translate_html().'</script>';
$htmlHeadXtra[] = $js;
@ -99,7 +92,7 @@ if ($is_allowed_to_edit) {
}
$editLink .= Display::url(
Display::return_icon('test_results.png', get_lang('Results and feedback and feedback'), [], ICON_SIZE_SMALL),
api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$objExercise->id,
api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.api_get_cidreq().'&id='.$objExercise->id,
['title' => get_lang('Results and feedback and feedback')]
);
}

2
public/main/exercise/stats.php
Unescape View File

@ -310,7 +310,7 @@ $interbreadcrumb[] = [
];
$tpl = new Template(get_lang('Report by question'));
$actions = '<a href="exercise_report.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'">'.
$actions = '<a href="exercise_report.php?id='.$exerciseId.'&'.api_get_cidreq().'">'.
Display:: return_icon(
'back.png',
get_lang('Go back to the questions list'),

4
public/main/extra/myStudents.php
Unescape View File

@ -1217,7 +1217,7 @@ if (!empty($studentId)) {
}
echo '</td>';
echo '<td>';
$all_attempt_url = "../exercise/exercise_report.php?exerciseId=$exercise_id&cidReq=$course_code&filter_by_user=$studentId&id_session=$sessionId";
$all_attempt_url = "../exercise/exercise_report.php?id=$exercise_id&cidReq=$course_code&filter_by_user=$studentId&id_session=$sessionId";
echo Display::url(
Display::return_icon(
'test_results.png',
@ -2324,7 +2324,7 @@ if (empty($_GET['details'])) {
echo '</td>';
echo '<td>';
$all_attempt_url = "../exercice/exercise_report.php?exerciseId=$exercise_id&cidReq=$course_code&filter_by_user=$studentId&id_session=$session_id";
$all_attempt_url = "../exercice/exercise_report.php?id=$exercise_id&cidReq=$course_code&filter_by_user=$studentId&id_session=$session_id";
echo Display::url(
Display::return_icon('test_results.png', get_lang('All attempts'), [], ICON_SIZE_SMALL),
$all_attempt_url

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

@ -2279,7 +2279,7 @@ HOTSPOT;
);
$filterByUser = isset($_GET['filter_by_user']) ? (int) $_GET['filter_by_user'] : 0;
$delete_link = '<a href="exercise_report.php?'.api_get_cidreq().'&filter_by_user='.$filterByUser.'&filter='.$filter.'&exerciseId='.$exercise_id.'&delete=delete&did='.$id.'"
$delete_link = '<a href="exercise_report.php?'.api_get_cidreq().'&filter_by_user='.$filterByUser.'&filter='.$filter.'&id='.$exercise_id.'&delete=delete&did='.$id.'"
onclick="javascript:if(!confirm(\''.sprintf(
addslashes(get_lang('Delete attempt?')),
$results[$i]['username'],

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

@ -1736,7 +1736,7 @@ if (empty($details)) {
echo '<td>';
if ($count_attempts > 0) {
$all_attempt_url = "../exercise/exercise_report.php?exerciseId=$exercise_id&"
$all_attempt_url = "../exercise/exercise_report.php?id=$exercise_id&"
."cidReq=$course_code&filter_by_user=$student_id&id_session=$sessionId";
echo Display::url(
Display::return_icon(

2
src/SkillBundle/Entity/SkillRelItem.php
Unescape View File

@ -409,7 +409,7 @@ class SkillRelItem
$url = '';
switch ($this->getItemType()) {
case ITEM_TYPE_EXERCISE:
$url = 'exercise/exercise_report.php?'.$cidReq.'&exerciseId='.$this->getItemId();
$url = 'exercise/exercise_report.php?'.$cidReq.'&id='.$this->getItemId();
break;
case ITEM_TYPE_STUDENT_PUBLICATION:

8
src/ThemeBundle/Resources/views/Mailer/Exercise/result_alert_body.html.twig
Unescape View File

@ -1,16 +1,16 @@
<div id="email-message" style="padding-top:10px; padding-bottom:10px;">
<p><strong>{{ 'DearStudentEmailIntroduction'|trans }}</strong> {{ 'AttemptVCC'|trans }} </p>
<p><strong>{{ 'Dear learner,'|trans }}</strong> {{ 'Your following attempt has been viewed/commented/corrected by the trainer'|trans }} </p>
<div style="border-color: #bce8f1; padding: 15px; background-color: #d9edf7; margin-bottom: 15px; font-size: 16px; color:#31708f;">
<p>
<strong>{{ 'CourseName'|trans }}: </strong>
<strong>{{ 'Course name'|trans }}: </strong>
{{ course_title }}
<br>
<strong>{{ 'Exercise'|trans }}: </strong>
<strong>{{ 'Test'|trans }}: </strong>
{{ test_title }}
</p>
</div>
<p>{{ 'ClickLinkToViewComment'|trans }}</p>
<p>{{ 'Click the link below to access your account and view your commented Examsheet.'|trans }}</p>
<p><a style="font-weight: bold; color: #2BA6CB;" href="{{ url }}">{{ url }}</a></p>
<div style="text-align: right;">
<p><strong>{{ 'Regards'|trans }}</strong><br>

Write Preview
Loading…
Cancel
Save