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 - format code, add (int) clean code

Browse Source
pull/2539/head
jmontoyaa 8 years ago
parent 687a5ad91e
commit 57d5ccdb8f
13 changed files with 521 additions and 797 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. 15
      main/extra/create_exam.php
  2. 19
      main/extra/create_intervention.php
  3. 8
      main/extra/database.php
  4. 6
      main/extra/delete_exam.php
  5. 98
      main/extra/edit_exam.php
  6. 89
      main/extra/edit_intervention.php
  7. 660
      main/extra/myStudents.php
  8. 259
      main/extra/my_progress_ind.php
  9. 31
      main/extra/print_myStudents.php
  10. 85
      main/extra/suivi_group_space.php
  11. 23
      main/extra/update_exam.php
  12. 19
      main/extra/update_intervention.php
  13. 6
      main/extra/upgrade_school_calendar.php

15
main/extra/create_exam.php
Unescape View File

@ -9,14 +9,15 @@ if (empty($allow)) {
}
$tbl_stats_exercices = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
$ex_user_id = isset($_GET['ex_user_id']) ? $_GET['ex_user_id'] : "";
$mod_no = isset($_GET['mod_no']) ? $_GET['mod_no'] : "";
$score_ex = isset($_GET['score_ex']) ? $_GET['score_ex'] : "";
$score_rep1 = isset($_GET['score_rep1']) ? $_GET['score_rep1'] : "";
$score_rep2 = isset($_GET['score_rep2']) ? $_GET['score_rep2'] : "";
$coment = isset($_GET['coment']) ? $_GET['coment'] : "";
$ex_user_id = isset($_GET['ex_user_id']) ? (int) $_GET['ex_user_id'] : '';
$mod_no = isset($_GET['mod_no']) ? Database::escape_string($_GET['mod_no']) : '';
$score_ex = isset($_GET['score_ex']) ? Database::escape_string($_GET['score_ex']) : '';
$score_rep1 = isset($_GET['score_rep1']) ? Database::escape_string($_GET['score_rep1']) : '';
$score_rep2 = isset($_GET['score_rep2']) ? Database::escape_string($_GET['score_rep2']) : '';
$coment = isset($_GET['coment']) ? Database::escape_string($_GET['coment']) : '';
$sql = "INSERT INTO $tbl_stats_exercices "."(exe_user_id,c_id,mod_no,score_ex,score_rep1,score_rep2,coment) ".
"VALUES "."('$ex_user_id','0','$mod_no','$score_ex', '$score_rep1', '$score_rep2', '$coment' )";
Database::query($sql);
header("location:../extra/myStudents.php?student=$ex_user_id");
header("location: myStudents.php?student=$ex_user_id");
exit;

19
main/extra/create_intervention.php
Unescape View File

@ -8,15 +8,14 @@ if (empty($allow)) {
exit;
}
$tbl_stats_exercices = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
$table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
$comment = isset($_POST['inter_coment']) ? Database::escape_string($_POST['inter_coment']) : '';
$date = isset($_POST['date']) ? Database::escape_string($_POST['date']) : '';
$level = isset($_POST['level']) ? Database::escape_string($_POST['level']) : '';
$ex_user_id = isset($_POST['ex_user_id']) ? Database::escape_string($_POST['ex_user_id']) : '';
foreach ($_POST as $index => $valeur) {
$$index = Database::escape_string(trim($valeur));
}
$sql4 = "INSERT INTO $tbl_stats_exercices "."(exe_user_id,c_id,level,exe_date,inter_coment) ".
"VALUES "."('$ex_user_id','0','$level','$date', '$inter_coment' )";
Database::query($sql4);
header("location:../extra/myStudents.php?student=$ex_user_id");
$sql = "INSERT INTO $table "."(exe_user_id,c_id,level,exe_date,inter_coment)
VALUES "."('$ex_user_id','0','$level','$date', '$comment')";
Database::query($sql);
header("location: myStudents.php?student=$ex_user_id");
exit;

8
main/extra/database.php
Unescape View File

@ -7,8 +7,6 @@ require_once '../inc/global.inc.php';
exit;
$sql = "ALTER TABLE track_e_exercises ADD COLUMN coment VARCHAR(255);";
Database::query($sql);
@ -33,7 +31,6 @@ Database::query($sql);
$sql = "ALTER TABLE track_e_exercises ADD COLUMN level VARCHAR(255);";
Database::query($sql);
$sql = "CREATE TABLE IF NOT EXISTS set_module (
`id` int(4) NOT NULL AUTO_INCREMENT,
`cours` varchar(40) NOT NULL,
@ -47,7 +44,6 @@ $sql = "CREATE TABLE IF NOT EXISTS set_module (
Database::query($sql);
/*$sql = "CREATE TABLE IF NOT EXISTS `kezprerequisites` (
`c_id` int(11) NOT NULL,
`lp_id` int(11) NOT NULL,
@ -57,7 +53,6 @@ Database::query($sql);
PRIMARY KEY (`c_id`,`lp_id`,`id`)
)";*/
$sql = "CREATE TABLE IF NOT EXISTS `c_cal_dates` (
`c_id` int(11) NOT NULL,
`date` date NOT NULL,
@ -70,7 +65,6 @@ $sql = "CREATE TABLE IF NOT EXISTS `c_cal_dates` (
Database::query($sql);
$sql = "CREATE TABLE IF NOT EXISTS `c_cal_horaire` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`c_id` int(11) NOT NULL,
@ -82,7 +76,6 @@ $sql = "CREATE TABLE IF NOT EXISTS `c_cal_horaire` (
UNIQUE KEY `c_id` (`c_id`,`name`),
KEY `idx` (`c_id`)
)";
Database::query($sql);
$sql = "CREATE TABLE IF NOT EXISTS `c_cal_set_module` (
@ -101,5 +94,4 @@ $sql = "CREATE TABLE IF NOT EXISTS `c_cal_temp` (
`user` varchar(250) NOT NULL,
KEY `idx` (`c_id`)
)";
Database::query($sql);

