chamilo /
chamilo-lms
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | $nameTools = get_lang('ToolName'); |
| 25 | 25 | |
| 26 | -$interbreadcrumb[]= array ("url"=>"courseLog.php", "name"=> "Statistics"); |
|
| 26 | +$interbreadcrumb[] = array("url"=>"courseLog.php", "name"=> "Statistics"); |
|
| 27 | 27 | |
| 28 | 28 | $htmlHeadXtra[] = "<style type='text/css'> |
| 29 | 29 | /*<![CDATA[*/ |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | td {border-bottom: thin dashed gray;} |
| 41 | 41 | /*]]>*/ |
| 42 | 42 | </style>"; |
| 43 | -Display::display_header($nameTools,"Tracking"); |
|
| 43 | +Display::display_header($nameTools, "Tracking"); |
|
| 44 | 44 | ?> |
| 45 | 45 | |
| 46 | 46 | <h3> |
@@ -59,16 +59,16 @@ discard block |
||
| 59 | 59 | // Defining the months of the year to allow translation of the months |
| 60 | 60 | $MonthsShort = api_get_months_short(); |
| 61 | 61 | |
| 62 | -$tool=$_REQUEST['tool']; |
|
| 63 | -$period=$_REQUEST['period']; |
|
| 64 | -$reqdate=$_REQUEST['reqdate']; |
|
| 62 | +$tool = $_REQUEST['tool']; |
|
| 63 | +$period = $_REQUEST['period']; |
|
| 64 | +$reqdate = $_REQUEST['reqdate']; |
|
| 65 | 65 | ?> |
| 66 | 66 | <table width="100%" cellpadding="2" cellspacing="0" border="0"> |
| 67 | 67 | <?php |
| 68 | 68 | $TABLETRACK_ACCESS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS); |
| 69 | 69 | $courseId = api_get_course_int_id(); |
| 70 | 70 | //stats for the current course |
| 71 | - if(isset($_cid)) { |
|
| 71 | + if (isset($_cid)) { |
|
| 72 | 72 | // to see stats of one course user must be courseAdmin of this course |
| 73 | 73 | $is_allowedToTrack = $is_courseAdmin; |
| 74 | 74 | $courseCodeEqualcidIfNeeded = "AND c_id = '$courseId'"; |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | $is_allowedToTrack = $is_platformAdmin; |
| 79 | 79 | $courseCodeEqualcidIfNeeded = ""; |
| 80 | 80 | } |
| 81 | - if( $is_allowedToTrack) { |
|
| 81 | + if ($is_allowedToTrack) { |
|
| 82 | 82 | // list of all tools |
| 83 | 83 | if (!isset($tool)) { |
| 84 | 84 | $sql = "SELECT access_tool, count( access_tool ) |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | echo "<tr> |
| 91 | 91 | <td> |
| 92 | 92 | "; |
| 93 | - if(isset($_cid)) echo "<b>$_cid : </b>"; |
|
| 93 | + if (isset($_cid)) echo "<b>$_cid : </b>"; |
|
| 94 | 94 | echo " <b>".get_lang('ToolList')."</b> |
| 95 | 95 | </td> |
| 96 | 96 | </tr> |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | </tr>"; |
| 109 | 109 | if (is_array($results)) |
| 110 | 110 | { |
| 111 | - for($j = 0 ; $j < count($results) ; $j++) |
|
| 111 | + for ($j = 0; $j < count($results); $j++) |
|
| 112 | 112 | { |
| 113 | 113 | echo "<tr>"; |
| 114 | 114 | echo "<td><a href='toolaccess_details.php?tool=".urlencode($results[$j][0])."'>".get_lang($results[$j][0])."</a></td>"; |
@@ -131,12 +131,12 @@ discard block |
||
| 131 | 131 | $encodedTool = urlencode($tool); |
| 132 | 132 | $tool = urldecode($tool); |
| 133 | 133 | |
| 134 | - if( !isset($reqdate) ) |
|
| 134 | + if (!isset($reqdate)) |
|
| 135 | 135 | $reqdate = time(); |
| 136 | 136 | echo "<tr> |
| 137 | 137 | <td> |
| 138 | 138 | "; |
| 139 | - if(isset($_cid)) echo "<b>$_cid : </b>"; |
|
| 139 | + if (isset($_cid)) echo "<b>$_cid : </b>"; |
|
| 140 | 140 | echo " <b>".get_lang($tool)."</b> |
| 141 | 141 | </td> |
| 142 | 142 | </tr> |
@@ -145,22 +145,22 @@ discard block |
||
| 145 | 145 | /* ------ display ------ */ |
| 146 | 146 | // displayed period |
| 147 | 147 | echo "<tr><td>"; |
| 148 | - switch($period) |
|
| 148 | + switch ($period) |
|
| 149 | 149 | { |
| 150 | 150 | case "month" : |
| 151 | - echo $MonthsLong[date("n", $reqdate)-1].date(" Y", $reqdate); |
|
| 151 | + echo $MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate); |
|
| 152 | 152 | break; |
| 153 | 153 | case "week" : |
| 154 | - $weeklowreqdate = ($reqdate-(86400*date("w" , $reqdate))); |
|
| 155 | - $weekhighreqdate = ($reqdate+(86400*(6-date("w" , $reqdate)) )); |
|
| 156 | - echo "<b>".$langFrom."</b> ".date("d " , $weeklowreqdate).$MonthsLong[date("n", $weeklowreqdate)-1].date(" Y" , $weeklowreqdate); |
|
| 157 | - echo " <b>".$langTo."</b> ".date("d " , $weekhighreqdate ).$MonthsLong[date("n", $weekhighreqdate)-1].date(" Y" , $weekhighreqdate); |
|
| 154 | + $weeklowreqdate = ($reqdate - (86400 * date("w", $reqdate))); |
|
| 155 | + $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate)))); |
|
| 156 | + echo "<b>".$langFrom."</b> ".date("d ", $weeklowreqdate).$MonthsLong[date("n", $weeklowreqdate) - 1].date(" Y", $weeklowreqdate); |
|
| 157 | + echo " <b>".$langTo."</b> ".date("d ", $weekhighreqdate).$MonthsLong[date("n", $weekhighreqdate) - 1].date(" Y", $weekhighreqdate); |
|
| 158 | 158 | break; |
| 159 | 159 | // default == day |
| 160 | 160 | default : |
| 161 | 161 | $period = "day"; |
| 162 | 162 | case "day" : |
| 163 | - echo $DaysLong[date("w" , $reqdate)].date(" d " , $reqdate).$MonthsLong[date("n", $reqdate)-1].date(" Y" , $reqdate); |
|
| 163 | + echo $DaysLong[date("w", $reqdate)].date(" d ", $reqdate).$MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate); |
|
| 164 | 164 | break; |
| 165 | 165 | } |
| 166 | 166 | echo "</tr></td>"; |
@@ -174,13 +174,13 @@ discard block |
||
| 174 | 174 | || |
| 175 | 175 | |
| 176 | 176 | "; |
| 177 | - switch($period) |
|
| 177 | + switch ($period) |
|
| 178 | 178 | { |
| 179 | 179 | case "month" : |
| 180 | 180 | // previous and next date must be evaluated |
| 181 | 181 | // 30 days should be a good approximation |
| 182 | - $previousReqDate = mktime(1,1,1,date("m",$reqdate)-1,1,date("Y",$reqdate)); |
|
| 183 | - $nextReqDate = mktime(1,1,1,date("m",$reqdate)+1,1,date("Y",$reqdate)); |
|
| 182 | + $previousReqDate = mktime(1, 1, 1, date("m", $reqdate) - 1, 1, date("Y", $reqdate)); |
|
| 183 | + $nextReqDate = mktime(1, 1, 1, date("m", $reqdate) + 1, 1, date("Y", $reqdate)); |
|
| 184 | 184 | echo " |
| 185 | 185 | [<a href='".api_get_self()."?tool=$encodedTool&period=month&reqdate=$previousReqDate' class='specialLink'>$langPreviousMonth</a>] |
| 186 | 186 | [<a href='".api_get_self()."?tool=$encodedTool&period=month&reqdate=$nextReqDate' class='specialLink'>$langNextMonth</a>] |
@@ -188,8 +188,8 @@ discard block |
||
| 188 | 188 | break; |
| 189 | 189 | case "week" : |
| 190 | 190 | // previous and next date must be evaluated |
| 191 | - $previousReqDate = $reqdate - 7*86400; |
|
| 192 | - $nextReqDate = $reqdate + 7*86400; |
|
| 191 | + $previousReqDate = $reqdate - 7 * 86400; |
|
| 192 | + $nextReqDate = $reqdate + 7 * 86400; |
|
| 193 | 193 | echo " |
| 194 | 194 | [<a href='".api_get_self()."?tool=$encodedTool&period=week&reqdate=$previousReqDate' class='specialLink'>$langPreviousWeek</a>] |
| 195 | 195 | [<a href='".api_get_self()."?tool=$encodedTool&period=week&reqdate=$nextReqDate' class='specialLink'>$langNextWeek</a>] |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | </tr> |
| 214 | 214 | "; |
| 215 | 215 | // display information about this period |
| 216 | - switch($period) |
|
| 216 | + switch ($period) |
|
| 217 | 217 | { |
| 218 | 218 | // all days |
| 219 | 219 | case "month" : |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | ORDER BY access_date ASC"; |
| 227 | 227 | |
| 228 | 228 | $days_array = StatsUtils::daysTab($sql); |
| 229 | - StatsUtils::makeHitsTable($days_array,$langDay); |
|
| 229 | + StatsUtils::makeHitsTable($days_array, $langDay); |
|
| 230 | 230 | break; |
| 231 | 231 | // all days |
| 232 | 232 | case "week" : |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | ORDER BY access_date ASC"; |
| 240 | 240 | |
| 241 | 241 | $days_array = StatsUtils::daysTab($sql); |
| 242 | - StatsUtils::makeHitsTable($days_array,$langDay); |
|
| 242 | + StatsUtils::makeHitsTable($days_array, $langDay); |
|
| 243 | 243 | break; |
| 244 | 244 | // all hours |
| 245 | 245 | case "day" : |
@@ -251,8 +251,8 @@ discard block |
||
| 251 | 251 | AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate')) |
| 252 | 252 | ORDER BY access_date ASC"; |
| 253 | 253 | |
| 254 | - $hours_array = StatsUtils::hoursTab($sql,$reqdate); |
|
| 255 | - StatsUtils::makeHitsTable($hours_array,$langHour); |
|
| 254 | + $hours_array = StatsUtils::hoursTab($sql, $reqdate); |
|
| 255 | + StatsUtils::makeHitsTable($hours_array, $langHour); |
|
| 256 | 256 | break; |
| 257 | 257 | } |
| 258 | 258 | } |
@@ -90,7 +90,9 @@ discard block |
||
| 90 | 90 | echo "<tr> |
| 91 | 91 | <td> |
| 92 | 92 | "; |
| 93 | - if(isset($_cid)) echo "<b>$_cid : </b>"; |
|
| 93 | + if(isset($_cid)) { |
|
| 94 | + echo "<b>$_cid : </b>"; |
|
| 95 | + } |
|
| 94 | 96 | echo " <b>".get_lang('ToolList')."</b> |
| 95 | 97 | </td> |
| 96 | 98 | </tr> |
@@ -116,27 +118,28 @@ discard block |
||
| 116 | 118 | echo"</tr>"; |
| 117 | 119 | } |
| 118 | 120 | |
| 119 | - } |
|
| 120 | - else |
|
| 121 | + } else |
|
| 121 | 122 | { |
| 122 | 123 | echo "<tr>"; |
| 123 | 124 | echo "<td colspan='2'><center>".get_lang('NoResult')."</center></td>"; |
| 124 | 125 | echo"</tr>"; |
| 125 | 126 | } |
| 126 | 127 | echo "</table></td></tr>"; |
| 127 | - } |
|
| 128 | - else |
|
| 128 | + } else |
|
| 129 | 129 | { |
| 130 | 130 | // this can prevent bug if there is special chars in $tool |
| 131 | 131 | $encodedTool = urlencode($tool); |
| 132 | 132 | $tool = urldecode($tool); |
| 133 | 133 | |
| 134 | - if( !isset($reqdate) ) |
|
| 135 | - $reqdate = time(); |
|
| 134 | + if( !isset($reqdate) ) { |
|
| 135 | + $reqdate = time(); |
|
| 136 | + } |
|
| 136 | 137 | echo "<tr> |
| 137 | 138 | <td> |
| 138 | 139 | "; |
| 139 | - if(isset($_cid)) echo "<b>$_cid : </b>"; |
|
| 140 | + if(isset($_cid)) { |
|
| 141 | + echo "<b>$_cid : </b>"; |
|
| 142 | + } |
|
| 140 | 143 | echo " <b>".get_lang($tool)."</b> |
| 141 | 144 | </td> |
| 142 | 145 | </tr> |
@@ -75,13 +75,13 @@ discard block |
||
| 75 | 75 | // check if uid is tutor of this group |
| 76 | 76 | $courseId = api_get_course_int_id(); |
| 77 | 77 | |
| 78 | - if (( $is_allowedToTrack || $is_allowedToTrackEverybodyInCourse)) { |
|
| 78 | + if (($is_allowedToTrack || $is_allowedToTrackEverybodyInCourse)) { |
|
| 79 | 79 | if ($is_allowedToTrackEverybodyInCourse) { |
| 80 | 80 | $sql = "SELECT u.firstname,u.lastname, u.email |
| 81 | 81 | FROM $TABLECOURSUSER cu , $TABLEUSER u |
| 82 | 82 | WHERE |
| 83 | 83 | cu.user_id = u.user_id AND |
| 84 | - cu.relation_type<>" . COURSE_RELATION_TYPE_RRHH . " AND |
|
| 84 | + cu.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND |
|
| 85 | 85 | cu.c_id = '$courseId' AND |
| 86 | 86 | u.user_id = '$uInfo'"; |
| 87 | 87 | } else { |
@@ -97,21 +97,21 @@ discard block |
||
| 97 | 97 | $res[2] == "" ? $res2 = get_lang('NoEmail') : $res2 = Display::encrypted_mailto_link($res[2]); |
| 98 | 98 | |
| 99 | 99 | echo "<tr><td>"; |
| 100 | - echo $informationsAbout . " : <br>"; |
|
| 100 | + echo $informationsAbout." : <br>"; |
|
| 101 | 101 | echo "<ul>\n" |
| 102 | - . "<li>" . get_lang('FirstName') . " : " . $res[0] . "</li>\n" |
|
| 103 | - . "<li>" . get_lang('LastName') . " : " . $res[1] . "</li>\n" |
|
| 104 | - . "<li>" . get_lang('Email') . " : " . $res2 . "</li>\n" |
|
| 102 | + . "<li>".get_lang('FirstName')." : ".$res[0]."</li>\n" |
|
| 103 | + . "<li>".get_lang('LastName')." : ".$res[1]."</li>\n" |
|
| 104 | + . "<li>".get_lang('Email')." : ".$res2."</li>\n" |
|
| 105 | 105 | . "</ul>"; |
| 106 | 106 | echo "</td></tr>"; |
| 107 | 107 | /* * ***** MENU ******* */ |
| 108 | 108 | echo "<tr> |
| 109 | 109 | <td> |
| 110 | - [<a href='userLog.php?uInfo=$uInfo&view=$view'>" . get_lang('Back') . "</a>] |
|
| 110 | + [<a href='userLog.php?uInfo=$uInfo&view=$view'>".get_lang('Back')."</a>] |
|
| 111 | 111 | "; |
| 112 | 112 | echo " || |
| 113 | - [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$reqdate' class='specialLink'>" . get_lang('PeriodWeek') . "</a>] |
|
| 114 | - [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$reqdate' class='specialLink'>" . get_lang('PeriodMonth') . "</a>] |
|
| 113 | + [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$reqdate' class='specialLink'>".get_lang('PeriodWeek')."</a>] |
|
| 114 | + [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$reqdate' class='specialLink'>".get_lang('PeriodMonth')."</a>] |
|
| 115 | 115 | || |
| 116 | 116 | "; |
| 117 | 117 | switch ($period) { |
@@ -120,8 +120,8 @@ discard block |
||
| 120 | 120 | $previousReqDate = $reqdate - 7 * 86400; |
| 121 | 121 | $nextReqDate = $reqdate + 7 * 86400; |
| 122 | 122 | echo " |
| 123 | - [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$previousReqDate' class='specialLink'>" . get_lang('PreviousWeek') . "</a>] |
|
| 124 | - [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$nextReqDate' class='specialLink'>" . get_lang('NextWeek') . "</a>] |
|
| 123 | + [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$previousReqDate' class='specialLink'>".get_lang('PreviousWeek')."</a>] |
|
| 124 | + [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=week&reqdate=$nextReqDate' class='specialLink'>".get_lang('NextWeek')."</a>] |
|
| 125 | 125 | "; |
| 126 | 126 | break; |
| 127 | 127 | default : |
@@ -132,8 +132,8 @@ discard block |
||
| 132 | 132 | $previousReqDate = mktime(1, 1, 1, date("m", $reqdate) - 1, 1, date("Y", $reqdate)); |
| 133 | 133 | $nextReqDate = mktime(1, 1, 1, date("m", $reqdate) + 1, 1, date("Y", $reqdate)); |
| 134 | 134 | echo " |
| 135 | - [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$previousReqDate' class='specialLink'>" . get_lang('PreviousMonth') . "</a>] |
|
| 136 | - [<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=month&reqdate=$nextReqDate' class='specialLink'>" . get_lang('NextMonth') . "</a>] |
|
| 135 | + [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$previousReqDate' class='specialLink'>".get_lang('PreviousMonth')."</a>] |
|
| 136 | + [<a href='" . api_get_self()."?uInfo=$uInfo&view=$view&period=month&reqdate=$nextReqDate' class='specialLink'>".get_lang('NextMonth')."</a>] |
|
| 137 | 137 | "; |
| 138 | 138 | break; |
| 139 | 139 | } |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | AND YEAR(access_date) = YEAR(FROM_UNIXTIME('$reqdate')) |
| 154 | 154 | GROUP BY DAYOFMONTH(access_date) |
| 155 | 155 | ORDER BY access_date ASC"; |
| 156 | - $displayedDate = $MonthsLong[date("n", $reqdate) - 1] . date(" Y", $reqdate); |
|
| 156 | + $displayedDate = $MonthsLong[date("n", $reqdate) - 1].date(" Y", $reqdate); |
|
| 157 | 157 | break; |
| 158 | 158 | case "week" : |
| 159 | 159 | $sql = "SELECT access_date |
@@ -165,24 +165,24 @@ discard block |
||
| 165 | 165 | GROUP BY DAYOFMONTH(access_date) |
| 166 | 166 | ORDER BY access_date ASC"; |
| 167 | 167 | $weeklowreqdate = ($reqdate - (86400 * date("w", $reqdate))); |
| 168 | - $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate)) )); |
|
| 169 | - $displayedDate = get_lang('From') . " " . date("d ", $weeklowreqdate) . $MonthsLong[date("n", $weeklowreqdate) - 1] . date(" Y", $weeklowreqdate) |
|
| 170 | - . " " . get_lang('To') . " " . date("d ", $weekhighreqdate) . $MonthsLong[date("n", $weekhighreqdate) - 1] . date(" Y", $weekhighreqdate); |
|
| 168 | + $weekhighreqdate = ($reqdate + (86400 * (6 - date("w", $reqdate)))); |
|
| 169 | + $displayedDate = get_lang('From')." ".date("d ", $weeklowreqdate).$MonthsLong[date("n", $weeklowreqdate) - 1].date(" Y", $weeklowreqdate) |
|
| 170 | + . " ".get_lang('To')." ".date("d ", $weekhighreqdate).$MonthsLong[date("n", $weekhighreqdate) - 1].date(" Y", $weekhighreqdate); |
|
| 171 | 171 | break; |
| 172 | 172 | } |
| 173 | 173 | echo "<tr><td>"; |
| 174 | 174 | $results = StatsUtils::getManyResults1Col($sql); |
| 175 | 175 | /* * * display of the displayed period ** */ |
| 176 | 176 | echo "<table width='100%' cellpadding='2' cellspacing='1' border='0' align=center>"; |
| 177 | - echo "<td bgcolor='#E6E6E6'>" . $displayedDate . "</td>"; |
|
| 177 | + echo "<td bgcolor='#E6E6E6'>".$displayedDate."</td>"; |
|
| 178 | 178 | if (is_array($results)) { |
| 179 | 179 | for ($j = 0; $j < sizeof($results); $j++) { |
| 180 | 180 | $beautifulDateTime = api_convert_and_format_date($results[$j], null, date_default_timezone_get()); |
| 181 | 181 | echo "<tr>"; |
| 182 | - echo "<td style='padding-left : 40px;' valign='top'>" . $beautifulDateTime . "</td>"; |
|
| 182 | + echo "<td style='padding-left : 40px;' valign='top'>".$beautifulDateTime."</td>"; |
|
| 183 | 183 | echo"</tr>"; |
| 184 | 184 | // $limit is used to select only results between $results[$j] (current login) and next one |
| 185 | - if ($j == ( sizeof($results) - 1 )) |
|
| 185 | + if ($j == (sizeof($results) - 1)) |
|
| 186 | 186 | $limit = date("Y-m-d H:i:s", $nextReqDate); |
| 187 | 187 | else |
| 188 | 188 | $limit = $results[$j + 1]; |
@@ -192,8 +192,8 @@ discard block |
||
| 192 | 192 | FROM $TABLETRACK_ACCESS |
| 193 | 193 | WHERE access_user_id = $uInfo |
| 194 | 194 | AND access_tool IS NOT NULL |
| 195 | - AND access_date > '" . $results[$j] . "' |
|
| 196 | - AND access_date < '" . $limit . "' |
|
| 195 | + AND access_date > '".$results[$j]."' |
|
| 196 | + AND access_date < '" . $limit."' |
|
| 197 | 197 | AND c_id = $courseId |
| 198 | 198 | GROUP BY access_tool |
| 199 | 199 | ORDER BY access_tool ASC"; |
@@ -204,8 +204,8 @@ discard block |
||
| 204 | 204 | echo "<table width='50%' cellpadding='0' cellspacing='0' border='0'>\n"; |
| 205 | 205 | for ($k = 0; $k < count($results2); $k++) { |
| 206 | 206 | echo "<tr>\n"; |
| 207 | - echo "<td width='70%' style='padding-left : 60px;'>" . get_lang($results2[$k][0]) . "</td>\n"; |
|
| 208 | - echo "<td width='30%' align='right' style='padding-right : 40px'>" . $results2[$k][1] . " " . get_lang('Visits') . "</td>\n"; |
|
| 207 | + echo "<td width='70%' style='padding-left : 60px;'>".get_lang($results2[$k][0])."</td>\n"; |
|
| 208 | + echo "<td width='30%' align='right' style='padding-right : 40px'>".$results2[$k][1]." ".get_lang('Visits')."</td>\n"; |
|
| 209 | 209 | echo "</tr>"; |
| 210 | 210 | } |
| 211 | 211 | echo "</table>\n"; |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | } |
| 216 | 216 | } else { |
| 217 | 217 | echo "<tr>"; |
| 218 | - echo "<td colspan='2' bgcolor='#eeeeee'>" . get_lang('NoResult') . "</td>"; |
|
| 218 | + echo "<td colspan='2' bgcolor='#eeeeee'>".get_lang('NoResult')."</td>"; |
|
| 219 | 219 | echo "</tr>"; |
| 220 | 220 | } |
| 221 | 221 | echo "</table>"; |
@@ -182,10 +182,11 @@ |
||
| 182 | 182 | echo "<td style='padding-left : 40px;' valign='top'>" . $beautifulDateTime . "</td>"; |
| 183 | 183 | echo"</tr>"; |
| 184 | 184 | // $limit is used to select only results between $results[$j] (current login) and next one |
| 185 | - if ($j == ( sizeof($results) - 1 )) |
|
| 186 | - $limit = date("Y-m-d H:i:s", $nextReqDate); |
|
| 187 | - else |
|
| 188 | - $limit = $results[$j + 1]; |
|
| 185 | + if ($j == ( sizeof($results) - 1 )) { |
|
| 186 | + $limit = date("Y-m-d H:i:s", $nextReqDate); |
|
| 187 | + } else { |
|
| 188 | + $limit = $results[$j + 1]; |
|
| 189 | + } |
|
| 189 | 190 | // select all access to tool between displayed date and next displayed date or now() if |
| 190 | 191 | // displayed date is the last login date |
| 191 | 192 | $sql = "SELECT access_tool, count(access_tool) |
@@ -16,7 +16,6 @@ |
||
| 16 | 16 | * @author Patrick Cool |
| 17 | 17 | * @author René Haentjens, added CSV file import (October 2004) |
| 18 | 18 | * @package chamilo.link |
| 19 | - |
|
| 20 | 19 | */ |
| 21 | 20 | |
| 22 | 21 | // Including libraries |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | |
| 99 | 99 | $action_links = ' |
| 100 | 100 | function action_formatter(cellvalue, options, rowObject) { |
| 101 | - return \'<a href="course_log_tools.php?id_session=0&cidReq='.$course_code.'&gidReq=\'+options.rowId+\'">'.Display::return_icon('2rightarrow.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'. |
|
| 101 | + return \'<a href="course_log_tools.php?id_session=0&cidReq='.$course_code.'&gidReq=\'+options.rowId+\'">'.Display::return_icon('2rightarrow.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'. |
|
| 102 | 102 | '\'; |
| 103 | 103 | }'; |
| 104 | 104 | |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | $htmlHeadXtra[] = ' |
| 109 | 109 | <script> |
| 110 | 110 | $(function() { |
| 111 | - '.Display::grid_js('group_users',$url, $columns, $column_model, $extra_params, array(), $action_links, true).' |
|
| 111 | + '.Display::grid_js('group_users', $url, $columns, $column_model, $extra_params, array(), $action_links, true).' |
|
| 112 | 112 | }); |
| 113 | 113 | </script>'; |
| 114 | 114 | |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | |
| 82 | 82 | if (!$exportToXLS) { |
| 83 | 83 | Display :: display_header(get_lang('Reporting')); |
| 84 | - $actionsLeft = $actionsRight =''; |
|
| 84 | + $actionsLeft = $actionsRight = ''; |
|
| 85 | 85 | if ($global) { |
| 86 | 86 | |
| 87 | 87 | $actionsLeft .= '<a href="'.api_get_path(WEB_CODE_PATH).'auth/my_progress.php">'. |
@@ -98,9 +98,9 @@ discard block |
||
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | $actionsRight .= '<a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exerciseId.'&'.$courseLink.'">'. |
| 101 | - Display::return_icon('export_excel.png',get_lang('ExportAsXLS'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 101 | + Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
| 102 | 102 | $actionsRight .= '<a href="javascript: void(0);" onclick="javascript: window.print()">'. |
| 103 | - Display::return_icon('printer.png',get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 103 | + Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
| 104 | 104 | |
| 105 | 105 | |
| 106 | 106 | $menuItems[] = Display::url( |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | |
| 150 | - $toolbar = Display::toolbarAction('toolbar-exams', $content = array( 0 => $actionsLeft, 1 => $actionsRight )); |
|
| 150 | + $toolbar = Display::toolbarAction('toolbar-exams', $content = array(0 => $actionsLeft, 1 => $actionsRight)); |
|
| 151 | 151 | echo $toolbar; |
| 152 | 152 | |
| 153 | 153 | $form->display(); |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | $countExercises = Database::store_result($result); |
| 208 | 208 | $exerciseSessionCount = $countExercises[0]['count']; |
| 209 | 209 | |
| 210 | - $exerciseCount = $exerciseCount + $exerciseCount * count($newSessionList) + $exerciseSessionCount; |
|
| 210 | + $exerciseCount = $exerciseCount + $exerciseCount * count($newSessionList) + $exerciseSessionCount; |
|
| 211 | 211 | |
| 212 | 212 | // Add course and session list. |
| 213 | 213 | if ($exerciseCount == 0) { |
@@ -424,7 +424,7 @@ discard block |
||
| 424 | 424 | $column++; |
| 425 | 425 | $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('ExamNotTaken')); |
| 426 | 426 | $column++; |
| 427 | - $worksheet->SetCellValueByColumnAndRow($line, $column, sprintf(get_lang('ExamPassX'), $filter_score) . '%'); |
|
| 427 | + $worksheet->SetCellValueByColumnAndRow($line, $column, sprintf(get_lang('ExamPassX'), $filter_score).'%'); |
|
| 428 | 428 | $column++; |
| 429 | 429 | $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('ExamFail')); |
| 430 | 430 | $column++; |
@@ -442,15 +442,15 @@ discard block |
||
| 442 | 442 | } |
| 443 | 443 | $line++; |
| 444 | 444 | } else { |
| 445 | - $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Exercises')); |
|
| 445 | + $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Exercises')); |
|
| 446 | 446 | $column++; |
| 447 | - $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('User')); |
|
| 447 | + $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('User')); |
|
| 448 | 448 | $column++; |
| 449 | - $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Percentage')); |
|
| 449 | + $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Percentage')); |
|
| 450 | 450 | $column++; |
| 451 | - $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Status')); |
|
| 451 | + $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Status')); |
|
| 452 | 452 | $column++; |
| 453 | - $worksheet->SetCellValueByColumnAndRow($line,$column,get_lang('Attempts')); |
|
| 453 | + $worksheet->SetCellValueByColumnAndRow($line, $column, get_lang('Attempts')); |
|
| 454 | 454 | $column++; |
| 455 | 455 | $line++; |
| 456 | 456 | foreach ($array as $row) { |
@@ -601,10 +601,10 @@ discard block |
||
| 601 | 601 | $percentageScore = 0; |
| 602 | 602 | |
| 603 | 603 | if ($weighting != 0) { |
| 604 | - $percentageScore = round(($score*100)/$weighting); |
|
| 604 | + $percentageScore = round(($score * 100) / $weighting); |
|
| 605 | 605 | } |
| 606 | 606 | |
| 607 | - if ($attempts['count'] > 0 ) { |
|
| 607 | + if ($attempts['count'] > 0) { |
|
| 608 | 608 | $taken++; |
| 609 | 609 | } |
| 610 | 610 | |
@@ -647,7 +647,7 @@ discard block |
||
| 647 | 647 | } else { |
| 648 | 648 | $score = '-'; |
| 649 | 649 | $userRow .= '<td>'; |
| 650 | - $userRow .= '-'; |
|
| 650 | + $userRow .= '-'; |
|
| 651 | 651 | $tempArray[] = '-'; |
| 652 | 652 | $userRow .= '</td>'; |
| 653 | 653 | |
@@ -701,13 +701,13 @@ discard block |
||
| 701 | 701 | // Exam taken |
| 702 | 702 | $html .= '<td>'; |
| 703 | 703 | $html .= $taken; |
| 704 | - $globalRow[]= $taken; |
|
| 704 | + $globalRow[] = $taken; |
|
| 705 | 705 | $html .= '</td>'; |
| 706 | 706 | |
| 707 | 707 | // Exam NOT taken |
| 708 | 708 | $html .= '<td>'; |
| 709 | 709 | $html .= $not_taken = $totalStudents - $taken; |
| 710 | - $globalRow[]= $not_taken; |
|
| 710 | + $globalRow[] = $not_taken; |
|
| 711 | 711 | $html .= '</td>'; |
| 712 | 712 | |
| 713 | 713 | // Exam pass |
@@ -718,19 +718,19 @@ discard block |
||
| 718 | 718 | } |
| 719 | 719 | |
| 720 | 720 | $html .= $total_with_parameter_score; |
| 721 | - $globalRow[]= $total_with_parameter_score; |
|
| 721 | + $globalRow[] = $total_with_parameter_score; |
|
| 722 | 722 | $html .= '</td>'; |
| 723 | 723 | |
| 724 | 724 | // Exam fail |
| 725 | 725 | $html .= '<td>'; |
| 726 | 726 | |
| 727 | 727 | $html .= $fail = $taken - $total_with_parameter_score; |
| 728 | - $globalRow[]= $fail; |
|
| 728 | + $globalRow[] = $fail; |
|
| 729 | 729 | $html .= '</td>'; |
| 730 | 730 | |
| 731 | 731 | $html .= '<td>'; |
| 732 | 732 | $html .= $totalStudents; |
| 733 | - $globalRow[]= $totalStudents; |
|
| 733 | + $globalRow[] = $totalStudents; |
|
| 734 | 734 | |
| 735 | 735 | $html .= '</td>'; |
| 736 | 736 | |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | // getting all the students of the course |
| 80 | 80 | if (empty($session_id)) { |
| 81 | - // Registered students in a course outside session. |
|
| 81 | + // Registered students in a course outside session. |
|
| 82 | 82 | $a_students = CourseManager:: get_student_list_from_course_code( |
| 83 | 83 | api_get_course_id(), |
| 84 | 84 | false, |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | api_get_group_id() |
| 90 | 90 | ); |
| 91 | 91 | } else { |
| 92 | - // Registered students in session. |
|
| 92 | + // Registered students in session. |
|
| 93 | 93 | $a_students = CourseManager:: get_student_list_from_course_code( |
| 94 | 94 | api_get_course_id(), |
| 95 | 95 | true, |
@@ -65,8 +65,8 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | // Breadcrumbs. |
| 67 | 67 | if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') { |
| 68 | - $interbreadcrumb[] = array('url' => '../admin/index.php','name' => get_lang('PlatformAdmin')); |
|
| 69 | - $interbreadcrumb[] = array('url' => '../session/session_list.php','name' => get_lang('SessionList')); |
|
| 68 | + $interbreadcrumb[] = array('url' => '../admin/index.php', 'name' => get_lang('PlatformAdmin')); |
|
| 69 | + $interbreadcrumb[] = array('url' => '../session/session_list.php', 'name' => get_lang('SessionList')); |
|
| 70 | 70 | $interbreadcrumb[] = array('url' => '../session/resume_session.php?id_session='.api_get_session_id(), 'name' => get_lang('SessionOverview')); |
| 71 | 71 | } |
| 72 | 72 | |
@@ -134,10 +134,10 @@ discard block |
||
| 134 | 134 | |
| 135 | 135 | echo '<span style="float:right; padding-top:0px;">'; |
| 136 | 136 | echo '<a href="javascript: void(0);" onclick="javascript: window.print();">'. |
| 137 | - Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 137 | + Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
| 138 | 138 | |
| 139 | 139 | echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&id_session='.api_get_session_id().'&export=csv"> |
| 140 | - '.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 140 | + '.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
| 141 | 141 | |
| 142 | 142 | echo '</span>'; |
| 143 | 143 | echo '</div>'; |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | $quiz_avg_score = round(($quiz_avg_score / $studentCount), 2).'%'; |
| 251 | 251 | $url = api_get_path( |
| 252 | 252 | WEB_CODE_PATH |
| 253 | - ) . 'exercise/overview.php?exerciseId='.$quiz['id'].$course_path_params; |
|
| 253 | + ).'exercise/overview.php?exerciseId='.$quiz['id'].$course_path_params; |
|
| 254 | 254 | |
| 255 | 255 | echo '<tr><td>'.Display::url( |
| 256 | 256 | $quiz['title'], |
@@ -111,7 +111,7 @@ |
||
| 111 | 111 | get_lang('HideColumn'), |
| 112 | 112 | array('align' => 'absmiddle', 'hspace' => '3px'), |
| 113 | 113 | ICON_SIZE_SMALL |
| 114 | - ) . "</div>' |
|
| 114 | + ) . "</div>' |
|
| 115 | 115 | ); |
| 116 | 116 | } |
| 117 | 117 | ); |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | get_lang('HideColumn'), |
| 113 | 113 | array('align' => 'absmiddle', 'hspace' => '3px'), |
| 114 | 114 | ICON_SIZE_SMALL |
| 115 | - ) . "</div>' |
|
| 115 | + )."</div>' |
|
| 116 | 116 | ); |
| 117 | 117 | } |
| 118 | 118 | ); |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | $TABLETRACK_LINKS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_LINKS); |
| 148 | 148 | $TABLETRACK_DOWNLOADS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS); |
| 149 | 149 | $TABLETRACK_ACCESS_2 = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS); |
| 150 | -$TABLETRACK_EXERCISES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES); |
|
| 150 | +$TABLETRACK_EXERCISES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES); |
|
| 151 | 151 | $TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER); |
| 152 | 152 | $TABLECOURSE = Database::get_main_table(TABLE_MAIN_COURSE); |
| 153 | 153 | $table_user = Database::get_main_table(TABLE_MAIN_USER); |
@@ -157,8 +157,8 @@ discard block |
||
| 157 | 157 | |
| 158 | 158 | // Breadcrumbs. |
| 159 | 159 | if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') { |
| 160 | - $interbreadcrumb[] = array('url' => '../admin/index.php','name' => get_lang('PlatformAdmin')); |
|
| 161 | - $interbreadcrumb[] = array('url' => '../session/session_list.php','name' => get_lang('SessionList')); |
|
| 160 | + $interbreadcrumb[] = array('url' => '../admin/index.php', 'name' => get_lang('PlatformAdmin')); |
|
| 161 | + $interbreadcrumb[] = array('url' => '../session/session_list.php', 'name' => get_lang('SessionList')); |
|
| 162 | 162 | $interbreadcrumb[] = array('url' => '../session/resume_session.php?id_session='.$sessionId, 'name' => get_lang('SessionOverview')); |
| 163 | 163 | } |
| 164 | 164 | |
@@ -229,21 +229,21 @@ discard block |
||
| 229 | 229 | if (!empty($sessionId)) { |
| 230 | 230 | $actionsLeft .= Display::url( |
| 231 | 231 | Display::return_icon('attendance_list.png', get_lang('Logins'), '', ICON_SIZE_MEDIUM), |
| 232 | - api_get_path(WEB_CODE_PATH) . 'attendance/index.php?' . api_get_cidreq() . '&action=calendar_logins' |
|
| 232 | + api_get_path(WEB_CODE_PATH).'attendance/index.php?'.api_get_cidreq().'&action=calendar_logins' |
|
| 233 | 233 | ); |
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | $actionsRight = '<div class="pull-right">'; |
| 237 | 237 | $actionsRight .= '<a href="javascript: void(0);" onclick="javascript: window.print();">'. |
| 238 | - Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 238 | + Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
| 239 | 239 | |
| 240 | 240 | $addional_param = ''; |
| 241 | 241 | if (isset($_GET['additional_profile_field'])) { |
| 242 | - $addional_param ='additional_profile_field='.intval($_GET['additional_profile_field']); |
|
| 242 | + $addional_param = 'additional_profile_field='.intval($_GET['additional_profile_field']); |
|
| 243 | 243 | } |
| 244 | 244 | $users_tracking_per_page = ''; |
| 245 | 245 | if (isset($_GET['users_tracking_per_page'])) { |
| 246 | - $users_tracking_per_page= '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']); |
|
| 246 | + $users_tracking_per_page = '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']); |
|
| 247 | 247 | } |
| 248 | 248 | $actionsRight .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&export=csv&'.$addional_param.$users_tracking_per_page.'"> |
| 249 | 249 | '.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>'; |
@@ -264,13 +264,13 @@ discard block |
||
| 264 | 264 | $form_search->addButtonSearch(get_lang('SearchUsers')); |
| 265 | 265 | |
| 266 | 266 | |
| 267 | -echo Display::toolbarAction('toolbar-courselog', array( 0 => $actionsLeft, 1 => $form_search->returnForm(), 2 => $actionsRight ), 3); |
|
| 267 | +echo Display::toolbarAction('toolbar-courselog', array(0 => $actionsLeft, 1 => $form_search->returnForm(), 2 => $actionsRight), 3); |
|
| 268 | 268 | |
| 269 | 269 | $course_name = get_lang('Course').' '.$courseInfo['name']; |
| 270 | 270 | |
| 271 | 271 | if ($session_id) { |
| 272 | 272 | $titleSession = Display::return_icon('session.png', get_lang('Session'), array(), ICON_SIZE_SMALL).' '.api_get_session_name($session_id); |
| 273 | - $titleCourse = Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_name; |
|
| 273 | + $titleCourse = Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$course_name; |
|
| 274 | 274 | |
| 275 | 275 | } else { |
| 276 | 276 | $titleSession = Display::return_icon('course.png', get_lang('Course'), array(), ICON_SIZE_SMALL).' '.$courseInfo['name']; |
@@ -312,7 +312,7 @@ discard block |
||
| 312 | 312 | $html .= '<ul class="session-list">'; |
| 313 | 313 | foreach ($sessionList as $session) { |
| 314 | 314 | $url = api_get_path(WEB_CODE_PATH).'mySpace/course.php?session_id='.$session['id'].'&cidReq='.$courseInfo['code']; |
| 315 | - $html .= Display::tag('li', $iconCourse . ' ' . Display::url($session['name'], $url)); |
|
| 315 | + $html .= Display::tag('li', $iconCourse.' '.Display::url($session['name'], $url)); |
|
| 316 | 316 | } |
| 317 | 317 | $html .= '</ul>'; |
| 318 | 318 | } |
@@ -327,12 +327,12 @@ discard block |
||
| 327 | 327 | $form = new FormValidator( |
| 328 | 328 | 'reminder_form', |
| 329 | 329 | 'get', |
| 330 | - api_get_path(WEB_CODE_PATH).'announcements/announcements.php?' . api_get_cidreq(), |
|
| 330 | + api_get_path(WEB_CODE_PATH).'announcements/announcements.php?'.api_get_cidreq(), |
|
| 331 | 331 | null, |
| 332 | 332 | ['style' => 'margin-bottom: 10px'], |
| 333 | 333 | FormValidator::LAYOUT_INLINE |
| 334 | 334 | ); |
| 335 | - $options = array ( |
|
| 335 | + $options = array( |
|
| 336 | 336 | 2 => sprintf($getLangXDays, 2), |
| 337 | 337 | 3 => sprintf($getLangXDays, 3), |
| 338 | 338 | 4 => sprintf($getLangXDays, 4), |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | ); |
| 346 | 346 | $el = $form->addSelect( |
| 347 | 347 | 'since', |
| 348 | - Display::returnFontAwesomeIcon('warning') . get_lang('RemindInactivesLearnersSince'), |
|
| 348 | + Display::returnFontAwesomeIcon('warning').get_lang('RemindInactivesLearnersSince'), |
|
| 349 | 349 | $options, |
| 350 | 350 | ['class' => 'col-sm-3'] |
| 351 | 351 | ); |
@@ -45,8 +45,8 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | // Breadcrumbs. |
| 47 | 47 | if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') { |
| 48 | - $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'admin/index.php','name' => get_lang('PlatformAdmin')); |
|
| 49 | - $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'session/session_list.php','name' => get_lang('SessionList')); |
|
| 48 | + $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'admin/index.php', 'name' => get_lang('PlatformAdmin')); |
|
| 49 | + $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'session/session_list.php', 'name' => get_lang('SessionList')); |
|
| 50 | 50 | $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'session/resume_session.php?id_session='.api_get_session_id(), 'name' => get_lang('SessionOverview')); |
| 51 | 51 | } |
| 52 | 52 | |
@@ -76,21 +76,21 @@ discard block |
||
| 76 | 76 | echo Display::return_icon('tools_na.png', get_lang('ResourcesTracking'), array(), ICON_SIZE_MEDIUM); |
| 77 | 77 | echo '<span style="float:right; padding-top:0px;">'; |
| 78 | 78 | echo '<a href="javascript: void(0);" onclick="javascript: window.print();">'. |
| 79 | - Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM). |
|
| 79 | + Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM). |
|
| 80 | 80 | '</a>'; |
| 81 | 81 | |
| 82 | 82 | $addional_param = ''; |
| 83 | 83 | if (isset($_GET['additional_profile_field'])) { |
| 84 | - $addional_param ='additional_profile_field='.intval($_GET['additional_profile_field']); |
|
| 84 | + $addional_param = 'additional_profile_field='.intval($_GET['additional_profile_field']); |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | $users_tracking_per_page = ''; |
| 88 | 88 | if (isset($_GET['users_tracking_per_page'])) { |
| 89 | - $users_tracking_per_page= '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']); |
|
| 89 | + $users_tracking_per_page = '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&export=csv&'.$addional_param.$users_tracking_per_page.'"> |
| 93 | -'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a>'; |
|
| 93 | +'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>'; |
|
| 94 | 94 | |
| 95 | 95 | echo '</span>'; |
| 96 | 96 | echo '</div>'; |
@@ -53,16 +53,16 @@ discard block |
||
| 53 | 53 | if ($view == "00000010") |
| 54 | 54 | $nameTools = get_lang('ScormAccess'); |
| 55 | 55 | |
| 56 | -$interbreadcrumb[] = array("url" => api_get_self() . "?view=0000000", "name" => get_lang('ToolName')); |
|
| 56 | +$interbreadcrumb[] = array("url" => api_get_self()."?view=0000000", "name" => get_lang('ToolName')); |
|
| 57 | 57 | |
| 58 | -include(api_get_path(LIBRARY_PATH) . "statsUtils.lib.inc.php"); |
|
| 58 | +include(api_get_path(LIBRARY_PATH)."statsUtils.lib.inc.php"); |
|
| 59 | 59 | include("../resourcelinker/resourcelinker.inc.php"); |
| 60 | 60 | |
| 61 | 61 | $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || api_is_drh(); |
| 62 | 62 | |
| 63 | 63 | /* MAIN CODE */ |
| 64 | 64 | |
| 65 | -$title[0] = get_lang('StatsOfCourse') . " : " . $_course['official_code']; |
|
| 65 | +$title[0] = get_lang('StatsOfCourse')." : ".$_course['official_code']; |
|
| 66 | 66 | |
| 67 | 67 | |
| 68 | 68 | $courseInfo = api_get_course_info($_course['official_code']); |
@@ -94,40 +94,40 @@ discard block |
||
| 94 | 94 | $sql = "SELECT $TABLECOURSUSER.user_i, $table_user.lastname, $table_user.firstname |
| 95 | 95 | FROM $TABLECOURSUSER, $table_user |
| 96 | 96 | WHERE |
| 97 | - $TABLECOURSUSER.c_id = '" . api_get_course_int_id() . "' AND |
|
| 97 | + $TABLECOURSUSER.c_id = '".api_get_course_int_id()."' AND |
|
| 98 | 98 | $TABLECOURSUSER.user_id = $table_user.user_id AND |
| 99 | - $TABLECOURSUSER.relation_type<>" . COURSE_RELATION_TYPE_RRHH . " |
|
| 99 | + $TABLECOURSUSER.relation_type<>".COURSE_RELATION_TYPE_RRHH." |
|
| 100 | 100 | ORDER BY $table_user.lastname"; |
| 101 | 101 | $results = StatsUtils::getManyResults3Col($sql); |
| 102 | 102 | |
| 103 | 103 | //BUGFIX: get visual code instead of real course code. Scormpaths use the visual code... (should be fixed in future versions) |
| 104 | - $sql = "SELECT visual_code FROM $TABLECOURSE WHERE code = '" . api_get_course_id() . "'"; |
|
| 104 | + $sql = "SELECT visual_code FROM $TABLECOURSE WHERE code = '".api_get_course_id()."'"; |
|
| 105 | 105 | $_course['visual_code'] = StatsUtils::getOneResult($sql); |
| 106 | 106 | |
| 107 | 107 | if (is_array($results)) { |
| 108 | 108 | $line = ''; |
| 109 | - $title_line = get_lang('Name') . ";" . get_lang('FirstAccess') . ";" . get_lang('LastAccess') . ";" . get_lang('Visited') . "\n"; |
|
| 109 | + $title_line = get_lang('Name').";".get_lang('FirstAccess').";".get_lang('LastAccess').";".get_lang('Visited')."\n"; |
|
| 110 | 110 | |
| 111 | 111 | for ($j = 0; $j < count($results); $j++) { |
| 112 | 112 | // BEGIN % visited |
| 113 | 113 | // sum of all items (= multiple learningpaths + SCORM imported paths) |
| 114 | - $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) FROM $tbl_learnpath_item_view iv " . |
|
| 114 | + $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) FROM $tbl_learnpath_item_view iv ". |
|
| 115 | 115 | "INNER JOIN $tbl_learnpath_view v |
| 116 | - ON iv.lp_view_id = v.id " . |
|
| 116 | + ON iv.lp_view_id = v.id ". |
|
| 117 | 117 | "WHERE |
| 118 | 118 | v.c_id = $course_id AND |
| 119 | 119 | iv.c_id = $course_id AND |
| 120 | - v.user_id = " . $results[$j][0]; |
|
| 120 | + v.user_id = ".$results[$j][0]; |
|
| 121 | 121 | $total_lpath_items = StatsUtils::getOneResult($sql); |
| 122 | 122 | |
| 123 | 123 | // sum of all completed items (= multiple learningpaths + SCORM imported paths) |
| 124 | - $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) " . |
|
| 125 | - "FROM $tbl_learnpath_item_view iv " . |
|
| 126 | - "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id = v.id " . |
|
| 124 | + $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) ". |
|
| 125 | + "FROM $tbl_learnpath_item_view iv ". |
|
| 126 | + "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id = v.id ". |
|
| 127 | 127 | "WHERE |
| 128 | 128 | v.c_id = $course_id AND |
| 129 | 129 | iv.c_id = $course_id AND |
| 130 | - v.user_id = " . $results[$j][0] . " " . |
|
| 130 | + v.user_id = ".$results[$j][0]." ". |
|
| 131 | 131 | "AND (status = 'completed' OR status='passed')"; |
| 132 | 132 | $total_lpath_items_completed = StatsUtils::getOneResult($sql); |
| 133 | 133 | |
@@ -138,23 +138,23 @@ discard block |
||
| 138 | 138 | // BEGIN first/last access |
| 139 | 139 | // first access |
| 140 | 140 | $sql = "SELECT access_date FROM $TABLETRACK_ACCESS_2 |
| 141 | - WHERE access_user_id = '" . $results[$j][0] . "' AND c_id = '" . $courseId . "' AND access_tool = 'learnpath' AND access_session_id = '" . api_get_session_id() . "' |
|
| 141 | + WHERE access_user_id = '".$results[$j][0]."' AND c_id = '".$courseId."' AND access_tool = 'learnpath' AND access_session_id = '".api_get_session_id()."' |
|
| 142 | 142 | ORDER BY access_id ASC LIMIT 1"; |
| 143 | 143 | $first_access = StatsUtils::getOneResult($sql); |
| 144 | 144 | $first_access = empty($first_access) ? "-" : date('d.m.y', strtotime($first_access)); |
| 145 | 145 | |
| 146 | 146 | // last access |
| 147 | - $sql = "SELECT access_date FROM $TABLETRACK_ACCESS WHERE access_user_id = '" . $results[$j][0] . "' AND c_id = '" . $courseId . "' AND access_tool = 'learnpath'"; |
|
| 147 | + $sql = "SELECT access_date FROM $TABLETRACK_ACCESS WHERE access_user_id = '".$results[$j][0]."' AND c_id = '".$courseId."' AND access_tool = 'learnpath'"; |
|
| 148 | 148 | $last_access = StatsUtils::getOneResult($sql); |
| 149 | 149 | $last_access = empty($last_access) ? "-" : date('d.m.y', strtotime($last_access)); |
| 150 | 150 | // END first/last access |
| 151 | 151 | // BEGIN presentation of data |
| 152 | - $line .= $results[$j][1] . " " . $results[$j][2] . ";" . $first_access . ";" . $last_access . ";" . $lpath_pct_completed . "\n"; |
|
| 152 | + $line .= $results[$j][1]." ".$results[$j][2].";".$first_access.";".$last_access.";".$lpath_pct_completed."\n"; |
|
| 153 | 153 | |
| 154 | 154 | // END presentation of data |
| 155 | 155 | } |
| 156 | 156 | } else { |
| 157 | - $line = get_lang('NoResult') . "\n"; |
|
| 157 | + $line = get_lang('NoResult')."\n"; |
|
| 158 | 158 | } |
| 159 | 159 | } |
| 160 | 160 | |
@@ -166,9 +166,9 @@ discard block |
||
| 166 | 166 | |
| 167 | 167 | $sql = "SELECT count(*) |
| 168 | 168 | FROM $TABLECOURSUSER |
| 169 | - WHERE c_id = '" . api_get_course_int_id() . "' AND relation_type<>" . COURSE_RELATION_TYPE_RRHH . ""; |
|
| 169 | + WHERE c_id = '".api_get_course_int_id()."' AND relation_type<>".COURSE_RELATION_TYPE_RRHH.""; |
|
| 170 | 170 | $count = StatsUtils::getOneResult($sql); |
| 171 | - $title_line = get_lang('CountUsers') . " ; " . $count . "\n"; |
|
| 171 | + $title_line = get_lang('CountUsers')." ; ".$count."\n"; |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | /* Access to this course */ |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | AND access_tool IS NULL"; |
| 187 | 187 | $count = StatsUtils::getOneResult($sql); |
| 188 | 188 | |
| 189 | - $line .= get_lang('CountToolAccess') . " ; " . $count . "\n"; |
|
| 189 | + $line .= get_lang('CountToolAccess')." ; ".$count."\n"; |
|
| 190 | 190 | |
| 191 | 191 | // last 31 days |
| 192 | 192 | $sql = "SELECT count(*) |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | AND access_tool IS NULL"; |
| 197 | 197 | $count = StatsUtils::getOneResult($sql); |
| 198 | 198 | |
| 199 | - $line .= get_lang('Last31days') . " ; " . $count . "\n"; |
|
| 199 | + $line .= get_lang('Last31days')." ; ".$count."\n"; |
|
| 200 | 200 | |
| 201 | 201 | // last 7 days |
| 202 | 202 | $sql = "SELECT count(*) |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | AND access_tool IS NULL"; |
| 207 | 207 | $count = StatsUtils::getOneResult($sql); |
| 208 | 208 | |
| 209 | - $line .= get_lang('Last7days') . " ; " . $count . "\n"; |
|
| 209 | + $line .= get_lang('Last7days')." ; ".$count."\n"; |
|
| 210 | 210 | |
| 211 | 211 | // today |
| 212 | 212 | $sql = "SELECT count(*) |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | AND ( access_date > CURDATE() ) |
| 216 | 216 | AND access_tool IS NULL"; |
| 217 | 217 | $count = StatsUtils::getOneResult($sql); |
| 218 | - $line .= get_lang('ThisDay') . " ; " . $count . "\n"; |
|
| 218 | + $line .= get_lang('ThisDay')." ; ".$count."\n"; |
|
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | /* Tools */ |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | $tempView[2] = '0'; |
| 225 | 225 | $title[1] = $nameTools; |
| 226 | 226 | $line = ''; |
| 227 | - $title_line = get_lang('ToolTitleToolnameColumn') . ";" . get_lang('ToolTitleUsersColumn') . ";" . get_lang('ToolTitleCountColumn') . "\n"; |
|
| 227 | + $title_line = get_lang('ToolTitleToolnameColumn').";".get_lang('ToolTitleUsersColumn').";".get_lang('ToolTitleCountColumn')."\n"; |
|
| 228 | 228 | |
| 229 | 229 | $sql = "SELECT access_tool, COUNT(DISTINCT access_user_id),count( access_tool ) |
| 230 | 230 | FROM $TABLETRACK_ACCESS |
@@ -236,10 +236,10 @@ discard block |
||
| 236 | 236 | |
| 237 | 237 | if (is_array($results)) { |
| 238 | 238 | for ($j = 0; $j < count($results); $j++) { |
| 239 | - $line .= $results[$j][0] . "/" . get_lang($results[$j][0]) . ";" . $results[$j][1] . ";" . $results[$j][2] . "\n"; |
|
| 239 | + $line .= $results[$j][0]."/".get_lang($results[$j][0]).";".$results[$j][1].";".$results[$j][2]."\n"; |
|
| 240 | 240 | } |
| 241 | 241 | } else { |
| 242 | - $line = get_lang('NoResult') . "\n"; |
|
| 242 | + $line = get_lang('NoResult')."\n"; |
|
| 243 | 243 | } |
| 244 | 244 | } |
| 245 | 245 | |
@@ -261,14 +261,14 @@ discard block |
||
| 261 | 261 | |
| 262 | 262 | $title[1] = $nameTools; |
| 263 | 263 | $line = ''; |
| 264 | - $title_line = get_lang('LinksTitleLinkColumn') . ";" . get_lang('LinksTitleUsersColumn') . ";" . get_lang('LinksTitleCountColumn') . "\n"; |
|
| 264 | + $title_line = get_lang('LinksTitleLinkColumn').";".get_lang('LinksTitleUsersColumn').";".get_lang('LinksTitleCountColumn')."\n"; |
|
| 265 | 265 | |
| 266 | 266 | if (is_array($results)) { |
| 267 | 267 | for ($j = 0; $j < count($results); $j++) { |
| 268 | - $line .= $results[$j][1] . "'>" . $results[$j][0] . ";" . $results[$j][2] . ";" . $results[$j][3] . "\n"; |
|
| 268 | + $line .= $results[$j][1]."'>".$results[$j][0].";".$results[$j][2].";".$results[$j][3]."\n"; |
|
| 269 | 269 | } |
| 270 | 270 | } else { |
| 271 | - $line = get_lang('NoResult') . "\n"; |
|
| 271 | + $line = get_lang('NoResult')."\n"; |
|
| 272 | 272 | } |
| 273 | 273 | } |
| 274 | 274 | |
@@ -287,13 +287,13 @@ discard block |
||
| 287 | 287 | |
| 288 | 288 | $title[1] = $nameTools; |
| 289 | 289 | $line = ''; |
| 290 | - $title_line = get_lang('DocumentsTitleDocumentColumn') . ";" . get_lang('DocumentsTitleUsersColumn') . ";" . get_lang('DocumentsTitleCountColumn') . "\n"; |
|
| 290 | + $title_line = get_lang('DocumentsTitleDocumentColumn').";".get_lang('DocumentsTitleUsersColumn').";".get_lang('DocumentsTitleCountColumn')."\n"; |
|
| 291 | 291 | if (is_array($results)) { |
| 292 | 292 | for ($j = 0; $j < count($results); $j++) { |
| 293 | - $line .= $results[$j][0] . ";" . $results[$j][1] . ";" . $results[$j][2] . "\n"; |
|
| 293 | + $line .= $results[$j][0].";".$results[$j][1].";".$results[$j][2]."\n"; |
|
| 294 | 294 | } |
| 295 | 295 | } else { |
| 296 | - $line = get_lang('NoResult') . "\n"; |
|
| 296 | + $line = get_lang('NoResult')."\n"; |
|
| 297 | 297 | } |
| 298 | 298 | } |
| 299 | 299 | |
@@ -321,10 +321,10 @@ discard block |
||
| 321 | 321 | //echo "<a href='".api_get_self()."?view=".$view."&scormcontopen=".$ar['id']."' class='specialLink'>$lp_title</a>"; |
| 322 | 322 | if ($ar['id'] == $scormcontopen) { //have to list the students here |
| 323 | 323 | $contentId = $ar['id']; |
| 324 | - $sql2 = "SELECT u.user_id, u.lastname, u.firstname " . |
|
| 325 | - "FROM $tbl_learnpath_view sd " . |
|
| 326 | - "INNER JOIN $table_user u " . |
|
| 327 | - "ON u.user_id = sd.user_id " . |
|
| 324 | + $sql2 = "SELECT u.user_id, u.lastname, u.firstname ". |
|
| 325 | + "FROM $tbl_learnpath_view sd ". |
|
| 326 | + "INNER JOIN $table_user u ". |
|
| 327 | + "ON u.user_id = sd.user_id ". |
|
| 328 | 328 | "WHERE sd.c_id = $course_id AND sd.lp_id=$contentId group by u.user_id"; |
| 329 | 329 | //error_log($sql2,0); |
| 330 | 330 | $result2 = Database::query($sql2); |
@@ -336,28 +336,28 @@ discard block |
||
| 336 | 336 | while ($ar2 != '') { |
| 337 | 337 | |
| 338 | 338 | if (isset($_REQUEST["scormstudentopen"]) && $ar2['user_id'] == $scormstudentopen) { |
| 339 | - $line .= $ar['id'] . " " . $ar2['user_id'] . " " . api_get_person_name($ar2['firstname'], $ar2['lastname']); |
|
| 339 | + $line .= $ar['id']." ".$ar2['user_id']." ".api_get_person_name($ar2['firstname'], $ar2['lastname']); |
|
| 340 | 340 | } else { |
| 341 | - $line .= $ar['id'] . " " . $ar2['user_id'] . " " . api_get_person_name($ar2['firstname'], $ar2['lastname']); |
|
| 341 | + $line .= $ar['id']." ".$ar2['user_id']." ".api_get_person_name($ar2['firstname'], $ar2['lastname']); |
|
| 342 | 342 | } |
| 343 | 343 | |
| 344 | 344 | if ($ar2['user_id'] == $scormstudentopen) { //have to list the student's results |
| 345 | 345 | $studentId = $ar2['user_id']; |
| 346 | - $sql3 = "SELECT iv.status, iv.score, i.title, iv.total_time " . |
|
| 347 | - "FROM $tbl_learnpath_item i " . |
|
| 348 | - "INNER JOIN $tbl_learnpath_item_view iv ON i.id=iv.lp_item_id " . |
|
| 349 | - "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id=v.id " . |
|
| 346 | + $sql3 = "SELECT iv.status, iv.score, i.title, iv.total_time ". |
|
| 347 | + "FROM $tbl_learnpath_item i ". |
|
| 348 | + "INNER JOIN $tbl_learnpath_item_view iv ON i.id=iv.lp_item_id ". |
|
| 349 | + "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id=v.id ". |
|
| 350 | 350 | "WHERE i.c_id = $course_id AND |
| 351 | 351 | iv.c_id = $course_id AND |
| 352 | 352 | v.c_id = $course_id AND |
| 353 | 353 | v.user_id=$studentId and v.lp_id=$contentId ORDER BY v.id, i.id"; |
| 354 | 354 | $result3 = Database::query($sql3); |
| 355 | 355 | $ar3 = Database::fetch_array($result3); |
| 356 | - $title_line .= get_lang('ScormTitleColumn') . ";" . get_lang('ScormStatusColumn') . ";" . get_lang('ScormScoreColumn') . ";" . get_lang('ScormTimeColumn'); |
|
| 356 | + $title_line .= get_lang('ScormTitleColumn').";".get_lang('ScormStatusColumn').";".get_lang('ScormScoreColumn').";".get_lang('ScormTimeColumn'); |
|
| 357 | 357 | while ($ar3['status'] != '') { |
| 358 | 358 | require_once '../newscorm/learnpathItem.class.php'; |
| 359 | 359 | $time = learnpathItem::getScormTimeFromParameter('php', $ar3['total_time']); |
| 360 | - $line .= $title . ";" . $ar3['status'] . ";" . $ar3['score'] . ";" . $time; |
|
| 360 | + $line .= $title.";".$ar3['status'].";".$ar3['score'].";".$time; |
|
| 361 | 361 | $ar3 = Database::fetch_array($result3); |
| 362 | 362 | } |
| 363 | 363 | } |
@@ -377,23 +377,23 @@ discard block |
||
| 377 | 377 | * Export to a CSV file |
| 378 | 378 | * Force the browser to save the file instead of opening it. |
| 379 | 379 | */ |
| 380 | - $len = strlen($title_line . $line); |
|
| 380 | + $len = strlen($title_line.$line); |
|
| 381 | 381 | header('Content-type: application/octet-stream'); |
| 382 | 382 | //header('Content-Type: application/force-download'); |
| 383 | - header('Content-length: ' . $len); |
|
| 384 | - $filename = api_html_entity_decode(str_replace(":", "", str_replace(" ", "_", $title[0] . '_' . $title[1] . '.csv'))); |
|
| 383 | + header('Content-length: '.$len); |
|
| 384 | + $filename = api_html_entity_decode(str_replace(":", "", str_replace(" ", "_", $title[0].'_'.$title[1].'.csv'))); |
|
| 385 | 385 | $filename = api_replace_dangerous_char($filename); |
| 386 | 386 | if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) { |
| 387 | - header('Content-Disposition: filename= ' . $filename); |
|
| 387 | + header('Content-Disposition: filename= '.$filename); |
|
| 388 | 388 | } else { |
| 389 | - header('Content-Disposition: attachment; filename= ' . $filename); |
|
| 389 | + header('Content-Disposition: attachment; filename= '.$filename); |
|
| 390 | 390 | } |
| 391 | 391 | if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) { |
| 392 | 392 | header('Pragma: '); |
| 393 | 393 | header('Cache-Control: '); |
| 394 | 394 | header('Cache-Control: public'); // IE cannot download from sessions without a cache |
| 395 | 395 | } |
| 396 | - header('Content-Description: ' . $filename); |
|
| 396 | + header('Content-Description: '.$filename); |
|
| 397 | 397 | header('Content-transfer-encoding: binary'); |
| 398 | 398 | |
| 399 | 399 | echo api_html_entity_decode($title_line, ENT_COMPAT); |
@@ -38,20 +38,27 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | $view = $_REQUEST['view']; |
| 40 | 40 | |
| 41 | -if ($view == "0000001") |
|
| 41 | +if ($view == "0000001") { |
|
| 42 | 42 | $nameTools = get_lang('SynthesisView'); |
| 43 | -if ($view == "1000000") |
|
| 43 | +} |
|
| 44 | +if ($view == "1000000") { |
|
| 44 | 45 | $nameTools = get_lang('CourseStats'); |
| 45 | -if ($view == "0100000") |
|
| 46 | +} |
|
| 47 | +if ($view == "0100000") { |
|
| 46 | 48 | $nameTools = get_lang('CourseAccess'); |
| 47 | -if ($view == "0010000") |
|
| 49 | +} |
|
| 50 | +if ($view == "0010000") { |
|
| 48 | 51 | $nameTools = get_lang('ToolsAccess'); |
| 49 | -if ($view == "0001000") |
|
| 52 | +} |
|
| 53 | +if ($view == "0001000") { |
|
| 50 | 54 | $nameTools = get_lang('LinksAccess'); |
| 51 | -if ($view == "0000100") |
|
| 55 | +} |
|
| 56 | +if ($view == "0000100") { |
|
| 52 | 57 | $nameTools = get_lang('DocumentsAccess'); |
| 53 | -if ($view == "00000010") |
|
| 58 | +} |
|
| 59 | +if ($view == "00000010") { |
|
| 54 | 60 | $nameTools = get_lang('ScormAccess'); |
| 61 | +} |
|
| 55 | 62 | |
| 56 | 63 | $interbreadcrumb[] = array("url" => api_get_self() . "?view=0000000", "name" => get_lang('ToolName')); |
| 57 | 64 | |
@@ -79,8 +86,9 @@ discard block |
||
| 79 | 86 | </div><br> |
| 80 | 87 | "; */ |
| 81 | 88 | |
| 82 | - if (!isset($view)) |
|
| 83 | - $view = "0000000"; |
|
| 89 | + if (!isset($view)) { |
|
| 90 | + $view = "0000000"; |
|
| 91 | + } |
|
| 84 | 92 | |
| 85 | 93 | |
| 86 | 94 | /* Reporting */ |
@@ -14,23 +14,23 @@ discard block |
||
| 14 | 14 | $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_courseCoach || $is_sessionAdmin; |
| 15 | 15 | |
| 16 | 16 | if (!$is_allowedToTrack) { |
| 17 | - api_not_allowed(true); |
|
| 17 | + api_not_allowed(true); |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | $export_to_xls = false; |
| 21 | 21 | if (isset($_GET['export'])) { |
| 22 | - $export_to_xls = true; |
|
| 22 | + $export_to_xls = true; |
|
| 23 | 23 | } |
| 24 | 24 | if (api_is_platform_admin() ) { |
| 25 | - $global = true; |
|
| 25 | + $global = true; |
|
| 26 | 26 | } else { |
| 27 | - $global = false; |
|
| 27 | + $global = false; |
|
| 28 | 28 | } |
| 29 | 29 | $global = true; |
| 30 | 30 | |
| 31 | 31 | $session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null; |
| 32 | 32 | if (empty($session_id)) { |
| 33 | - $session_id = 1; |
|
| 33 | + $session_id = 1; |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | $form = new FormValidator('search_simple','POST','','',null,false); |
@@ -39,10 +39,10 @@ discard block |
||
| 39 | 39 | $session_list = SessionManager::get_sessions_list(array(), array('name')); |
| 40 | 40 | $my_session_list = array(); |
| 41 | 41 | foreach($session_list as $sesion_item) { |
| 42 | - $my_session_list[$sesion_item['id']] = $sesion_item['name']; |
|
| 42 | + $my_session_list[$sesion_item['id']] = $sesion_item['name']; |
|
| 43 | 43 | } |
| 44 | 44 | if (count($session_list) == 0) { |
| 45 | - $my_session_list[0] = get_lang('None'); |
|
| 45 | + $my_session_list[0] = get_lang('None'); |
|
| 46 | 46 | } |
| 47 | 47 | $form->addElement('select', 'session_id', get_lang('Sessions'), $my_session_list); |
| 48 | 48 | $form->addButtonFilter(get_lang('Filter')); |
@@ -51,32 +51,32 @@ discard block |
||
| 51 | 51 | if (!empty($_REQUEST['session_id'])) $session_id = intval($_REQUEST['session_id']); else $session_id = 0; |
| 52 | 52 | |
| 53 | 53 | if (empty($session_id)) { |
| 54 | - $session_id = key($my_session_list); |
|
| 54 | + $session_id = key($my_session_list); |
|
| 55 | 55 | } |
| 56 | 56 | $form->setDefaults(array('session_id'=>$session_id)); |
| 57 | 57 | $course_list = SessionManager::get_course_list_by_session_id($session_id); |
| 58 | 58 | |
| 59 | 59 | if (!$export_to_xls) { |
| 60 | - Display :: display_header(get_lang("MySpace")); |
|
| 61 | - echo '<div class="actions">'; |
|
| 60 | + Display :: display_header(get_lang("MySpace")); |
|
| 61 | + echo '<div class="actions">'; |
|
| 62 | 62 | |
| 63 | - if ($global) { |
|
| 64 | - echo MySpace::getTopMenu(); |
|
| 65 | - } else { |
|
| 66 | - echo '<div style="float:left; clear:left"> |
|
| 63 | + if ($global) { |
|
| 64 | + echo MySpace::getTopMenu(); |
|
| 65 | + } else { |
|
| 66 | + echo '<div style="float:left; clear:left"> |
|
| 67 | 67 | <a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a> | |
| 68 | 68 | <a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.get_lang('CourseTracking').'</a> '; |
| 69 | - echo '</div>'; |
|
| 70 | - } |
|
| 71 | - echo '</div>'; |
|
| 69 | + echo '</div>'; |
|
| 70 | + } |
|
| 71 | + echo '</div>'; |
|
| 72 | 72 | |
| 73 | - if (api_is_platform_admin()) { |
|
| 74 | - echo MySpace::getAdminActions(); |
|
| 75 | - } |
|
| 73 | + if (api_is_platform_admin()) { |
|
| 74 | + echo MySpace::getAdminActions(); |
|
| 75 | + } |
|
| 76 | 76 | |
| 77 | - echo '<h2>'.get_lang('LPExerciseResultsBySession').'</h2>'; |
|
| 78 | - $form->display(); |
|
| 79 | - Display::display_normal_message(get_lang('StudentScoreAverageIsCalculatedBaseInAllLPsAndAllAttempts')); |
|
| 77 | + echo '<h2>'.get_lang('LPExerciseResultsBySession').'</h2>'; |
|
| 78 | + $form->display(); |
|
| 79 | + Display::display_normal_message(get_lang('StudentScoreAverageIsCalculatedBaseInAllLPsAndAllAttempts')); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | $users = SessionManager::get_users_by_session($session_id); |
@@ -86,15 +86,15 @@ discard block |
||
| 86 | 86 | $main_result = array(); |
| 87 | 87 | //Getting course list |
| 88 | 88 | foreach ($course_list as $current_course ) { |
| 89 | - $course_info = api_get_course_info($current_course['code']); |
|
| 90 | - $_course = $course_info; |
|
| 91 | - $attempt_result = array(); |
|
| 89 | + $course_info = api_get_course_info($current_course['code']); |
|
| 90 | + $_course = $course_info; |
|
| 91 | + $attempt_result = array(); |
|
| 92 | 92 | |
| 93 | - //Getting LP list |
|
| 94 | - $list = new LearnpathList('', $current_course['code'], $session_id); |
|
| 95 | - $lp_list = $list->get_flat_list(); |
|
| 93 | + //Getting LP list |
|
| 94 | + $list = new LearnpathList('', $current_course['code'], $session_id); |
|
| 95 | + $lp_list = $list->get_flat_list(); |
|
| 96 | 96 | |
| 97 | - // Looping LPs |
|
| 97 | + // Looping LPs |
|
| 98 | 98 | foreach ($lp_list as $lp_id =>$lp) { |
| 99 | 99 | $exercise_list = Event::get_all_exercises_from_lp($lp_id, $course_info['real_id']); |
| 100 | 100 | // Looping Chamilo Exercises in LP |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | } |
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | - $main_result[$current_course['code']] = $attempt_result; |
|
| 114 | + $main_result[$current_course['code']] = $attempt_result; |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | $total_average_score = 0; |
@@ -119,102 +119,102 @@ discard block |
||
| 119 | 119 | $html_result = ''; |
| 120 | 120 | if (!empty($users) && is_array($users)) { |
| 121 | 121 | |
| 122 | - $html_result .= '<table class="data_table">'; |
|
| 123 | - $html_result .= '<tr><th>'.get_lang('User').'</th>'; |
|
| 124 | - foreach($course_list as $item ) { |
|
| 125 | - $html_result .= '<th>'.$item['title'].'<br /> '.get_lang('AverageScore').' %</th>'; |
|
| 126 | - } |
|
| 127 | - $html_result .= '<th>'.get_lang('AverageScore').' %</th>'; |
|
| 128 | - $html_result .= '<th>'.get_lang('LastConnexionDate').'</th></tr>'; |
|
| 129 | - |
|
| 130 | - foreach ($users as $user) { |
|
| 131 | - $total_student = 0; |
|
| 132 | - $counter ++; |
|
| 133 | - $s_css_class = 'row_even'; |
|
| 134 | - if ($counter % 2 ==0 ) { |
|
| 135 | - $s_css_class = 'row_odd'; |
|
| 136 | - } |
|
| 137 | - $html_result .= "<tr class='$s_css_class'> |
|
| 122 | + $html_result .= '<table class="data_table">'; |
|
| 123 | + $html_result .= '<tr><th>'.get_lang('User').'</th>'; |
|
| 124 | + foreach($course_list as $item ) { |
|
| 125 | + $html_result .= '<th>'.$item['title'].'<br /> '.get_lang('AverageScore').' %</th>'; |
|
| 126 | + } |
|
| 127 | + $html_result .= '<th>'.get_lang('AverageScore').' %</th>'; |
|
| 128 | + $html_result .= '<th>'.get_lang('LastConnexionDate').'</th></tr>'; |
|
| 129 | + |
|
| 130 | + foreach ($users as $user) { |
|
| 131 | + $total_student = 0; |
|
| 132 | + $counter ++; |
|
| 133 | + $s_css_class = 'row_even'; |
|
| 134 | + if ($counter % 2 ==0 ) { |
|
| 135 | + $s_css_class = 'row_odd'; |
|
| 136 | + } |
|
| 137 | + $html_result .= "<tr class='$s_css_class'> |
|
| 138 | 138 | <td >"; |
| 139 | - $html_result .= $user['firstname'].' '.$user['lastname']; |
|
| 140 | - $html_result .= "</td>"; |
|
| 141 | - |
|
| 142 | - // Getting course list |
|
| 143 | - |
|
| 144 | - $counter = 0; |
|
| 145 | - $total_result_by_user = 0; |
|
| 146 | - foreach ($course_list as $current_course ) { |
|
| 147 | - $total_course = 0; |
|
| 148 | - $html_result .= "<td>"; |
|
| 149 | - |
|
| 150 | - |
|
| 151 | - $result = '-'; |
|
| 152 | - if (isset($main_result[$current_course['code']][$user['user_id']])) { |
|
| 153 | - $user_info_stat = $main_result[$current_course['code']][$user['user_id']]; |
|
| 154 | - if (!empty($user_info_stat['result']) && !empty($user_info_stat['attempts'])) { |
|
| 155 | - $result = round( |
|
| 156 | - $user_info_stat['result'] / $user_info_stat['attempts'] * 100, |
|
| 157 | - 2 |
|
| 158 | - ); |
|
| 159 | - $total_course += $result; |
|
| 160 | - $total_result_by_user += $result; |
|
| 161 | - $course_average[$current_course['code']] += $total_course; |
|
| 162 | - $course_average_counter[$current_course['code']]++; |
|
| 163 | - $result = $result . ' (' . $user_info_stat['attempts'] . ' ' . get_lang( |
|
| 164 | - 'Attempts' |
|
| 165 | - ) . ')'; |
|
| 166 | - $counter++; |
|
| 167 | - } |
|
| 168 | - } |
|
| 169 | - |
|
| 170 | - $html_result .= $result; |
|
| 171 | - $html_result .= "</td>"; |
|
| 172 | - } |
|
| 173 | - if (empty($counter)) { |
|
| 174 | - $total_student = '-'; |
|
| 175 | - } else { |
|
| 176 | - $total_student = $total_result_by_user/$counter; |
|
| 177 | - $total_average_score+=$total_student; |
|
| 178 | - $total_average_score_count++; |
|
| 179 | - } |
|
| 180 | - $string_date=Tracking :: get_last_connection_date($user['user_id'],true); |
|
| 181 | - $html_result .="<td>$total_student</td><td>$string_date</td></tr>"; |
|
| 182 | - } |
|
| 183 | - |
|
| 184 | - $html_result .="<tr><th>".get_lang('AverageScore')."</th>"; |
|
| 185 | - $total_average = 0; |
|
| 186 | - $counter = 0; |
|
| 187 | - foreach($course_list as $course_item) { |
|
| 188 | - if (!empty($course_average_counter[$course_item['code']])) { |
|
| 189 | - $average_per_course = round( |
|
| 190 | - $course_average[$course_item['code']]/($course_average_counter[$course_item['code']]*100)*100, |
|
| 191 | - 2 |
|
| 192 | - ); |
|
| 193 | - } else { |
|
| 194 | - $average_per_course = '-'; |
|
| 195 | - } |
|
| 196 | - if (!empty($average_per_course)) { |
|
| 197 | - $counter++; |
|
| 198 | - } |
|
| 199 | - $total_average = $total_average + $average_per_course; |
|
| 200 | - $html_result .="<td>$average_per_course</td>"; |
|
| 201 | - } |
|
| 202 | - if (!empty($total_average_score_count)) { |
|
| 203 | - $total_average = round($total_average_score/($total_average_score_count*100)*100,2); |
|
| 204 | - } else { |
|
| 205 | - $total_average = '-'; |
|
| 206 | - } |
|
| 207 | - |
|
| 208 | - $html_result .='<td>'.$total_average.'</td>'; |
|
| 209 | - $html_result .="<td>-</td>"; |
|
| 210 | - $html_result .="</tr>"; |
|
| 211 | - $html_result .= '</table>'; |
|
| 139 | + $html_result .= $user['firstname'].' '.$user['lastname']; |
|
| 140 | + $html_result .= "</td>"; |
|
| 141 | + |
|
| 142 | + // Getting course list |
|
| 143 | + |
|
| 144 | + $counter = 0; |
|
| 145 | + $total_result_by_user = 0; |
|
| 146 | + foreach ($course_list as $current_course ) { |
|
| 147 | + $total_course = 0; |
|
| 148 | + $html_result .= "<td>"; |
|
| 149 | + |
|
| 150 | + |
|
| 151 | + $result = '-'; |
|
| 152 | + if (isset($main_result[$current_course['code']][$user['user_id']])) { |
|
| 153 | + $user_info_stat = $main_result[$current_course['code']][$user['user_id']]; |
|
| 154 | + if (!empty($user_info_stat['result']) && !empty($user_info_stat['attempts'])) { |
|
| 155 | + $result = round( |
|
| 156 | + $user_info_stat['result'] / $user_info_stat['attempts'] * 100, |
|
| 157 | + 2 |
|
| 158 | + ); |
|
| 159 | + $total_course += $result; |
|
| 160 | + $total_result_by_user += $result; |
|
| 161 | + $course_average[$current_course['code']] += $total_course; |
|
| 162 | + $course_average_counter[$current_course['code']]++; |
|
| 163 | + $result = $result . ' (' . $user_info_stat['attempts'] . ' ' . get_lang( |
|
| 164 | + 'Attempts' |
|
| 165 | + ) . ')'; |
|
| 166 | + $counter++; |
|
| 167 | + } |
|
| 168 | + } |
|
| 169 | + |
|
| 170 | + $html_result .= $result; |
|
| 171 | + $html_result .= "</td>"; |
|
| 172 | + } |
|
| 173 | + if (empty($counter)) { |
|
| 174 | + $total_student = '-'; |
|
| 175 | + } else { |
|
| 176 | + $total_student = $total_result_by_user/$counter; |
|
| 177 | + $total_average_score+=$total_student; |
|
| 178 | + $total_average_score_count++; |
|
| 179 | + } |
|
| 180 | + $string_date=Tracking :: get_last_connection_date($user['user_id'],true); |
|
| 181 | + $html_result .="<td>$total_student</td><td>$string_date</td></tr>"; |
|
| 182 | + } |
|
| 183 | + |
|
| 184 | + $html_result .="<tr><th>".get_lang('AverageScore')."</th>"; |
|
| 185 | + $total_average = 0; |
|
| 186 | + $counter = 0; |
|
| 187 | + foreach($course_list as $course_item) { |
|
| 188 | + if (!empty($course_average_counter[$course_item['code']])) { |
|
| 189 | + $average_per_course = round( |
|
| 190 | + $course_average[$course_item['code']]/($course_average_counter[$course_item['code']]*100)*100, |
|
| 191 | + 2 |
|
| 192 | + ); |
|
| 193 | + } else { |
|
| 194 | + $average_per_course = '-'; |
|
| 195 | + } |
|
| 196 | + if (!empty($average_per_course)) { |
|
| 197 | + $counter++; |
|
| 198 | + } |
|
| 199 | + $total_average = $total_average + $average_per_course; |
|
| 200 | + $html_result .="<td>$average_per_course</td>"; |
|
| 201 | + } |
|
| 202 | + if (!empty($total_average_score_count)) { |
|
| 203 | + $total_average = round($total_average_score/($total_average_score_count*100)*100,2); |
|
| 204 | + } else { |
|
| 205 | + $total_average = '-'; |
|
| 206 | + } |
|
| 207 | + |
|
| 208 | + $html_result .='<td>'.$total_average.'</td>'; |
|
| 209 | + $html_result .="<td>-</td>"; |
|
| 210 | + $html_result .="</tr>"; |
|
| 211 | + $html_result .= '</table>'; |
|
| 212 | 212 | } else { |
| 213 | - Display::display_warning_message(get_lang('NoResults')); |
|
| 213 | + Display::display_warning_message(get_lang('NoResults')); |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | if (!$export_to_xls) { |
| 217 | - echo $html_result; |
|
| 217 | + echo $html_result; |
|
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | Display :: display_footer(); |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | if (isset($_GET['export'])) { |
| 22 | 22 | $export_to_xls = true; |
| 23 | 23 | } |
| 24 | -if (api_is_platform_admin() ) { |
|
| 24 | +if (api_is_platform_admin()) { |
|
| 25 | 25 | $global = true; |
| 26 | 26 | } else { |
| 27 | 27 | $global = false; |
@@ -30,15 +30,15 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | $session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null; |
| 32 | 32 | if (empty($session_id)) { |
| 33 | - $session_id = 1; |
|
| 33 | + $session_id = 1; |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | -$form = new FormValidator('search_simple','POST','','',null,false); |
|
| 36 | +$form = new FormValidator('search_simple', 'POST', '', '', null, false); |
|
| 37 | 37 | |
| 38 | 38 | //Get session list |
| 39 | 39 | $session_list = SessionManager::get_sessions_list(array(), array('name')); |
| 40 | 40 | $my_session_list = array(); |
| 41 | -foreach($session_list as $sesion_item) { |
|
| 41 | +foreach ($session_list as $sesion_item) { |
|
| 42 | 42 | $my_session_list[$sesion_item['id']] = $sesion_item['name']; |
| 43 | 43 | } |
| 44 | 44 | if (count($session_list) == 0) { |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | } |
| 71 | 71 | echo '</div>'; |
| 72 | 72 | |
| 73 | - if (api_is_platform_admin()) { |
|
| 73 | + if (api_is_platform_admin()) { |
|
| 74 | 74 | echo MySpace::getAdminActions(); |
| 75 | 75 | } |
| 76 | 76 | |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | $counter = 0; |
| 86 | 86 | $main_result = array(); |
| 87 | 87 | //Getting course list |
| 88 | -foreach ($course_list as $current_course ) { |
|
| 88 | +foreach ($course_list as $current_course) { |
|
| 89 | 89 | $course_info = api_get_course_info($current_course['code']); |
| 90 | 90 | $_course = $course_info; |
| 91 | 91 | $attempt_result = array(); |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | |
| 122 | 122 | $html_result .= '<table class="data_table">'; |
| 123 | 123 | $html_result .= '<tr><th>'.get_lang('User').'</th>'; |
| 124 | - foreach($course_list as $item ) { |
|
| 124 | + foreach ($course_list as $item) { |
|
| 125 | 125 | $html_result .= '<th>'.$item['title'].'<br /> '.get_lang('AverageScore').' %</th>'; |
| 126 | 126 | } |
| 127 | 127 | $html_result .= '<th>'.get_lang('AverageScore').' %</th>'; |
@@ -129,9 +129,9 @@ discard block |
||
| 129 | 129 | |
| 130 | 130 | foreach ($users as $user) { |
| 131 | 131 | $total_student = 0; |
| 132 | - $counter ++; |
|
| 132 | + $counter++; |
|
| 133 | 133 | $s_css_class = 'row_even'; |
| 134 | - if ($counter % 2 ==0 ) { |
|
| 134 | + if ($counter % 2 == 0) { |
|
| 135 | 135 | $s_css_class = 'row_odd'; |
| 136 | 136 | } |
| 137 | 137 | $html_result .= "<tr class='$s_css_class'> |
@@ -143,12 +143,12 @@ discard block |
||
| 143 | 143 | |
| 144 | 144 | $counter = 0; |
| 145 | 145 | $total_result_by_user = 0; |
| 146 | - foreach ($course_list as $current_course ) { |
|
| 146 | + foreach ($course_list as $current_course) { |
|
| 147 | 147 | $total_course = 0; |
| 148 | 148 | $html_result .= "<td>"; |
| 149 | 149 | |
| 150 | 150 | |
| 151 | - $result = '-'; |
|
| 151 | + $result = '-'; |
|
| 152 | 152 | if (isset($main_result[$current_course['code']][$user['user_id']])) { |
| 153 | 153 | $user_info_stat = $main_result[$current_course['code']][$user['user_id']]; |
| 154 | 154 | if (!empty($user_info_stat['result']) && !empty($user_info_stat['attempts'])) { |
@@ -160,9 +160,9 @@ discard block |
||
| 160 | 160 | $total_result_by_user += $result; |
| 161 | 161 | $course_average[$current_course['code']] += $total_course; |
| 162 | 162 | $course_average_counter[$current_course['code']]++; |
| 163 | - $result = $result . ' (' . $user_info_stat['attempts'] . ' ' . get_lang( |
|
| 163 | + $result = $result.' ('.$user_info_stat['attempts'].' '.get_lang( |
|
| 164 | 164 | 'Attempts' |
| 165 | - ) . ')'; |
|
| 165 | + ).')'; |
|
| 166 | 166 | $counter++; |
| 167 | 167 | } |
| 168 | 168 | } |
@@ -173,21 +173,21 @@ discard block |
||
| 173 | 173 | if (empty($counter)) { |
| 174 | 174 | $total_student = '-'; |
| 175 | 175 | } else { |
| 176 | - $total_student = $total_result_by_user/$counter; |
|
| 177 | - $total_average_score+=$total_student; |
|
| 176 | + $total_student = $total_result_by_user / $counter; |
|
| 177 | + $total_average_score += $total_student; |
|
| 178 | 178 | $total_average_score_count++; |
| 179 | 179 | } |
| 180 | - $string_date=Tracking :: get_last_connection_date($user['user_id'],true); |
|
| 181 | - $html_result .="<td>$total_student</td><td>$string_date</td></tr>"; |
|
| 180 | + $string_date = Tracking :: get_last_connection_date($user['user_id'], true); |
|
| 181 | + $html_result .= "<td>$total_student</td><td>$string_date</td></tr>"; |
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | - $html_result .="<tr><th>".get_lang('AverageScore')."</th>"; |
|
| 184 | + $html_result .= "<tr><th>".get_lang('AverageScore')."</th>"; |
|
| 185 | 185 | $total_average = 0; |
| 186 | 186 | $counter = 0; |
| 187 | - foreach($course_list as $course_item) { |
|
| 187 | + foreach ($course_list as $course_item) { |
|
| 188 | 188 | if (!empty($course_average_counter[$course_item['code']])) { |
| 189 | 189 | $average_per_course = round( |
| 190 | - $course_average[$course_item['code']]/($course_average_counter[$course_item['code']]*100)*100, |
|
| 190 | + $course_average[$course_item['code']] / ($course_average_counter[$course_item['code']] * 100) * 100, |
|
| 191 | 191 | 2 |
| 192 | 192 | ); |
| 193 | 193 | } else { |
@@ -197,17 +197,17 @@ discard block |
||
| 197 | 197 | $counter++; |
| 198 | 198 | } |
| 199 | 199 | $total_average = $total_average + $average_per_course; |
| 200 | - $html_result .="<td>$average_per_course</td>"; |
|
| 200 | + $html_result .= "<td>$average_per_course</td>"; |
|
| 201 | 201 | } |
| 202 | 202 | if (!empty($total_average_score_count)) { |
| 203 | - $total_average = round($total_average_score/($total_average_score_count*100)*100,2); |
|
| 203 | + $total_average = round($total_average_score / ($total_average_score_count * 100) * 100, 2); |
|
| 204 | 204 | } else { |
| 205 | 205 | $total_average = '-'; |
| 206 | 206 | } |
| 207 | 207 | |
| 208 | - $html_result .='<td>'.$total_average.'</td>'; |
|
| 209 | - $html_result .="<td>-</td>"; |
|
| 210 | - $html_result .="</tr>"; |
|
| 208 | + $html_result .= '<td>'.$total_average.'</td>'; |
|
| 209 | + $html_result .= "<td>-</td>"; |
|
| 210 | + $html_result .= "</tr>"; |
|
| 211 | 211 | $html_result .= '</table>'; |
| 212 | 212 | } else { |
| 213 | 213 | Display::display_warning_message(get_lang('NoResults')); |
@@ -47,8 +47,16 @@ |
||
| 47 | 47 | $form->addElement('select', 'session_id', get_lang('Sessions'), $my_session_list); |
| 48 | 48 | $form->addButtonFilter(get_lang('Filter')); |
| 49 | 49 | |
| 50 | -if (!empty($_REQUEST['score'])) $filter_score = intval($_REQUEST['score']); else $filter_score = 70; |
|
| 51 | -if (!empty($_REQUEST['session_id'])) $session_id = intval($_REQUEST['session_id']); else $session_id = 0; |
|
| 50 | +if (!empty($_REQUEST['score'])) { |
|
| 51 | + $filter_score = intval($_REQUEST['score']); |
|
| 52 | +} else { |
|
| 53 | + $filter_score = 70; |
|
| 54 | +} |
|
| 55 | +if (!empty($_REQUEST['session_id'])) { |
|
| 56 | + $session_id = intval($_REQUEST['session_id']); |
|
| 57 | +} else { |
|
| 58 | + $session_id = 0; |
|
| 59 | +} |
|
| 52 | 60 | |
| 53 | 61 | if (empty($session_id)) { |
| 54 | 62 | $session_id = key($my_session_list); |
