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

sessino mandatory for survey report BT#7277

Browse Source
1.9.x
César Perales 13 years ago
parent 01a9fafd65
commit 4736780cdc
2 changed files with 21 additions and 28 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
      main/inc/lib/sessionmanager.lib.php
  2. 40
      main/mySpace/index.php

9
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -653,7 +653,6 @@ class SessionManager
$where $order $limit";
$sql_query = sprintf($sql, $course['code'], intval($sessionId));
$rs = Database::query($sql_query);
while ($user = Database::fetch_array($rs))
{
@ -676,8 +675,12 @@ class SessionManager
FROM $c_survey_answer sa
INNER JOIN $c_survey_question sq ON sq.question_id = sa.question_id "
//." INNER JOIN $c_survey s ON sq.survey_id = s.survey_id "
." INNER JOIN $c_survey_question_option sqo ON sqo.c_id = sa.c_id AND sqo.survey_id = sq.survey_id AND sqo.question_id = sq.question_id AND sqo.question_option_id = sa.option_id
WHERE sa.survey_id = %d AND sa.c_id = %d AND sa.user = %d" . $where_survey;
." INNER JOIN $c_survey_question_option sqo ON sqo.c_id = sa.c_id
WHERE sqo.survey_id = sq.survey_id
AND sqo.question_id = sq.question_id
AND sqo.question_option_id = sa.option_id
AND sa.survey_id = %d AND sa.c_id = %d AND sa.user = %d
" . $where_survey;
$sql_query = sprintf($sql, $surveyId, $courseId, $user['user_id']);

40
main/mySpace/index.php
Unescape View File

@ -694,27 +694,12 @@ if ($is_platform_admin && in_array($view, array('admin')) && $display != 'yourst
$script = '
$("#survey_name").on("change", function() {
var date_to = $("#date_to").val();
var date_from = $("#date_from").val();
var sessionId = $("#session_name").val();
var courseId = $("#course_name").val();
var surveyId = $("#survey_name").val();
window.location = "'.$self.'?view=admin&display='.$display.'&session_id="+sessionId+"&course_id="+courseId+"&survey_id="+surveyId+"&date_to="+date_to+"&date_from="+date_from;
window.location = "'.$self.'?view=admin&display='.$display.'&session_id="+sessionId+"&course_id="+courseId+"&survey_id="+surveyId;
});
$("#date_from, #date_to").datepicker({
dateFormat: "yy-mm-dd",
onSelect: function( selectedDate ) {
var filled = areBothFilled();
if (filled) {
var date_to = $("#date_to").val();
var date_from = $("#date_from").val();
var sessionId = $("#session_name").val();
var courseId = $("#course_name").val();
var surveyId = $("#survey_name").val();
window.location = "'.$self.'?view=admin&display='.$display.'&session_id="+sessionId+"&course_id="+courseId+"&survey_id="+surveyId+"&date_to="+date_to+"&date_from="+date_from;
}
}
});';
';
}
//Student and profile filter
@ -791,9 +776,10 @@ if ($is_platform_admin && in_array($view, array('admin')) && $display != 'yourst
}
//date filter
$sessionFilter->addElement('text', 'from', get_lang('From'), array('id' => 'date_from', 'value' => (!empty($_GET['date_from']) ? $_GET['date_from'] : ''), 'style' => 'width:75px' ));
$sessionFilter->addElement('text', 'to', get_lang('Until'), array('id' => 'date_to', 'value' => (!empty($_GET['date_to']) ? $_GET['date_to'] : ''), 'style' => 'width:75px' ));
if (!in_array($display, array('surveyoverview'))) {
$sessionFilter->addElement('text', 'from', get_lang('From'), array('id' => 'date_from', 'value' => (!empty($_GET['date_from']) ? $_GET['date_from'] : ''), 'style' => 'width:75px' ));
$sessionFilter->addElement('text', 'to', get_lang('Until'), array('id' => 'date_to', 'value' => (!empty($_GET['date_to']) ? $_GET['date_to'] : ''), 'style' => 'width:75px' ));
}
//$sessionFilter->addElement('submit', '', get_lang('Generate'), 'id="generateReport"');
echo '<div class="">';
@ -867,14 +853,18 @@ if ($is_platform_admin && in_array($view, array('admin')) && $display != 'yourst
Display::display_warning_message(get_lang('ChooseCourse'));
}
} else if($display == 'surveyoverview') {
if (!empty($_GET['course_id'])) {
if (!empty($_GET['survey_id'])) {
echo MySpace::display_survey_overview(intval($_GET['session_id']), intval($_GET['course_id']), intval($_GET['survey_id']), $_GET['date_from'], $_GET['date_to']);
if (!empty($_GET['session_id'])) {
if (!empty($_GET['course_id'])) {
if (!empty($_GET['survey_id'])) {
echo MySpace::display_survey_overview(intval($_GET['session_id']), intval($_GET['course_id']), intval($_GET['survey_id']), $_GET['date_from'], $_GET['date_to']);
} else {
Display::display_warning_message(get_lang('ChooseSurvey'));
}
} else {
Display::display_warning_message(get_lang('ChooseSurvey'));
Display::display_warning_message(get_lang('ChooseCourse'));
}
} else {
Display::display_warning_message(get_lang('ChooseCourse'));
Display::display_warning_message(get_lang('ChooseSession'));
}
} else if($display == 'courseoverview') {
MySpace::display_tracking_course_overview();

Write Preview
Loading…
Cancel
Save