6
main/extra/delete_exam.php
Unescape View File

@ -14,10 +14,10 @@ api_block_anonymous_users();
$ex_user_id = isset($_GET['student_id']) ? $_GET['student_id'] : "";
$num = isset($_GET['num']) ? (int) $_GET['num'] : 0;
$tbl_stats_exercices = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
$sql = "DELETE FROM $tbl_stats_exercices WHERE exe_id ='$num'";
$table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
$sql = "DELETE FROM $table WHERE exe_id ='$num'";
Database::query($sql);
header("location:../extra/myStudents.php?student=$ex_user_id");
header("location: myStudents.php?student=$ex_user_id");
exit;

98
main/extra/edit_exam.php
Unescape View File

@ -13,65 +13,59 @@ api_block_anonymous_users();
Display::display_header();
$tbl_stats_exercices = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
$num = isset($_GET['num']) ? $_GET['num'] : '';
$student_idd = isset($_GET['student_id']) ? $_GET['student_id'] : '';
foreach ($_POST as $index => $valeur) {
$$index = Database::escape_string(trim($valeur));
}
$num = isset($_GET['num']) ? (int) $_GET['num'] : '';
$student_idd = isset($_GET['student_id']) ? (int) $_GET['student_id'] : '';
?>
<form action="update_exam.php" method="post" name="save_exam">
<center>
<table class='data_table'>
<tr>
<th colspan="6">
<?php echo get_lang('edit_save'); ?>
</th>
<tr>
<th><?php echo get_lang('module_no') ?></th>
<th><?php echo get_lang('result_exam') ?></th>
<th><?php echo get_lang('result_rep_1') ?></th>
<th><?php echo get_lang('result_rep_2') ?></th>
<th><?php echo get_lang('comment') ?></th>
<th><?php echo get_lang('action') ?></th>
</tr>
<?php
<table class='data_table'>
<tr>
<th colspan="6">
<?php echo get_lang('edit_save'); ?>
</th>
<tr>
<th><?php echo get_lang('module_no') ?></th>
<th><?php echo get_lang('result_exam') ?></th>
<th><?php echo get_lang('result_rep_1') ?></th>
<th><?php echo get_lang('result_rep_2') ?></th>
<th><?php echo get_lang('comment') ?></th>
<th><?php echo get_lang('action') ?></th>
</tr>
<?php
$sqlexam = "SELECT * FROM $tbl_stats_exercices WHERE exe_id = $num";
$resultexam = Database::query($sqlexam);
while ($a_exam = Database::fetch_array($resultexam)) {
$exe_id = $a_exam['exe_id'];
$mod_no = $a_exam['mod_no'];
$score_ex = $a_exam['score_ex'];
$score_rep1 = $a_exam['score_rep1'];
$score_rep2 = $a_exam['score_rep2'];
$coment = $a_exam['coment'];
echo "
<tr>
<td>
<input type=text style=width:20% name=mod_no size=1 value= ".$a_exam['mod_no'].">
</td>
<td>
<input type=text style=width:20% name=score_ex size=1 value=".$a_exam['score_ex'].">
</td>
<td><input type=text style=width:20% name=score_rep1 size=1 value=".$a_exam['score_rep1']."></td>
<td><input type=text style=width:20% name=score_rep2 size=1 value=".$a_exam['score_rep2']."></td>
";
?>
<td><textarea class="span5" name="coment" cols="65" rows="2"><?php echo $coment; ?></textarea><br></td>
<INPUT type=hidden name=ex_idd value= <?php echo "$exe_id" ?>>
<INPUT type=hidden name=student_id value= <?php echo "$student_idd" ?>>
$sqlexam = "SELECT * FROM $tbl_stats_exercices WHERE exe_id = $num";
$resultexam = Database::query($sqlexam);
while ($a_exam = Database::fetch_array($resultexam)) {
$exe_id = $a_exam['exe_id'];
$mod_no = $a_exam['mod_no'];
$score_ex = $a_exam['score_ex'];
$score_rep1 = $a_exam['score_rep1'];
$score_rep2 = $a_exam['score_rep2'];
$coment = $a_exam['coment'];
echo "
<tr>
<td>
<input type=text name=mod_no size=1 value= ".$a_exam['mod_no'].">
</td>
<td>
<input type="submit" value="Sauvegarder" name="B1">
<input type=text name=score_ex size=1 value=".$a_exam['score_ex'].">
</td>
</tr>
<?php
}
<td><input type=text name=score_rep1 size=1 value=".$a_exam['score_rep1']."></td>
<td><input type=text name=score_rep2 size=1 value=".$a_exam['score_rep2']."></td>
";
?>
</table>
<td><textarea class="span5" name="coment" cols="65" rows="2"><?php echo $coment; ?></textarea><br></td>
<INPUT type=hidden name=ex_idd value= <?php echo "$exe_id" ?>>
<INPUT type=hidden name=student_id value= <?php echo "$student_idd" ?>>
<td>
<input type="submit" value="Sauvegarder" name="B1">
</td>
</tr>
<?php
}
?>
</table>
</form>
<?php

89
main/extra/edit_intervention.php
Unescape View File

