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

[svn r19957] logic changes - changed score 0% and % by "/" in learner details - (partial FS#4062)

Browse Source
skala
Isaac Flores 17 years ago
parent 63ab98675d
commit c26b913a8c
2 changed files with 36 additions and 18 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. 24
      main/auth/my_progress.php
  2. 30
      main/mySpace/myStudents.php

24
main/auth/my_progress.php
Unescape View File

@ -50,9 +50,9 @@ while($row = Database :: fetch_array($rs))
{ {
$Courses[$row['course_code']] = CourseManager::get_course_information($row['course_code']); $Courses[$row['course_code']] = CourseManager::get_course_information($row['course_code']);
} }
echo '<div class="actions-title" >';
api_display_tool_title($nameTools); echo $nameTools;
echo '</div>';
$now=date('Y-m-d'); $now=date('Y-m-d');
?> ?>
@ -106,7 +106,13 @@ foreach($Courses as $enreg)
</td> </td>
<td align='center'> <td align='center'>
<?php echo $pourcentageScore.'%'; ?> <?php
if (!is_null($pourcentageScore)) {
echo $pourcentageScore.'%';
} else {
echo '0%';
}
?>
</td> </td>
<td align='center' > <td align='center' >
@ -344,15 +350,19 @@ foreach($Courses as $enreg)
echo '</td>'; echo '</td>';
if ($a_exercices['results_disabled']==0) { if ($a_exercices['results_disabled']==0) {
echo '<td align="center">'; echo '<td align="center">';
echo $pourcentageScore.'%'; if ($a_essais['essais']>0) {
echo $pourcentageScore.'%';
} else {
echo '/';
}
echo '</td>'; echo '</td>';
echo '<td align="center">'; echo '<td align="center">';
echo $a_essais['essais']; echo $a_essais['essais'];
echo '</td> echo '</td>
<td align="center" width="25">'; <td align="center" width="25">';
if($a_essais['essais']>0) if($a_essais['essais']>0)
echo '<a href="../exercice/exercise_show.php?origin=myprogress&id='.$exe_id.'&cidReq='.$a_infosCours['code'].'&id_session='.$_GET['id_session'].'"> '.Display::return_icon('quiz.gif', get_lang('Quiz')).' </a>'; echo '<a href="../exercice/exercise_show.php?origin=myprogress&id='.$exe_id.'&cidReq='.$a_infosCours['code'].'&id_session='.Security::remove_XSS($_GET['id_session']).'"> '.Display::return_icon('quiz.gif', get_lang('Quiz')).' </a>';
echo '</td>'; echo '</td>';
} else { } else {
// we show or not the results if the teacher wants to // we show or not the results if the teacher wants to

30
main/mySpace/myStudents.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$Id: myStudents.php 19794 2009-04-15 19:54:31Z aportugal $ <?php //$Id: myStudents.php 19957 2009-04-21 21:43:08Z iflorespaz $
/* For licensing terms, see /dokeos_license.txt */ /* For licensing terms, see /dokeos_license.txt */
/** /**
* Implements the tracking of students in the Reporting pages * Implements the tracking of students in the Reporting pages
@ -657,8 +657,9 @@ if(!empty($_GET['student']))
//QUIZZ IN LP //QUIZZ IN LP
$score = Tracking::get_avg_student_score(intval($_GET['student']), Database::escape_string($_GET['course']), array($a_learnpath['id'])); $score = Tracking::get_avg_student_score(intval($_GET['student']), Database::escape_string($_GET['course']), array($a_learnpath['id']));
if (empty($score)) { if (empty($score)) {
$score = 0; //$score = 0;
} }
if($i%2==0){ if($i%2==0){
$s_css_class="row_odd"; $s_css_class="row_odd";
@ -680,7 +681,7 @@ if(!empty($_GET['student']))
<?php echo api_time_to_hms($total_time) ?> <?php echo api_time_to_hms($total_time) ?>
</td> </td>
<td align="center"> <td align="center">
<?php if(!is_null($score)) echo $score.' %'; else echo '-'; ?> <?php if(!is_null($score)) echo $score.' %'; else echo '/';$score=0; ?>
</td> </td>
<td align="center"> <td align="center">
<?php echo $progress ?> <?php echo $progress ?>
@ -693,7 +694,7 @@ if(!empty($_GET['student']))
if($any_result === true) if($any_result === true)
{ {
?> ?>
<a href="lp_tracking.php?course=<?php echo $_GET['course'] ?>&origin=<?php echo $_GET['origin'] ?>&lp_id=<?php echo $a_learnpath['id']?>&student_id=<?php echo $a_infosUser['user_id'] ?>"> <a href="lp_tracking.php?course=<?php echo Security::remove_XSS($_GET['course']) ?>&origin=<?php echo Security::remove_XSS($_GET['origin']) ?>&lp_id=<?php echo $a_learnpath['id']?>&student_id=<?php echo $a_infosUser['user_id'] ?>">
<img src="../img/2rightarrow.gif" border="0" /> <img src="../img/2rightarrow.gif" border="0" />
</a> </a>
<?php <?php
@ -741,7 +742,7 @@ if(!empty($_GET['student']))
$csv_content[] = array(); $csv_content[] = array();
$csv_content[] = array(get_lang('Exercices'),get_lang('Score'),get_lang('Attempts')); $csv_content[] = array(get_lang('Exercices'),get_lang('Score'),get_lang('Attempts'));
$a_infosCours = CourseManager :: get_course_information($_GET['course']); $a_infosCours = CourseManager :: get_course_information(Security::remove_XSS($_GET['course']));
$t_tool = Database::get_course_table(TABLE_TOOL_LIST,$a_infosCours['db_name']); $t_tool = Database::get_course_table(TABLE_TOOL_LIST,$a_infosCours['db_name']);
$sql='SELECT visibility FROM '.$t_tool.' WHERE name="quiz"'; $sql='SELECT visibility FROM '.$t_tool.' WHERE name="quiz"';
@ -757,6 +758,7 @@ if(!empty($_GET['student']))
$resultExercices = api_sql_query($sqlExercices,__FILE__,__LINE__); $resultExercices = api_sql_query($sqlExercices,__FILE__,__LINE__);
$i = 0; $i = 0;
$is_student=Security::remove_XSS($_GET['student']);
if(Database::num_rows($resultExercices)>0) if(Database::num_rows($resultExercices)>0)
{ {
while($a_exercices = Database::fetch_array($resultExercices)) while($a_exercices = Database::fetch_array($resultExercices))
@ -767,14 +769,14 @@ if(!empty($_GET['student']))
AND ex.exe_exo_id = ".$a_exercices['id']." AND ex.exe_exo_id = ".$a_exercices['id']."
AND orig_lp_id = 0 AND orig_lp_id = 0
AND orig_lp_item_id = 0 AND orig_lp_item_id = 0
AND exe_user_id='".$_GET["student"]."'" AND exe_user_id='".Database::escape_string($is_student)."'"
; ;
$resultEssais = api_sql_query($sqlEssais,__FILE__,__LINE__); $resultEssais = api_sql_query($sqlEssais,__FILE__,__LINE__);
$a_essais = Database::fetch_array($resultEssais); $a_essais = Database::fetch_array($resultEssais);
$sqlScore = "SELECT exe_id, exe_result,exe_weighting $sqlScore = "SELECT exe_id, exe_result,exe_weighting
FROM $tbl_stats_exercices FROM $tbl_stats_exercices
WHERE exe_user_id = ".$_GET['student']." WHERE exe_user_id = ".Database::escape_string($is_student)."
AND exe_cours_id = '".$a_infosCours['code']."' AND exe_cours_id = '".$a_infosCours['code']."'
AND exe_exo_id = ".$a_exercices['id']." AND exe_exo_id = ".$a_exercices['id']."
AND orig_lp_id = 0 AND orig_lp_id = 0
@ -816,7 +818,13 @@ if(!empty($_GET['student']))
"; ";
echo " <td align='center'> echo " <td align='center'>
"; ";
echo $pourcentageScore.' %'; if ($a_essais['essais']>0 ) {
echo $pourcentageScore.' %';
} else {
echo '/';
$pourcentageScore=0;
}
echo " </td> echo " </td>
<td align='center'> <td align='center'>
"; ";
@ -825,14 +833,14 @@ if(!empty($_GET['student']))
<td align='center'> <td align='center'>
"; ";
$sql_last_attempt='SELECT exe_id FROM '.$tbl_stats_exercices.' WHERE exe_exo_id="'.$a_exercices['id'].'" AND exe_user_id="'.$_GET['student'].'" AND exe_cours_id="'.$a_infosCours['code'].'" AND orig_lp_id = 0 AND orig_lp_item_id = 0 ORDER BY exe_date DESC LIMIT 1'; $sql_last_attempt='SELECT exe_id FROM '.$tbl_stats_exercices.' WHERE exe_exo_id="'.$a_exercices['id'].'" AND exe_user_id="'.Security::remove_XSS($_GET['student']).'" AND exe_cours_id="'.$a_infosCours['code'].'" AND orig_lp_id = 0 AND orig_lp_item_id = 0 ORDER BY exe_date DESC LIMIT 1';
$resultLastAttempt = api_sql_query($sql_last_attempt,__FILE__,__LINE__); $resultLastAttempt = api_sql_query($sql_last_attempt,__FILE__,__LINE__);
if(Database::num_rows($resultLastAttempt)>0) if(Database::num_rows($resultLastAttempt)>0)
{ {
$id_last_attempt=Database::result($resultLastAttempt,0,0); $id_last_attempt=Database::result($resultLastAttempt,0,0);
if($a_essais['essais']>0) if($a_essais['essais']>0)
echo '<a href="../exercice/exercise_show.php?id='.$id_last_attempt.'&cidReq='.$a_infosCours['code'].'&student='.$_GET['student'].'&origin='.(empty($_GET['origin']) ? 'tracking' : $_GET['origin']).'"> <img src="'.api_get_path(WEB_IMG_PATH).'quiz.gif" border="0"> </a>'; echo '<a href="../exercice/exercise_show.php?id='.$id_last_attempt.'&cidReq='.$a_infosCours['code'].'&student='.Security::remove_XSS($_GET['student']).'&origin='.(empty($_GET['origin']) ? 'tracking' : Security::remove_XSS($_GET['origin'])).'"> <img src="'.api_get_path(WEB_IMG_PATH).'quiz.gif" border="0" /> </a>';
} }
echo " </td> echo " </td>
</tr> </tr>
@ -966,7 +974,7 @@ if(!empty($_GET['student']))
$a_courses = Tracking :: get_courses_followed_by_coach($_user['user_id']); $a_courses = Tracking :: get_courses_followed_by_coach($_user['user_id']);
} }
else{ else{
$a_courses = Tracking :: get_courses_followed_by_coach($_GET['id_coach']); $a_courses = Tracking :: get_courses_followed_by_coach(Security::remove_XSS($_GET['id_coach']));
} }
} }
if(count($a_courses)>0) if(count($a_courses)>0)

Write Preview
Loading…
Cancel
Save