@ -11,60 +11,55 @@ if (empty($allow)) {
api_block_anonymous_users();
Display::display_header();
$num = isset($_GET['num']) ? $_GET['num'] : "";
$student_idd = isset($_GET['student_id']) ? $_GET['student_id'] : "";
$num = isset($_GET['num']) ? (int) $_GET['num'] : 0;
$student_idd = isset($_GET['student_id']) ? (int) $_GET['student_id'] : 0;
$tbl_stats_exercices = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
foreach ($_GET as $index => $valeur) {
$$index = Database::escape_string(trim($valeur));
}
?>
<form action="update_intervention.php" method="post" name="save_intercention">
<center>
<table class='data_table'>
<tr>
<th colspan="4"><?php echo get_lang('edit_save'); ?>
<tr>
<th><?php echo get_lang('level') ?></th>
<th><?php echo get_lang('lang_date') ?></th>
<th><?php echo get_lang('interventions_commentaires') ?></th>
<th><?php echo get_lang('action') ?></th>
</tr>
<?php
$sqlinter = "SELECT * FROM $tbl_stats_exercices WHERE exe_id = $num";
$resultinter = Database::query($sqlinter);
while ($a_inter = Database::fetch_array($resultinter)) {
$level = $a_inter['level'];
$mod_no = $a_inter['mod_no'];
$score_ex = $a_inter['score_ex'];
$inter_coment = stripslashes($a_inter['inter_coment']);
echo "
<tr><center>
<td> ".$a_inter['level']."
</td>
<td><center>
".$a_inter['exe_date']."
</td>
";
$exe_id = $a_inter['exe_id'];
?>
<td>
<textarea
class="span5" name="inter_coment" cols="65"
rows="2">
<?php echo $inter_coment; ?></textarea>
<br>
<table class='data_table'>
<tr>
<th colspan="4"><?php echo get_lang('edit_save'); ?>
<tr>
<th><?php echo get_lang('level') ?></th>
<th><?php echo get_lang('lang_date') ?></th>
<th><?php echo get_lang('interventions_commentaires') ?></th>
<th><?php echo get_lang('action') ?></th>
</tr>
<?php
$sqlinter = "SELECT * FROM $tbl_stats_exercices WHERE exe_id = $num";
$resultinter = Database::query($sqlinter);
while ($a_inter = Database::fetch_array($resultinter)) {
$level = $a_inter['level'];
$mod_no = $a_inter['mod_no'];
$score_ex = $a_inter['score_ex'];
$inter_coment = stripslashes($a_inter['inter_coment']);
echo "
<tr><center>
<td> ".$a_inter['level']."
</td>
<INPUT type=hidden name=ex_id value= <?php echo "$exe_id" ?>>
<INPUT type=hidden name=student_id value= <?php echo "$student_idd" ?>>
<td><input type="submit" value="Sauvegarder" name="B1"></td>
<td><center>
".$a_inter['exe_date']."
</td>
</tr>
<?php
}
";
$exe_id = $a_inter['exe_id'];
?>
</table>
<td>
<textarea name="inter_coment" cols="65" rows="2">
<?php echo $inter_coment; ?>
</textarea>
<br>
</td>
<INPUT type=hidden name=exe_id value= <?php echo "$exe_id" ?>>
<INPUT type=hidden name=student_id value= <?php echo "$student_idd" ?>>
<td><input type="submit" value="Sauvegarder" name="B1"></td>
</td>
</tr>
<?php
}
?>
</table>
</form>
<?php

660
main/extra/myStudents.php
View File

File diff suppressed because it is too large Load Diff

259
main/extra/my_progress_ind.php
Unescape View File

@ -8,9 +8,11 @@ if (empty($allow)) {
exit;
}
api_block_anonymous_users();
$nameTools = get_lang('MyProgress');
$this_section = 'session_my_progress_ind';
api_block_anonymous_users();
$_user = api_get_user_info();
$tbl_stats_exercices = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
$tbl_stats_access = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
@ -24,8 +26,7 @@ $result = Database::query(
$_user['user_id']." ORDER BY date_start, date_end, name");
$Sessions = Database::store_result($result);
$Courses = array();
$Courses = [];
foreach ($Sessions as $enreg) {
$id_session_temp = $enreg['id'];
@ -47,14 +48,11 @@ foreach ($Sessions as $enreg) {
WHERE $tbl_session_course.c_id=$c_id
AND $tbl_session_course.id_session='$id_session_temp'
ORDER BY title";
$result = Database::query($sql);
while ($a_session_courses = Database::fetch_array($result)) {
$a_session_courses['id_session'] = $id_session_temp;
$Courses[$a_session_courses['code']] = $a_session_courses;
}
}
// affichage des jours complétés dans les parcours l'élève
@ -64,33 +62,25 @@ $sql2 = "SELECT c_id, user_id
FROM course_rel_user
WHERE user_id = '$user_c_id'
";
$result2 = Database::query($sql2);
$Total = 0;
while ($a_courses = Database::fetch_array($result2)) {
$courses_code = $a_courses ['c_id'];
//on sort le c_id avec le code du cours
//on sort le c_id avec le code du cours
//$sql8 = "SELECT *
// FROM course
// WHERE code = '$courses_code'
// ";
// $result8 = Database::query($sql8);
// $course_code_id = Database::fetch_array($result8) ;
$c_id = $courses_code
$c_id = $courses_code;
//pours chaque cours dans lequel il est inscrit, on cherche les jours complétés
?><p></p>
<?php
$Req1 = "SELECT *
FROM c_lp_view
WHERE user_id = '$user_c_id'
AND c_id = '$c_id'
";
$res = Database::query($Req1);
while ($result = Database::fetch_array($res)) {
$lp_id = $result['lp_id'];
$lp_id_view = $result['id'];
@ -154,25 +144,19 @@ while ($jtot = Database::fetch_array($resultjt)) {
//fin des jour de l'agenda
//on trouve le nombre dans l'agenda selon la date d'aujourdhui
//si rien n'est inscrit cette journée dans l'agenda, recule de -1
//si rien n'est inscrit cette journée dans l'agenda, recule de -1
$jour_agenda = '';
$tour = -1;
while ($jour_agenda == '') {
$tour++;
$date = date("Y-m-d", mktime(0, 0, 0, date("m"), date("d") - $tour, date("Y")));
$sql4 = "SELECT title FROM $tbl_personal_agenda
WHERE user = '".$_user['user_id']."'
AND text='Pour le calendrier, ne pas effacer'
AND date like '".$date." %:%'
";
WHERE user = '".$_user['user_id']."' AND
text='Pour le calendrier, ne pas effacer' AND
date like '".$date." %:%' ";
$result4 = Database::query($sql4);
$res4 = Database::fetch_array($result4);
$jour_agenda = $res4['title'];
if ($tour > 300) {
break;
}
@ -185,90 +169,84 @@ if ($diff > 0) {
}
$diff = abs($diff);
?>
<table class="data_table">
<th rowspan="5">
<?php
//on récupere les points de controle de l'élève
$pt[] = '0';
$pt[] = '0';
$sqlcontrole = "SELECT diff
FROM $tbl_stats_exercices
WHERE exe_user_id = ".$_user['user_id']."
AND diff != ''
ORDER BY exe_date ASC
";
$result = Database::query($sqlcontrole);
while ($ptctl = Database::fetch_array($result)) {
$pt[] = $ptctl ['diff'];
}
<html>
<table class="data_table">
<th rowspan="5">
<?php
//on récupere les points de controle de l'élève
$pt[] = '0';
$pt[] = '0';
$sqlcontrole = "SELECT diff
FROM $tbl_stats_exercices
WHERE exe_user_id = ".$_user['user_id']."
AND diff != ''
ORDER BY exe_date ASC
";
$result = Database::query($sqlcontrole);
while ($ptctl = Database::fetch_array($result)) {
$pt[] = $ptctl ['diff'];
}
//graphique de suivi
/*include "../inc/teechartphp/sources/TChart.php";
$chart = new TChart(500, 300);
$chart->getAspect()->setView3D(false);
$chart->getHeader()->setText("Graphique de suivi");
$chart->getAxes()->getLeft()->setMinimumOffset(10);
$chart->getAxes()->getLeft()->setMaximumOffset(10);
$chart->getAxes()->getBottom()->setMinimumOffset(10);
$chart->getAxes()->getBottom()->setMaximumOffset(10);
$line1 = new Line($chart->getChart());
$data = $pt;
$line1->addArray($data);
foreach ($chart->getSeries() as $serie) {
$pointer = $serie->getPointer();
$pointer->setVisible(true);
$pointer->getPen()->setVisible(false);
$pointer->setHorizSize(2);
$pointer->setVertSize(2);
$marks = $serie->getMarks();
$marks->setVisible(true);
$marks->setArrowLength(5);
$marks->getArrow()->setVisible(false);
$marks->setTransparent(true);
}
//graphique de suivi
/*include "../inc/teechartphp/sources/TChart.php";
$chart = new TChart(500, 300);
$chart->getAspect()->setView3D(false);
$chart->getHeader()->setText("Graphique de suivi");
$chart->getAxes()->getLeft()->setMinimumOffset(10);
$chart->getAxes()->getLeft()->setMaximumOffset(10);
$chart->getAxes()->getBottom()->setMinimumOffset(10);
$chart->getAxes()->getBottom()->setMaximumOffset(10);
$line1 = new Line($chart->getChart());
$data = $pt;
$line1->addArray($data);
foreach ($chart->getSeries() as $serie) {
$pointer = $serie->getPointer();
$pointer->setVisible(true);
$pointer->getPen()->setVisible(false);
$pointer->setHorizSize(2);
$pointer->setVertSize(2);
$marks = $serie->getMarks();
$marks->setVisible(true);
$marks->setArrowLength(5);
$marks->getArrow()->setVisible(false);
$marks->setTransparent(true);
}
$x = $_user['user_id'];
$line1->getPointer()->setStyle(PointerStyle::$CIRCLE);
$chart->getLegend()->setVisible(false);
$chart->render("../garbage/$x-image.png");
$rand = rand();
print '<img src="../garbage/'.$x.'-image.png?rand='.$rand.'">';
*/
?>
<tr>
<th align="left" width="412">
<?php echo get_lang('Cumulatif_agenda'); ?>: <b><font
color=#CC0000> <?php echo $jour_realise_tot ?></font></b></p>
</tr>
</th>
$x = $_user['user_id'];
$line1->getPointer()->setStyle(PointerStyle::$CIRCLE);
$chart->getLegend()->setVisible(false);
$chart->render("../garbage/$x-image.png");
$rand = rand();
print '<img src="../garbage/'.$x.'-image.png?rand='.$rand.'">';
*/
?>
<tr>
<th align="left" width="412">
<?php echo get_lang('Cumulatif_agenda'); ?>: <b><font
color=#CC0000> <?php echo $jour_realise_tot ?></font></b></p>
</th>
</tr>
<tr>
<th align="left">
<?php echo get_lang('Cumulatif'); ?> <b><font color=#CC0000> <?php echo $Total ?></font></b></p>
</th>
</tr>
</th>
<tr>
<th align="left">
<?php echo get_lang('jours_selon_horaire'); ?>: <b><font
color=#CC0000> <?php echo $jour_agenda ?><?php echo $Days ?></font></b></p>
</th>
</tr>
</th>
<tr>
<th align="left">
<?php echo get_lang('diff2'); ?>: <b><font
color=#CC0000> <?php echo $diff ?><?php echo $Days, $sing ?></font></b></p>
</th>
</tr>
</table>
<hr>
<center>
<table class='data_table'>
<tr>
<th><?php echo get_lang('level') ?> </th>
<th>
@ -277,26 +255,21 @@ $diff = abs($diff);
<th>
<?php echo get_lang('interventions_commentaires') ?>
</th>
</tr>
<?php
$sqlinter = "SELECT *
FROM $tbl_stats_exercices
WHERE exe_user_id = ".$_user['user_id']."
And level != 0
Order by LEVEL ASC
";
Order by LEVEL ASC";
$resultinter = Database::query($sqlinter);
$level = '';
while ($a_inter = Database::fetch_array($resultinter)) {
$level = $a_inter['level'];
$mod_no = $a_inter['mod_no'];
$inter_coment = stripslashes($a_inter['inter_coment']);
$inter_coment = Security::remove_XSS($a_inter['inter_coment']);
$inter_date = substr($a_inter['exe_date'], 0, 11);
echo "
<tr><center>
<td> ".$a_inter['level']."
@ -309,18 +282,17 @@ $diff = abs($diff);
</td>
";
$exe_id = $a_inter['exe_id'];
}
if ($level == 3) {
echo ' <span style="color: red; font-weight: bold;"><img src="../img/anim/pointeranim.gif"align="middle" > ', $limit, '</span>';
echo '<span style="color: red; font-weight: bold;"><img src="../img/anim/pointeranim.gif"align="middle" > ';
echo $limit;
echo '</span>';
}
?>
<p>
</table><br>
<?php
//début de fin des cours prevu
$user_info = api_get_user_info();
$user_id = api_get_user_id();
//On cherche le calendrier pour ce user et le c_id de ce calendrier
@ -331,54 +303,40 @@ $sql = "SELECT *
$result = Database::query($sql);
$horaire_id = Database::fetch_array($result);
$nom_hor = $horaire_id ['official_code'];
$c_id_horaire = strstr($nom_hor, '.');
$c_id_horaire = str_replace(".", "", "$c_id_horaire");
// Courses
echo '<h3>'.get_lang('Course').'</h3>';
echo '<table class="data_table">';
echo '<tr>
<th>'.get_lang('Course').'</th>
<th>'.get_lang('Time').'</th>
<th>'.get_lang('FirstConnexion').'</th>
<th>'.get_lang('Course').'</th>
<th>'.get_lang('Time').'</th>
<th>'.get_lang('FirstConnexion').'</th>
<th>'.get_lang('Progress').'</th>
<th>'.get_lang('fin_mod_prevue').'</th>
</tr>';
<th>'.get_lang('fin_mod_prevue').'</th>
</tr>';
//on recherche les cours où sont inscrit les user
$user_c_id = $_user['user_id'];
$sql2 = "SELECT c_id, user_id
FROM course_rel_user
WHERE user_id = '$user_id'
";
FROM course_rel_user
WHERE user_id = '$user_id'";
$result2 = Database::query($sql2);
while ($a_courses = Database::fetch_array($result2)) {
$courses_code = $a_courses ['c_id'];
//on sort le c_id avec le code du cours
$sql8 = "SELECT title, code
FROM course
WHERE id = '$courses_code'
";
FROM course
WHERE id = '$courses_code'";
$result8 = Database::query($sql8);
$course_code_id = Database::fetch_array($result8);
$c_id = $courses_code;
$c_title = $course_code_id ['title'];
$c_title = $course_code_id['title'];
// Francois Belisle Kezber
// The Tracking Class still uses the course code rather then the course id.
$tracking_c_code = $course_code_id['code'];
// time spent on the course
$time_spent_on_course = api_time_to_hms(Tracking:: get_time_spent_on_the_course($user_id, $c_id, $session_id));
// firts connection date
$sql2 = "SELECT STR_TO_DATE(access_date,'%Y-%m-%d')
FROM $tbl_stats_access
@ -400,15 +358,12 @@ while ($a_courses = Database::fetch_array($result2)) {
//pour trouver la date de fin prévue du module
$end_date_module = get_lang('hors_cal');
//on trouve le nombre de jour pour ce module
$sql = "SELECT * FROM c_cal_set_module
where c_id = '$c_id'";
$res = Database::query($sql);
$resulta = Database::fetch_array($res);
$nombre_heure = $resulta['minutes'];
// on trouve le nombre de minute par jour
$sql = "SELECT * FROM c_cal_horaire
where c_id = '$c_id_horaire'
@ -418,7 +373,6 @@ while ($a_courses = Database::fetch_array($result2)) {
$res = Database::query($sql);
$resulta = Database::fetch_array($res);
$nombre_minutes = (int) $resulta['num_minute'];
//on calcule le nombre de jour par module
$nombre_jours_module = 0;
if (!empty($nombre_minutes)) {
@ -428,7 +382,6 @@ while ($a_courses = Database::fetch_array($result2)) {
$nombre_jours_module = (int) $nombre_jours_module;
//on trouve la date de fin de chaque module AND date = date_format('$first_connection_date_to_module','%Y-%m-%d')
$sql = "SELECT * FROM c_cal_dates
WHERE
horaire_name = '$nom_hor' AND
@ -438,30 +391,20 @@ while ($a_courses = Database::fetch_array($result2)) {
LIMIT $nombre_jours_module, 18446744073709551615
";
$res = Database::query($sql);
//Database::data_seek($res,$nombre_jours_module);
$row = Database::fetch_row($res);
$end_date_module = $row[1];
//fin de trouver la date de fin prévue du module
//progression en %
//fin de trouver la date de fin prévue du module
//progression en %
$t_lp = Database:: get_course_table(TABLE_LP_MAIN);
$sql_lp = " SELECT lp.name, lp.id FROM $t_lp lp WHERE c_id = '$c_id' ORDER BY lp.display_order";
$rs_lp = Database::query($sql_lp);
$i = 0;
while ($learnpath = Database:: fetch_array($rs_lp)) {
$lp_id = intval($learnpath['id']);
$lp_name = $learnpath['name'];
$any_result = false;
// Get progress in lp
// Francois Belisle Kezber
// Course Code passed rather then course_id
$progress = Tracking::get_avg_student_progress(
@ -489,7 +432,6 @@ while ($a_courses = Database::fetch_array($result2)) {
$any_result = true;
}
if ($i % 2 == 0) {
$css_class = "row_even";
} else {
@ -503,33 +445,26 @@ while ($a_courses = Database::fetch_array($result2)) {
} else {
$progress = '-';
}
$data_learnpath[/*$i*/
$lp_id][] = $progress.'%';
}
$warming = '';
$today = date('Y-m-d');
if (isset($end_date_module) && $end_date_module <= $today AND $progress != '100%') {
$warming = '<b><font color=#CC0000> '.get_lang('limite_atteinte').'</font></b>';
}
$end_date_module = $end_date_module.$warming;
echo '<tr>
<td >'.$c_title.'</td>
<td >'.$time_spent_on_course.'</td>
<td >'.$first_connection_date_to_module.'</td>
<td >'.$c_title.'</td>
<td >'.$time_spent_on_course.'</td>
<td >'.$first_connection_date_to_module.'</td>
<td >'.$progress.'</td>
<td >'.$end_date_module.'</td>';
echo '</tr>';
}
echo '</table>';
?> </table>
<br/><br/>
<center>
<table class='data_table'>
<tr>
<th colspan="6">
@ -540,18 +475,10 @@ echo '</table>';
</th>
<tr>
<th><?php echo get_lang('module'); ?></th>
<th>
<?php echo get_lang('result_exam'); ?>
</th>
<th>
<?php echo get_lang('result_rep_1'); ?>
</th>
<th>
<?php echo get_lang('result_rep_2'); ?>
</th>
<th>
<?php echo get_lang('comment'); ?>
</th>
<th><?php echo get_lang('result_exam'); ?></th>
<th><?php echo get_lang('result_rep_1'); ?></th>
<th><?php echo get_lang('result_rep_2'); ?></th>
<th><?php echo get_lang('comment'); ?></th>
</tr>
<?php

31
main/extra/print_myStudents.php
Unescape View File

@ -137,37 +137,9 @@ if (!api_is_allowed_to_edit() && !api_is_coach() && !api_is_drh() && !api_is_cou
}
Display:: display_header($nameTools);
/*
* MAIN CODE
*/
// Database Table Definitions
$tbl_user = Database:: get_main_table(TABLE_MAIN_USER);
$tbl_session_user = Database:: get_main_table(TABLE_MAIN_SESSION_USER);
$tbl_session = Database:: get_main_table(TABLE_MAIN_SESSION);
$tbl_session_course = Database:: get_main_table(TABLE_MAIN_SESSION_COURSE);
$tbl_session_course_user = Database:: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$tbl_course = Database:: get_main_table(TABLE_MAIN_COURSE);
$tbl_course_user = Database:: get_main_table(TABLE_MAIN_COURSE_USER);
$tbl_stats_access = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS);
$tbl_stats_exercices = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
$tbl_stats_exercices_attempts = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
$tbl_personal_agenda = Database:: get_main_table(TABLE_PERSONAL_AGENDA);
$tbl_course_lp_item = Database:: get_course_table(TABLE_LP_ITEM);
$tbl_course_lp_view = 'lp_view';
$tbl_course_lp_view_item = 'lp_item_view';
$tbl_course_lp_item = 'lp_item';
$tbl_course_lp = 'lp';
$tbl_course_quiz = 'quiz';
$course_quiz_question = 'quiz_question';
$course_quiz_rel_question = 'quiz_rel_question';
$course_quiz_answer = 'quiz_answer';
$course_student_publication = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
$TABLECALHORAIRE = Database:: get_course_table(TABLE_CAL_HORAIRE);
if (isset($_GET['user_id']) && $_GET['user_id'] != "") {
if (isset($_GET['user_id']) && $_GET['user_id'] != '') {
$user_id = intval($_GET['user_id']);
} else {
$user_id = $_user['user_id'];
@ -219,7 +191,6 @@ $info_user['name'] = api_get_person_name($info_user['firstname'], $info_user['la
ORDER BY mod_no ASC
";
$resultexam = Database::query($sqlexam);
while ($a_exam = Database::fetch_array($resultexam)) {
//$ex_id = $a_exam['ex_id'];
$mod_no = $a_exam['mod_no'];

85
main/extra/suivi_group_space.php
Unescape View File

@ -60,7 +60,6 @@ if ($current_group['doc_state'] != 1 &&
}
/* Header */
Display::display_header($nameTools.' '.Security::remove_XSS($current_group['name']), 'Group');
Display::display_introduction_section(TOOL_GROUP);
@ -70,7 +69,6 @@ $is_course_member = CourseManager::is_user_subscribed_in_real_or_linked_course(
$course_code
);
/*
* List all the tutors of the current group
*/
@ -103,11 +101,9 @@ if (!empty($tutor_info)) {
echo $tutor_info;
}
/*
* List all the members of the current group
*/
echo '<div class="actions">';
$now = date('Y-m-d');
@ -161,7 +157,6 @@ $table->set_header(9, get_lang('save_diff'), false, 'align="center"');
$table->set_header(10, get_lang('GroupCalendar'), false, 'align="center"');
$table->set_header(11, get_lang('Details'), false);
// Database table definition
$table_group_user = Database:: get_course_table(TABLE_GROUP_USER);
$table_user = Database:: get_main_table(TABLE_MAIN_USER);
@ -174,26 +169,25 @@ $tbl_stats_exercices = Database:: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCIS
$tbl_stats_exercices_temp = Database:: get_main_table(track_e_exercices_temp);
$tbl_group_course_info = Database:: get_course_table(TABLE_GROUP);
$course_id = api_get_course_int_id();
//echo($course_id);
//on trouve le vrai groupID
//on trouve le vrai groupID
$sql = "SELECT iid FROM ".$tbl_group_course_info." where c_id=".$course_id." and id=".$current_group['id'];
$current_group_result = Database::query($sql);
$current_group = Database::fetch_assoc($current_group_result)['iid'];
//on trouve les user dans le groupe
$sql = "SELECT *
FROM ".$table_user." user, ".$table_group_user." group_rel_user
WHERE group_rel_user.c_id = $course_id AND group_rel_user.user_id = user.user_id
AND group_rel_user.group_id = ".$current_group." order by lastname
";
//echo($sql);
FROM ".$table_user." user, ".$table_group_user." group_rel_user
WHERE group_rel_user.c_id = $course_id AND group_rel_user.user_id = user.user_id
AND group_rel_user.group_id = ".$current_group." order by lastname
";
$result = Database::query($sql);
// Francois Belisle Kezber
// Le TableDisplay contient une fonction qui set les headers... les headers sont plac<EFBFBD>s dans la Row 0... Ce qui ecrase le contenue
// le la vrai row 0... Il faut donc ajouter un empty record a la row 0 qui se fera ecras<EFBFBD> par lesh headers plutot que le premier record
// en ajoutant un empty record, ca fonctionne, mais il faut trouver pourquoi les headers ecrasent le premier record
$row = array();
$row = [];
$row[] = $student_datas['official_code'];
$row[] = $student_datas['lastname'];
@ -218,33 +212,22 @@ foreach ($all_datas as $row) {
$table->addRow($row);
}
while ($resulta = Database::fetch_array($result)) {
$user_in_groupe = $resulta ['user_id'];
unset($all_datas);
//on cherche les examens
$sqlexam = "SELECT mod_no
FROM $tbl_stats_exercices
WHERE exe_user_id = '$user_in_groupe'
AND c_id = '0' AND (score_ex = 'SU' || score_rep1 = 'SU' || score_rep2 ='SU')
ORDER BY mod_no ASC
";
FROM $tbl_stats_exercices
WHERE exe_user_id = '$user_in_groupe'
AND c_id = '0' AND (score_ex = 'SU' || score_rep1 = 'SU' || score_rep2 ='SU')
ORDER BY mod_no ASC";
$resultexam = Database::query($sqlexam);
while ($a_exam = Database::fetch_array($resultexam)) {
$exam = "$exam - $a_exam[0]";
}
Database::query(
"INSERT INTO $tbl_stats_exercices_temp
(id, exe_user_id, mod_passed) VALUES('', '$user_in_groupe', '$exam') "
"INSERT INTO $tbl_stats_exercices_temp (id, exe_user_id, mod_passed) VALUES('', '$user_in_groupe', '$exam') "
);
unset($exam);
//fin de exam
//on compte le nombre de m% dans l'agenda pour chaque module
/*
@ -263,16 +246,10 @@ while ($resulta = Database::fetch_array($result)) {
}
//fin des jour de l'agenda
*/
$course_code = $_course['id'];
//$student_datas = UserManager :: get_user_info_by_id($user_in_groupe);
$student_datas = api_get_user_info($user_in_groupe);
// affichage des jours complétés dans les parcours par chaque élève
//on recherche les cours où sont inscrit les user
// affichage des jours complétés dans les parcours par chaque élève
//on recherche les cours où sont inscrit les user
$sql2 = "SELECT c_id, user_id
FROM course_rel_user
WHERE user_id = '$user_in_groupe'
@ -280,10 +257,8 @@ while ($resulta = Database::fetch_array($result)) {
$result2 = Database::query($sql2);
$Total = 0;
while ($a_courses = Database::fetch_array($result2)) {
$Courses_code = $a_courses ['c_id'];
$Courses_rel_user_id = $a_courses ['user_id'];
//on sort le temps passé dans chaque cours
$sql = "SELECT SUM(UNIX_TIMESTAMP(logout_course_date) - UNIX_TIMESTAMP(login_course_date)) as nb_seconds
FROM track_e_course_access
@ -315,9 +290,6 @@ while ($resulta = Database::fetch_array($result)) {
WHERE user_id = '$Courses_rel_user_id'
AND c_id = '$c_id'
";
// echo $Req3.'<br>';
$res3 = Database::query($Req3);
while ($result3 = Database::fetch_array($res3)) {
$lp_id = $result3['lp_id'];
@ -347,18 +319,14 @@ while ($resulta = Database::fetch_array($result)) {
while ($resul5 = Database::fetch_array($res5)) {
$max = $resul5['0'];
$Req6 = "SELECT COUNT( id )
FROM c_lp_item_view
WHERE id = '$max'
FROM c_lp_item_view
WHERE id = '$max'
AND c_id = '$c_id_view'
";
$res6 = Database::query($Req6);
while ($resultat6 = Database::fetch_array($res6)) {
$Total = $Total + $resultat6[0];
}
}
}
@ -368,18 +336,14 @@ while ($resulta = Database::fetch_array($result)) {
// on recherche les exam sauvegardé dans la table temp
$sqlexamtot = "SELECT mod_passed
FROM $tbl_stats_exercices_temp
WHERE exe_user_id = '$user_in_groupe'
FROM $tbl_stats_exercices_temp
WHERE exe_user_id = '$user_in_groupe'
";
$resultexamtot = Database::query($sqlexamtot);
$a_examtot = Database::fetch_array($resultexamtot);
$exampass = $a_examtot['mod_passed'];
//on trouve le nombre dans l'agenda selon la date d'aujourdhui
//si rien n'est inscrit cette journée dans l'agenda, recule de -1
//si rien n'est inscrit cette journée dans l'agenda, recule de -1
unset($jour_agenda);
$tour = -1;
while ($jour_agenda == '') {
@ -387,25 +351,20 @@ while ($resulta = Database::fetch_array($result)) {
$date = date("Y-m-d", mktime(0, 0, 0, date("m"), date("d") - $tour, date("Y")));
$sql4 = "SELECT * FROM $tbl_personal_agenda
WHERE user = '$user_in_groupe' AND
WHERE user = '$user_in_groupe' AND
text='Pour le calendrier, ne pas effacer'
AND date like '".$date." %:%'
";
$result4 = Database::query($sql4);
$res4 = Database::fetch_array($result4);
$jour_agenda = $res4['title'];
if ($tour > 300) {
break;
}
}
//on affiche la différence
//on affiche la différence
$diff = $jour_agenda - $Total;
if ($diff > 0) {
$sing = '<b><font color=#CC0000>';
} else {
@ -429,7 +388,7 @@ while ($resulta = Database::fetch_array($result)) {
$last_connection_date = get_lang('NoConnexion');
}
// on présente tous les résultats
$row = array();
$row = [];
$row[] = $student_datas['official_code'];
$row[] = $student_datas['lastname'];

23
main/extra/update_exam.php
Unescape View File

@ -10,22 +10,19 @@ if (empty($allow)) {
$tbl_stats_exercices = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
//$ex_idd =isset($_POST['exe_id'])?$_POST['exe_id']:"";
//$ex_user_id =isset($_POST['ex_user_id'])?$_POST['ex_user_id']:"";
//$mod_no=isset($_POST['mod_no'])?$_POST['mod_no']:"";
//$score_ex=isset($_POST['score_ex'])?$_POST['score_ex']:"";
//$score_rep1=isset($_POST['score_rep1'])?$_POST['score_rep1']:"";
//$score_rep2=isset($_POST['score_rep2'])?$_POST['score_rep2']:"";
//$coment=isset($_POST['coment'])?$_POST['coment']:"";
//$student_id =isset($_POST['student_id'])?$_POST['student_id']:"";
$ex_idd = isset($_POST['exe_id']) ? (int) $_POST['exe_id'] : '';
$ex_user_id = isset($_POST['ex_user_id']) ? (int) $_POST['ex_user_id'] : '';
$mod_no = isset($_POST['mod_no']) ? Database::escape_string($_POST['mod_no']) : '';
$score_ex = isset($_POST['score_ex']) ? Database::escape_string($_POST['score_ex']) : '';
$score_rep1 = isset($_POST['score_rep1']) ? Database::escape_string($_POST['score_rep1']) : '';
$score_rep2 = isset($_POST['score_rep2']) ? Database::escape_string($_POST['score_rep2']) : '';
$coment = isset($_POST['coment']) ? Database::escape_string($_POST['coment']) : '';
$student_id = isset($_POST['student_id']) ? Database::escape_string($_POST['student_id']) : '';
foreach ($_POST as $index => $valeur) {
$$index = Database::escape_string(trim($valeur));
}
$sql4 = "UPDATE $tbl_stats_exercices SET
$sql = "UPDATE $tbl_stats_exercices SET
mod_no='$mod_no', score_ex='$score_ex', score_rep1='$score_rep1', score_rep2='$score_rep2', coment='$coment'
WHERE exe_id = '$ex_idd'
";
Database::query($sql4);
Database::query($sql);
header("location:../extra/myStudents.php?student=$student_id");
exit;

19
main/extra/update_intervention.php
Unescape View File

@ -8,18 +8,11 @@ if (empty($allow)) {
exit;
}
$tbl_stats_exercices = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
$ex_id = isset($_POST['exe_id']) ? $_POST['exe_id'] : "";
$student_id = isset($_POST['student_id']) ? $_POST['student_id'] : "";
$inter_coment = isset($_POST['inter_coment']) ? $_POST['inter_coment'] : "";
foreach ($_POST as $index => $valeur) {
$$index = Database::escape_string(trim($valeur));
}
$sql4 = "UPDATE $tbl_stats_exercices SET inter_coment='$inter_coment'
WHERE exe_id = '$ex_id'
";
Database::query($sql4);
$table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
$ex_id = isset($_POST['exe_id']) ? (int) $_POST['exe_id'] : '';
$student_id = isset($_POST['student_id']) ? (int) $_POST['student_id'] : '';
$inter_coment = isset($_POST['inter_coment']) ? Database::escape_string($_POST['inter_coment']) : '';
$sql = "UPDATE $table SET inter_coment='$inter_coment' WHERE exe_id = '$ex_id' ";
Database::query($sql);
header("location:../extra/myStudents.php?student=$student_id");
exit;

6
main/extra/upgrade_school_calendar.php
Unescape View File

@ -23,17 +23,11 @@ foreach ($_POST as $index => $valeur) {
}
?>
<th colspan="6">
<?php echo get_lang('edit_save'); ?>
<?php
$sql4 = "UPDATE set_module SET cal_day_num='$d_number' WHERE id = '$d_id' ";
Database::query($sql4);
print_r(unserialize($_POST['aaa']));
?>
</form>
</table>
<?php
Display::display_footer();

Write Preview
Loading…
Cancel
Save