@@ -314,8 +314,8 @@ discard block |
||
| 314 | 314 | $extend_link = ''; |
| 315 | 315 | if (!empty($inter_num)) { |
| 316 | 316 | $extend_link = Display::url( |
| 317 | - Display::return_icon('visible.gif', get_lang('HideAttemptView')), |
|
| 318 | - api_get_self() . '?action=stats&fold_id=' . $my_item_id . $url_suffix |
|
| 317 | + Display::return_icon('visible.gif', get_lang('HideAttemptView')), |
|
| 318 | + api_get_self() . '?action=stats&fold_id=' . $my_item_id . $url_suffix |
|
| 319 | 319 | ); |
| 320 | 320 | } |
| 321 | 321 | $title = $row['mytitle']; |
@@ -1366,7 +1366,7 @@ discard block |
||
| 1366 | 1366 | $newDate = new DateTime('-30 days', new DateTimeZone('UTC')); |
| 1367 | 1367 | $condition_time = " AND (login_date >= '{$newDate->format('Y-m-d H:i:s')}'"; |
| 1368 | 1368 | $condition_time .= "AND logout_date <= '{$today->format('Y-m-d H:i:s')}') "; |
| 1369 | - break; |
|
| 1369 | + break; |
|
| 1370 | 1370 | case 'custom': |
| 1371 | 1371 | if (!empty($start_date) && !empty($end_date)) { |
| 1372 | 1372 | $start_date = Database::escape_string($start_date); |
@@ -1376,10 +1376,10 @@ discard block |
||
| 1376 | 1376 | break; |
| 1377 | 1377 | } |
| 1378 | 1378 | |
| 1379 | - $sql = 'SELECT SUM(TIMESTAMPDIFF(SECOND, login_date, logout_date)) diff |
|
| 1379 | + $sql = 'SELECT SUM(TIMESTAMPDIFF(SECOND, login_date, logout_date)) diff |
|
| 1380 | 1380 | FROM '.$tbl_track_login.' |
| 1381 | 1381 | WHERE '.$userCondition.$condition_time; |
| 1382 | - $rs = Database::query($sql); |
|
| 1382 | + $rs = Database::query($sql); |
|
| 1383 | 1383 | $row = Database::fetch_array($rs, 'ASSOC'); |
| 1384 | 1384 | $diff = $row['diff']; |
| 1385 | 1385 | |
@@ -1401,18 +1401,18 @@ discard block |
||
| 1401 | 1401 | public static function get_time_spent_on_the_course($user_id, $courseId, $session_id = 0) |
| 1402 | 1402 | { |
| 1403 | 1403 | $courseId = intval($courseId); |
| 1404 | - $session_id = intval($session_id); |
|
| 1405 | - |
|
| 1406 | - $tbl_track_course = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); |
|
| 1407 | - if (is_array($user_id)) { |
|
| 1408 | - $user_id = array_map('intval', $user_id); |
|
| 1409 | - $condition_user = " AND user_id IN (".implode(',',$user_id).") "; |
|
| 1410 | - } else { |
|
| 1411 | - $user_id = intval($user_id); |
|
| 1412 | - $condition_user = " AND user_id = $user_id "; |
|
| 1413 | - } |
|
| 1414 | - |
|
| 1415 | - $sql = "SELECT |
|
| 1404 | + $session_id = intval($session_id); |
|
| 1405 | + |
|
| 1406 | + $tbl_track_course = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); |
|
| 1407 | + if (is_array($user_id)) { |
|
| 1408 | + $user_id = array_map('intval', $user_id); |
|
| 1409 | + $condition_user = " AND user_id IN (".implode(',',$user_id).") "; |
|
| 1410 | + } else { |
|
| 1411 | + $user_id = intval($user_id); |
|
| 1412 | + $condition_user = " AND user_id = $user_id "; |
|
| 1413 | + } |
|
| 1414 | + |
|
| 1415 | + $sql = "SELECT |
|
| 1416 | 1416 | SUM(UNIX_TIMESTAMP(logout_course_date) - UNIX_TIMESTAMP(login_course_date)) as nb_seconds |
| 1417 | 1417 | FROM $tbl_track_course |
| 1418 | 1418 | WHERE UNIX_TIMESTAMP(logout_course_date) > UNIX_TIMESTAMP(login_course_date) "; |
@@ -1427,9 +1427,9 @@ discard block |
||
| 1427 | 1427 | |
| 1428 | 1428 | $sql .= $condition_user; |
| 1429 | 1429 | $rs = Database::query($sql); |
| 1430 | - $row = Database::fetch_array($rs); |
|
| 1430 | + $row = Database::fetch_array($rs); |
|
| 1431 | 1431 | |
| 1432 | - return $row['nb_seconds']; |
|
| 1432 | + return $row['nb_seconds']; |
|
| 1433 | 1433 | } |
| 1434 | 1434 | |
| 1435 | 1435 | /** |
@@ -1440,25 +1440,25 @@ discard block |
||
| 1440 | 1440 | */ |
| 1441 | 1441 | public static function get_first_connection_date($student_id) |
| 1442 | 1442 | { |
| 1443 | - $tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN); |
|
| 1444 | - $sql = 'SELECT login_date |
|
| 1443 | + $tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN); |
|
| 1444 | + $sql = 'SELECT login_date |
|
| 1445 | 1445 | FROM ' . $tbl_track_login . ' |
| 1446 | 1446 | WHERE login_user_id = ' . intval($student_id) . ' |
| 1447 | 1447 | ORDER BY login_date ASC |
| 1448 | 1448 | LIMIT 0,1'; |
| 1449 | 1449 | |
| 1450 | - $rs = Database::query($sql); |
|
| 1451 | - if (Database::num_rows($rs)>0) { |
|
| 1452 | - if ($first_login_date = Database::result($rs, 0, 0)) { |
|
| 1450 | + $rs = Database::query($sql); |
|
| 1451 | + if (Database::num_rows($rs)>0) { |
|
| 1452 | + if ($first_login_date = Database::result($rs, 0, 0)) { |
|
| 1453 | 1453 | return api_convert_and_format_date( |
| 1454 | 1454 | $first_login_date, |
| 1455 | 1455 | DATE_FORMAT_SHORT, |
| 1456 | 1456 | date_default_timezone_get() |
| 1457 | 1457 | ); |
| 1458 | - } |
|
| 1459 | - } |
|
| 1458 | + } |
|
| 1459 | + } |
|
| 1460 | 1460 | |
| 1461 | - return false; |
|
| 1461 | + return false; |
|
| 1462 | 1462 | } |
| 1463 | 1463 | |
| 1464 | 1464 | /** |
@@ -1471,38 +1471,38 @@ discard block |
||
| 1471 | 1471 | */ |
| 1472 | 1472 | public static function get_last_connection_date($student_id, $warning_message = false, $return_timestamp = false) |
| 1473 | 1473 | { |
| 1474 | - $table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN); |
|
| 1475 | - $sql = 'SELECT login_date |
|
| 1474 | + $table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN); |
|
| 1475 | + $sql = 'SELECT login_date |
|
| 1476 | 1476 | FROM ' . $table . ' |
| 1477 | 1477 | WHERE login_user_id = ' . intval($student_id) . ' |
| 1478 | 1478 | ORDER BY login_date |
| 1479 | 1479 | DESC LIMIT 0,1'; |
| 1480 | 1480 | |
| 1481 | - $rs = Database::query($sql); |
|
| 1482 | - if (Database::num_rows($rs) > 0) { |
|
| 1483 | - if ($last_login_date = Database::result($rs, 0, 0)) { |
|
| 1484 | - $last_login_date = api_get_local_time($last_login_date); |
|
| 1485 | - if ($return_timestamp) { |
|
| 1486 | - return api_strtotime($last_login_date,'UTC'); |
|
| 1487 | - } else { |
|
| 1488 | - if (!$warning_message) { |
|
| 1489 | - return api_format_date($last_login_date, DATE_FORMAT_SHORT); |
|
| 1490 | - } else { |
|
| 1491 | - $timestamp = api_strtotime($last_login_date,'UTC'); |
|
| 1492 | - $currentTimestamp = time(); |
|
| 1493 | - |
|
| 1494 | - //If the last connection is > than 7 days, the text is red |
|
| 1495 | - //345600 = 7 days in seconds |
|
| 1496 | - if ($currentTimestamp - $timestamp > 604800) { |
|
| 1497 | - return '<span style="color: #F00;">' . api_format_date($last_login_date, DATE_FORMAT_SHORT) . '</span>'; |
|
| 1498 | - } else { |
|
| 1499 | - return api_format_date($last_login_date, DATE_FORMAT_SHORT); |
|
| 1500 | - } |
|
| 1501 | - } |
|
| 1502 | - } |
|
| 1503 | - } |
|
| 1504 | - } |
|
| 1505 | - return false; |
|
| 1481 | + $rs = Database::query($sql); |
|
| 1482 | + if (Database::num_rows($rs) > 0) { |
|
| 1483 | + if ($last_login_date = Database::result($rs, 0, 0)) { |
|
| 1484 | + $last_login_date = api_get_local_time($last_login_date); |
|
| 1485 | + if ($return_timestamp) { |
|
| 1486 | + return api_strtotime($last_login_date,'UTC'); |
|
| 1487 | + } else { |
|
| 1488 | + if (!$warning_message) { |
|
| 1489 | + return api_format_date($last_login_date, DATE_FORMAT_SHORT); |
|
| 1490 | + } else { |
|
| 1491 | + $timestamp = api_strtotime($last_login_date,'UTC'); |
|
| 1492 | + $currentTimestamp = time(); |
|
| 1493 | + |
|
| 1494 | + //If the last connection is > than 7 days, the text is red |
|
| 1495 | + //345600 = 7 days in seconds |
|
| 1496 | + if ($currentTimestamp - $timestamp > 604800) { |
|
| 1497 | + return '<span style="color: #F00;">' . api_format_date($last_login_date, DATE_FORMAT_SHORT) . '</span>'; |
|
| 1498 | + } else { |
|
| 1499 | + return api_format_date($last_login_date, DATE_FORMAT_SHORT); |
|
| 1500 | + } |
|
| 1501 | + } |
|
| 1502 | + } |
|
| 1503 | + } |
|
| 1504 | + } |
|
| 1505 | + return false; |
|
| 1506 | 1506 | } |
| 1507 | 1507 | |
| 1508 | 1508 | /** |
@@ -1556,30 +1556,30 @@ discard block |
||
| 1556 | 1556 | $session_id = 0, |
| 1557 | 1557 | $convert_date = true |
| 1558 | 1558 | ) { |
| 1559 | - $student_id = intval($student_id); |
|
| 1559 | + $student_id = intval($student_id); |
|
| 1560 | 1560 | $courseId = intval($courseId); |
| 1561 | - $session_id = intval($session_id); |
|
| 1561 | + $session_id = intval($session_id); |
|
| 1562 | 1562 | |
| 1563 | - $tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); |
|
| 1564 | - $sql = 'SELECT login_course_date |
|
| 1563 | + $tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); |
|
| 1564 | + $sql = 'SELECT login_course_date |
|
| 1565 | 1565 | FROM '.$tbl_track_login.' |
| 1566 | 1566 | WHERE |
| 1567 | 1567 | user_id = '.$student_id.' AND |
| 1568 | 1568 | c_id = '.$courseId.' AND |
| 1569 | 1569 | session_id = '.$session_id.' |
| 1570 | 1570 | ORDER BY login_course_date ASC LIMIT 0,1'; |
| 1571 | - $rs = Database::query($sql); |
|
| 1572 | - if (Database::num_rows($rs) > 0) { |
|
| 1573 | - if ($first_login_date = Database::result($rs, 0, 0)) { |
|
| 1574 | - if ($convert_date) { |
|
| 1575 | - return api_convert_and_format_date($first_login_date, DATE_FORMAT_SHORT); |
|
| 1576 | - } else { |
|
| 1577 | - return $first_login_date; |
|
| 1578 | - } |
|
| 1579 | - } |
|
| 1580 | - } |
|
| 1581 | - |
|
| 1582 | - return false; |
|
| 1571 | + $rs = Database::query($sql); |
|
| 1572 | + if (Database::num_rows($rs) > 0) { |
|
| 1573 | + if ($first_login_date = Database::result($rs, 0, 0)) { |
|
| 1574 | + if ($convert_date) { |
|
| 1575 | + return api_convert_and_format_date($first_login_date, DATE_FORMAT_SHORT); |
|
| 1576 | + } else { |
|
| 1577 | + return $first_login_date; |
|
| 1578 | + } |
|
| 1579 | + } |
|
| 1580 | + } |
|
| 1581 | + |
|
| 1582 | + return false; |
|
| 1583 | 1583 | } |
| 1584 | 1584 | |
| 1585 | 1585 | /** |
@@ -1595,13 +1595,13 @@ discard block |
||
| 1595 | 1595 | $session_id = 0, |
| 1596 | 1596 | $convert_date = true |
| 1597 | 1597 | ) { |
| 1598 | - // protect data |
|
| 1599 | - $student_id = intval($student_id); |
|
| 1598 | + // protect data |
|
| 1599 | + $student_id = intval($student_id); |
|
| 1600 | 1600 | $courseId = $courseInfo['real_id']; |
| 1601 | - $session_id = intval($session_id); |
|
| 1601 | + $session_id = intval($session_id); |
|
| 1602 | 1602 | |
| 1603 | - $tbl_track_e_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS); |
|
| 1604 | - $sql = 'SELECT access_date |
|
| 1603 | + $tbl_track_e_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS); |
|
| 1604 | + $sql = 'SELECT access_date |
|
| 1605 | 1605 | FROM '.$tbl_track_e_access.' |
| 1606 | 1606 | WHERE access_user_id = '.$student_id.' AND |
| 1607 | 1607 | c_id = "'.$courseId.'" AND |
@@ -1609,39 +1609,39 @@ discard block |
||
| 1609 | 1609 | ORDER BY access_date DESC |
| 1610 | 1610 | LIMIT 0,1'; |
| 1611 | 1611 | |
| 1612 | - $rs = Database::query($sql); |
|
| 1613 | - if (Database::num_rows($rs) > 0) { |
|
| 1614 | - if ($last_login_date = Database::result($rs, 0, 0)) { |
|
| 1612 | + $rs = Database::query($sql); |
|
| 1613 | + if (Database::num_rows($rs) > 0) { |
|
| 1614 | + if ($last_login_date = Database::result($rs, 0, 0)) { |
|
| 1615 | 1615 | if (empty($last_login_date) || $last_login_date == '0000-00-00 00:00:00') { |
| 1616 | 1616 | return false; |
| 1617 | 1617 | } |
| 1618 | 1618 | //see #5736 |
| 1619 | 1619 | $last_login_date_timestamp = api_strtotime($last_login_date); |
| 1620 | - $now = time(); |
|
| 1621 | - //If the last connection is > than 7 days, the text is red |
|
| 1622 | - //345600 = 7 days in seconds |
|
| 1623 | - if ($now - $last_login_date_timestamp > 604800) { |
|
| 1624 | - if ($convert_date) { |
|
| 1620 | + $now = time(); |
|
| 1621 | + //If the last connection is > than 7 days, the text is red |
|
| 1622 | + //345600 = 7 days in seconds |
|
| 1623 | + if ($now - $last_login_date_timestamp > 604800) { |
|
| 1624 | + if ($convert_date) { |
|
| 1625 | 1625 | $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT); |
| 1626 | 1626 | $icon = api_is_allowed_to_edit() ? |
| 1627 | 1627 | '<a href="'.api_get_path(WEB_CODE_PATH).'announcements/announcements.php?action=add&remind_inactive='.$student_id.'&cidReq='.$courseInfo['code'].'" title="'.get_lang('RemindInactiveUser').'"> |
| 1628 | 1628 | '.Display::return_icon('messagebox_warning.gif').' |
| 1629 | 1629 | </a>' |
| 1630 | 1630 | : null; |
| 1631 | - return $icon. Display::label($last_login_date, 'warning'); |
|
| 1632 | - } else { |
|
| 1633 | - return $last_login_date; |
|
| 1634 | - } |
|
| 1635 | - } else { |
|
| 1636 | - if ($convert_date) { |
|
| 1637 | - return api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT); |
|
| 1638 | - } else { |
|
| 1639 | - return $last_login_date; |
|
| 1640 | - } |
|
| 1641 | - } |
|
| 1642 | - } |
|
| 1643 | - } |
|
| 1644 | - return false; |
|
| 1631 | + return $icon. Display::label($last_login_date, 'warning'); |
|
| 1632 | + } else { |
|
| 1633 | + return $last_login_date; |
|
| 1634 | + } |
|
| 1635 | + } else { |
|
| 1636 | + if ($convert_date) { |
|
| 1637 | + return api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT); |
|
| 1638 | + } else { |
|
| 1639 | + return $last_login_date; |
|
| 1640 | + } |
|
| 1641 | + } |
|
| 1642 | + } |
|
| 1643 | + } |
|
| 1644 | + return false; |
|
| 1645 | 1645 | } |
| 1646 | 1646 | |
| 1647 | 1647 | /** |
@@ -1655,11 +1655,11 @@ discard block |
||
| 1655 | 1655 | public static function get_course_connections_count($courseId, $session_id = 0, $start = 0, $stop = null) |
| 1656 | 1656 | { |
| 1657 | 1657 | if ($start < 0) { |
| 1658 | - $start = 0; |
|
| 1659 | - } |
|
| 1660 | - if (!isset($stop) or ($stop < 0)) { |
|
| 1661 | - $stop = api_get_utc_datetime(); |
|
| 1662 | - } |
|
| 1658 | + $start = 0; |
|
| 1659 | + } |
|
| 1660 | + if (!isset($stop) or ($stop < 0)) { |
|
| 1661 | + $stop = api_get_utc_datetime(); |
|
| 1662 | + } |
|
| 1663 | 1663 | |
| 1664 | 1664 | // Given we're storing in cache, round the start and end times |
| 1665 | 1665 | // to the lower minute |
@@ -1668,11 +1668,11 @@ discard block |
||
| 1668 | 1668 | $roundedStart = Database::escape_string($roundedStart); |
| 1669 | 1669 | $roundedStop = Database::escape_string($roundedStop); |
| 1670 | 1670 | |
| 1671 | - $month_filter = " AND login_course_date > '$roundedStart' AND login_course_date < '$roundedStop' "; |
|
| 1671 | + $month_filter = " AND login_course_date > '$roundedStart' AND login_course_date < '$roundedStop' "; |
|
| 1672 | 1672 | |
| 1673 | 1673 | $courseId = intval($courseId); |
| 1674 | - $session_id = intval($session_id); |
|
| 1675 | - $count = 0; |
|
| 1674 | + $session_id = intval($session_id); |
|
| 1675 | + $count = 0; |
|
| 1676 | 1676 | $tbl_track_e_course_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); |
| 1677 | 1677 | $sql = "SELECT count(*) as count_connections |
| 1678 | 1678 | FROM $tbl_track_e_course_access |
@@ -1711,7 +1711,7 @@ discard block |
||
| 1711 | 1711 | } |
| 1712 | 1712 | } |
| 1713 | 1713 | |
| 1714 | - return $count; |
|
| 1714 | + return $count; |
|
| 1715 | 1715 | } |
| 1716 | 1716 | |
| 1717 | 1717 | /** |
@@ -1722,25 +1722,25 @@ discard block |
||
| 1722 | 1722 | */ |
| 1723 | 1723 | public static function count_course_per_student($user_id, $include_sessions = true) |
| 1724 | 1724 | { |
| 1725 | - $user_id = intval($user_id); |
|
| 1726 | - $tbl_course_rel_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER); |
|
| 1727 | - $tbl_session_course_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); |
|
| 1725 | + $user_id = intval($user_id); |
|
| 1726 | + $tbl_course_rel_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER); |
|
| 1727 | + $tbl_session_course_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); |
|
| 1728 | 1728 | |
| 1729 | - $sql = 'SELECT DISTINCT c_id |
|
| 1729 | + $sql = 'SELECT DISTINCT c_id |
|
| 1730 | 1730 | FROM ' . $tbl_course_rel_user . ' |
| 1731 | 1731 | WHERE user_id = ' . $user_id.' AND relation_type<>'.COURSE_RELATION_TYPE_RRHH; |
| 1732 | - $rs = Database::query($sql); |
|
| 1733 | - $nb_courses = Database::num_rows($rs); |
|
| 1732 | + $rs = Database::query($sql); |
|
| 1733 | + $nb_courses = Database::num_rows($rs); |
|
| 1734 | 1734 | |
| 1735 | - if ($include_sessions) { |
|
| 1736 | - $sql = 'SELECT DISTINCT c_id |
|
| 1735 | + if ($include_sessions) { |
|
| 1736 | + $sql = 'SELECT DISTINCT c_id |
|
| 1737 | 1737 | FROM ' . $tbl_session_course_rel_user . ' |
| 1738 | 1738 | WHERE user_id = ' . $user_id; |
| 1739 | - $rs = Database::query($sql); |
|
| 1740 | - $nb_courses += Database::num_rows($rs); |
|
| 1741 | - } |
|
| 1739 | + $rs = Database::query($sql); |
|
| 1740 | + $nb_courses += Database::num_rows($rs); |
|
| 1741 | + } |
|
| 1742 | 1742 | |
| 1743 | - return $nb_courses; |
|
| 1743 | + return $nb_courses; |
|
| 1744 | 1744 | } |
| 1745 | 1745 | |
| 1746 | 1746 | /** |
@@ -1771,25 +1771,25 @@ discard block |
||
| 1771 | 1771 | $into_lp = 0 |
| 1772 | 1772 | ) { |
| 1773 | 1773 | $course_code = Database::escape_string($course_code); |
| 1774 | - $course_info = api_get_course_info($course_code); |
|
| 1775 | - if (!empty($course_info)) { |
|
| 1776 | - // table definition |
|
| 1777 | - $tbl_course_quiz = Database::get_course_table(TABLE_QUIZ_TEST); |
|
| 1778 | - $tbl_stats_exercise = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES); |
|
| 1779 | - |
|
| 1780 | - // Compose a filter based on optional exercise given |
|
| 1781 | - $condition_quiz = ""; |
|
| 1782 | - if (!empty($exercise_id)) { |
|
| 1783 | - $exercise_id = intval($exercise_id); |
|
| 1784 | - $condition_quiz =" AND id = $exercise_id "; |
|
| 1785 | - } |
|
| 1786 | - |
|
| 1787 | - // Compose a filter based on optional session id given |
|
| 1788 | - $condition_session = ""; |
|
| 1789 | - if (isset($session_id)) { |
|
| 1790 | - $session_id = intval($session_id); |
|
| 1791 | - $condition_session = " AND session_id = $session_id "; |
|
| 1792 | - } |
|
| 1774 | + $course_info = api_get_course_info($course_code); |
|
| 1775 | + if (!empty($course_info)) { |
|
| 1776 | + // table definition |
|
| 1777 | + $tbl_course_quiz = Database::get_course_table(TABLE_QUIZ_TEST); |
|
| 1778 | + $tbl_stats_exercise = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES); |
|
| 1779 | + |
|
| 1780 | + // Compose a filter based on optional exercise given |
|
| 1781 | + $condition_quiz = ""; |
|
| 1782 | + if (!empty($exercise_id)) { |
|
| 1783 | + $exercise_id = intval($exercise_id); |
|
| 1784 | + $condition_quiz =" AND id = $exercise_id "; |
|
| 1785 | + } |
|
| 1786 | + |
|
| 1787 | + // Compose a filter based on optional session id given |
|
| 1788 | + $condition_session = ""; |
|
| 1789 | + if (isset($session_id)) { |
|
| 1790 | + $session_id = intval($session_id); |
|
| 1791 | + $condition_session = " AND session_id = $session_id "; |
|
| 1792 | + } |
|
| 1793 | 1793 | if ($active_filter == 1) { |
| 1794 | 1794 | $condition_active = 'AND active <> -1'; |
| 1795 | 1795 | } elseif ($active_filter == 0) { |
@@ -1805,25 +1805,25 @@ discard block |
||
| 1805 | 1805 | $select_lp_id = ', orig_lp_id as lp_id '; |
| 1806 | 1806 | } |
| 1807 | 1807 | |
| 1808 | - $sql = "SELECT count(id) FROM $tbl_course_quiz |
|
| 1808 | + $sql = "SELECT count(id) FROM $tbl_course_quiz |
|
| 1809 | 1809 | WHERE c_id = {$course_info['real_id']} $condition_active $condition_quiz "; |
| 1810 | - $count_quiz = Database::fetch_row(Database::query($sql)); |
|
| 1810 | + $count_quiz = Database::fetch_row(Database::query($sql)); |
|
| 1811 | 1811 | |
| 1812 | - if (!empty($count_quiz[0]) && !empty($student_id)) { |
|
| 1813 | - if (is_array($student_id)) { |
|
| 1812 | + if (!empty($count_quiz[0]) && !empty($student_id)) { |
|
| 1813 | + if (is_array($student_id)) { |
|
| 1814 | 1814 | $student_id = array_map('intval', $student_id); |
| 1815 | - $condition_user = " AND exe_user_id IN (".implode(',', $student_id).") "; |
|
| 1816 | - } else { |
|
| 1815 | + $condition_user = " AND exe_user_id IN (".implode(',', $student_id).") "; |
|
| 1816 | + } else { |
|
| 1817 | 1817 | $student_id = intval($student_id); |
| 1818 | - $condition_user = " AND exe_user_id = '$student_id' "; |
|
| 1819 | - } |
|
| 1818 | + $condition_user = " AND exe_user_id = '$student_id' "; |
|
| 1819 | + } |
|
| 1820 | 1820 | |
| 1821 | - if (empty($exercise_id)) { |
|
| 1822 | - $sql = "SELECT id FROM $tbl_course_quiz |
|
| 1821 | + if (empty($exercise_id)) { |
|
| 1822 | + $sql = "SELECT id FROM $tbl_course_quiz |
|
| 1823 | 1823 | WHERE c_id = {$course_info['real_id']} $condition_active $condition_quiz"; |
| 1824 | 1824 | $result = Database::query($sql); |
| 1825 | 1825 | $exercise_list = array(); |
| 1826 | - $exercise_id = null; |
|
| 1826 | + $exercise_id = null; |
|
| 1827 | 1827 | if (Database::num_rows($result)) { |
| 1828 | 1828 | while ($row = Database::fetch_array($result)) { |
| 1829 | 1829 | $exercise_list[] = $row['id']; |
@@ -1832,11 +1832,11 @@ discard block |
||
| 1832 | 1832 | if (!empty($exercise_list)) { |
| 1833 | 1833 | $exercise_id = implode("','",$exercise_list); |
| 1834 | 1834 | } |
| 1835 | - } |
|
| 1835 | + } |
|
| 1836 | 1836 | |
| 1837 | - $count_quiz = Database::fetch_row(Database::query($sql)); |
|
| 1837 | + $count_quiz = Database::fetch_row(Database::query($sql)); |
|
| 1838 | 1838 | |
| 1839 | - $sql = "SELECT |
|
| 1839 | + $sql = "SELECT |
|
| 1840 | 1840 | SUM(exe_result/exe_weighting*100) as avg_score, |
| 1841 | 1841 | COUNT(*) as num_attempts |
| 1842 | 1842 | $select_lp_id |
@@ -1850,20 +1850,20 @@ discard block |
||
| 1850 | 1850 | $condition_into_lp |
| 1851 | 1851 | ORDER BY exe_date DESC"; |
| 1852 | 1852 | |
| 1853 | - $res = Database::query($sql); |
|
| 1854 | - $row = Database::fetch_array($res); |
|
| 1855 | - $quiz_avg_score = null; |
|
| 1853 | + $res = Database::query($sql); |
|
| 1854 | + $row = Database::fetch_array($res); |
|
| 1855 | + $quiz_avg_score = null; |
|
| 1856 | 1856 | |
| 1857 | - if (!empty($row['avg_score'])) { |
|
| 1858 | - $quiz_avg_score = round($row['avg_score'],2); |
|
| 1859 | - } |
|
| 1857 | + if (!empty($row['avg_score'])) { |
|
| 1858 | + $quiz_avg_score = round($row['avg_score'],2); |
|
| 1859 | + } |
|
| 1860 | 1860 | |
| 1861 | - if(!empty($row['num_attempts'])) { |
|
| 1862 | - $quiz_avg_score = round($quiz_avg_score / $row['num_attempts'], 2); |
|
| 1863 | - } |
|
| 1864 | - if (is_array($student_id)) { |
|
| 1865 | - $quiz_avg_score = round($quiz_avg_score / count($student_id), 2); |
|
| 1866 | - } |
|
| 1861 | + if(!empty($row['num_attempts'])) { |
|
| 1862 | + $quiz_avg_score = round($quiz_avg_score / $row['num_attempts'], 2); |
|
| 1863 | + } |
|
| 1864 | + if (is_array($student_id)) { |
|
| 1865 | + $quiz_avg_score = round($quiz_avg_score / count($student_id), 2); |
|
| 1866 | + } |
|
| 1867 | 1867 | if ($into_lp == 0) { |
| 1868 | 1868 | return $quiz_avg_score; |
| 1869 | 1869 | } else { |
@@ -1886,9 +1886,9 @@ discard block |
||
| 1886 | 1886 | return array($quiz_avg_score, null); |
| 1887 | 1887 | } |
| 1888 | 1888 | } |
| 1889 | - } |
|
| 1890 | - } |
|
| 1891 | - return null; |
|
| 1889 | + } |
|
| 1890 | + } |
|
| 1891 | + return null; |
|
| 1892 | 1892 | } |
| 1893 | 1893 | |
| 1894 | 1894 | /** |
@@ -1921,15 +1921,15 @@ discard block |
||
| 1921 | 1921 | $find_all_lp = 0 |
| 1922 | 1922 | ) { |
| 1923 | 1923 | $courseId = intval($courseId); |
| 1924 | - $student_id = intval($student_id); |
|
| 1925 | - $exercise_id = intval($exercise_id); |
|
| 1926 | - $session_id = intval($session_id); |
|
| 1924 | + $student_id = intval($student_id); |
|
| 1925 | + $exercise_id = intval($exercise_id); |
|
| 1926 | + $session_id = intval($session_id); |
|
| 1927 | 1927 | |
| 1928 | - $lp_id = intval($lp_id); |
|
| 1928 | + $lp_id = intval($lp_id); |
|
| 1929 | 1929 | $lp_item_id = intval($lp_item_id); |
| 1930 | - $tbl_stats_exercises = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES); |
|
| 1930 | + $tbl_stats_exercises = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES); |
|
| 1931 | 1931 | |
| 1932 | - $sql = "SELECT COUNT(ex.exe_id) as essais FROM $tbl_stats_exercises AS ex |
|
| 1932 | + $sql = "SELECT COUNT(ex.exe_id) as essais FROM $tbl_stats_exercises AS ex |
|
| 1933 | 1933 | WHERE ex.c_id = $courseId |
| 1934 | 1934 | AND ex.exe_exo_id = $exercise_id |
| 1935 | 1935 | AND status = '' |
@@ -1944,11 +1944,11 @@ discard block |
||
| 1944 | 1944 | AND orig_lp_item_id = $lp_item_id"; |
| 1945 | 1945 | } |
| 1946 | 1946 | |
| 1947 | - $rs = Database::query($sql); |
|
| 1948 | - $row = Database::fetch_row($rs); |
|
| 1949 | - $count_attempts = $row[0]; |
|
| 1947 | + $rs = Database::query($sql); |
|
| 1948 | + $row = Database::fetch_row($rs); |
|
| 1949 | + $count_attempts = $row[0]; |
|
| 1950 | 1950 | |
| 1951 | - return $count_attempts; |
|
| 1951 | + return $count_attempts; |
|
| 1952 | 1952 | } |
| 1953 | 1953 | |
| 1954 | 1954 | /** |
@@ -1958,7 +1958,7 @@ discard block |
||
| 1958 | 1958 | * @param int $user_id |
| 1959 | 1959 | * @param int $courseId |
| 1960 | 1960 | * @param int $session_id |
| 1961 | - */ |
|
| 1961 | + */ |
|
| 1962 | 1962 | public static function get_exercise_student_progress($exercise_list, $user_id, $courseId, $session_id) |
| 1963 | 1963 | { |
| 1964 | 1964 | $courseId = intval($courseId); |
@@ -3622,8 +3622,8 @@ discard block |
||
| 3622 | 3622 | |
| 3623 | 3623 | $condition_session = ''; |
| 3624 | 3624 | if (isset($session_id)) { |
| 3625 | - $session_id = intval($session_id); |
|
| 3626 | - $condition_session = ' AND f.session_id = '. $session_id; |
|
| 3625 | + $session_id = intval($session_id); |
|
| 3626 | + $condition_session = ' AND f.session_id = '. $session_id; |
|
| 3627 | 3627 | } |
| 3628 | 3628 | |
| 3629 | 3629 | $groupId = intval($groupId); |
@@ -5522,9 +5522,9 @@ discard block |
||
| 5522 | 5522 | } |
| 5523 | 5523 | |
| 5524 | 5524 | /** |
| 5525 | - * @param FormValidator $form |
|
| 5526 | - * @return mixed |
|
| 5527 | - */ |
|
| 5525 | + * @param FormValidator $form |
|
| 5526 | + * @return mixed |
|
| 5527 | + */ |
|
| 5528 | 5528 | public static function setUserSearchForm($form) |
| 5529 | 5529 | { |
| 5530 | 5530 | global $_configuration; |
@@ -5838,26 +5838,26 @@ discard block |
||
| 5838 | 5838 | $session_id = api_get_session_id(); |
| 5839 | 5839 | $course_id = api_get_course_int_id(); |
| 5840 | 5840 | |
| 5841 | - $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY); |
|
| 5842 | - $table_user = Database :: get_main_table(TABLE_MAIN_USER); |
|
| 5841 | + $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY); |
|
| 5842 | + $table_user = Database :: get_main_table(TABLE_MAIN_USER); |
|
| 5843 | 5843 | |
| 5844 | - $sql = "SELECT count(tool) AS total_number_of_items |
|
| 5844 | + $sql = "SELECT count(tool) AS total_number_of_items |
|
| 5845 | 5845 | FROM $table_item_property track_resource, $table_user user |
| 5846 | 5846 | WHERE |
| 5847 | 5847 | track_resource.c_id = $course_id AND |
| 5848 | 5848 | track_resource.insert_user_id = user.user_id AND |
| 5849 | 5849 | session_id " .(empty($session_id) ? ' IS NULL ' : " = $session_id "); |
| 5850 | 5850 | |
| 5851 | - if (isset($_GET['keyword'])) { |
|
| 5852 | - $keyword = Database::escape_string(trim($_GET['keyword'])); |
|
| 5853 | - $sql .= " AND ( |
|
| 5851 | + if (isset($_GET['keyword'])) { |
|
| 5852 | + $keyword = Database::escape_string(trim($_GET['keyword'])); |
|
| 5853 | + $sql .= " AND ( |
|
| 5854 | 5854 | user.username LIKE '%".$keyword."%' OR |
| 5855 | 5855 | lastedit_type LIKE '%".$keyword."%' OR |
| 5856 | 5856 | tool LIKE '%".$keyword."%' |
| 5857 | 5857 | )"; |
| 5858 | - } |
|
| 5858 | + } |
|
| 5859 | 5859 | |
| 5860 | - $sql .= " AND tool IN ( |
|
| 5860 | + $sql .= " AND tool IN ( |
|
| 5861 | 5861 | 'document', |
| 5862 | 5862 | 'learnpath', |
| 5863 | 5863 | 'quiz', |
@@ -5869,10 +5869,10 @@ discard block |
||
| 5869 | 5869 | 'thematic_advance', |
| 5870 | 5870 | 'thematic_plan' |
| 5871 | 5871 | )"; |
| 5872 | - $res = Database::query($sql); |
|
| 5873 | - $obj = Database::fetch_object($res); |
|
| 5872 | + $res = Database::query($sql); |
|
| 5873 | + $obj = Database::fetch_object($res); |
|
| 5874 | 5874 | |
| 5875 | - return $obj->total_number_of_items; |
|
| 5875 | + return $obj->total_number_of_items; |
|
| 5876 | 5876 | } |
| 5877 | 5877 | |
| 5878 | 5878 | /** |
@@ -5887,12 +5887,12 @@ discard block |
||
| 5887 | 5887 | $session_id = api_get_session_id(); |
| 5888 | 5888 | $course_id = api_get_course_int_id(); |
| 5889 | 5889 | |
| 5890 | - $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY); |
|
| 5891 | - $table_user = Database :: get_main_table(TABLE_MAIN_USER); |
|
| 5892 | - $table_session = Database :: get_main_table(TABLE_MAIN_SESSION); |
|
| 5893 | - $session_id = intval($session_id); |
|
| 5890 | + $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY); |
|
| 5891 | + $table_user = Database :: get_main_table(TABLE_MAIN_USER); |
|
| 5892 | + $table_session = Database :: get_main_table(TABLE_MAIN_SESSION); |
|
| 5893 | + $session_id = intval($session_id); |
|
| 5894 | 5894 | |
| 5895 | - $sql = "SELECT |
|
| 5895 | + $sql = "SELECT |
|
| 5896 | 5896 | tool as col0, |
| 5897 | 5897 | lastedit_type as col1, |
| 5898 | 5898 | ref as ref, |
@@ -5906,16 +5906,16 @@ discard block |
||
| 5906 | 5906 | track_resource.insert_user_id = user.user_id AND |
| 5907 | 5907 | session_id " .(empty($session_id) ? ' IS NULL ' : " = $session_id "); |
| 5908 | 5908 | |
| 5909 | - if (isset($_GET['keyword'])) { |
|
| 5910 | - $keyword = Database::escape_string(trim($_GET['keyword'])); |
|
| 5911 | - $sql .= " AND ( |
|
| 5909 | + if (isset($_GET['keyword'])) { |
|
| 5910 | + $keyword = Database::escape_string(trim($_GET['keyword'])); |
|
| 5911 | + $sql .= " AND ( |
|
| 5912 | 5912 | user.username LIKE '%".$keyword."%' OR |
| 5913 | 5913 | lastedit_type LIKE '%".$keyword."%' OR |
| 5914 | 5914 | tool LIKE '%".$keyword."%' |
| 5915 | 5915 | ) "; |
| 5916 | - } |
|
| 5916 | + } |
|
| 5917 | 5917 | |
| 5918 | - $sql .= " AND tool IN ( |
|
| 5918 | + $sql .= " AND tool IN ( |
|
| 5919 | 5919 | 'document', |
| 5920 | 5920 | 'learnpath', |
| 5921 | 5921 | 'quiz', |
@@ -5928,41 +5928,41 @@ discard block |
||
| 5928 | 5928 | 'thematic_plan' |
| 5929 | 5929 | )"; |
| 5930 | 5930 | |
| 5931 | - if ($column == 0) { |
|
| 5932 | - $column = '0'; |
|
| 5933 | - } |
|
| 5934 | - if ($column != '' && $direction != '') { |
|
| 5935 | - if ($column != 2 && $column != 4) { |
|
| 5936 | - $sql .= " ORDER BY col$column $direction"; |
|
| 5937 | - } |
|
| 5938 | - } else { |
|
| 5939 | - $sql .= " ORDER BY col5 DESC "; |
|
| 5940 | - } |
|
| 5931 | + if ($column == 0) { |
|
| 5932 | + $column = '0'; |
|
| 5933 | + } |
|
| 5934 | + if ($column != '' && $direction != '') { |
|
| 5935 | + if ($column != 2 && $column != 4) { |
|
| 5936 | + $sql .= " ORDER BY col$column $direction"; |
|
| 5937 | + } |
|
| 5938 | + } else { |
|
| 5939 | + $sql .= " ORDER BY col5 DESC "; |
|
| 5940 | + } |
|
| 5941 | 5941 | |
| 5942 | 5942 | $from = intval($from); |
| 5943 | 5943 | $number_of_items = intval($number_of_items); |
| 5944 | 5944 | |
| 5945 | - $sql .= " LIMIT $from, $number_of_items "; |
|
| 5946 | - |
|
| 5947 | - $res = Database::query($sql); |
|
| 5948 | - $resources = array(); |
|
| 5949 | - $thematic_tools = array('thematic', 'thematic_advance', 'thematic_plan'); |
|
| 5950 | - while ($row = Database::fetch_array($res)) { |
|
| 5951 | - $ref = $row['ref']; |
|
| 5952 | - $table_name = TrackingCourseLog::get_tool_name_table($row['col0']); |
|
| 5953 | - $table_tool = Database :: get_course_table($table_name['table_name']); |
|
| 5945 | + $sql .= " LIMIT $from, $number_of_items "; |
|
| 5954 | 5946 | |
| 5955 | - $id = $table_name['id_tool']; |
|
| 5956 | - $recorset = false; |
|
| 5957 | - |
|
| 5958 | - if (in_array($row['col0'], array('thematic_plan', 'thematic_advance'))) { |
|
| 5959 | - $tbl_thematic = Database :: get_course_table(TABLE_THEMATIC); |
|
| 5960 | - $sql = "SELECT thematic_id FROM $table_tool |
|
| 5947 | + $res = Database::query($sql); |
|
| 5948 | + $resources = array(); |
|
| 5949 | + $thematic_tools = array('thematic', 'thematic_advance', 'thematic_plan'); |
|
| 5950 | + while ($row = Database::fetch_array($res)) { |
|
| 5951 | + $ref = $row['ref']; |
|
| 5952 | + $table_name = TrackingCourseLog::get_tool_name_table($row['col0']); |
|
| 5953 | + $table_tool = Database :: get_course_table($table_name['table_name']); |
|
| 5954 | + |
|
| 5955 | + $id = $table_name['id_tool']; |
|
| 5956 | + $recorset = false; |
|
| 5957 | + |
|
| 5958 | + if (in_array($row['col0'], array('thematic_plan', 'thematic_advance'))) { |
|
| 5959 | + $tbl_thematic = Database :: get_course_table(TABLE_THEMATIC); |
|
| 5960 | + $sql = "SELECT thematic_id FROM $table_tool |
|
| 5961 | 5961 | WHERE c_id = $course_id AND id = $ref"; |
| 5962 | - $rs_thematic = Database::query($sql); |
|
| 5963 | - if (Database::num_rows($rs_thematic)) { |
|
| 5964 | - $row_thematic = Database::fetch_array($rs_thematic); |
|
| 5965 | - $thematic_id = $row_thematic['thematic_id']; |
|
| 5962 | + $rs_thematic = Database::query($sql); |
|
| 5963 | + if (Database::num_rows($rs_thematic)) { |
|
| 5964 | + $row_thematic = Database::fetch_array($rs_thematic); |
|
| 5965 | + $thematic_id = $row_thematic['thematic_id']; |
|
| 5966 | 5966 | |
| 5967 | 5967 | $sql = "SELECT session.id, session.name, user.username |
| 5968 | 5968 | FROM $tbl_thematic t, $table_session session, $table_user user |
@@ -5971,9 +5971,9 @@ discard block |
||
| 5971 | 5971 | t.session_id = session.id AND |
| 5972 | 5972 | session.id_coach = user.user_id AND |
| 5973 | 5973 | t.id = $thematic_id"; |
| 5974 | - $recorset = Database::query($sql); |
|
| 5975 | - } |
|
| 5976 | - } else { |
|
| 5974 | + $recorset = Database::query($sql); |
|
| 5975 | + } |
|
| 5976 | + } else { |
|
| 5977 | 5977 | $sql = "SELECT session.id, session.name, user.username |
| 5978 | 5978 | FROM $table_tool tool, $table_session session, $table_user user |
| 5979 | 5979 | WHERE |
@@ -5981,127 +5981,127 @@ discard block |
||
| 5981 | 5981 | tool.session_id = session.id AND |
| 5982 | 5982 | session.id_coach = user.user_id AND |
| 5983 | 5983 | tool.$id = $ref"; |
| 5984 | - $recorset = Database::query($sql); |
|
| 5985 | - } |
|
| 5986 | - |
|
| 5987 | - if (!empty($recorset)) { |
|
| 5988 | - $obj = Database::fetch_object($recorset); |
|
| 5989 | - |
|
| 5990 | - $name_session = ''; |
|
| 5991 | - $coach_name = ''; |
|
| 5992 | - if (!empty($obj)) { |
|
| 5993 | - $name_session = $obj->name; |
|
| 5994 | - $coach_name = $obj->username; |
|
| 5995 | - } |
|
| 5996 | - |
|
| 5997 | - $url_tool = api_get_path(WEB_CODE_PATH).$table_name['link_tool']; |
|
| 5998 | - $row[0] = ''; |
|
| 5999 | - if ($row['col6'] != 2) { |
|
| 6000 | - if (in_array($row['col0'], $thematic_tools)) { |
|
| 6001 | - |
|
| 6002 | - $exp_thematic_tool = explode('_', $row['col0']); |
|
| 6003 | - $thematic_tool_title = ''; |
|
| 6004 | - if (is_array($exp_thematic_tool)) { |
|
| 6005 | - foreach ($exp_thematic_tool as $exp) { |
|
| 6006 | - $thematic_tool_title .= api_ucfirst($exp); |
|
| 6007 | - } |
|
| 6008 | - } else { |
|
| 6009 | - $thematic_tool_title = api_ucfirst($row['col0']); |
|
| 6010 | - } |
|
| 6011 | - |
|
| 6012 | - $row[0] = '<a href="'.$url_tool.'?'.api_get_cidreq().'&action=thematic_details">'.get_lang($thematic_tool_title).'</a>'; |
|
| 6013 | - } else { |
|
| 6014 | - $row[0] = '<a href="'.$url_tool.'?'.api_get_cidreq().'">'.get_lang('Tool'.api_ucfirst($row['col0'])).'</a>'; |
|
| 6015 | - } |
|
| 6016 | - } else { |
|
| 6017 | - $row[0] = api_ucfirst($row['col0']); |
|
| 6018 | - } |
|
| 6019 | - $row[1] = get_lang($row[1]); |
|
| 6020 | - $row[6] = api_convert_and_format_date($row['col5'], null, date_default_timezone_get()); |
|
| 6021 | - $row[5] = ''; |
|
| 6022 | - //@todo Improve this code please |
|
| 6023 | - switch ($table_name['table_name']) { |
|
| 6024 | - case 'document' : |
|
| 6025 | - $sql = "SELECT tool.title as title FROM $table_tool tool |
|
| 5984 | + $recorset = Database::query($sql); |
|
| 5985 | + } |
|
| 5986 | + |
|
| 5987 | + if (!empty($recorset)) { |
|
| 5988 | + $obj = Database::fetch_object($recorset); |
|
| 5989 | + |
|
| 5990 | + $name_session = ''; |
|
| 5991 | + $coach_name = ''; |
|
| 5992 | + if (!empty($obj)) { |
|
| 5993 | + $name_session = $obj->name; |
|
| 5994 | + $coach_name = $obj->username; |
|
| 5995 | + } |
|
| 5996 | + |
|
| 5997 | + $url_tool = api_get_path(WEB_CODE_PATH).$table_name['link_tool']; |
|
| 5998 | + $row[0] = ''; |
|
| 5999 | + if ($row['col6'] != 2) { |
|
| 6000 | + if (in_array($row['col0'], $thematic_tools)) { |
|
| 6001 | + |
|
| 6002 | + $exp_thematic_tool = explode('_', $row['col0']); |
|
| 6003 | + $thematic_tool_title = ''; |
|
| 6004 | + if (is_array($exp_thematic_tool)) { |
|
| 6005 | + foreach ($exp_thematic_tool as $exp) { |
|
| 6006 | + $thematic_tool_title .= api_ucfirst($exp); |
|
| 6007 | + } |
|
| 6008 | + } else { |
|
| 6009 | + $thematic_tool_title = api_ucfirst($row['col0']); |
|
| 6010 | + } |
|
| 6011 | + |
|
| 6012 | + $row[0] = '<a href="'.$url_tool.'?'.api_get_cidreq().'&action=thematic_details">'.get_lang($thematic_tool_title).'</a>'; |
|
| 6013 | + } else { |
|
| 6014 | + $row[0] = '<a href="'.$url_tool.'?'.api_get_cidreq().'">'.get_lang('Tool'.api_ucfirst($row['col0'])).'</a>'; |
|
| 6015 | + } |
|
| 6016 | + } else { |
|
| 6017 | + $row[0] = api_ucfirst($row['col0']); |
|
| 6018 | + } |
|
| 6019 | + $row[1] = get_lang($row[1]); |
|
| 6020 | + $row[6] = api_convert_and_format_date($row['col5'], null, date_default_timezone_get()); |
|
| 6021 | + $row[5] = ''; |
|
| 6022 | + //@todo Improve this code please |
|
| 6023 | + switch ($table_name['table_name']) { |
|
| 6024 | + case 'document' : |
|
| 6025 | + $sql = "SELECT tool.title as title FROM $table_tool tool |
|
| 6026 | 6026 | WHERE c_id = $course_id AND id = $ref"; |
| 6027 | - $rs_document = Database::query($sql); |
|
| 6028 | - $obj_document = Database::fetch_object($rs_document); |
|
| 6029 | - $row[5] = $obj_document->title; |
|
| 6027 | + $rs_document = Database::query($sql); |
|
| 6028 | + $obj_document = Database::fetch_object($rs_document); |
|
| 6029 | + $row[5] = $obj_document->title; |
|
| 6030 | 6030 | |
| 6031 | - break; |
|
| 6032 | - case 'announcement': |
|
| 6031 | + break; |
|
| 6032 | + case 'announcement': |
|
| 6033 | 6033 | $sql = "SELECT title FROM $table_tool |
| 6034 | 6034 | WHERE c_id = $course_id AND id = $ref"; |
| 6035 | - $rs_document = Database::query($sql); |
|
| 6036 | - $obj_document = Database::fetch_object($rs_document); |
|
| 6035 | + $rs_document = Database::query($sql); |
|
| 6036 | + $obj_document = Database::fetch_object($rs_document); |
|
| 6037 | 6037 | if ($obj_document) { |
| 6038 | 6038 | $row[5] = $obj_document->title; |
| 6039 | 6039 | } |
| 6040 | - break; |
|
| 6041 | - case 'glossary': |
|
| 6040 | + break; |
|
| 6041 | + case 'glossary': |
|
| 6042 | 6042 | $sql = "SELECT name FROM $table_tool |
| 6043 | 6043 | WHERE c_id = $course_id AND glossary_id = $ref"; |
| 6044 | - $rs_document = Database::query($sql); |
|
| 6045 | - $obj_document = Database::fetch_object($rs_document); |
|
| 6044 | + $rs_document = Database::query($sql); |
|
| 6045 | + $obj_document = Database::fetch_object($rs_document); |
|
| 6046 | 6046 | if ($obj_document) { |
| 6047 | 6047 | $row[5] = $obj_document->name; |
| 6048 | 6048 | } |
| 6049 | - break; |
|
| 6050 | - case 'lp': |
|
| 6049 | + break; |
|
| 6050 | + case 'lp': |
|
| 6051 | 6051 | $sql = "SELECT name |
| 6052 | 6052 | FROM $table_tool WHERE c_id = $course_id AND id = $ref"; |
| 6053 | - $rs_document = Database::query($sql); |
|
| 6054 | - $obj_document = Database::fetch_object($rs_document); |
|
| 6055 | - $row[5] = $obj_document->name; |
|
| 6056 | - break; |
|
| 6057 | - case 'quiz': |
|
| 6053 | + $rs_document = Database::query($sql); |
|
| 6054 | + $obj_document = Database::fetch_object($rs_document); |
|
| 6055 | + $row[5] = $obj_document->name; |
|
| 6056 | + break; |
|
| 6057 | + case 'quiz': |
|
| 6058 | 6058 | $sql = "SELECT title FROM $table_tool |
| 6059 | 6059 | WHERE c_id = $course_id AND id = $ref"; |
| 6060 | - $rs_document = Database::query($sql); |
|
| 6061 | - $obj_document = Database::fetch_object($rs_document); |
|
| 6060 | + $rs_document = Database::query($sql); |
|
| 6061 | + $obj_document = Database::fetch_object($rs_document); |
|
| 6062 | 6062 | if ($obj_document) { |
| 6063 | 6063 | $row[5] = $obj_document->title; |
| 6064 | 6064 | } |
| 6065 | - break; |
|
| 6066 | - case 'course_description': |
|
| 6065 | + break; |
|
| 6066 | + case 'course_description': |
|
| 6067 | 6067 | $sql = "SELECT title FROM $table_tool |
| 6068 | 6068 | WHERE c_id = $course_id AND id = $ref"; |
| 6069 | - $rs_document = Database::query($sql); |
|
| 6070 | - $obj_document = Database::fetch_object($rs_document); |
|
| 6069 | + $rs_document = Database::query($sql); |
|
| 6070 | + $obj_document = Database::fetch_object($rs_document); |
|
| 6071 | 6071 | if ($obj_document) { |
| 6072 | 6072 | $row[5] = $obj_document->title; |
| 6073 | 6073 | } |
| 6074 | - break; |
|
| 6075 | - case 'thematic': |
|
| 6076 | - $rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref"); |
|
| 6077 | - if (Database::num_rows($rs) > 0) { |
|
| 6078 | - $obj = Database::fetch_object($rs); |
|
| 6079 | - $row[5] = $obj->title; |
|
| 6080 | - } |
|
| 6081 | - break; |
|
| 6082 | - case 'thematic_advance': |
|
| 6083 | - $rs = Database::query("SELECT content FROM $table_tool WHERE c_id = $course_id AND id = $ref"); |
|
| 6084 | - if (Database::num_rows($rs) > 0) { |
|
| 6085 | - $obj = Database::fetch_object($rs); |
|
| 6086 | - $row[5] = $obj->content; |
|
| 6087 | - } |
|
| 6088 | - break; |
|
| 6089 | - case 'thematic_plan': |
|
| 6090 | - $rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref"); |
|
| 6091 | - if (Database::num_rows($rs) > 0) { |
|
| 6092 | - $obj = Database::fetch_object($rs); |
|
| 6093 | - $row[5] = $obj->title; |
|
| 6094 | - } |
|
| 6095 | - break; |
|
| 6096 | - default: |
|
| 6097 | - break; |
|
| 6098 | - } |
|
| 6099 | - |
|
| 6100 | - $row2 = $name_session; |
|
| 6101 | - if (!empty($coach_name)) { |
|
| 6102 | - $row2 .= '<br />'.get_lang('Coach').': '.$coach_name; |
|
| 6103 | - } |
|
| 6104 | - $row[2] = $row2; |
|
| 6074 | + break; |
|
| 6075 | + case 'thematic': |
|
| 6076 | + $rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref"); |
|
| 6077 | + if (Database::num_rows($rs) > 0) { |
|
| 6078 | + $obj = Database::fetch_object($rs); |
|
| 6079 | + $row[5] = $obj->title; |
|
| 6080 | + } |
|
| 6081 | + break; |
|
| 6082 | + case 'thematic_advance': |
|
| 6083 | + $rs = Database::query("SELECT content FROM $table_tool WHERE c_id = $course_id AND id = $ref"); |
|
| 6084 | + if (Database::num_rows($rs) > 0) { |
|
| 6085 | + $obj = Database::fetch_object($rs); |
|
| 6086 | + $row[5] = $obj->content; |
|
| 6087 | + } |
|
| 6088 | + break; |
|
| 6089 | + case 'thematic_plan': |
|
| 6090 | + $rs = Database::query("SELECT title FROM $table_tool WHERE c_id = $course_id AND id = $ref"); |
|
| 6091 | + if (Database::num_rows($rs) > 0) { |
|
| 6092 | + $obj = Database::fetch_object($rs); |
|
| 6093 | + $row[5] = $obj->title; |
|
| 6094 | + } |
|
| 6095 | + break; |
|
| 6096 | + default: |
|
| 6097 | + break; |
|
| 6098 | + } |
|
| 6099 | + |
|
| 6100 | + $row2 = $name_session; |
|
| 6101 | + if (!empty($coach_name)) { |
|
| 6102 | + $row2 .= '<br />'.get_lang('Coach').': '.$coach_name; |
|
| 6103 | + } |
|
| 6104 | + $row[2] = $row2; |
|
| 6105 | 6105 | if (!empty($row['col3'])) { |
| 6106 | 6106 | $userInfo = api_get_user_info($row['user_id']); |
| 6107 | 6107 | |
@@ -6118,11 +6118,11 @@ discard block |
||
| 6118 | 6118 | $row[4] = $ip; |
| 6119 | 6119 | } |
| 6120 | 6120 | |
| 6121 | - $resources[] = $row; |
|
| 6122 | - } |
|
| 6123 | - } |
|
| 6121 | + $resources[] = $row; |
|
| 6122 | + } |
|
| 6123 | + } |
|
| 6124 | 6124 | |
| 6125 | - return $resources; |
|
| 6125 | + return $resources; |
|
| 6126 | 6126 | } |
| 6127 | 6127 | |
| 6128 | 6128 | /** |
@@ -6132,63 +6132,63 @@ discard block |
||
| 6132 | 6132 | */ |
| 6133 | 6133 | public static function get_tool_name_table($tool) |
| 6134 | 6134 | { |
| 6135 | - switch ($tool) { |
|
| 6136 | - case 'document': |
|
| 6137 | - $table_name = TABLE_DOCUMENT; |
|
| 6138 | - $link_tool = 'document/document.php'; |
|
| 6139 | - $id_tool = 'id'; |
|
| 6140 | - break; |
|
| 6141 | - case 'learnpath': |
|
| 6142 | - $table_name = TABLE_LP_MAIN; |
|
| 6143 | - $link_tool = 'newscorm/lp_controller.php'; |
|
| 6144 | - $id_tool = 'id'; |
|
| 6145 | - break; |
|
| 6146 | - case 'quiz': |
|
| 6147 | - $table_name = TABLE_QUIZ_TEST; |
|
| 6148 | - $link_tool = 'exercice/exercice.php'; |
|
| 6149 | - $id_tool = 'id'; |
|
| 6150 | - break; |
|
| 6151 | - case 'glossary': |
|
| 6152 | - $table_name = TABLE_GLOSSARY; |
|
| 6153 | - $link_tool = 'glossary/index.php'; |
|
| 6154 | - $id_tool = 'glossary_id'; |
|
| 6155 | - break; |
|
| 6156 | - case 'link': |
|
| 6157 | - $table_name = TABLE_LINK; |
|
| 6158 | - $link_tool = 'link/link.php'; |
|
| 6159 | - $id_tool = 'id'; |
|
| 6160 | - break; |
|
| 6161 | - case 'course_description': |
|
| 6162 | - $table_name = TABLE_COURSE_DESCRIPTION; |
|
| 6163 | - $link_tool = 'course_description/'; |
|
| 6164 | - $id_tool = 'id'; |
|
| 6165 | - break; |
|
| 6166 | - case 'announcement': |
|
| 6167 | - $table_name = TABLE_ANNOUNCEMENT; |
|
| 6168 | - $link_tool = 'announcements/announcements.php'; |
|
| 6169 | - $id_tool = 'id'; |
|
| 6170 | - break; |
|
| 6171 | - case 'thematic': |
|
| 6172 | - $table_name = TABLE_THEMATIC; |
|
| 6173 | - $link_tool = 'course_progress/index.php'; |
|
| 6174 | - $id_tool = 'id'; |
|
| 6175 | - break; |
|
| 6176 | - case 'thematic_advance': |
|
| 6177 | - $table_name = TABLE_THEMATIC_ADVANCE; |
|
| 6178 | - $link_tool = 'course_progress/index.php'; |
|
| 6179 | - $id_tool = 'id'; |
|
| 6180 | - break; |
|
| 6181 | - case 'thematic_plan': |
|
| 6182 | - $table_name = TABLE_THEMATIC_PLAN; |
|
| 6183 | - $link_tool = 'course_progress/index.php'; |
|
| 6184 | - $id_tool = 'id'; |
|
| 6185 | - break; |
|
| 6186 | - default: |
|
| 6187 | - $table_name = $tool; |
|
| 6188 | - break; |
|
| 6189 | - } |
|
| 6190 | - |
|
| 6191 | - return array( |
|
| 6135 | + switch ($tool) { |
|
| 6136 | + case 'document': |
|
| 6137 | + $table_name = TABLE_DOCUMENT; |
|
| 6138 | + $link_tool = 'document/document.php'; |
|
| 6139 | + $id_tool = 'id'; |
|
| 6140 | + break; |
|
| 6141 | + case 'learnpath': |
|
| 6142 | + $table_name = TABLE_LP_MAIN; |
|
| 6143 | + $link_tool = 'newscorm/lp_controller.php'; |
|
| 6144 | + $id_tool = 'id'; |
|
| 6145 | + break; |
|
| 6146 | + case 'quiz': |
|
| 6147 | + $table_name = TABLE_QUIZ_TEST; |
|
| 6148 | + $link_tool = 'exercice/exercice.php'; |
|
| 6149 | + $id_tool = 'id'; |
|
| 6150 | + break; |
|
| 6151 | + case 'glossary': |
|
| 6152 | + $table_name = TABLE_GLOSSARY; |
|
| 6153 | + $link_tool = 'glossary/index.php'; |
|
| 6154 | + $id_tool = 'glossary_id'; |
|
| 6155 | + break; |
|
| 6156 | + case 'link': |
|
| 6157 | + $table_name = TABLE_LINK; |
|
| 6158 | + $link_tool = 'link/link.php'; |
|
| 6159 | + $id_tool = 'id'; |
|
| 6160 | + break; |
|
| 6161 | + case 'course_description': |
|
| 6162 | + $table_name = TABLE_COURSE_DESCRIPTION; |
|
| 6163 | + $link_tool = 'course_description/'; |
|
| 6164 | + $id_tool = 'id'; |
|
| 6165 | + break; |
|
| 6166 | + case 'announcement': |
|
| 6167 | + $table_name = TABLE_ANNOUNCEMENT; |
|
| 6168 | + $link_tool = 'announcements/announcements.php'; |
|
| 6169 | + $id_tool = 'id'; |
|
| 6170 | + break; |
|
| 6171 | + case 'thematic': |
|
| 6172 | + $table_name = TABLE_THEMATIC; |
|
| 6173 | + $link_tool = 'course_progress/index.php'; |
|
| 6174 | + $id_tool = 'id'; |
|
| 6175 | + break; |
|
| 6176 | + case 'thematic_advance': |
|
| 6177 | + $table_name = TABLE_THEMATIC_ADVANCE; |
|
| 6178 | + $link_tool = 'course_progress/index.php'; |
|
| 6179 | + $id_tool = 'id'; |
|
| 6180 | + break; |
|
| 6181 | + case 'thematic_plan': |
|
| 6182 | + $table_name = TABLE_THEMATIC_PLAN; |
|
| 6183 | + $link_tool = 'course_progress/index.php'; |
|
| 6184 | + $id_tool = 'id'; |
|
| 6185 | + break; |
|
| 6186 | + default: |
|
| 6187 | + $table_name = $tool; |
|
| 6188 | + break; |
|
| 6189 | + } |
|
| 6190 | + |
|
| 6191 | + return array( |
|
| 6192 | 6192 | 'table_name' => $table_name, |
| 6193 | 6193 | 'link_tool' => $link_tool, |
| 6194 | 6194 | 'id_tool' => $id_tool |
@@ -6197,45 +6197,45 @@ discard block |
||
| 6197 | 6197 | |
| 6198 | 6198 | public static function display_additional_profile_fields() |
| 6199 | 6199 | { |
| 6200 | - // getting all the extra profile fields that are defined by the platform administrator |
|
| 6201 | - $extra_fields = UserManager :: get_extra_fields(0,50,5,'ASC'); |
|
| 6202 | - |
|
| 6203 | - // creating the form |
|
| 6204 | - $return = '<form action="courseLog.php" method="get" name="additional_profile_field_form" id="additional_profile_field_form">'; |
|
| 6205 | - |
|
| 6206 | - // the select field with the additional user profile fields (= this is where we select the field of which we want to see |
|
| 6207 | - // the information the users have entered or selected. |
|
| 6208 | - $return .= '<select name="additional_profile_field">'; |
|
| 6209 | - $return .= '<option value="-">'.get_lang('SelectFieldToAdd').'</option>'; |
|
| 6210 | - $extra_fields_to_show = 0; |
|
| 6211 | - foreach ($extra_fields as $key=>$field) { |
|
| 6212 | - // show only extra fields that are visible + and can be filtered, added by J.Montoya |
|
| 6213 | - if ($field[6]==1 && $field[8] == 1) { |
|
| 6214 | - if (isset($_GET['additional_profile_field']) && $field[0] == $_GET['additional_profile_field'] ) { |
|
| 6215 | - $selected = 'selected="selected"'; |
|
| 6216 | - } else { |
|
| 6217 | - $selected = ''; |
|
| 6218 | - } |
|
| 6219 | - $extra_fields_to_show++; |
|
| 6220 | - $return .= '<option value="'.$field[0].'" '.$selected.'>'.$field[3].'</option>'; |
|
| 6221 | - } |
|
| 6222 | - } |
|
| 6223 | - $return .= '</select>'; |
|
| 6224 | - |
|
| 6225 | - // the form elements for the $_GET parameters (because the form is passed through GET |
|
| 6226 | - foreach ($_GET as $key=>$value){ |
|
| 6227 | - if ($key <> 'additional_profile_field') { |
|
| 6228 | - $return .= '<input type="hidden" name="'.Security::remove_XSS($key).'" value="'.Security::remove_XSS($value).'" />'; |
|
| 6229 | - } |
|
| 6230 | - } |
|
| 6231 | - // the submit button |
|
| 6232 | - $return .= '<button class="save" type="submit">'.get_lang('AddAdditionalProfileField').'</button>'; |
|
| 6233 | - $return .= '</form>'; |
|
| 6234 | - if ($extra_fields_to_show > 0) { |
|
| 6235 | - return $return; |
|
| 6236 | - } else { |
|
| 6237 | - return ''; |
|
| 6238 | - } |
|
| 6200 | + // getting all the extra profile fields that are defined by the platform administrator |
|
| 6201 | + $extra_fields = UserManager :: get_extra_fields(0,50,5,'ASC'); |
|
| 6202 | + |
|
| 6203 | + // creating the form |
|
| 6204 | + $return = '<form action="courseLog.php" method="get" name="additional_profile_field_form" id="additional_profile_field_form">'; |
|
| 6205 | + |
|
| 6206 | + // the select field with the additional user profile fields (= this is where we select the field of which we want to see |
|
| 6207 | + // the information the users have entered or selected. |
|
| 6208 | + $return .= '<select name="additional_profile_field">'; |
|
| 6209 | + $return .= '<option value="-">'.get_lang('SelectFieldToAdd').'</option>'; |
|
| 6210 | + $extra_fields_to_show = 0; |
|
| 6211 | + foreach ($extra_fields as $key=>$field) { |
|
| 6212 | + // show only extra fields that are visible + and can be filtered, added by J.Montoya |
|
| 6213 | + if ($field[6]==1 && $field[8] == 1) { |
|
| 6214 | + if (isset($_GET['additional_profile_field']) && $field[0] == $_GET['additional_profile_field'] ) { |
|
| 6215 | + $selected = 'selected="selected"'; |
|
| 6216 | + } else { |
|
| 6217 | + $selected = ''; |
|
| 6218 | + } |
|
| 6219 | + $extra_fields_to_show++; |
|
| 6220 | + $return .= '<option value="'.$field[0].'" '.$selected.'>'.$field[3].'</option>'; |
|
| 6221 | + } |
|
| 6222 | + } |
|
| 6223 | + $return .= '</select>'; |
|
| 6224 | + |
|
| 6225 | + // the form elements for the $_GET parameters (because the form is passed through GET |
|
| 6226 | + foreach ($_GET as $key=>$value){ |
|
| 6227 | + if ($key <> 'additional_profile_field') { |
|
| 6228 | + $return .= '<input type="hidden" name="'.Security::remove_XSS($key).'" value="'.Security::remove_XSS($value).'" />'; |
|
| 6229 | + } |
|
| 6230 | + } |
|
| 6231 | + // the submit button |
|
| 6232 | + $return .= '<button class="save" type="submit">'.get_lang('AddAdditionalProfileField').'</button>'; |
|
| 6233 | + $return .= '</form>'; |
|
| 6234 | + if ($extra_fields_to_show > 0) { |
|
| 6235 | + return $return; |
|
| 6236 | + } else { |
|
| 6237 | + return ''; |
|
| 6238 | + } |
|
| 6239 | 6239 | } |
| 6240 | 6240 | |
| 6241 | 6241 | /** |
@@ -6254,31 +6254,31 @@ discard block |
||
| 6254 | 6254 | */ |
| 6255 | 6255 | public static function get_addtional_profile_information_of_field_by_user($field_id, $users) |
| 6256 | 6256 | { |
| 6257 | - // Database table definition |
|
| 6258 | - $table_user = Database::get_main_table(TABLE_MAIN_USER); |
|
| 6259 | - $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES); |
|
| 6257 | + // Database table definition |
|
| 6258 | + $table_user = Database::get_main_table(TABLE_MAIN_USER); |
|
| 6259 | + $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES); |
|
| 6260 | 6260 | $extraField = Database::get_main_table(TABLE_EXTRA_FIELD); |
| 6261 | - $result_extra_field = UserManager::get_extra_field_information($field_id); |
|
| 6262 | - |
|
| 6263 | - if (!empty($users)) { |
|
| 6264 | - if ($result_extra_field['field_type'] == UserManager::USER_FIELD_TYPE_TAG ) { |
|
| 6265 | - foreach($users as $user_id) { |
|
| 6266 | - $user_result = UserManager::get_user_tags($user_id, $field_id); |
|
| 6267 | - $tag_list = array(); |
|
| 6268 | - foreach($user_result as $item) { |
|
| 6269 | - $tag_list[] = $item['tag']; |
|
| 6270 | - } |
|
| 6271 | - $return[$user_id][] = implode(', ',$tag_list); |
|
| 6272 | - } |
|
| 6273 | - } else { |
|
| 6274 | - $new_user_array = array(); |
|
| 6275 | - foreach ($users as $user_id) { |
|
| 6276 | - $new_user_array[]= "'".$user_id."'"; |
|
| 6277 | - } |
|
| 6278 | - $users = implode(',',$new_user_array); |
|
| 6261 | + $result_extra_field = UserManager::get_extra_field_information($field_id); |
|
| 6262 | + |
|
| 6263 | + if (!empty($users)) { |
|
| 6264 | + if ($result_extra_field['field_type'] == UserManager::USER_FIELD_TYPE_TAG ) { |
|
| 6265 | + foreach($users as $user_id) { |
|
| 6266 | + $user_result = UserManager::get_user_tags($user_id, $field_id); |
|
| 6267 | + $tag_list = array(); |
|
| 6268 | + foreach($user_result as $item) { |
|
| 6269 | + $tag_list[] = $item['tag']; |
|
| 6270 | + } |
|
| 6271 | + $return[$user_id][] = implode(', ',$tag_list); |
|
| 6272 | + } |
|
| 6273 | + } else { |
|
| 6274 | + $new_user_array = array(); |
|
| 6275 | + foreach ($users as $user_id) { |
|
| 6276 | + $new_user_array[]= "'".$user_id."'"; |
|
| 6277 | + } |
|
| 6278 | + $users = implode(',',$new_user_array); |
|
| 6279 | 6279 | $extraFieldType = EntityExtraField::USER_FIELD_TYPE; |
| 6280 | - // Selecting only the necessary information NOT ALL the user list |
|
| 6281 | - $sql = "SELECT user.user_id, v.value |
|
| 6280 | + // Selecting only the necessary information NOT ALL the user list |
|
| 6281 | + $sql = "SELECT user.user_id, v.value |
|
| 6282 | 6282 | FROM $table_user user |
| 6283 | 6283 | INNER JOIN $table_user_field_values v |
| 6284 | 6284 | ON (user.user_id = v.item_id) |
@@ -6289,27 +6289,27 @@ discard block |
||
| 6289 | 6289 | v.field_id=".intval($field_id)." AND |
| 6290 | 6290 | user.user_id IN ($users)"; |
| 6291 | 6291 | |
| 6292 | - $result = Database::query($sql); |
|
| 6293 | - while($row = Database::fetch_array($result)) { |
|
| 6294 | - // get option value for field type double select by id |
|
| 6295 | - if (!empty($row['value'])) { |
|
| 6296 | - if ($result_extra_field['field_type'] == |
|
| 6292 | + $result = Database::query($sql); |
|
| 6293 | + while($row = Database::fetch_array($result)) { |
|
| 6294 | + // get option value for field type double select by id |
|
| 6295 | + if (!empty($row['value'])) { |
|
| 6296 | + if ($result_extra_field['field_type'] == |
|
| 6297 | 6297 | ExtraField::FIELD_TYPE_DOUBLE_SELECT |
| 6298 | 6298 | ) { |
| 6299 | - $id_double_select = explode(';', $row['value']); |
|
| 6300 | - if (is_array($id_double_select)) { |
|
| 6301 | - $value1 = $result_extra_field['options'][$id_double_select[0]]['option_value']; |
|
| 6302 | - $value2 = $result_extra_field['options'][$id_double_select[1]]['option_value']; |
|
| 6303 | - $row['value'] = ($value1.';'.$value2); |
|
| 6304 | - } |
|
| 6305 | - } |
|
| 6306 | - } |
|
| 6307 | - // get other value from extra field |
|
| 6308 | - $return[$row['user_id']][] = $row['value']; |
|
| 6309 | - } |
|
| 6310 | - } |
|
| 6311 | - } |
|
| 6312 | - return $return; |
|
| 6299 | + $id_double_select = explode(';', $row['value']); |
|
| 6300 | + if (is_array($id_double_select)) { |
|
| 6301 | + $value1 = $result_extra_field['options'][$id_double_select[0]]['option_value']; |
|
| 6302 | + $value2 = $result_extra_field['options'][$id_double_select[1]]['option_value']; |
|
| 6303 | + $row['value'] = ($value1.';'.$value2); |
|
| 6304 | + } |
|
| 6305 | + } |
|
| 6306 | + } |
|
| 6307 | + // get other value from extra field |
|
| 6308 | + $return[$row['user_id']][] = $row['value']; |
|
| 6309 | + } |
|
| 6310 | + } |
|
| 6311 | + } |
|
| 6312 | + return $return; |
|
| 6313 | 6313 | } |
| 6314 | 6314 | |
| 6315 | 6315 | /** |
@@ -6318,18 +6318,18 @@ discard block |
||
| 6318 | 6318 | */ |
| 6319 | 6319 | public function count_student_in_course() |
| 6320 | 6320 | { |
| 6321 | - global $nbStudents; |
|
| 6322 | - return $nbStudents; |
|
| 6321 | + global $nbStudents; |
|
| 6322 | + return $nbStudents; |
|
| 6323 | 6323 | } |
| 6324 | 6324 | |
| 6325 | 6325 | public function sort_users($a, $b) |
| 6326 | 6326 | { |
| 6327 | - return strcmp(trim(api_strtolower($a[$_SESSION['tracking_column']])), trim(api_strtolower($b[$_SESSION['tracking_column']]))); |
|
| 6327 | + return strcmp(trim(api_strtolower($a[$_SESSION['tracking_column']])), trim(api_strtolower($b[$_SESSION['tracking_column']]))); |
|
| 6328 | 6328 | } |
| 6329 | 6329 | |
| 6330 | 6330 | public function sort_users_desc($a, $b) |
| 6331 | 6331 | { |
| 6332 | - return strcmp( trim(api_strtolower($b[$_SESSION['tracking_column']])), trim(api_strtolower($a[$_SESSION['tracking_column']]))); |
|
| 6332 | + return strcmp( trim(api_strtolower($b[$_SESSION['tracking_column']])), trim(api_strtolower($a[$_SESSION['tracking_column']]))); |
|
| 6333 | 6333 | } |
| 6334 | 6334 | |
| 6335 | 6335 | /** |
@@ -6338,8 +6338,8 @@ discard block |
||
| 6338 | 6338 | */ |
| 6339 | 6339 | public static function get_number_of_users() |
| 6340 | 6340 | { |
| 6341 | - global $user_ids; |
|
| 6342 | - return count($user_ids); |
|
| 6341 | + global $user_ids; |
|
| 6342 | + return count($user_ids); |
|
| 6343 | 6343 | } |
| 6344 | 6344 | |
| 6345 | 6345 | /** |
@@ -6355,37 +6355,37 @@ discard block |
||
| 6355 | 6355 | { |
| 6356 | 6356 | global $user_ids, $course_code, $additional_user_profile_info, $export_csv, $is_western_name_order, $csv_content, $session_id; |
| 6357 | 6357 | |
| 6358 | - $course_code = Database::escape_string($course_code); |
|
| 6359 | - $tbl_user = Database::get_main_table(TABLE_MAIN_USER); |
|
| 6360 | - $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
| 6358 | + $course_code = Database::escape_string($course_code); |
|
| 6359 | + $tbl_user = Database::get_main_table(TABLE_MAIN_USER); |
|
| 6360 | + $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
| 6361 | 6361 | |
| 6362 | - $access_url_id = api_get_current_access_url_id(); |
|
| 6362 | + $access_url_id = api_get_current_access_url_id(); |
|
| 6363 | 6363 | |
| 6364 | - // get all users data from a course for sortable with limit |
|
| 6365 | - if (is_array($user_ids)) { |
|
| 6366 | - $user_ids = array_map('intval', $user_ids); |
|
| 6367 | - $condition_user = " WHERE user.user_id IN (".implode(',',$user_ids).") "; |
|
| 6368 | - } else { |
|
| 6369 | - $user_ids = intval($user_ids); |
|
| 6370 | - $condition_user = " WHERE user.user_id = $user_ids "; |
|
| 6371 | - } |
|
| 6364 | + // get all users data from a course for sortable with limit |
|
| 6365 | + if (is_array($user_ids)) { |
|
| 6366 | + $user_ids = array_map('intval', $user_ids); |
|
| 6367 | + $condition_user = " WHERE user.user_id IN (".implode(',',$user_ids).") "; |
|
| 6368 | + } else { |
|
| 6369 | + $user_ids = intval($user_ids); |
|
| 6370 | + $condition_user = " WHERE user.user_id = $user_ids "; |
|
| 6371 | + } |
|
| 6372 | 6372 | |
| 6373 | - if (!empty($_GET['user_keyword'])) { |
|
| 6374 | - $keyword = trim(Database::escape_string($_GET['user_keyword'])); |
|
| 6375 | - $condition_user .= " AND ( |
|
| 6373 | + if (!empty($_GET['user_keyword'])) { |
|
| 6374 | + $keyword = trim(Database::escape_string($_GET['user_keyword'])); |
|
| 6375 | + $condition_user .= " AND ( |
|
| 6376 | 6376 | user.firstname LIKE '%".$keyword."%' OR |
| 6377 | 6377 | user.lastname LIKE '%".$keyword."%' OR |
| 6378 | 6378 | user.username LIKE '%".$keyword."%' OR |
| 6379 | 6379 | user.email LIKE '%".$keyword."%' |
| 6380 | 6380 | ) "; |
| 6381 | - } |
|
| 6381 | + } |
|
| 6382 | 6382 | |
| 6383 | 6383 | $url_table = null; |
| 6384 | 6384 | $url_condition = null; |
| 6385 | - if (api_is_multiple_url_enabled()) { |
|
| 6386 | - $url_table = ", ".$tbl_url_rel_user." as url_users"; |
|
| 6387 | - $url_condition = " AND user.user_id = url_users.user_id AND access_url_id='$access_url_id'"; |
|
| 6388 | - } |
|
| 6385 | + if (api_is_multiple_url_enabled()) { |
|
| 6386 | + $url_table = ", ".$tbl_url_rel_user." as url_users"; |
|
| 6387 | + $url_condition = " AND user.user_id = url_users.user_id AND access_url_id='$access_url_id'"; |
|
| 6388 | + } |
|
| 6389 | 6389 | |
| 6390 | 6390 | $invitedUsersCondition = ''; |
| 6391 | 6391 | |
@@ -6393,7 +6393,7 @@ discard block |
||
| 6393 | 6393 | $invitedUsersCondition = " AND user.status != " . INVITEE; |
| 6394 | 6394 | } |
| 6395 | 6395 | |
| 6396 | - $sql = "SELECT user.user_id as user_id, |
|
| 6396 | + $sql = "SELECT user.user_id as user_id, |
|
| 6397 | 6397 | user.official_code as col0, |
| 6398 | 6398 | user.lastname as col1, |
| 6399 | 6399 | user.firstname as col2, |
@@ -6401,17 +6401,17 @@ discard block |
||
| 6401 | 6401 | FROM $tbl_user as user $url_table |
| 6402 | 6402 | $condition_user $url_condition $invitedUsersCondition"; |
| 6403 | 6403 | |
| 6404 | - if (!in_array($direction, array('ASC','DESC'))) { |
|
| 6405 | - $direction = 'ASC'; |
|
| 6406 | - } |
|
| 6404 | + if (!in_array($direction, array('ASC','DESC'))) { |
|
| 6405 | + $direction = 'ASC'; |
|
| 6406 | + } |
|
| 6407 | 6407 | |
| 6408 | - $column = intval($column); |
|
| 6408 | + $column = intval($column); |
|
| 6409 | 6409 | |
| 6410 | - $from = intval($from); |
|
| 6411 | - $number_of_items = intval($number_of_items); |
|
| 6410 | + $from = intval($from); |
|
| 6411 | + $number_of_items = intval($number_of_items); |
|
| 6412 | 6412 | |
| 6413 | - $sql .= " ORDER BY col$column $direction "; |
|
| 6414 | - $sql .= " LIMIT $from,$number_of_items"; |
|
| 6413 | + $sql .= " ORDER BY col$column $direction "; |
|
| 6414 | + $sql .= " LIMIT $from,$number_of_items"; |
|
| 6415 | 6415 | |
| 6416 | 6416 | $res = Database::query($sql); |
| 6417 | 6417 | $users = array(); |
@@ -6445,7 +6445,7 @@ discard block |
||
| 6445 | 6445 | } |
| 6446 | 6446 | } |
| 6447 | 6447 | |
| 6448 | - while ($user = Database::fetch_array($res, 'ASSOC')) { |
|
| 6448 | + while ($user = Database::fetch_array($res, 'ASSOC')) { |
|
| 6449 | 6449 | $courseInfo = api_get_course_info($course_code); |
| 6450 | 6450 | $courseId = $courseInfo['real_id']; |
| 6451 | 6451 | |
@@ -6476,10 +6476,10 @@ discard block |
||
| 6476 | 6476 | $session_id |
| 6477 | 6477 | ); |
| 6478 | 6478 | |
| 6479 | - if (empty($avg_student_progress)) { |
|
| 6479 | + if (empty($avg_student_progress)) { |
|
| 6480 | 6480 | $avg_student_progress = 0; |
| 6481 | - } |
|
| 6482 | - $user['average_progress'] = $avg_student_progress.'%'; |
|
| 6481 | + } |
|
| 6482 | + $user['average_progress'] = $avg_student_progress.'%'; |
|
| 6483 | 6483 | |
| 6484 | 6484 | $total_user_exercise = Tracking::get_exercise_student_progress( |
| 6485 | 6485 | $total_exercises, |
@@ -6499,11 +6499,11 @@ discard block |
||
| 6499 | 6499 | |
| 6500 | 6500 | $user['exercise_average_best_attempt'] = $total_user_exercise; |
| 6501 | 6501 | |
| 6502 | - if (is_numeric($avg_student_score)) { |
|
| 6503 | - $user['student_score'] = $avg_student_score.'%'; |
|
| 6504 | - } else { |
|
| 6505 | - $user['student_score'] = $avg_student_score; |
|
| 6506 | - } |
|
| 6502 | + if (is_numeric($avg_student_score)) { |
|
| 6503 | + $user['student_score'] = $avg_student_score.'%'; |
|
| 6504 | + } else { |
|
| 6505 | + $user['student_score'] = $avg_student_score; |
|
| 6506 | + } |
|
| 6507 | 6507 | |
| 6508 | 6508 | $user['count_assignments'] = Tracking::count_student_assignments( |
| 6509 | 6509 | $user['user_id'], |
@@ -6526,29 +6526,29 @@ discard block |
||
| 6526 | 6526 | $session_id |
| 6527 | 6527 | ); |
| 6528 | 6528 | |
| 6529 | - // we need to display an additional profile field |
|
| 6530 | - $user['additional'] = ''; |
|
| 6529 | + // we need to display an additional profile field |
|
| 6530 | + $user['additional'] = ''; |
|
| 6531 | 6531 | |
| 6532 | - if (isset($_GET['additional_profile_field']) && is_numeric($_GET['additional_profile_field'])) { |
|
| 6533 | - if (isset($additional_user_profile_info[$user['user_id']]) && |
|
| 6532 | + if (isset($_GET['additional_profile_field']) && is_numeric($_GET['additional_profile_field'])) { |
|
| 6533 | + if (isset($additional_user_profile_info[$user['user_id']]) && |
|
| 6534 | 6534 | is_array($additional_user_profile_info[$user['user_id']]) |
| 6535 | 6535 | ) { |
| 6536 | - $user['additional'] = implode(', ', $additional_user_profile_info[$user['user_id']]); |
|
| 6537 | - } |
|
| 6538 | - } |
|
| 6536 | + $user['additional'] = implode(', ', $additional_user_profile_info[$user['user_id']]); |
|
| 6537 | + } |
|
| 6538 | + } |
|
| 6539 | 6539 | |
| 6540 | 6540 | if (empty($session_id)) { |
| 6541 | 6541 | $user['survey'] = (isset($survey_user_list[$user['user_id']]) ? $survey_user_list[$user['user_id']] : 0) .' / '.$total_surveys; |
| 6542 | 6542 | } |
| 6543 | 6543 | |
| 6544 | - $user['link'] = '<center> |
|
| 6544 | + $user['link'] = '<center> |
|
| 6545 | 6545 | <a href="../mySpace/myStudents.php?student='.$user['user_id'].'&details=true&course='.$course_code.'&origin=tracking_course&id_session='.$session_id.'"> |
| 6546 | 6546 | '.Display::return_icon('2rightarrow.png').' |
| 6547 | 6547 | </a> |
| 6548 | 6548 | </center>'; |
| 6549 | 6549 | |
| 6550 | - // store columns in array $users |
|
| 6551 | - $is_western_name_order = api_is_western_name_order(); |
|
| 6550 | + // store columns in array $users |
|
| 6551 | + $is_western_name_order = api_is_western_name_order(); |
|
| 6552 | 6552 | $user_row = array(); |
| 6553 | 6553 | $user_row[]= $user['official_code']; //0 |
| 6554 | 6554 | if ($is_western_name_order) { |
@@ -6584,21 +6584,21 @@ discard block |
||
| 6584 | 6584 | |
| 6585 | 6585 | $users[] = $user_row; |
| 6586 | 6586 | |
| 6587 | - if ($export_csv) { |
|
| 6588 | - if (empty($session_id)) { |
|
| 6587 | + if ($export_csv) { |
|
| 6588 | + if (empty($session_id)) { |
|
| 6589 | 6589 | $user_row = array_map('strip_tags', $user_row); |
| 6590 | - unset($user_row[14]); |
|
| 6591 | - unset($user_row[15]); |
|
| 6590 | + unset($user_row[14]); |
|
| 6591 | + unset($user_row[15]); |
|
| 6592 | 6592 | } else { |
| 6593 | 6593 | $user_row = array_map('strip_tags', $user_row); |
| 6594 | 6594 | unset($user_row[13]); |
| 6595 | 6595 | unset($user_row[14]); |
| 6596 | 6596 | } |
| 6597 | 6597 | |
| 6598 | - $csv_content[] = $user_row; |
|
| 6599 | - } |
|
| 6600 | - } |
|
| 6601 | - return $users; |
|
| 6598 | + $csv_content[] = $user_row; |
|
| 6599 | + } |
|
| 6600 | + } |
|
| 6601 | + return $users; |
|
| 6602 | 6602 | } |
| 6603 | 6603 | } |
| 6604 | 6604 | |
@@ -6616,18 +6616,18 @@ discard block |
||
| 6616 | 6616 | */ |
| 6617 | 6617 | public function display_login_tracking_info($view, $user_id, $course_id, $session_id = 0) |
| 6618 | 6618 | { |
| 6619 | - $MonthsLong = $GLOBALS['MonthsLong']; |
|
| 6620 | - |
|
| 6621 | - // protected data |
|
| 6622 | - $user_id = intval($user_id); |
|
| 6623 | - $session_id = intval($session_id); |
|
| 6624 | - $course_id = Database::escape_string($course_id); |
|
| 6625 | - |
|
| 6626 | - $track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS); |
|
| 6627 | - $tempView = $view; |
|
| 6628 | - if(substr($view,0,1) == '1') { |
|
| 6629 | - $new_view = substr_replace($view,'0',0,1); |
|
| 6630 | - echo " |
|
| 6619 | + $MonthsLong = $GLOBALS['MonthsLong']; |
|
| 6620 | + |
|
| 6621 | + // protected data |
|
| 6622 | + $user_id = intval($user_id); |
|
| 6623 | + $session_id = intval($session_id); |
|
| 6624 | + $course_id = Database::escape_string($course_id); |
|
| 6625 | + |
|
| 6626 | + $track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS); |
|
| 6627 | + $tempView = $view; |
|
| 6628 | + if(substr($view,0,1) == '1') { |
|
| 6629 | + $new_view = substr_replace($view,'0',0,1); |
|
| 6630 | + echo " |
|
| 6631 | 6631 | <tr> |
| 6632 | 6632 | <td valign='top'> |
| 6633 | 6633 | <font color='#0000FF'>- </font>" . |
@@ -6635,9 +6635,9 @@ discard block |
||
| 6635 | 6635 | </td> |
| 6636 | 6636 | </tr> |
| 6637 | 6637 | "; |
| 6638 | - echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LoginsDetails')."<br>"; |
|
| 6638 | + echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LoginsDetails')."<br>"; |
|
| 6639 | 6639 | |
| 6640 | - $sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date) |
|
| 6640 | + $sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date) |
|
| 6641 | 6641 | FROM $track_access_table |
| 6642 | 6642 | WHERE access_user_id = $user_id |
| 6643 | 6643 | AND c_id = $course_id |
@@ -6645,11 +6645,11 @@ discard block |
||
| 6645 | 6645 | GROUP BY YEAR(access_date),MONTH(access_date) |
| 6646 | 6646 | ORDER BY YEAR(access_date),MONTH(access_date) ASC"; |
| 6647 | 6647 | |
| 6648 | - echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>"; |
|
| 6649 | - $results = getManyResults3Col($sql); |
|
| 6648 | + echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>"; |
|
| 6649 | + $results = getManyResults3Col($sql); |
|
| 6650 | 6650 | |
| 6651 | - echo "<table cellpadding='2' cellspacing='1' border='0' align=center>"; |
|
| 6652 | - echo "<tr> |
|
| 6651 | + echo "<table cellpadding='2' cellspacing='1' border='0' align=center>"; |
|
| 6652 | + echo "<tr> |
|
| 6653 | 6653 | <td class='secLine'> |
| 6654 | 6654 | ".get_lang('LoginsTitleMonthColumn')." |
| 6655 | 6655 | </td> |
@@ -6657,36 +6657,36 @@ discard block |
||
| 6657 | 6657 | ".get_lang('LoginsTitleCountColumn')." |
| 6658 | 6658 | </td> |
| 6659 | 6659 | </tr>"; |
| 6660 | - $total = 0; |
|
| 6661 | - if (is_array($results)) { |
|
| 6662 | - for($j = 0 ; $j < count($results) ; $j++) { |
|
| 6663 | - echo "<tr>"; |
|
| 6664 | - echo "<td class='content'><a href='logins_details.php?uInfo=".$user_id."&reqdate=".$results[$j][0]."&view=".Security::remove_XSS($view)."'>".$MonthsLong[date('n', $results[$j][0])-1].' '.date('Y', $results[$j][0])."</a></td>"; |
|
| 6665 | - echo "<td valign='top' align='right' class='content'>".$results[$j][1]."</td>"; |
|
| 6666 | - echo"</tr>"; |
|
| 6667 | - $total = $total + $results[$j][1]; |
|
| 6668 | - } |
|
| 6669 | - echo "<tr>"; |
|
| 6670 | - echo "<td>".get_lang('Total')."</td>"; |
|
| 6671 | - echo "<td align='right' class='content'>".$total."</td>"; |
|
| 6672 | - echo"</tr>"; |
|
| 6673 | - } else { |
|
| 6674 | - echo "<tr>"; |
|
| 6675 | - echo "<td colspan='2'><center>".get_lang('NoResult')."</center></td>"; |
|
| 6676 | - echo"</tr>"; |
|
| 6677 | - } |
|
| 6678 | - echo "</table>"; |
|
| 6679 | - echo "</td></tr>"; |
|
| 6680 | - } else { |
|
| 6681 | - $new_view = substr_replace($view,'1',0,1); |
|
| 6682 | - echo " |
|
| 6660 | + $total = 0; |
|
| 6661 | + if (is_array($results)) { |
|
| 6662 | + for($j = 0 ; $j < count($results) ; $j++) { |
|
| 6663 | + echo "<tr>"; |
|
| 6664 | + echo "<td class='content'><a href='logins_details.php?uInfo=".$user_id."&reqdate=".$results[$j][0]."&view=".Security::remove_XSS($view)."'>".$MonthsLong[date('n', $results[$j][0])-1].' '.date('Y', $results[$j][0])."</a></td>"; |
|
| 6665 | + echo "<td valign='top' align='right' class='content'>".$results[$j][1]."</td>"; |
|
| 6666 | + echo"</tr>"; |
|
| 6667 | + $total = $total + $results[$j][1]; |
|
| 6668 | + } |
|
| 6669 | + echo "<tr>"; |
|
| 6670 | + echo "<td>".get_lang('Total')."</td>"; |
|
| 6671 | + echo "<td align='right' class='content'>".$total."</td>"; |
|
| 6672 | + echo"</tr>"; |
|
| 6673 | + } else { |
|
| 6674 | + echo "<tr>"; |
|
| 6675 | + echo "<td colspan='2'><center>".get_lang('NoResult')."</center></td>"; |
|
| 6676 | + echo"</tr>"; |
|
| 6677 | + } |
|
| 6678 | + echo "</table>"; |
|
| 6679 | + echo "</td></tr>"; |
|
| 6680 | + } else { |
|
| 6681 | + $new_view = substr_replace($view,'1',0,1); |
|
| 6682 | + echo " |
|
| 6683 | 6683 | <tr> |
| 6684 | 6684 | <td valign='top'> |
| 6685 | 6685 | +<font color='#0000FF'> </font><a href='".api_get_self()."?uInfo=".$user_id."&view=".Security::remove_XSS($new_view)."' class='specialLink'>".get_lang('LoginsAndAccessTools')."</a> |
| 6686 | 6686 | </td> |
| 6687 | 6687 | </tr> |
| 6688 | 6688 | "; |
| 6689 | - } |
|
| 6689 | + } |
|
| 6690 | 6690 | } |
| 6691 | 6691 | |
| 6692 | 6692 | /** |
@@ -6699,38 +6699,38 @@ discard block |
||
| 6699 | 6699 | */ |
| 6700 | 6700 | public function display_exercise_tracking_info($view, $user_id, $courseCode) |
| 6701 | 6701 | { |
| 6702 | - global $TBL_TRACK_HOTPOTATOES, $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $dateTimeFormatLong; |
|
| 6702 | + global $TBL_TRACK_HOTPOTATOES, $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $dateTimeFormatLong; |
|
| 6703 | 6703 | $courseId = api_get_course_int_id($courseCode); |
| 6704 | - if(substr($view,1,1) == '1') { |
|
| 6705 | - $new_view = substr_replace($view,'0',1,1); |
|
| 6706 | - echo "<tr> |
|
| 6704 | + if(substr($view,1,1) == '1') { |
|
| 6705 | + $new_view = substr_replace($view,'0',1,1); |
|
| 6706 | + echo "<tr> |
|
| 6707 | 6707 | <td valign='top'> |
| 6708 | 6708 | <font color='#0000FF'>- </font><b>".get_lang('ExercicesResults')."</b> [<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>] [<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=01000'>".get_lang('ExportAsCSV')."</a>] |
| 6709 | 6709 | </td> |
| 6710 | 6710 | </tr>"; |
| 6711 | - echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('ExercicesDetails')."<br />"; |
|
| 6711 | + echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('ExercicesDetails')."<br />"; |
|
| 6712 | 6712 | |
| 6713 | - $sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date) |
|
| 6713 | + $sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date) |
|
| 6714 | 6714 | FROM $TABLECOURSE_EXERCICES AS ce , $TABLETRACK_EXERCICES AS te |
| 6715 | 6715 | WHERE te.c_id = $courseId |
| 6716 | 6716 | AND te.exe_user_id = ".intval($user_id)." |
| 6717 | 6717 | AND te.exe_exo_id = ce.id |
| 6718 | 6718 | ORDER BY ce.title ASC, te.exe_date ASC"; |
| 6719 | 6719 | |
| 6720 | - $hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date) |
|
| 6720 | + $hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date) |
|
| 6721 | 6721 | FROM $TBL_TRACK_HOTPOTATOES AS te |
| 6722 | 6722 | WHERE te.exe_user_id = '".intval($user_id)."' AND te.c_id = $courseId |
| 6723 | 6723 | ORDER BY te.c_id ASC, te.exe_date ASC"; |
| 6724 | 6724 | |
| 6725 | - $hpresults = StatsUtils::getManyResultsXCol($hpsql, 4); |
|
| 6725 | + $hpresults = StatsUtils::getManyResultsXCol($hpsql, 4); |
|
| 6726 | 6726 | |
| 6727 | - $NoTestRes = 0; |
|
| 6728 | - $NoHPTestRes = 0; |
|
| 6727 | + $NoTestRes = 0; |
|
| 6728 | + $NoHPTestRes = 0; |
|
| 6729 | 6729 | |
| 6730 | - echo "<tr>\n<td style='padding-left : 40px;padding-right : 40px;'>\n"; |
|
| 6731 | - $results = StatsUtils::getManyResultsXCol($sql, 4); |
|
| 6732 | - echo "<table cellpadding='2' cellspacing='1' border='0' align='center'>\n"; |
|
| 6733 | - echo " |
|
| 6730 | + echo "<tr>\n<td style='padding-left : 40px;padding-right : 40px;'>\n"; |
|
| 6731 | + $results = StatsUtils::getManyResultsXCol($sql, 4); |
|
| 6732 | + echo "<table cellpadding='2' cellspacing='1' border='0' align='center'>\n"; |
|
| 6733 | + echo " |
|
| 6734 | 6734 | <tr bgcolor='#E6E6E6'> |
| 6735 | 6735 | <td> |
| 6736 | 6736 | ".get_lang('ExercicesTitleExerciceColumn')." |
@@ -6743,28 +6743,28 @@ discard block |
||
| 6743 | 6743 | </td> |
| 6744 | 6744 | </tr>"; |
| 6745 | 6745 | |
| 6746 | - if (is_array($results)) { |
|
| 6747 | - for($i = 0; $i < sizeof($results); $i++) { |
|
| 6748 | - $display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get()); |
|
| 6749 | - echo "<tr>\n"; |
|
| 6750 | - echo "<td class='content'>".$results[$i][0]."</td>\n"; |
|
| 6751 | - echo "<td class='content'>".$display_date."</td>\n"; |
|
| 6752 | - echo "<td valign='top' align='right' class='content'>".$results[$i][1]." / ".$results[$i][2]."</td>\n"; |
|
| 6753 | - echo "</tr>\n"; |
|
| 6754 | - } |
|
| 6755 | - } else { |
|
| 6756 | - // istvan begin |
|
| 6757 | - $NoTestRes = 1; |
|
| 6758 | - } |
|
| 6759 | - |
|
| 6760 | - // The Result of Tests |
|
| 6761 | - if (is_array($hpresults)) { |
|
| 6762 | - for($i = 0; $i < sizeof($hpresults); $i++) { |
|
| 6763 | - $title = GetQuizName($hpresults[$i][0],''); |
|
| 6764 | - if ($title == '') |
|
| 6765 | - $title = basename($hpresults[$i][0]); |
|
| 6766 | - $display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get()); |
|
| 6767 | - ?> |
|
| 6746 | + if (is_array($results)) { |
|
| 6747 | + for($i = 0; $i < sizeof($results); $i++) { |
|
| 6748 | + $display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get()); |
|
| 6749 | + echo "<tr>\n"; |
|
| 6750 | + echo "<td class='content'>".$results[$i][0]."</td>\n"; |
|
| 6751 | + echo "<td class='content'>".$display_date."</td>\n"; |
|
| 6752 | + echo "<td valign='top' align='right' class='content'>".$results[$i][1]." / ".$results[$i][2]."</td>\n"; |
|
| 6753 | + echo "</tr>\n"; |
|
| 6754 | + } |
|
| 6755 | + } else { |
|
| 6756 | + // istvan begin |
|
| 6757 | + $NoTestRes = 1; |
|
| 6758 | + } |
|
| 6759 | + |
|
| 6760 | + // The Result of Tests |
|
| 6761 | + if (is_array($hpresults)) { |
|
| 6762 | + for($i = 0; $i < sizeof($hpresults); $i++) { |
|
| 6763 | + $title = GetQuizName($hpresults[$i][0],''); |
|
| 6764 | + if ($title == '') |
|
| 6765 | + $title = basename($hpresults[$i][0]); |
|
| 6766 | + $display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get()); |
|
| 6767 | + ?> |
|
| 6768 | 6768 | <tr> |
| 6769 | 6769 | <td class="content"><?php echo $title; ?></td> |
| 6770 | 6770 | <td class="content" align="center"><?php echo $display_date; ?></td> |
@@ -6774,26 +6774,26 @@ discard block |
||
| 6774 | 6774 | |
| 6775 | 6775 | <?php |
| 6776 | 6776 | } |
| 6777 | - } else { |
|
| 6778 | - $NoHPTestRes = 1; |
|
| 6779 | - } |
|
| 6780 | - |
|
| 6781 | - if ($NoTestRes == 1 && $NoHPTestRes == 1) { |
|
| 6782 | - echo "<tr>\n"; |
|
| 6783 | - echo "<td colspan='3'><center>".get_lang('NoResult')."</center></td>\n"; |
|
| 6784 | - echo "</tr>\n"; |
|
| 6785 | - } |
|
| 6786 | - echo "</table>"; |
|
| 6787 | - echo "</td>\n</tr>\n"; |
|
| 6788 | - } else { |
|
| 6789 | - $new_view = substr_replace($view,'1',1,1); |
|
| 6790 | - echo " |
|
| 6777 | + } else { |
|
| 6778 | + $NoHPTestRes = 1; |
|
| 6779 | + } |
|
| 6780 | + |
|
| 6781 | + if ($NoTestRes == 1 && $NoHPTestRes == 1) { |
|
| 6782 | + echo "<tr>\n"; |
|
| 6783 | + echo "<td colspan='3'><center>".get_lang('NoResult')."</center></td>\n"; |
|
| 6784 | + echo "</tr>\n"; |
|
| 6785 | + } |
|
| 6786 | + echo "</table>"; |
|
| 6787 | + echo "</td>\n</tr>\n"; |
|
| 6788 | + } else { |
|
| 6789 | + $new_view = substr_replace($view,'1',1,1); |
|
| 6790 | + echo " |
|
| 6791 | 6791 | <tr> |
| 6792 | 6792 | <td valign='top'> |
| 6793 | 6793 | +<font color='#0000FF'> </font><a href='".api_get_self()."?uInfo=$user_id&view=".$new_view."' class='specialLink'>".get_lang('ExercicesResults')."</a> |
| 6794 | 6794 | </td> |
| 6795 | 6795 | </tr>"; |
| 6796 | - } |
|
| 6796 | + } |
|
| 6797 | 6797 | } |
| 6798 | 6798 | |
| 6799 | 6799 | /** |
@@ -6802,27 +6802,27 @@ discard block |
||
| 6802 | 6802 | */ |
| 6803 | 6803 | public function display_student_publications_tracking_info($view, $user_id, $course_id) |
| 6804 | 6804 | { |
| 6805 | - global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK; |
|
| 6805 | + global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK; |
|
| 6806 | 6806 | $_course = api_get_course_info_by_id($course_id); |
| 6807 | 6807 | |
| 6808 | - if (substr($view,2,1) == '1') { |
|
| 6809 | - $new_view = substr_replace($view,'0',2,1); |
|
| 6810 | - echo "<tr> |
|
| 6808 | + if (substr($view,2,1) == '1') { |
|
| 6809 | + $new_view = substr_replace($view,'0',2,1); |
|
| 6810 | + echo "<tr> |
|
| 6811 | 6811 | <td valign='top'> |
| 6812 | 6812 | <font color='#0000FF'>- </font><b>".get_lang('WorkUploads')."</b> [<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>] [<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=00100'>".get_lang('ExportAsCSV')."</a>] |
| 6813 | 6813 | </td> |
| 6814 | 6814 | </tr>"; |
| 6815 | - echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('WorksDetails')."<br>"; |
|
| 6816 | - $sql = "SELECT u.upload_date, w.title, w.author,w.url |
|
| 6815 | + echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('WorksDetails')."<br>"; |
|
| 6816 | + $sql = "SELECT u.upload_date, w.title, w.author,w.url |
|
| 6817 | 6817 | FROM $TABLETRACK_UPLOADS u , $TABLECOURSE_WORK w |
| 6818 | 6818 | WHERE u.upload_work_id = w.id |
| 6819 | 6819 | AND u.upload_user_id = '".intval($user_id)."' |
| 6820 | 6820 | AND u.c_id = '".intval($course_id)."' |
| 6821 | 6821 | ORDER BY u.upload_date DESC"; |
| 6822 | - echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>"; |
|
| 6823 | - $results = StatsUtils::getManyResultsXCol($sql,4); |
|
| 6824 | - echo "<table cellpadding='2' cellspacing='1' border='0' align=center>"; |
|
| 6825 | - echo "<tr> |
|
| 6822 | + echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>"; |
|
| 6823 | + $results = StatsUtils::getManyResultsXCol($sql,4); |
|
| 6824 | + echo "<table cellpadding='2' cellspacing='1' border='0' align=center>"; |
|
| 6825 | + echo "<tr> |
|
| 6826 | 6826 | <td class='secLine' width='40%'> |
| 6827 | 6827 | ".get_lang('WorkTitle')." |
| 6828 | 6828 | </td> |
@@ -6833,35 +6833,35 @@ discard block |
||
| 6833 | 6833 | ".get_lang('Date')." |
| 6834 | 6834 | </td> |
| 6835 | 6835 | </tr>"; |
| 6836 | - if (is_array($results)) { |
|
| 6837 | - for($j = 0 ; $j < count($results) ; $j++) { |
|
| 6838 | - $pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3]; |
|
| 6839 | - $beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get()); |
|
| 6840 | - echo "<tr>"; |
|
| 6841 | - echo "<td class='content'>" |
|
| 6842 | - ."<a href ='".$pathToFile."'>".$results[$j][1]."</a>" |
|
| 6843 | - ."</td>"; |
|
| 6844 | - echo "<td class='content'>".$results[$j][2]."</td>"; |
|
| 6845 | - echo "<td class='content'>".$beautifulDate."</td>"; |
|
| 6846 | - echo"</tr>"; |
|
| 6847 | - } |
|
| 6848 | - } else { |
|
| 6849 | - echo "<tr>"; |
|
| 6850 | - echo "<td colspan='3'><center>".get_lang('NoResult')."</center></td>"; |
|
| 6851 | - echo"</tr>"; |
|
| 6852 | - } |
|
| 6853 | - echo "</table>"; |
|
| 6854 | - echo "</td></tr>"; |
|
| 6855 | - } else { |
|
| 6856 | - $new_view = substr_replace($view,'1',2,1); |
|
| 6857 | - echo " |
|
| 6836 | + if (is_array($results)) { |
|
| 6837 | + for($j = 0 ; $j < count($results) ; $j++) { |
|
| 6838 | + $pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3]; |
|
| 6839 | + $beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get()); |
|
| 6840 | + echo "<tr>"; |
|
| 6841 | + echo "<td class='content'>" |
|
| 6842 | + ."<a href ='".$pathToFile."'>".$results[$j][1]."</a>" |
|
| 6843 | + ."</td>"; |
|
| 6844 | + echo "<td class='content'>".$results[$j][2]."</td>"; |
|
| 6845 | + echo "<td class='content'>".$beautifulDate."</td>"; |
|
| 6846 | + echo"</tr>"; |
|
| 6847 | + } |
|
| 6848 | + } else { |
|
| 6849 | + echo "<tr>"; |
|
| 6850 | + echo "<td colspan='3'><center>".get_lang('NoResult')."</center></td>"; |
|
| 6851 | + echo"</tr>"; |
|
| 6852 | + } |
|
| 6853 | + echo "</table>"; |
|
| 6854 | + echo "</td></tr>"; |
|
| 6855 | + } else { |
|
| 6856 | + $new_view = substr_replace($view,'1',2,1); |
|
| 6857 | + echo " |
|
| 6858 | 6858 | <tr> |
| 6859 | 6859 | <td valign='top'> |
| 6860 | 6860 | +<font color='#0000FF'> </font><a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."' class='specialLink'>".get_lang('WorkUploads')."</a> |
| 6861 | 6861 | </td> |
| 6862 | 6862 | </tr> |
| 6863 | 6863 | "; |
| 6864 | - } |
|
| 6864 | + } |
|
| 6865 | 6865 | } |
| 6866 | 6866 | |
| 6867 | 6867 | /** |
@@ -6870,55 +6870,55 @@ discard block |
||
| 6870 | 6870 | */ |
| 6871 | 6871 | public function display_links_tracking_info($view, $user_id, $courseCode) |
| 6872 | 6872 | { |
| 6873 | - global $TABLETRACK_LINKS, $TABLECOURSE_LINKS; |
|
| 6873 | + global $TABLETRACK_LINKS, $TABLECOURSE_LINKS; |
|
| 6874 | 6874 | $courseId = api_get_course_int_id($courseCode); |
| 6875 | - if (substr($view,3,1) == '1') { |
|
| 6876 | - $new_view = substr_replace($view,'0',3,1); |
|
| 6877 | - echo " |
|
| 6875 | + if (substr($view,3,1) == '1') { |
|
| 6876 | + $new_view = substr_replace($view,'0',3,1); |
|
| 6877 | + echo " |
|
| 6878 | 6878 | <tr> |
| 6879 | 6879 | <td valign='top'> |
| 6880 | 6880 | <font color='#0000FF'>- </font><b>".get_lang('LinksAccess')."</b> [<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>] [<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=00010'>".get_lang('ExportAsCSV')."</a>] |
| 6881 | 6881 | </td> |
| 6882 | 6882 | </tr> |
| 6883 | 6883 | "; |
| 6884 | - echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LinksDetails')."<br>"; |
|
| 6885 | - $sql = "SELECT cl.title, cl.url |
|
| 6884 | + echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('LinksDetails')."<br>"; |
|
| 6885 | + $sql = "SELECT cl.title, cl.url |
|
| 6886 | 6886 | FROM $TABLETRACK_LINKS AS sl, $TABLECOURSE_LINKS AS cl |
| 6887 | 6887 | WHERE sl.links_link_id = cl.id |
| 6888 | 6888 | AND sl.c_id = $courseId |
| 6889 | 6889 | AND sl.links_user_id = ".intval($user_id)." |
| 6890 | 6890 | GROUP BY cl.title, cl.url"; |
| 6891 | - echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>"; |
|
| 6892 | - $results = StatsUtils::getManyResults2Col($sql); |
|
| 6893 | - echo "<table cellpadding='2' cellspacing='1' border='0' align=center>"; |
|
| 6894 | - echo "<tr> |
|
| 6891 | + echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>"; |
|
| 6892 | + $results = StatsUtils::getManyResults2Col($sql); |
|
| 6893 | + echo "<table cellpadding='2' cellspacing='1' border='0' align=center>"; |
|
| 6894 | + echo "<tr> |
|
| 6895 | 6895 | <td class='secLine'> |
| 6896 | 6896 | ".get_lang('LinksTitleLinkColumn')." |
| 6897 | 6897 | </td> |
| 6898 | 6898 | </tr>"; |
| 6899 | - if (is_array($results)) { |
|
| 6900 | - for($j = 0 ; $j < count($results) ; $j++) { |
|
| 6901 | - echo "<tr>"; |
|
| 6902 | - echo "<td class='content'><a href='".$results[$j][1]."'>".$results[$j][0]."</a></td>"; |
|
| 6903 | - echo"</tr>"; |
|
| 6904 | - } |
|
| 6905 | - } else { |
|
| 6906 | - echo "<tr>"; |
|
| 6907 | - echo "<td ><center>".get_lang('NoResult')."</center></td>"; |
|
| 6908 | - echo"</tr>"; |
|
| 6909 | - } |
|
| 6910 | - echo "</table>"; |
|
| 6911 | - echo "</td></tr>"; |
|
| 6912 | - } else { |
|
| 6913 | - $new_view = substr_replace($view,'1',3,1); |
|
| 6914 | - echo " |
|
| 6899 | + if (is_array($results)) { |
|
| 6900 | + for($j = 0 ; $j < count($results) ; $j++) { |
|
| 6901 | + echo "<tr>"; |
|
| 6902 | + echo "<td class='content'><a href='".$results[$j][1]."'>".$results[$j][0]."</a></td>"; |
|
| 6903 | + echo"</tr>"; |
|
| 6904 | + } |
|
| 6905 | + } else { |
|
| 6906 | + echo "<tr>"; |
|
| 6907 | + echo "<td ><center>".get_lang('NoResult')."</center></td>"; |
|
| 6908 | + echo"</tr>"; |
|
| 6909 | + } |
|
| 6910 | + echo "</table>"; |
|
| 6911 | + echo "</td></tr>"; |
|
| 6912 | + } else { |
|
| 6913 | + $new_view = substr_replace($view,'1',3,1); |
|
| 6914 | + echo " |
|
| 6915 | 6915 | <tr> |
| 6916 | 6916 | <td valign='top'> |
| 6917 | 6917 | +<font color='#0000FF'> </font><a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."' class='specialLink'>".get_lang('LinksAccess')."</a> |
| 6918 | 6918 | </td> |
| 6919 | 6919 | </tr> |
| 6920 | 6920 | "; |
| 6921 | - } |
|
| 6921 | + } |
|
| 6922 | 6922 | } |
| 6923 | 6923 | |
| 6924 | 6924 | /** |
@@ -6931,61 +6931,61 @@ discard block |
||
| 6931 | 6931 | */ |
| 6932 | 6932 | public static function display_document_tracking_info($view, $user_id, $course_code, $session_id = 0) |
| 6933 | 6933 | { |
| 6934 | - // protect data |
|
| 6934 | + // protect data |
|
| 6935 | 6935 | $user_id = intval($user_id); |
| 6936 | 6936 | $courseId = api_get_course_int_id($course_code); |
| 6937 | - $session_id = intval($session_id); |
|
| 6937 | + $session_id = intval($session_id); |
|
| 6938 | 6938 | |
| 6939 | - $downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS); |
|
| 6940 | - if(substr($view,4,1) == '1') { |
|
| 6941 | - $new_view = substr_replace($view,'0',4,1); |
|
| 6942 | - echo " |
|
| 6939 | + $downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS); |
|
| 6940 | + if(substr($view,4,1) == '1') { |
|
| 6941 | + $new_view = substr_replace($view,'0',4,1); |
|
| 6942 | + echo " |
|
| 6943 | 6943 | <tr> |
| 6944 | 6944 | <td valign='top'> |
| 6945 | 6945 | <font color='#0000FF'>- </font><b>".get_lang('DocumentsAccess')."</b> [<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>] [<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=00001'>".get_lang('ExportAsCSV')."</a>] |
| 6946 | 6946 | </td> |
| 6947 | 6947 | </tr> |
| 6948 | 6948 | "; |
| 6949 | - echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('DocumentsDetails')."<br>"; |
|
| 6949 | + echo "<tr><td style='padding-left : 40px;' valign='top'>".get_lang('DocumentsDetails')."<br>"; |
|
| 6950 | 6950 | |
| 6951 | - $sql = "SELECT down_doc_path |
|
| 6951 | + $sql = "SELECT down_doc_path |
|
| 6952 | 6952 | FROM $downloads_table |
| 6953 | 6953 | WHERE c_id = $courseId |
| 6954 | 6954 | AND down_user_id = $user_id |
| 6955 | 6955 | AND down_session_id = $session_id |
| 6956 | 6956 | GROUP BY down_doc_path"; |
| 6957 | 6957 | |
| 6958 | - echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>"; |
|
| 6959 | - $results = StatsUtils::getManyResults1Col($sql); |
|
| 6960 | - echo "<table cellpadding='2' cellspacing='1' border='0' align='center'>"; |
|
| 6961 | - echo "<tr> |
|
| 6958 | + echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>"; |
|
| 6959 | + $results = StatsUtils::getManyResults1Col($sql); |
|
| 6960 | + echo "<table cellpadding='2' cellspacing='1' border='0' align='center'>"; |
|
| 6961 | + echo "<tr> |
|
| 6962 | 6962 | <td class='secLine'> |
| 6963 | 6963 | ".get_lang('DocumentsTitleDocumentColumn')." |
| 6964 | 6964 | </td> |
| 6965 | 6965 | </tr>"; |
| 6966 | - if (is_array($results)) { |
|
| 6967 | - for($j = 0 ; $j < count($results) ; $j++) { |
|
| 6968 | - echo "<tr>"; |
|
| 6969 | - echo "<td class='content'>".$results[$j]."</td>"; |
|
| 6970 | - echo"</tr>"; |
|
| 6971 | - } |
|
| 6972 | - } else { |
|
| 6973 | - echo "<tr>"; |
|
| 6974 | - echo "<td><center>".get_lang('NoResult')."</center></td>"; |
|
| 6975 | - echo"</tr>"; |
|
| 6976 | - } |
|
| 6977 | - echo "</table>"; |
|
| 6978 | - echo "</td></tr>"; |
|
| 6979 | - } else { |
|
| 6980 | - $new_view = substr_replace($view,'1',4,1); |
|
| 6981 | - echo " |
|
| 6966 | + if (is_array($results)) { |
|
| 6967 | + for($j = 0 ; $j < count($results) ; $j++) { |
|
| 6968 | + echo "<tr>"; |
|
| 6969 | + echo "<td class='content'>".$results[$j]."</td>"; |
|
| 6970 | + echo"</tr>"; |
|
| 6971 | + } |
|
| 6972 | + } else { |
|
| 6973 | + echo "<tr>"; |
|
| 6974 | + echo "<td><center>".get_lang('NoResult')."</center></td>"; |
|
| 6975 | + echo"</tr>"; |
|
| 6976 | + } |
|
| 6977 | + echo "</table>"; |
|
| 6978 | + echo "</td></tr>"; |
|
| 6979 | + } else { |
|
| 6980 | + $new_view = substr_replace($view,'1',4,1); |
|
| 6981 | + echo " |
|
| 6982 | 6982 | <tr> |
| 6983 | 6983 | <td valign='top'> |
| 6984 | 6984 | +<font color='#0000FF'> </font><a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."' class='specialLink'>".get_lang('DocumentsAccess')."</a> |
| 6985 | 6985 | </td> |
| 6986 | 6986 | </tr> |
| 6987 | 6987 | "; |
| 6988 | - } |
|
| 6988 | + } |
|
| 6989 | 6989 | } |
| 6990 | 6990 | |
| 6991 | 6991 | /** |
@@ -7042,43 +7042,43 @@ discard block |
||
| 7042 | 7042 | */ |
| 7043 | 7043 | public function display_login_tracking_info($view, $user_id, $course_id, $session_id = 0) |
| 7044 | 7044 | { |
| 7045 | - $MonthsLong = $GLOBALS['MonthsLong']; |
|
| 7046 | - $track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS); |
|
| 7047 | - |
|
| 7048 | - // protected data |
|
| 7049 | - $user_id = intval($user_id); |
|
| 7050 | - $session_id = intval($session_id); |
|
| 7051 | - $course_id = intval($course_id); |
|
| 7052 | - |
|
| 7053 | - $tempView = $view; |
|
| 7054 | - if (substr($view,0,1) == '1') { |
|
| 7055 | - $new_view = substr_replace($view,'0',0,1); |
|
| 7056 | - $title[1]= get_lang('LoginsAndAccessTools').get_lang('LoginsDetails'); |
|
| 7057 | - $sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date) |
|
| 7045 | + $MonthsLong = $GLOBALS['MonthsLong']; |
|
| 7046 | + $track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS); |
|
| 7047 | + |
|
| 7048 | + // protected data |
|
| 7049 | + $user_id = intval($user_id); |
|
| 7050 | + $session_id = intval($session_id); |
|
| 7051 | + $course_id = intval($course_id); |
|
| 7052 | + |
|
| 7053 | + $tempView = $view; |
|
| 7054 | + if (substr($view,0,1) == '1') { |
|
| 7055 | + $new_view = substr_replace($view,'0',0,1); |
|
| 7056 | + $title[1]= get_lang('LoginsAndAccessTools').get_lang('LoginsDetails'); |
|
| 7057 | + $sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date) |
|
| 7058 | 7058 | FROM $track_access_table |
| 7059 | 7059 | WHERE access_user_id = $user_id |
| 7060 | 7060 | AND c_id = $course_id |
| 7061 | 7061 | AND access_session_id = $session_id |
| 7062 | 7062 | GROUP BY YEAR(access_date),MONTH(access_date) |
| 7063 | 7063 | ORDER BY YEAR(access_date),MONTH(access_date) ASC"; |
| 7064 | - //$results = getManyResults2Col($sql); |
|
| 7065 | - $results = getManyResults3Col($sql); |
|
| 7066 | - $title_line= get_lang('LoginsTitleMonthColumn').';'.get_lang('LoginsTitleCountColumn')."\n"; |
|
| 7067 | - $line=''; |
|
| 7068 | - $total = 0; |
|
| 7069 | - if (is_array($results)) { |
|
| 7070 | - for($j = 0 ; $j < count($results) ; $j++) { |
|
| 7071 | - $line .= $results[$j][0].';'.$results[$j][1]."\n"; |
|
| 7072 | - $total = $total + $results[$j][1]; |
|
| 7073 | - } |
|
| 7074 | - $line .= get_lang('Total').";".$total."\n"; |
|
| 7075 | - } else { |
|
| 7076 | - $line= get_lang('NoResult')."</center></td>"; |
|
| 7077 | - } |
|
| 7078 | - } else { |
|
| 7079 | - $new_view = substr_replace($view,'1',0,1); |
|
| 7080 | - } |
|
| 7081 | - return array($title_line, $line); |
|
| 7064 | + //$results = getManyResults2Col($sql); |
|
| 7065 | + $results = getManyResults3Col($sql); |
|
| 7066 | + $title_line= get_lang('LoginsTitleMonthColumn').';'.get_lang('LoginsTitleCountColumn')."\n"; |
|
| 7067 | + $line=''; |
|
| 7068 | + $total = 0; |
|
| 7069 | + if (is_array($results)) { |
|
| 7070 | + for($j = 0 ; $j < count($results) ; $j++) { |
|
| 7071 | + $line .= $results[$j][0].';'.$results[$j][1]."\n"; |
|
| 7072 | + $total = $total + $results[$j][1]; |
|
| 7073 | + } |
|
| 7074 | + $line .= get_lang('Total').";".$total."\n"; |
|
| 7075 | + } else { |
|
| 7076 | + $line= get_lang('NoResult')."</center></td>"; |
|
| 7077 | + } |
|
| 7078 | + } else { |
|
| 7079 | + $new_view = substr_replace($view,'1',0,1); |
|
| 7080 | + } |
|
| 7081 | + return array($title_line, $line); |
|
| 7082 | 7082 | } |
| 7083 | 7083 | |
| 7084 | 7084 | /** |
@@ -7091,67 +7091,67 @@ discard block |
||
| 7091 | 7091 | */ |
| 7092 | 7092 | public function display_exercise_tracking_info($view, $userId, $courseCode) |
| 7093 | 7093 | { |
| 7094 | - global $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $TABLETRACK_HOTPOTATOES, $dateTimeFormatLong; |
|
| 7094 | + global $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $TABLETRACK_HOTPOTATOES, $dateTimeFormatLong; |
|
| 7095 | 7095 | $courseId = api_get_course_int_id($courseCode); |
| 7096 | 7096 | $userId = intval($userId); |
| 7097 | - if (substr($view,1,1) == '1') { |
|
| 7098 | - $new_view = substr_replace($view,'0',1,1); |
|
| 7099 | - $title[1] = get_lang('ExercicesDetails'); |
|
| 7100 | - $line = ''; |
|
| 7101 | - $sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date) |
|
| 7097 | + if (substr($view,1,1) == '1') { |
|
| 7098 | + $new_view = substr_replace($view,'0',1,1); |
|
| 7099 | + $title[1] = get_lang('ExercicesDetails'); |
|
| 7100 | + $line = ''; |
|
| 7101 | + $sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date) |
|
| 7102 | 7102 | FROM $TABLECOURSE_EXERCICES AS ce , $TABLETRACK_EXERCICES AS te |
| 7103 | 7103 | WHERE te.c_id = $courseId |
| 7104 | 7104 | AND te.exe_user_id = $userId |
| 7105 | 7105 | AND te.exe_exo_id = ce.id |
| 7106 | 7106 | ORDER BY ce.title ASC, te.exe_date ASC"; |
| 7107 | 7107 | |
| 7108 | - $hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date) |
|
| 7108 | + $hpsql = "SELECT te.exe_name, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date) |
|
| 7109 | 7109 | FROM $TABLETRACK_HOTPOTATOES AS te |
| 7110 | 7110 | WHERE te.exe_user_id = '$userId' AND te.c_id = $courseId |
| 7111 | 7111 | ORDER BY te.c_id ASC, te.exe_date ASC"; |
| 7112 | 7112 | |
| 7113 | - $hpresults = StatsUtils::getManyResultsXCol($hpsql, 4); |
|
| 7113 | + $hpresults = StatsUtils::getManyResultsXCol($hpsql, 4); |
|
| 7114 | 7114 | |
| 7115 | - $NoTestRes = 0; |
|
| 7116 | - $NoHPTestRes = 0; |
|
| 7115 | + $NoTestRes = 0; |
|
| 7116 | + $NoHPTestRes = 0; |
|
| 7117 | 7117 | |
| 7118 | - $results = StatsUtils::getManyResultsXCol($sql, 4); |
|
| 7119 | - $title_line = get_lang('ExercicesTitleExerciceColumn').";".get_lang('Date').';'.get_lang('ExercicesTitleScoreColumn')."\n"; |
|
| 7118 | + $results = StatsUtils::getManyResultsXCol($sql, 4); |
|
| 7119 | + $title_line = get_lang('ExercicesTitleExerciceColumn').";".get_lang('Date').';'.get_lang('ExercicesTitleScoreColumn')."\n"; |
|
| 7120 | 7120 | |
| 7121 | - if (is_array($results)) { |
|
| 7122 | - for($i = 0; $i < sizeof($results); $i++) |
|
| 7123 | - { |
|
| 7124 | - $display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get()); |
|
| 7125 | - $line .= $results[$i][0].";".$display_date.";".$results[$i][1]." / ".$results[$i][2]."\n"; |
|
| 7126 | - } |
|
| 7127 | - } else { |
|
| 7121 | + if (is_array($results)) { |
|
| 7122 | + for($i = 0; $i < sizeof($results); $i++) |
|
| 7123 | + { |
|
| 7124 | + $display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get()); |
|
| 7125 | + $line .= $results[$i][0].";".$display_date.";".$results[$i][1]." / ".$results[$i][2]."\n"; |
|
| 7126 | + } |
|
| 7127 | + } else { |
|
| 7128 | 7128 | // istvan begin |
| 7129 | - $NoTestRes = 1; |
|
| 7130 | - } |
|
| 7131 | - |
|
| 7132 | - // The Result of Tests |
|
| 7133 | - if (is_array($hpresults)) { |
|
| 7134 | - for($i = 0; $i < sizeof($hpresults); $i++) { |
|
| 7135 | - $title = GetQuizName($hpresults[$i][0],''); |
|
| 7136 | - |
|
| 7137 | - if ($title == '') |
|
| 7138 | - $title = basename($hpresults[$i][0]); |
|
| 7139 | - |
|
| 7140 | - $display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get()); |
|
| 7141 | - |
|
| 7142 | - $line .= $title.';'.$display_date.';'.$hpresults[$i][1].'/'.$hpresults[$i][2]."\n"; |
|
| 7143 | - } |
|
| 7144 | - } else { |
|
| 7145 | - $NoHPTestRes = 1; |
|
| 7146 | - } |
|
| 7147 | - |
|
| 7148 | - if ($NoTestRes == 1 && $NoHPTestRes == 1) { |
|
| 7149 | - $line=get_lang('NoResult'); |
|
| 7150 | - } |
|
| 7151 | - } else { |
|
| 7152 | - $new_view = substr_replace($view,'1',1,1); |
|
| 7153 | - } |
|
| 7154 | - return array($title_line, $line); |
|
| 7129 | + $NoTestRes = 1; |
|
| 7130 | + } |
|
| 7131 | + |
|
| 7132 | + // The Result of Tests |
|
| 7133 | + if (is_array($hpresults)) { |
|
| 7134 | + for($i = 0; $i < sizeof($hpresults); $i++) { |
|
| 7135 | + $title = GetQuizName($hpresults[$i][0],''); |
|
| 7136 | + |
|
| 7137 | + if ($title == '') |
|
| 7138 | + $title = basename($hpresults[$i][0]); |
|
| 7139 | + |
|
| 7140 | + $display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get()); |
|
| 7141 | + |
|
| 7142 | + $line .= $title.';'.$display_date.';'.$hpresults[$i][1].'/'.$hpresults[$i][2]."\n"; |
|
| 7143 | + } |
|
| 7144 | + } else { |
|
| 7145 | + $NoHPTestRes = 1; |
|
| 7146 | + } |
|
| 7147 | + |
|
| 7148 | + if ($NoTestRes == 1 && $NoHPTestRes == 1) { |
|
| 7149 | + $line=get_lang('NoResult'); |
|
| 7150 | + } |
|
| 7151 | + } else { |
|
| 7152 | + $new_view = substr_replace($view,'1',1,1); |
|
| 7153 | + } |
|
| 7154 | + return array($title_line, $line); |
|
| 7155 | 7155 | } |
| 7156 | 7156 | |
| 7157 | 7157 | /** |
@@ -7160,37 +7160,37 @@ discard block |
||
| 7160 | 7160 | */ |
| 7161 | 7161 | public function display_student_publications_tracking_info($view, $user_id, $course_id) |
| 7162 | 7162 | { |
| 7163 | - global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK; |
|
| 7163 | + global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK; |
|
| 7164 | 7164 | $_course = api_get_course_info(); |
| 7165 | 7165 | $user_id = intval($user_id); |
| 7166 | 7166 | $course_id = intval($course_id); |
| 7167 | 7167 | |
| 7168 | - if (substr($view,2,1) == '1') { |
|
| 7169 | - $sql = "SELECT u.upload_date, w.title, w.author, w.url |
|
| 7168 | + if (substr($view,2,1) == '1') { |
|
| 7169 | + $sql = "SELECT u.upload_date, w.title, w.author, w.url |
|
| 7170 | 7170 | FROM $TABLETRACK_UPLOADS u , $TABLECOURSE_WORK w |
| 7171 | 7171 | WHERE |
| 7172 | 7172 | u.upload_work_id = w.id AND |
| 7173 | 7173 | u.upload_user_id = '$user_id' AND |
| 7174 | 7174 | u.c_id = '$course_id' |
| 7175 | 7175 | ORDER BY u.upload_date DESC"; |
| 7176 | - $results = StatsUtils::getManyResultsXCol($sql,4); |
|
| 7177 | - |
|
| 7178 | - $title[1]=get_lang('WorksDetails'); |
|
| 7179 | - $line=''; |
|
| 7180 | - $title_line=get_lang('WorkTitle').";".get_lang('WorkAuthors').";".get_lang('Date')."\n"; |
|
| 7181 | - |
|
| 7182 | - if (is_array($results)) { |
|
| 7183 | - for($j = 0 ; $j < count($results) ; $j++) { |
|
| 7184 | - $pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3]; |
|
| 7185 | - $beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get()); |
|
| 7186 | - $line .= $results[$j][1].";".$results[$j][2].";".$beautifulDate."\n"; |
|
| 7187 | - } |
|
| 7188 | - |
|
| 7189 | - } else { |
|
| 7190 | - $line= get_lang('NoResult'); |
|
| 7191 | - } |
|
| 7192 | - } |
|
| 7193 | - return array($title_line, $line); |
|
| 7176 | + $results = StatsUtils::getManyResultsXCol($sql,4); |
|
| 7177 | + |
|
| 7178 | + $title[1]=get_lang('WorksDetails'); |
|
| 7179 | + $line=''; |
|
| 7180 | + $title_line=get_lang('WorkTitle').";".get_lang('WorkAuthors').";".get_lang('Date')."\n"; |
|
| 7181 | + |
|
| 7182 | + if (is_array($results)) { |
|
| 7183 | + for($j = 0 ; $j < count($results) ; $j++) { |
|
| 7184 | + $pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3]; |
|
| 7185 | + $beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get()); |
|
| 7186 | + $line .= $results[$j][1].";".$results[$j][2].";".$beautifulDate."\n"; |
|
| 7187 | + } |
|
| 7188 | + |
|
| 7189 | + } else { |
|
| 7190 | + $line= get_lang('NoResult'); |
|
| 7191 | + } |
|
| 7192 | + } |
|
| 7193 | + return array($title_line, $line); |
|
| 7194 | 7194 | } |
| 7195 | 7195 | |
| 7196 | 7196 | /** |
@@ -7199,32 +7199,32 @@ discard block |
||
| 7199 | 7199 | */ |
| 7200 | 7200 | public function display_links_tracking_info($view, $userId, $courseCode) |
| 7201 | 7201 | { |
| 7202 | - global $TABLETRACK_LINKS, $TABLECOURSE_LINKS; |
|
| 7202 | + global $TABLETRACK_LINKS, $TABLECOURSE_LINKS; |
|
| 7203 | 7203 | $courseId = api_get_course_int_id($courseCode); |
| 7204 | 7204 | $userId = intval($userId); |
| 7205 | 7205 | $line = null; |
| 7206 | - if (substr($view,3,1) == '1') { |
|
| 7207 | - $new_view = substr_replace($view,'0',3,1); |
|
| 7208 | - $title[1]=get_lang('LinksDetails'); |
|
| 7209 | - $sql = "SELECT cl.title, cl.url |
|
| 7206 | + if (substr($view,3,1) == '1') { |
|
| 7207 | + $new_view = substr_replace($view,'0',3,1); |
|
| 7208 | + $title[1]=get_lang('LinksDetails'); |
|
| 7209 | + $sql = "SELECT cl.title, cl.url |
|
| 7210 | 7210 | FROM $TABLETRACK_LINKS AS sl, $TABLECOURSE_LINKS AS cl |
| 7211 | 7211 | WHERE sl.links_link_id = cl.id |
| 7212 | 7212 | AND sl.c_id = $courseId |
| 7213 | 7213 | AND sl.links_user_id = $userId |
| 7214 | 7214 | GROUP BY cl.title, cl.url"; |
| 7215 | - $results = StatsUtils::getManyResults2Col($sql); |
|
| 7216 | - $title_line= get_lang('LinksTitleLinkColumn')."\n"; |
|
| 7217 | - if (is_array($results)) { |
|
| 7218 | - for ($j = 0 ; $j < count($results) ; $j++) { |
|
| 7219 | - $line .= $results[$j][0]."\n"; |
|
| 7220 | - } |
|
| 7221 | - } else { |
|
| 7222 | - $line=get_lang('NoResult'); |
|
| 7223 | - } |
|
| 7224 | - } else { |
|
| 7225 | - $new_view = substr_replace($view,'1',3,1); |
|
| 7226 | - } |
|
| 7227 | - return array($title_line, $line); |
|
| 7215 | + $results = StatsUtils::getManyResults2Col($sql); |
|
| 7216 | + $title_line= get_lang('LinksTitleLinkColumn')."\n"; |
|
| 7217 | + if (is_array($results)) { |
|
| 7218 | + for ($j = 0 ; $j < count($results) ; $j++) { |
|
| 7219 | + $line .= $results[$j][0]."\n"; |
|
| 7220 | + } |
|
| 7221 | + } else { |
|
| 7222 | + $line=get_lang('NoResult'); |
|
| 7223 | + } |
|
| 7224 | + } else { |
|
| 7225 | + $new_view = substr_replace($view,'1',3,1); |
|
| 7226 | + } |
|
| 7227 | + return array($title_line, $line); |
|
| 7228 | 7228 | } |
| 7229 | 7229 | |
| 7230 | 7230 | /** |
@@ -7237,38 +7237,38 @@ discard block |
||
| 7237 | 7237 | */ |
| 7238 | 7238 | public function display_document_tracking_info($view, $user_id, $courseCode, $session_id = 0) |
| 7239 | 7239 | { |
| 7240 | - // protect data |
|
| 7241 | - $user_id = intval($user_id); |
|
| 7240 | + // protect data |
|
| 7241 | + $user_id = intval($user_id); |
|
| 7242 | 7242 | $courseId = api_get_course_int_id($courseCode); |
| 7243 | - $session_id = intval($session_id); |
|
| 7243 | + $session_id = intval($session_id); |
|
| 7244 | 7244 | |
| 7245 | - $downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS); |
|
| 7245 | + $downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS); |
|
| 7246 | 7246 | |
| 7247 | - if (substr($view,4,1) == '1') { |
|
| 7248 | - $new_view = substr_replace($view,'0',4,1); |
|
| 7249 | - $title[1]= get_lang('DocumentsDetails'); |
|
| 7247 | + if (substr($view,4,1) == '1') { |
|
| 7248 | + $new_view = substr_replace($view,'0',4,1); |
|
| 7249 | + $title[1]= get_lang('DocumentsDetails'); |
|
| 7250 | 7250 | |
| 7251 | - $sql = "SELECT down_doc_path |
|
| 7251 | + $sql = "SELECT down_doc_path |
|
| 7252 | 7252 | FROM $downloads_table |
| 7253 | 7253 | WHERE c_id = $courseId |
| 7254 | 7254 | AND down_user_id = $user_id |
| 7255 | 7255 | AND down_session_id = $session_id |
| 7256 | 7256 | GROUP BY down_doc_path"; |
| 7257 | 7257 | |
| 7258 | - $results = StatsUtils::getManyResults1Col($sql); |
|
| 7259 | - $title_line = get_lang('DocumentsTitleDocumentColumn')."\n"; |
|
| 7258 | + $results = StatsUtils::getManyResults1Col($sql); |
|
| 7259 | + $title_line = get_lang('DocumentsTitleDocumentColumn')."\n"; |
|
| 7260 | 7260 | $line = null; |
| 7261 | - if (is_array($results)) { |
|
| 7262 | - for ($j = 0 ; $j < count($results) ; $j++) { |
|
| 7263 | - $line .= $results[$j]."\n"; |
|
| 7264 | - } |
|
| 7265 | - } else { |
|
| 7266 | - $line = get_lang('NoResult'); |
|
| 7267 | - } |
|
| 7268 | - } else { |
|
| 7269 | - $new_view = substr_replace($view,'1',4,1); |
|
| 7270 | - } |
|
| 7271 | - return array($title_line, $line); |
|
| 7261 | + if (is_array($results)) { |
|
| 7262 | + for ($j = 0 ; $j < count($results) ; $j++) { |
|
| 7263 | + $line .= $results[$j]."\n"; |
|
| 7264 | + } |
|
| 7265 | + } else { |
|
| 7266 | + $line = get_lang('NoResult'); |
|
| 7267 | + } |
|
| 7268 | + } else { |
|
| 7269 | + $new_view = substr_replace($view,'1',4,1); |
|
| 7270 | + } |
|
| 7271 | + return array($title_line, $line); |
|
| 7272 | 7272 | } |
| 7273 | 7273 | |
| 7274 | 7274 | /** |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $extendedAttempt = null, |
| 115 | 115 | $extendedAll = null, |
| 116 | 116 | $type = 'classic', |
| 117 | - $allowExtend = true |
|
| 117 | + $allowExtend = true |
|
| 118 | 118 | ) { |
| 119 | 119 | if (empty($courseInfo) || empty($lp_id)) { |
| 120 | 120 | return null; |
@@ -138,22 +138,22 @@ discard block |
||
| 138 | 138 | $extend_all = 0; |
| 139 | 139 | |
| 140 | 140 | if ($origin == 'tracking') { |
| 141 | - $url_suffix = '&session_id=' . $session_id . '&course=' . $courseCode . '&student_id=' . $user_id . '&lp_id=' . $lp_id . '&origin=' . $origin; |
|
| 141 | + $url_suffix = '&session_id='.$session_id.'&course='.$courseCode.'&student_id='.$user_id.'&lp_id='.$lp_id.'&origin='.$origin; |
|
| 142 | 142 | } else { |
| 143 | - $url_suffix = '&lp_id=' . $lp_id; |
|
| 143 | + $url_suffix = '&lp_id='.$lp_id; |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | if (!empty($extendedAll)) { |
| 147 | 147 | $extend_all_link = Display::url( |
| 148 | 148 | Display::return_icon('view_less_stats.gif', get_lang('HideAllAttempts')), |
| 149 | - api_get_self() . '?action=stats' . $url_suffix |
|
| 149 | + api_get_self().'?action=stats'.$url_suffix |
|
| 150 | 150 | ); |
| 151 | 151 | |
| 152 | 152 | $extend_all = 1; |
| 153 | 153 | } else { |
| 154 | 154 | $extend_all_link = Display::url( |
| 155 | 155 | Display::return_icon('view_more_stats.gif', get_lang('ShowAllAttempts')), |
| 156 | - api_get_self() . '?action=stats&extend_all=1' . $url_suffix |
|
| 156 | + api_get_self().'?action=stats&extend_all=1'.$url_suffix |
|
| 157 | 157 | ); |
| 158 | 158 | } |
| 159 | 159 | |
@@ -165,24 +165,24 @@ discard block |
||
| 165 | 165 | |
| 166 | 166 | $actionColumn = null; |
| 167 | 167 | if ($type == 'classic') { |
| 168 | - $actionColumn = ' <th>' . get_lang('Actions') . '</th>'; |
|
| 168 | + $actionColumn = ' <th>'.get_lang('Actions').'</th>'; |
|
| 169 | 169 | } |
| 170 | 170 | $output .= '<div class="table-responsive">'; |
| 171 | 171 | $output .= '<table class="table tracking"> |
| 172 | 172 | <thead> |
| 173 | 173 | <tr class="table-header"> |
| 174 | - <th width="16">' . ($allowExtend == true ? $extend_all_link : ' ') . '</th> |
|
| 174 | + <th width="16">' . ($allowExtend == true ? $extend_all_link : ' ').'</th> |
|
| 175 | 175 | <th colspan="4"> |
| 176 | - ' . get_lang('ScormLessonTitle') .' |
|
| 176 | + ' . get_lang('ScormLessonTitle').' |
|
| 177 | 177 | </th> |
| 178 | 178 | <th colspan="2"> |
| 179 | - ' . get_lang('ScormStatus') . ' |
|
| 179 | + ' . get_lang('ScormStatus').' |
|
| 180 | 180 | </th> |
| 181 | 181 | <th colspan="2"> |
| 182 | - ' . get_lang('ScormScore') . ' |
|
| 182 | + ' . get_lang('ScormScore').' |
|
| 183 | 183 | </th> |
| 184 | 184 | <th colspan="2"> |
| 185 | - ' . get_lang('ScormTime') . ' |
|
| 185 | + ' . get_lang('ScormTime').' |
|
| 186 | 186 | </th> |
| 187 | 187 | '.$actionColumn.' |
| 188 | 188 | </tr> |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | // Prepare statement to go through each attempt. |
| 246 | 246 | $viewCondition = null; |
| 247 | 247 | if (!empty($view)) { |
| 248 | - $viewCondition = " AND v.view_count = $view "; |
|
| 248 | + $viewCondition = " AND v.view_count = $view "; |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | $sql = "SELECT |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | FROM $TBL_QUIZ |
| 294 | 294 | WHERE |
| 295 | 295 | c_id = $course_id AND |
| 296 | - id ='" . $my_path . "'"; |
|
| 296 | + id ='".$my_path."'"; |
|
| 297 | 297 | $res_result_disabled = Database::query($sql); |
| 298 | 298 | $row_result_disabled = Database::fetch_row($res_result_disabled); |
| 299 | 299 | |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | if (!empty($inter_num)) { |
| 316 | 316 | $extend_link = Display::url( |
| 317 | 317 | Display::return_icon('visible.gif', get_lang('HideAttemptView')), |
| 318 | - api_get_self() . '?action=stats&fold_id=' . $my_item_id . $url_suffix |
|
| 318 | + api_get_self().'?action=stats&fold_id='.$my_item_id.$url_suffix |
|
| 319 | 319 | ); |
| 320 | 320 | } |
| 321 | 321 | $title = $row['mytitle']; |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | |
| 334 | 334 | $action = null; |
| 335 | 335 | if ($type == 'classic') { |
| 336 | - $action = '<td></td>'; |
|
| 336 | + $action = '<td></td>'; |
|
| 337 | 337 | } |
| 338 | 338 | |
| 339 | 339 | if (in_array($row['item_type'], $chapterTypes)) { |
@@ -377,13 +377,13 @@ discard block |
||
| 377 | 377 | $extend_this_attempt = 1; |
| 378 | 378 | $extend_attempt_link = Display::url( |
| 379 | 379 | Display::return_icon('visible.gif', get_lang('HideAttemptView')), |
| 380 | - api_get_self() . '?action=stats&extend_id=' . $my_item_id . '&fold_attempt_id=' . $row['iv_id'] . $url_suffix |
|
| 380 | + api_get_self().'?action=stats&extend_id='.$my_item_id.'&fold_attempt_id='.$row['iv_id'].$url_suffix |
|
| 381 | 381 | ); |
| 382 | 382 | } else { // Same case if fold_attempt_id is set, so not implemented explicitly. |
| 383 | 383 | // The extend button for this attempt has not been clicked. |
| 384 | 384 | $extend_attempt_link = Display::url( |
| 385 | 385 | Display::return_icon('invisible.gif', get_lang('ExtendAttemptView')), |
| 386 | - api_get_self() . '?action=stats&extend_id=' . $my_item_id . '&extend_attempt_id=' . $row['iv_id'] . $url_suffix |
|
| 386 | + api_get_self().'?action=stats&extend_id='.$my_item_id.'&extend_attempt_id='.$row['iv_id'].$url_suffix |
|
| 387 | 387 | ); |
| 388 | 388 | } |
| 389 | 389 | } |
@@ -416,7 +416,7 @@ discard block |
||
| 416 | 416 | } |
| 417 | 417 | |
| 418 | 418 | // Remove "NaN" if any (@todo: locate the source of these NaN) |
| 419 | - $time = str_replace('NaN', '00' . $h . '00\'00"', $time); |
|
| 419 | + $time = str_replace('NaN', '00'.$h.'00\'00"', $time); |
|
| 420 | 420 | |
| 421 | 421 | if ($row['item_type'] != 'dokeos_chapter') { |
| 422 | 422 | if (!$is_allowed_to_edit && $result_disabled_ext_all) { |
@@ -444,13 +444,13 @@ discard block |
||
| 444 | 444 | $action = '<td></td>'; |
| 445 | 445 | } |
| 446 | 446 | |
| 447 | - $output .= '<tr class="' . $oddclass . '"> |
|
| 447 | + $output .= '<tr class="'.$oddclass.'"> |
|
| 448 | 448 | <td></td> |
| 449 | - <td>' . $extend_attempt_link . '</td> |
|
| 450 | - <td colspan="3">' . get_lang('Attempt') . ' ' . $attemptCount . '</td> |
|
| 451 | - <td colspan="2">' . learnpathItem::humanize_status($lesson_status, true, $type) . '</td> |
|
| 452 | - <td colspan="2">' . $view_score . '</td> |
|
| 453 | - <td colspan="2">' . $time . '</td> |
|
| 449 | + <td>' . $extend_attempt_link.'</td> |
|
| 450 | + <td colspan="3">' . get_lang('Attempt').' '.$attemptCount.'</td> |
|
| 451 | + <td colspan="2">' . learnpathItem::humanize_status($lesson_status, true, $type).'</td> |
|
| 452 | + <td colspan="2">' . $view_score.'</td> |
|
| 453 | + <td colspan="2">' . $time.'</td> |
|
| 454 | 454 | '.$action.' |
| 455 | 455 | </tr>'; |
| 456 | 456 | $attemptCount++; |
@@ -463,10 +463,10 @@ discard block |
||
| 463 | 463 | if (!$is_allowed_to_edit && $result_disabled_ext_all) { |
| 464 | 464 | $temp[] = '/'; |
| 465 | 465 | } else { |
| 466 | - $temp[] = ($score == 0 ? '0/' . $maxscore : ($maxscore == 0 ? $score : $score . '/' . float_format($maxscore, 1))); |
|
| 466 | + $temp[] = ($score == 0 ? '0/'.$maxscore : ($maxscore == 0 ? $score : $score.'/'.float_format($maxscore, 1))); |
|
| 467 | 467 | } |
| 468 | 468 | } else { |
| 469 | - $temp[] = ($score == 0 ? '/' : ($maxscore == 0 ? $score : $score . '/' . float_format($maxscore, 1))); |
|
| 469 | + $temp[] = ($score == 0 ? '/' : ($maxscore == 0 ? $score : $score.'/'.float_format($maxscore, 1))); |
|
| 470 | 470 | } |
| 471 | 471 | $temp[] = $time; |
| 472 | 472 | $csv_content[] = $temp; |
@@ -503,13 +503,13 @@ discard block |
||
| 503 | 503 | <td></td> |
| 504 | 504 | <td></td> |
| 505 | 505 | <td></td> |
| 506 | - <td>'.$interaction['order_id'] . '</td> |
|
| 507 | - <td>'.$interaction['id'] . '</td> |
|
| 506 | + <td>'.$interaction['order_id'].'</td> |
|
| 507 | + <td>'.$interaction['id'].'</td> |
|
| 508 | 508 | <td colspan="2">' . $interaction['type'].'</td> |
| 509 | - <td>'.$student_response . '</td> |
|
| 510 | - <td>'.$interaction['result'] . '</td> |
|
| 511 | - <td>'.$interaction['latency'] . '</td> |
|
| 512 | - <td>'.$interaction['time'] . '</td> |
|
| 509 | + <td>'.$student_response.'</td> |
|
| 510 | + <td>'.$interaction['result'].'</td> |
|
| 511 | + <td>'.$interaction['latency'].'</td> |
|
| 512 | + <td>'.$interaction['time'].'</td> |
|
| 513 | 513 | '.$action.' |
| 514 | 514 | </tr>'; |
| 515 | 515 | $counter++; |
@@ -526,12 +526,12 @@ discard block |
||
| 526 | 526 | <td></td> |
| 527 | 527 | <td></td> |
| 528 | 528 | <td></td> |
| 529 | - <td>' . $interaction['order_id'] . '</td> |
|
| 530 | - <td colspan="2">' . $interaction['objective_id'] . '</td> |
|
| 531 | - <td colspan="2">' . $interaction['status'] .'</td> |
|
| 532 | - <td>' . $interaction['score_raw'] . '</td> |
|
| 533 | - <td>' . $interaction['score_max'] . '</td> |
|
| 534 | - <td>' . $interaction['score_min'] . '</td> |
|
| 529 | + <td>' . $interaction['order_id'].'</td> |
|
| 530 | + <td colspan="2">' . $interaction['objective_id'].'</td> |
|
| 531 | + <td colspan="2">' . $interaction['status'].'</td> |
|
| 532 | + <td>' . $interaction['score_raw'].'</td> |
|
| 533 | + <td>' . $interaction['score_max'].'</td> |
|
| 534 | + <td>' . $interaction['score_min'].'</td> |
|
| 535 | 535 | '.$action.' |
| 536 | 536 | </tr>'; |
| 537 | 537 | $counter++; |
@@ -554,7 +554,7 @@ discard block |
||
| 554 | 554 | $my_path = Database::escape_string($my_path); |
| 555 | 555 | $sql = "SELECT results_disabled |
| 556 | 556 | FROM $TBL_QUIZ |
| 557 | - WHERE c_id = $course_id AND id ='" . $my_path . "'"; |
|
| 557 | + WHERE c_id = $course_id AND id ='".$my_path."'"; |
|
| 558 | 558 | $res_result_disabled = Database::query($sql); |
| 559 | 559 | $row_result_disabled = Database::fetch_row($res_result_disabled); |
| 560 | 560 | |
@@ -578,14 +578,14 @@ discard block |
||
| 578 | 578 | $extend_this_attempt = 1; |
| 579 | 579 | $extend_attempt_link = Display::url( |
| 580 | 580 | Display::return_icon('visible.gif', get_lang('HideAttemptView')), |
| 581 | - api_get_self() . '?action=stats&extend_id=' . $my_item_id . '&fold_attempt_id=' . $row['iv_id'] . $url_suffix |
|
| 581 | + api_get_self().'?action=stats&extend_id='.$my_item_id.'&fold_attempt_id='.$row['iv_id'].$url_suffix |
|
| 582 | 582 | ); |
| 583 | 583 | } else { |
| 584 | 584 | // Same case if fold_attempt_id is set, so not implemented explicitly. |
| 585 | 585 | // The extend button for this attempt has not been clicked. |
| 586 | 586 | $extend_attempt_link = Display::url( |
| 587 | 587 | Display::return_icon('invisible.gif', get_lang('ExtendAttemptView')), |
| 588 | - api_get_self() . '?action=stats&extend_id=' . $my_item_id . '&extend_attempt_id=' . $row['iv_id'] . $url_suffix |
|
| 588 | + api_get_self().'?action=stats&extend_id='.$my_item_id.'&extend_attempt_id='.$row['iv_id'].$url_suffix |
|
| 589 | 589 | ); |
| 590 | 590 | } |
| 591 | 591 | } |
@@ -600,7 +600,7 @@ discard block |
||
| 600 | 600 | if ($inter_num > 1) { |
| 601 | 601 | $extend_link = Display::url( |
| 602 | 602 | Display::return_icon('invisible.gif', get_lang('ExtendAttemptView')), |
| 603 | - api_get_self() . '?action=stats&extend_id=' . $my_item_id . '&extend_attempt_id=' . $row['iv_id'] . $url_suffix |
|
| 603 | + api_get_self().'?action=stats&extend_id='.$my_item_id.'&extend_attempt_id='.$row['iv_id'].$url_suffix |
|
| 604 | 604 | ); |
| 605 | 605 | } |
| 606 | 606 | |
@@ -616,15 +616,15 @@ discard block |
||
| 616 | 616 | |
| 617 | 617 | // Selecting the exe_id from stats attempts tables in order to look the max score value. |
| 618 | 618 | |
| 619 | - $sql = 'SELECT * FROM ' . $tbl_stats_exercices . ' |
|
| 619 | + $sql = 'SELECT * FROM '.$tbl_stats_exercices.' |
|
| 620 | 620 | WHERE |
| 621 | - exe_exo_id="' . $row['path'] . '" AND |
|
| 622 | - exe_user_id="' . $user_id . '" AND |
|
| 623 | - orig_lp_id = "' . $lp_id . '" AND |
|
| 624 | - orig_lp_item_id = "' . $row['myid'] . '" AND |
|
| 625 | - c_id = ' . $course_id . ' AND |
|
| 621 | + exe_exo_id="' . $row['path'].'" AND |
|
| 622 | + exe_user_id="' . $user_id.'" AND |
|
| 623 | + orig_lp_id = "' . $lp_id.'" AND |
|
| 624 | + orig_lp_item_id = "' . $row['myid'].'" AND |
|
| 625 | + c_id = ' . $course_id.' AND |
|
| 626 | 626 | status <> "incomplete" AND |
| 627 | - session_id = ' . $session_id . ' |
|
| 627 | + session_id = ' . $session_id.' |
|
| 628 | 628 | ORDER BY exe_date DESC |
| 629 | 629 | LIMIT 1'; |
| 630 | 630 | |
@@ -655,8 +655,8 @@ discard block |
||
| 655 | 655 | FROM $TBL_LP_ITEM_VIEW |
| 656 | 656 | WHERE |
| 657 | 657 | c_id = $course_id AND |
| 658 | - lp_item_id = '" . (int) $my_id . "' AND |
|
| 659 | - lp_view_id = '" . (int) $my_lp_view_id . "' |
|
| 658 | + lp_item_id = '".(int) $my_id."' AND |
|
| 659 | + lp_view_id = '" . (int) $my_lp_view_id."' |
|
| 660 | 660 | ORDER BY view_count DESC limit 1"; |
| 661 | 661 | $res_score = Database::query($sql); |
| 662 | 662 | $row_score = Database::fetch_array($res_score); |
@@ -665,8 +665,8 @@ discard block |
||
| 665 | 665 | FROM $TBL_LP_ITEM_VIEW |
| 666 | 666 | WHERE |
| 667 | 667 | c_id = $course_id AND |
| 668 | - lp_item_id = '" . (int) $my_id . "' AND |
|
| 669 | - lp_view_id = '" . (int) $my_lp_view_id . "'"; |
|
| 668 | + lp_item_id = '".(int) $my_id."' AND |
|
| 669 | + lp_view_id = '" . (int) $my_lp_view_id."'"; |
|
| 670 | 670 | $res_time = Database::query($sql); |
| 671 | 671 | $row_time = Database::fetch_array($res_time); |
| 672 | 672 | |
@@ -725,16 +725,16 @@ discard block |
||
| 725 | 725 | } else { |
| 726 | 726 | $correct_test_link = '-'; |
| 727 | 727 | if ($row['item_type'] == 'quiz') { |
| 728 | - $my_url_suffix = '&course=' . $courseCode . '&student_id=' . $user_id . '&lp_id=' . intval($row['mylpid']) . '&origin=' . $origin; |
|
| 729 | - $sql = 'SELECT * FROM ' . $tbl_stats_exercices . ' |
|
| 728 | + $my_url_suffix = '&course='.$courseCode.'&student_id='.$user_id.'&lp_id='.intval($row['mylpid']).'&origin='.$origin; |
|
| 729 | + $sql = 'SELECT * FROM '.$tbl_stats_exercices.' |
|
| 730 | 730 | WHERE |
| 731 | - exe_exo_id="' . $row['path'] . '" AND |
|
| 732 | - exe_user_id="' . $user_id . '" AND |
|
| 733 | - orig_lp_id = "' . $lp_id . '" AND |
|
| 734 | - orig_lp_item_id = "' . $row['myid'] . '" AND |
|
| 735 | - c_id = ' . $course_id . ' AND |
|
| 731 | + exe_exo_id="' . $row['path'].'" AND |
|
| 732 | + exe_user_id="' . $user_id.'" AND |
|
| 733 | + orig_lp_id = "' . $lp_id.'" AND |
|
| 734 | + orig_lp_item_id = "' . $row['myid'].'" AND |
|
| 735 | + c_id = ' . $course_id.' AND |
|
| 736 | 736 | status <> "incomplete" AND |
| 737 | - session_id = ' . $session_id . ' |
|
| 737 | + session_id = ' . $session_id.' |
|
| 738 | 738 | ORDER BY exe_date DESC '; |
| 739 | 739 | |
| 740 | 740 | $resultLastAttempt = Database::query($sql); |
@@ -746,12 +746,12 @@ discard block |
||
| 746 | 746 | ) { |
| 747 | 747 | $correct_test_link = Display::url( |
| 748 | 748 | Display::return_icon('view_less_stats.gif', get_lang('HideAllAttempts')), |
| 749 | - api_get_self() . '?action=stats' . $my_url_suffix . '&session_id=' . $session_id . '&lp_item_id=' . $my_id |
|
| 749 | + api_get_self().'?action=stats'.$my_url_suffix.'&session_id='.$session_id.'&lp_item_id='.$my_id |
|
| 750 | 750 | ); |
| 751 | 751 | } else { |
| 752 | 752 | $correct_test_link = Display::url( |
| 753 | 753 | Display::return_icon('view_more_stats.gif', get_lang('ShowAllAttemptsByExercise')), |
| 754 | - api_get_self() . '?action=stats&extend_attempt=1' . $my_url_suffix . '&session_id=' . $session_id . '&lp_item_id=' . $my_id |
|
| 754 | + api_get_self().'?action=stats&extend_attempt=1'.$my_url_suffix.'&session_id='.$session_id.'&lp_item_id='.$my_id |
|
| 755 | 755 | ); |
| 756 | 756 | } |
| 757 | 757 | } |
@@ -761,14 +761,14 @@ discard block |
||
| 761 | 761 | |
| 762 | 762 | $action = null; |
| 763 | 763 | if ($type == 'classic') { |
| 764 | - $action = '<td>' . $correct_test_link . '</td>'; |
|
| 764 | + $action = '<td>'.$correct_test_link.'</td>'; |
|
| 765 | 765 | } |
| 766 | 766 | |
| 767 | 767 | if ($lp_id == $my_lp_id && false) { |
| 768 | 768 | |
| 769 | - $output .= '<tr class =' . $oddclass . '> |
|
| 770 | - <td>' . $extend_link . '</td> |
|
| 771 | - <td colspan="4">' . $title . '</td> |
|
| 769 | + $output .= '<tr class ='.$oddclass.'> |
|
| 770 | + <td>' . $extend_link.'</td> |
|
| 771 | + <td colspan="4">' . $title.'</td> |
|
| 772 | 772 | <td colspan="2"> </td> |
| 773 | 773 | <td colspan="2"> </td> |
| 774 | 774 | <td colspan="2"> </td> |
@@ -793,13 +793,13 @@ discard block |
||
| 793 | 793 | $scoreItem .= ExerciseLib::show_score($score, $maxscore, false); |
| 794 | 794 | } |
| 795 | 795 | } else { |
| 796 | - $scoreItem .= $score == 0 ? '/' : ($maxscore == 0 ? $score : $score . '/' . $maxscore); |
|
| 796 | + $scoreItem .= $score == 0 ? '/' : ($maxscore == 0 ? $score : $score.'/'.$maxscore); |
|
| 797 | 797 | } |
| 798 | 798 | |
| 799 | 799 | $output .= ' |
| 800 | 800 | <td>'.$extend_link.'</td> |
| 801 | - <td colspan="4">' . $title . '</td> |
|
| 802 | - <td colspan="2">' . learnpathitem::humanize_status($lesson_status) .'</td> |
|
| 801 | + <td colspan="4">' . $title.'</td> |
|
| 802 | + <td colspan="2">' . learnpathitem::humanize_status($lesson_status).'</td> |
|
| 803 | 803 | <td colspan="2">'.$scoreItem.'</td> |
| 804 | 804 | <td colspan="2">'.$time.'</td> |
| 805 | 805 | '.$action.' |
@@ -816,10 +816,10 @@ discard block |
||
| 816 | 816 | if (!$is_allowed_to_edit && $result_disabled_ext_all) { |
| 817 | 817 | $temp[] = '/'; |
| 818 | 818 | } else { |
| 819 | - $temp[] = ($score == 0 ? '0/' . $maxscore : ($maxscore == 0 ? $score : $score . '/' . float_format($maxscore, 1))); |
|
| 819 | + $temp[] = ($score == 0 ? '0/'.$maxscore : ($maxscore == 0 ? $score : $score.'/'.float_format($maxscore, 1))); |
|
| 820 | 820 | } |
| 821 | 821 | } else { |
| 822 | - $temp[] = ($score == 0 ? '/' : ($maxscore == 0 ? $score : $score . '/' . float_format($maxscore, 1))); |
|
| 822 | + $temp[] = ($score == 0 ? '/' : ($maxscore == 0 ? $score : $score.'/'.float_format($maxscore, 1))); |
|
| 823 | 823 | } |
| 824 | 824 | $temp[] = $time; |
| 825 | 825 | $csv_content[] = $temp; |
@@ -830,7 +830,7 @@ discard block |
||
| 830 | 830 | |
| 831 | 831 | $action = null; |
| 832 | 832 | if ($type == 'classic') { |
| 833 | - $action = '<td></td>'; |
|
| 833 | + $action = '<td></td>'; |
|
| 834 | 834 | } |
| 835 | 835 | |
| 836 | 836 | if ($extend_this_attempt || $extend_all) { |
@@ -867,11 +867,11 @@ discard block |
||
| 867 | 867 | <td></td> |
| 868 | 868 | <td></td> |
| 869 | 869 | <td></td> |
| 870 | - <td>' . $interaction['order_id'] . '</td> |
|
| 871 | - <td colspan="2">'.$interaction['objective_id'] . '</td> |
|
| 872 | - <td colspan="2">' . $interaction['status'] . '</td> |
|
| 870 | + <td>' . $interaction['order_id'].'</td> |
|
| 871 | + <td colspan="2">'.$interaction['objective_id'].'</td> |
|
| 872 | + <td colspan="2">' . $interaction['status'].'</td> |
|
| 873 | 873 | <td>' . $interaction['score_raw'].'</td> |
| 874 | - <td>' . $interaction['score_max'] .'</td> |
|
| 874 | + <td>' . $interaction['score_max'].'</td> |
|
| 875 | 875 | <td>' . $interaction['score_min'].'</td> |
| 876 | 876 | '.$action.' |
| 877 | 877 | </tr>'; |
@@ -880,7 +880,7 @@ discard block |
||
| 880 | 880 | } |
| 881 | 881 | |
| 882 | 882 | // Attempts listing by exercise. |
| 883 | - if ($lp_id == $my_lp_id && $lp_item_id== $my_id && $extendedAttempt) { |
|
| 883 | + if ($lp_id == $my_lp_id && $lp_item_id == $my_id && $extendedAttempt) { |
|
| 884 | 884 | // Get attempts of a exercise. |
| 885 | 885 | if (!empty($lp_id) && |
| 886 | 886 | !empty($lp_item_id) && |
@@ -895,15 +895,15 @@ discard block |
||
| 895 | 895 | $row_path = Database::fetch_array($res_path); |
| 896 | 896 | |
| 897 | 897 | if (Database::num_rows($res_path) > 0) { |
| 898 | - $sql = 'SELECT * FROM ' . $tbl_stats_exercices . ' |
|
| 898 | + $sql = 'SELECT * FROM '.$tbl_stats_exercices.' |
|
| 899 | 899 | WHERE |
| 900 | - exe_exo_id="' . (int) $row_path['path'] . '" AND |
|
| 900 | + exe_exo_id="' . (int) $row_path['path'].'" AND |
|
| 901 | 901 | status <> "incomplete" AND |
| 902 | - exe_user_id="' . $user_id . '" AND |
|
| 903 | - orig_lp_id = "' . (int) $lp_id . '" AND |
|
| 904 | - orig_lp_item_id = "' . (int) $lp_item_id . '" AND |
|
| 905 | - c_id = ' . $course_id . ' AND |
|
| 906 | - session_id = ' . $session_id . ' |
|
| 902 | + exe_user_id="' . $user_id.'" AND |
|
| 903 | + orig_lp_id = "' . (int) $lp_id.'" AND |
|
| 904 | + orig_lp_item_id = "' . (int) $lp_item_id.'" AND |
|
| 905 | + c_id = ' . $course_id.' AND |
|
| 906 | + session_id = ' . $session_id.' |
|
| 907 | 907 | ORDER BY exe_date'; |
| 908 | 908 | $res_attempts = Database::query($sql); |
| 909 | 909 | $num_attempts = Database::num_rows($res_attempts); |
@@ -921,7 +921,7 @@ discard block |
||
| 921 | 921 | if ($mktime_start_date && $mktime_exe_date) { |
| 922 | 922 | $mytime = ((int) $mktime_exe_date - (int) $mktime_start_date); |
| 923 | 923 | $time_attemp = learnpathItem :: getScormTimeFromParameter('js', $mytime); |
| 924 | - $time_attemp = str_replace('NaN', '00' . $h . '00\'00"', $time_attemp); |
|
| 924 | + $time_attemp = str_replace('NaN', '00'.$h.'00\'00"', $time_attemp); |
|
| 925 | 925 | } else { |
| 926 | 926 | $time_attemp = ' - '; |
| 927 | 927 | } |
@@ -947,33 +947,33 @@ discard block |
||
| 947 | 947 | $my_lesson_status = learnpathitem::humanize_status('incomplete'); |
| 948 | 948 | } |
| 949 | 949 | |
| 950 | - $output .= '<tr class="' . $oddclass . '" > |
|
| 950 | + $output .= '<tr class="'.$oddclass.'" > |
|
| 951 | 951 | <td></td> |
| 952 | - <td>' . $extend_attempt_link . '</td> |
|
| 953 | - <td colspan="3">' . get_lang('Attempt').' '. $n.'</td> |
|
| 954 | - <td colspan="2">' . $my_lesson_status . '</td> |
|
| 955 | - <td colspan="2">'.$view_score . '</td> |
|
| 956 | - <td colspan="2">'.$time_attemp . '</td>'; |
|
| 952 | + <td>' . $extend_attempt_link.'</td> |
|
| 953 | + <td colspan="3">' . get_lang('Attempt').' '.$n.'</td> |
|
| 954 | + <td colspan="2">' . $my_lesson_status.'</td> |
|
| 955 | + <td colspan="2">'.$view_score.'</td> |
|
| 956 | + <td colspan="2">'.$time_attemp.'</td>'; |
|
| 957 | 957 | if ($action == 'classic') { |
| 958 | 958 | if ($origin != 'tracking') { |
| 959 | 959 | if (!$is_allowed_to_edit && $result_disabled_ext_all) { |
| 960 | 960 | $output .= '<td> |
| 961 | - <img src="' . Display::returnIconPath('quiz_na.gif').'" alt="' . get_lang('ShowAttempt') . '" title="' . get_lang('ShowAttempt') . '"> |
|
| 961 | + <img src="' . Display::returnIconPath('quiz_na.gif').'" alt="'.get_lang('ShowAttempt').'" title="'.get_lang('ShowAttempt').'"> |
|
| 962 | 962 | </td>'; |
| 963 | 963 | } else { |
| 964 | 964 | $output .= '<td> |
| 965 | - <a href="../exercice/exercise_show.php?origin=' . $origin . '&id=' . $my_exe_id . '&cidReq=' . $courseCode . '" target="_parent"> |
|
| 966 | - <img src="' . Display::returnIconPath('quiz.gif').'" alt="' . get_lang('ShowAttempt') . '" title="' . get_lang('ShowAttempt') . '"> |
|
| 965 | + <a href="../exercice/exercise_show.php?origin=' . $origin.'&id='.$my_exe_id.'&cidReq='.$courseCode.'" target="_parent"> |
|
| 966 | + <img src="' . Display::returnIconPath('quiz.gif').'" alt="'.get_lang('ShowAttempt').'" title="'.get_lang('ShowAttempt').'"> |
|
| 967 | 967 | </a></td>'; |
| 968 | 968 | } |
| 969 | 969 | } else { |
| 970 | 970 | if (!$is_allowed_to_edit && $result_disabled_ext_all) { |
| 971 | 971 | $output .= '<td> |
| 972 | - <img src="' . Display::returnIconPath('quiz_na.gif').'" alt="' . get_lang('ShowAndQualifyAttempt') . '" title="' . get_lang('ShowAndQualifyAttempt') . '"></td>'; |
|
| 972 | + <img src="' . Display::returnIconPath('quiz_na.gif').'" alt="'.get_lang('ShowAndQualifyAttempt').'" title="'.get_lang('ShowAndQualifyAttempt').'"></td>'; |
|
| 973 | 973 | } else { |
| 974 | 974 | $output .= '<td> |
| 975 | - <a href="../exercice/exercise_show.php?cidReq=' . $courseCode . '&origin=correct_exercise_in_lp&id=' . $my_exe_id . '" target="_parent"> |
|
| 976 | - <img src="' . Display::returnIconPath('quiz.gif').'" alt="' . get_lang('ShowAndQualifyAttempt') . '" title="' . get_lang('ShowAndQualifyAttempt') . '"></a></td>'; |
|
| 975 | + <a href="../exercice/exercise_show.php?cidReq=' . $courseCode.'&origin=correct_exercise_in_lp&id='.$my_exe_id.'" target="_parent"> |
|
| 976 | + <img src="' . Display::returnIconPath('quiz.gif').'" alt="'.get_lang('ShowAndQualifyAttempt').'" title="'.get_lang('ShowAndQualifyAttempt').'"></a></td>'; |
|
| 977 | 977 | } |
| 978 | 978 | } |
| 979 | 979 | } |
@@ -1032,13 +1032,13 @@ discard block |
||
| 1032 | 1032 | } |
| 1033 | 1033 | |
| 1034 | 1034 | $total_time = learnpathItem::getScormTimeFromParameter('js', $total_time); |
| 1035 | - $total_time = str_replace('NaN', '00' . $h . '00\'00"', $total_time); |
|
| 1035 | + $total_time = str_replace('NaN', '00'.$h.'00\'00"', $total_time); |
|
| 1036 | 1036 | |
| 1037 | 1037 | if (!$is_allowed_to_edit && $result_disabled_ext_all) { |
| 1038 | 1038 | $final_score = Display::return_icon('invisible.gif', get_lang('ResultsHiddenByExerciseSetting')); |
| 1039 | 1039 | } else { |
| 1040 | 1040 | if (is_numeric($total_score)) { |
| 1041 | - $final_score = $total_score . '%'; |
|
| 1041 | + $final_score = $total_score.'%'; |
|
| 1042 | 1042 | } else { |
| 1043 | 1043 | $final_score = $total_score; |
| 1044 | 1044 | } |
@@ -1054,19 +1054,19 @@ discard block |
||
| 1054 | 1054 | |
| 1055 | 1055 | $action = null; |
| 1056 | 1056 | if ($type == 'classic') { |
| 1057 | - $action = '<td></td>'; |
|
| 1057 | + $action = '<td></td>'; |
|
| 1058 | 1058 | } |
| 1059 | 1059 | |
| 1060 | 1060 | $output .= '<tr class="'.$oddclass.'"> |
| 1061 | 1061 | <td></td> |
| 1062 | 1062 | <td colspan="4"> |
| 1063 | - <i>' . get_lang('AccomplishedStepsTotal') .'</i> |
|
| 1063 | + <i>' . get_lang('AccomplishedStepsTotal').'</i> |
|
| 1064 | 1064 | </td> |
| 1065 | 1065 | <td colspan="2">'.$progress.'%</td> |
| 1066 | 1066 | <td colspan="2"> |
| 1067 | 1067 | ' . $final_score.' |
| 1068 | 1068 | </td> |
| 1069 | - <td colspan="2">' . $total_time . '</div> |
|
| 1069 | + <td colspan="2">' . $total_time.'</div> |
|
| 1070 | 1070 | '.$action.' |
| 1071 | 1071 | </tr>'; |
| 1072 | 1072 | |
@@ -1406,7 +1406,7 @@ discard block |
||
| 1406 | 1406 | $tbl_track_course = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); |
| 1407 | 1407 | if (is_array($user_id)) { |
| 1408 | 1408 | $user_id = array_map('intval', $user_id); |
| 1409 | - $condition_user = " AND user_id IN (".implode(',',$user_id).") "; |
|
| 1409 | + $condition_user = " AND user_id IN (".implode(',', $user_id).") "; |
|
| 1410 | 1410 | } else { |
| 1411 | 1411 | $user_id = intval($user_id); |
| 1412 | 1412 | $condition_user = " AND user_id = $user_id "; |
@@ -1442,13 +1442,13 @@ discard block |
||
| 1442 | 1442 | { |
| 1443 | 1443 | $tbl_track_login = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN); |
| 1444 | 1444 | $sql = 'SELECT login_date |
| 1445 | - FROM ' . $tbl_track_login . ' |
|
| 1446 | - WHERE login_user_id = ' . intval($student_id) . ' |
|
| 1445 | + FROM ' . $tbl_track_login.' |
|
| 1446 | + WHERE login_user_id = ' . intval($student_id).' |
|
| 1447 | 1447 | ORDER BY login_date ASC |
| 1448 | 1448 | LIMIT 0,1'; |
| 1449 | 1449 | |
| 1450 | 1450 | $rs = Database::query($sql); |
| 1451 | - if (Database::num_rows($rs)>0) { |
|
| 1451 | + if (Database::num_rows($rs) > 0) { |
|
| 1452 | 1452 | if ($first_login_date = Database::result($rs, 0, 0)) { |
| 1453 | 1453 | return api_convert_and_format_date( |
| 1454 | 1454 | $first_login_date, |
@@ -1473,8 +1473,8 @@ discard block |
||
| 1473 | 1473 | { |
| 1474 | 1474 | $table = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN); |
| 1475 | 1475 | $sql = 'SELECT login_date |
| 1476 | - FROM ' . $table . ' |
|
| 1477 | - WHERE login_user_id = ' . intval($student_id) . ' |
|
| 1476 | + FROM ' . $table.' |
|
| 1477 | + WHERE login_user_id = ' . intval($student_id).' |
|
| 1478 | 1478 | ORDER BY login_date |
| 1479 | 1479 | DESC LIMIT 0,1'; |
| 1480 | 1480 | |
@@ -1483,18 +1483,18 @@ discard block |
||
| 1483 | 1483 | if ($last_login_date = Database::result($rs, 0, 0)) { |
| 1484 | 1484 | $last_login_date = api_get_local_time($last_login_date); |
| 1485 | 1485 | if ($return_timestamp) { |
| 1486 | - return api_strtotime($last_login_date,'UTC'); |
|
| 1486 | + return api_strtotime($last_login_date, 'UTC'); |
|
| 1487 | 1487 | } else { |
| 1488 | 1488 | if (!$warning_message) { |
| 1489 | 1489 | return api_format_date($last_login_date, DATE_FORMAT_SHORT); |
| 1490 | 1490 | } else { |
| 1491 | - $timestamp = api_strtotime($last_login_date,'UTC'); |
|
| 1491 | + $timestamp = api_strtotime($last_login_date, 'UTC'); |
|
| 1492 | 1492 | $currentTimestamp = time(); |
| 1493 | 1493 | |
| 1494 | 1494 | //If the last connection is > than 7 days, the text is red |
| 1495 | 1495 | //345600 = 7 days in seconds |
| 1496 | 1496 | if ($currentTimestamp - $timestamp > 604800) { |
| 1497 | - return '<span style="color: #F00;">' . api_format_date($last_login_date, DATE_FORMAT_SHORT) . '</span>'; |
|
| 1497 | + return '<span style="color: #F00;">'.api_format_date($last_login_date, DATE_FORMAT_SHORT).'</span>'; |
|
| 1498 | 1498 | } else { |
| 1499 | 1499 | return api_format_date($last_login_date, DATE_FORMAT_SHORT); |
| 1500 | 1500 | } |
@@ -1529,7 +1529,7 @@ discard block |
||
| 1529 | 1529 | $sql = "$select |
| 1530 | 1530 | FROM $tbl_track_login |
| 1531 | 1531 | WHERE |
| 1532 | - login_user_id IN (' ". implode("','", $studentList) . "' ) AND |
|
| 1532 | + login_user_id IN (' ".implode("','", $studentList)."' ) AND |
|
| 1533 | 1533 | login_date < '$date' |
| 1534 | 1534 | "; |
| 1535 | 1535 | $rs = Database::query($sql); |
@@ -1628,7 +1628,7 @@ discard block |
||
| 1628 | 1628 | '.Display::return_icon('messagebox_warning.gif').' |
| 1629 | 1629 | </a>' |
| 1630 | 1630 | : null; |
| 1631 | - return $icon. Display::label($last_login_date, 'warning'); |
|
| 1631 | + return $icon.Display::label($last_login_date, 'warning'); |
|
| 1632 | 1632 | } else { |
| 1633 | 1633 | return $last_login_date; |
| 1634 | 1634 | } |
@@ -1663,8 +1663,8 @@ discard block |
||
| 1663 | 1663 | |
| 1664 | 1664 | // Given we're storing in cache, round the start and end times |
| 1665 | 1665 | // to the lower minute |
| 1666 | - $roundedStart = substr($start, 0, -2) . '00'; |
|
| 1667 | - $roundedStop = substr($stop, 0, -2) . '00'; |
|
| 1666 | + $roundedStart = substr($start, 0, -2).'00'; |
|
| 1667 | + $roundedStop = substr($stop, 0, -2).'00'; |
|
| 1668 | 1668 | $roundedStart = Database::escape_string($roundedStart); |
| 1669 | 1669 | $roundedStop = Database::escape_string($roundedStop); |
| 1670 | 1670 | |
@@ -1674,7 +1674,7 @@ discard block |
||
| 1674 | 1674 | $session_id = intval($session_id); |
| 1675 | 1675 | $count = 0; |
| 1676 | 1676 | $tbl_track_e_course_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS); |
| 1677 | - $sql = "SELECT count(*) as count_connections |
|
| 1677 | + $sql = "SELECT count(*) as count_connections |
|
| 1678 | 1678 | FROM $tbl_track_e_course_access |
| 1679 | 1679 | WHERE |
| 1680 | 1680 | c_id = $courseId AND |
@@ -1696,7 +1696,7 @@ discard block |
||
| 1696 | 1696 | $count = apcu_fetch($apc_var); |
| 1697 | 1697 | } else { |
| 1698 | 1698 | $rs = Database::query($sql); |
| 1699 | - if (Database::num_rows($rs)>0) { |
|
| 1699 | + if (Database::num_rows($rs) > 0) { |
|
| 1700 | 1700 | $row = Database::fetch_object($rs); |
| 1701 | 1701 | $count = $row->count_connections; |
| 1702 | 1702 | } |
@@ -1705,7 +1705,7 @@ discard block |
||
| 1705 | 1705 | } |
| 1706 | 1706 | } else { |
| 1707 | 1707 | $rs = Database::query($sql); |
| 1708 | - if (Database::num_rows($rs)>0) { |
|
| 1708 | + if (Database::num_rows($rs) > 0) { |
|
| 1709 | 1709 | $row = Database::fetch_object($rs); |
| 1710 | 1710 | $count = $row->count_connections; |
| 1711 | 1711 | } |
@@ -1727,14 +1727,14 @@ discard block |
||
| 1727 | 1727 | $tbl_session_course_rel_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER); |
| 1728 | 1728 | |
| 1729 | 1729 | $sql = 'SELECT DISTINCT c_id |
| 1730 | - FROM ' . $tbl_course_rel_user . ' |
|
| 1730 | + FROM ' . $tbl_course_rel_user.' |
|
| 1731 | 1731 | WHERE user_id = ' . $user_id.' AND relation_type<>'.COURSE_RELATION_TYPE_RRHH; |
| 1732 | 1732 | $rs = Database::query($sql); |
| 1733 | 1733 | $nb_courses = Database::num_rows($rs); |
| 1734 | 1734 | |
| 1735 | 1735 | if ($include_sessions) { |
| 1736 | 1736 | $sql = 'SELECT DISTINCT c_id |
| 1737 | - FROM ' . $tbl_session_course_rel_user . ' |
|
| 1737 | + FROM ' . $tbl_session_course_rel_user.' |
|
| 1738 | 1738 | WHERE user_id = ' . $user_id; |
| 1739 | 1739 | $rs = Database::query($sql); |
| 1740 | 1740 | $nb_courses += Database::num_rows($rs); |
@@ -1781,7 +1781,7 @@ discard block |
||
| 1781 | 1781 | $condition_quiz = ""; |
| 1782 | 1782 | if (!empty($exercise_id)) { |
| 1783 | 1783 | $exercise_id = intval($exercise_id); |
| 1784 | - $condition_quiz =" AND id = $exercise_id "; |
|
| 1784 | + $condition_quiz = " AND id = $exercise_id "; |
|
| 1785 | 1785 | } |
| 1786 | 1786 | |
| 1787 | 1787 | // Compose a filter based on optional session id given |
@@ -1830,7 +1830,7 @@ discard block |
||
| 1830 | 1830 | } |
| 1831 | 1831 | } |
| 1832 | 1832 | if (!empty($exercise_list)) { |
| 1833 | - $exercise_id = implode("','",$exercise_list); |
|
| 1833 | + $exercise_id = implode("','", $exercise_list); |
|
| 1834 | 1834 | } |
| 1835 | 1835 | } |
| 1836 | 1836 | |
@@ -1855,10 +1855,10 @@ discard block |
||
| 1855 | 1855 | $quiz_avg_score = null; |
| 1856 | 1856 | |
| 1857 | 1857 | if (!empty($row['avg_score'])) { |
| 1858 | - $quiz_avg_score = round($row['avg_score'],2); |
|
| 1858 | + $quiz_avg_score = round($row['avg_score'], 2); |
|
| 1859 | 1859 | } |
| 1860 | 1860 | |
| 1861 | - if(!empty($row['num_attempts'])) { |
|
| 1861 | + if (!empty($row['num_attempts'])) { |
|
| 1862 | 1862 | $quiz_avg_score = round($quiz_avg_score / $row['num_attempts'], 2); |
| 1863 | 1863 | } |
| 1864 | 1864 | if (is_array($student_id)) { |
@@ -1988,7 +1988,7 @@ discard block |
||
| 1988 | 1988 | $row = Database::fetch_row($rs); |
| 1989 | 1989 | $count = $row[0]; |
| 1990 | 1990 | } |
| 1991 | - $count = ($count != 0 ) ? 100*round(intval($count)/count($exercise_list), 2) .'%' : '0%'; |
|
| 1991 | + $count = ($count != 0) ? 100 * round(intval($count) / count($exercise_list), 2).'%' : '0%'; |
|
| 1992 | 1992 | return $count; |
| 1993 | 1993 | } |
| 1994 | 1994 | |
@@ -2013,7 +2013,7 @@ discard block |
||
| 2013 | 2013 | ); |
| 2014 | 2014 | |
| 2015 | 2015 | if (!empty($best_attempt) && !empty($best_attempt['exe_weighting'])) { |
| 2016 | - $result += $best_attempt['exe_result']/$best_attempt['exe_weighting']; |
|
| 2016 | + $result += $best_attempt['exe_result'] / $best_attempt['exe_weighting']; |
|
| 2017 | 2017 | } |
| 2018 | 2018 | } |
| 2019 | 2019 | $result = $result / count($exercise_list); |
@@ -2050,7 +2050,7 @@ discard block |
||
| 2050 | 2050 | $query = sprintf($sql, intval($courseId), $sessionId); |
| 2051 | 2051 | $rs = Database::query($query); |
| 2052 | 2052 | $teachers = array(); |
| 2053 | - while ($teacher = Database::fetch_array($rs,'ASSOC')) { |
|
| 2053 | + while ($teacher = Database::fetch_array($rs, 'ASSOC')) { |
|
| 2054 | 2054 | $teachers[] = $teacher; |
| 2055 | 2055 | } |
| 2056 | 2056 | $data = array(); |
@@ -2174,7 +2174,7 @@ discard block |
||
| 2174 | 2174 | $data[] = array( |
| 2175 | 2175 | 'course' => $course['title'], |
| 2176 | 2176 | 'session' => $teacher['name'], |
| 2177 | - 'tutor' => $tutor['username'] . ' - ' . $tutor['lastname'] . ' ' . $tutor['firstname'], |
|
| 2177 | + 'tutor' => $tutor['username'].' - '.$tutor['lastname'].' '.$tutor['firstname'], |
|
| 2178 | 2178 | 'documents' => $totalDocuments, |
| 2179 | 2179 | 'links' => $totalLinks, |
| 2180 | 2180 | 'forums' => $totalForums, |
@@ -2237,7 +2237,7 @@ discard block |
||
| 2237 | 2237 | for ($i = 0; $i < count($lpIdList); $i++) { |
| 2238 | 2238 | $placeHolders[] = '?'; |
| 2239 | 2239 | } |
| 2240 | - $lpConditions['AND id IN(' . implode(', ', $placeHolders) . ') '] = $lpIdList; |
|
| 2240 | + $lpConditions['AND id IN('.implode(', ', $placeHolders).') '] = $lpIdList; |
|
| 2241 | 2241 | } |
| 2242 | 2242 | |
| 2243 | 2243 | if ($onlySeriousGame) { |
@@ -2257,14 +2257,14 @@ discard block |
||
| 2257 | 2257 | |
| 2258 | 2258 | $conditions = [ |
| 2259 | 2259 | " c_id = {$courseInfo['real_id']} ", |
| 2260 | - " lp_view.lp_id IN(" . implode(', ', $filteredLP) . ") " |
|
| 2260 | + " lp_view.lp_id IN(".implode(', ', $filteredLP).") " |
|
| 2261 | 2261 | ]; |
| 2262 | 2262 | |
| 2263 | 2263 | $groupBy = 'GROUP BY lp_id'; |
| 2264 | 2264 | |
| 2265 | 2265 | if (is_array($studentId)) { |
| 2266 | 2266 | $studentId = array_map('intval', $studentId); |
| 2267 | - $conditions[] = " lp_view.user_id IN (" . implode(',', $studentId) . ") "; |
|
| 2267 | + $conditions[] = " lp_view.user_id IN (".implode(',', $studentId).") "; |
|
| 2268 | 2268 | |
| 2269 | 2269 | |
| 2270 | 2270 | } else { |
@@ -2399,7 +2399,7 @@ discard block |
||
| 2399 | 2399 | // Compose a filter based on optional learning paths list given |
| 2400 | 2400 | $condition_lp = ""; |
| 2401 | 2401 | if (count($lp_ids) > 0) { |
| 2402 | - $condition_lp =" AND id IN(".implode(',',$lp_ids).") "; |
|
| 2402 | + $condition_lp = " AND id IN(".implode(',', $lp_ids).") "; |
|
| 2403 | 2403 | } |
| 2404 | 2404 | |
| 2405 | 2405 | // Compose a filter based on optional session id |
@@ -2439,9 +2439,9 @@ discard block |
||
| 2439 | 2439 | // prepare filter on users |
| 2440 | 2440 | if (is_array($student_id)) { |
| 2441 | 2441 | array_walk($student_id, 'intval'); |
| 2442 | - $condition_user1 =" AND user_id IN (".implode(',', $student_id).") "; |
|
| 2442 | + $condition_user1 = " AND user_id IN (".implode(',', $student_id).") "; |
|
| 2443 | 2443 | } else { |
| 2444 | - $condition_user1 =" AND user_id = $student_id "; |
|
| 2444 | + $condition_user1 = " AND user_id = $student_id "; |
|
| 2445 | 2445 | } |
| 2446 | 2446 | |
| 2447 | 2447 | if ($count_row_lp > 0 && !empty($student_id)) { |
@@ -2484,7 +2484,7 @@ discard block |
||
| 2484 | 2484 | ORDER BY lp_item_id"; |
| 2485 | 2485 | $res_lp_item = Database::query($sql); |
| 2486 | 2486 | |
| 2487 | - while ($row_lp_item = Database::fetch_array($res_lp_item,'ASSOC')) { |
|
| 2487 | + while ($row_lp_item = Database::fetch_array($res_lp_item, 'ASSOC')) { |
|
| 2488 | 2488 | $my_lp_item_id = $row_lp_item['lp_item_id']; |
| 2489 | 2489 | |
| 2490 | 2490 | // Getting the most recent attempt |
@@ -2507,8 +2507,8 @@ discard block |
||
| 2507 | 2507 | ORDER BY view_count DESC |
| 2508 | 2508 | LIMIT 1"; |
| 2509 | 2509 | $res_lp_item_result = Database::query($sql); |
| 2510 | - while ($row_max_score = Database::fetch_array($res_lp_item_result,'ASSOC')) { |
|
| 2511 | - $list[]= $row_max_score; |
|
| 2510 | + while ($row_max_score = Database::fetch_array($res_lp_item_result, 'ASSOC')) { |
|
| 2511 | + $list[] = $row_max_score; |
|
| 2512 | 2512 | } |
| 2513 | 2513 | } |
| 2514 | 2514 | } else { |
@@ -2532,8 +2532,8 @@ discard block |
||
| 2532 | 2532 | if ($debug) echo $sql.'<br />'; |
| 2533 | 2533 | $res_max_score = Database::query($sql); |
| 2534 | 2534 | |
| 2535 | - while ($row_max_score = Database::fetch_array($res_max_score,'ASSOC')) { |
|
| 2536 | - $list[]= $row_max_score; |
|
| 2535 | + while ($row_max_score = Database::fetch_array($res_max_score, 'ASSOC')) { |
|
| 2536 | + $list[] = $row_max_score; |
|
| 2537 | 2537 | } |
| 2538 | 2538 | } |
| 2539 | 2539 | |
@@ -2548,7 +2548,7 @@ discard block |
||
| 2548 | 2548 | $max_score_item_view = $row_max_score['max_score_item_view']; |
| 2549 | 2549 | $score = $row_max_score['score']; |
| 2550 | 2550 | |
| 2551 | - if ($debug) echo '<h3>Item Type: ' .$row_max_score['item_type'].'</h3>'; |
|
| 2551 | + if ($debug) echo '<h3>Item Type: '.$row_max_score['item_type'].'</h3>'; |
|
| 2552 | 2552 | |
| 2553 | 2553 | if ($row_max_score['item_type'] == 'sco') { |
| 2554 | 2554 | /* Check if it is sco (easier to get max_score) |
@@ -2566,7 +2566,7 @@ discard block |
||
| 2566 | 2566 | } |
| 2567 | 2567 | // Avoid division by zero errors |
| 2568 | 2568 | if (!empty($max_score)) { |
| 2569 | - $lp_partial_total += $score/$max_score; |
|
| 2569 | + $lp_partial_total += $score / $max_score; |
|
| 2570 | 2570 | } |
| 2571 | 2571 | if ($debug) echo '<b>$lp_partial_total, $score, $max_score '.$lp_partial_total.' '.$score.' '.$max_score.'</b><br />'; |
| 2572 | 2572 | } else { |
@@ -2590,10 +2590,10 @@ discard block |
||
| 2590 | 2590 | ORDER BY exe_date DESC |
| 2591 | 2591 | LIMIT 1"; |
| 2592 | 2592 | |
| 2593 | - if ($debug) echo $sql .'<br />'; |
|
| 2593 | + if ($debug) echo $sql.'<br />'; |
|
| 2594 | 2594 | $result_last_attempt = Database::query($sql); |
| 2595 | 2595 | $num = Database :: num_rows($result_last_attempt); |
| 2596 | - if ($num > 0 ) { |
|
| 2596 | + if ($num > 0) { |
|
| 2597 | 2597 | $id_last_attempt = Database :: result($result_last_attempt, 0, 0); |
| 2598 | 2598 | if ($debug) echo $id_last_attempt.'<br />'; |
| 2599 | 2599 | |
@@ -2622,13 +2622,13 @@ discard block |
||
| 2622 | 2622 | $max_score = $row_max_score_bis['maxscore']; |
| 2623 | 2623 | } |
| 2624 | 2624 | if (!empty($max_score) && floatval($max_score) > 0) { |
| 2625 | - $lp_partial_total += $score/$max_score; |
|
| 2625 | + $lp_partial_total += $score / $max_score; |
|
| 2626 | 2626 | } |
| 2627 | 2627 | if ($debug) echo '$lp_partial_total, $score, $max_score <b>'.$lp_partial_total.' '.$score.' '.$max_score.'</b><br />'; |
| 2628 | 2628 | } |
| 2629 | 2629 | } |
| 2630 | 2630 | |
| 2631 | - if (in_array($row_max_score['item_type'], array('quiz','sco'))) { |
|
| 2631 | + if (in_array($row_max_score['item_type'], array('quiz', 'sco'))) { |
|
| 2632 | 2632 | // Normal way |
| 2633 | 2633 | if ($use_max_score[$lp_id]) { |
| 2634 | 2634 | $count_items++; |
@@ -2663,8 +2663,8 @@ discard block |
||
| 2663 | 2663 | if ($debug) echo $sql; |
| 2664 | 2664 | $result_have_quiz = Database::query($sql); |
| 2665 | 2665 | |
| 2666 | - if (Database::num_rows($result_have_quiz) > 0 ) { |
|
| 2667 | - $row = Database::fetch_array($result_have_quiz,'ASSOC'); |
|
| 2666 | + if (Database::num_rows($result_have_quiz) > 0) { |
|
| 2667 | + $row = Database::fetch_array($result_have_quiz, 'ASSOC'); |
|
| 2668 | 2668 | if (is_numeric($row['count']) && $row['count'] != 0) { |
| 2669 | 2669 | $lp_with_quiz++; |
| 2670 | 2670 | } |
@@ -2676,7 +2676,7 @@ discard block |
||
| 2676 | 2676 | |
| 2677 | 2677 | if ($lp_with_quiz != 0) { |
| 2678 | 2678 | if (!$return_array) { |
| 2679 | - $score_of_scorm_calculate = round(($global_result/$lp_with_quiz),2); |
|
| 2679 | + $score_of_scorm_calculate = round(($global_result / $lp_with_quiz), 2); |
|
| 2680 | 2680 | if ($debug) var_dump($score_of_scorm_calculate); |
| 2681 | 2681 | if (empty($lp_ids)) { |
| 2682 | 2682 | if ($debug) echo '<h2>All lps fix: '.$score_of_scorm_calculate.'</h2>'; |
@@ -2750,9 +2750,9 @@ discard block |
||
| 2750 | 2750 | |
| 2751 | 2751 | if (is_array($student_id)) { |
| 2752 | 2752 | array_walk($student_id, 'intval'); |
| 2753 | - $conditions[] =" lp_view.user_id IN (".implode(',', $student_id).") "; |
|
| 2753 | + $conditions[] = " lp_view.user_id IN (".implode(',', $student_id).") "; |
|
| 2754 | 2754 | } else { |
| 2755 | - $conditions[] =" lp_view.user_id = $student_id "; |
|
| 2755 | + $conditions[] = " lp_view.user_id = $student_id "; |
|
| 2756 | 2756 | } |
| 2757 | 2757 | |
| 2758 | 2758 | $conditionsToString = implode('AND ', $conditions); |
@@ -2776,7 +2776,7 @@ discard block |
||
| 2776 | 2776 | return 0; |
| 2777 | 2777 | } |
| 2778 | 2778 | |
| 2779 | - return ($row['sum_score'] / $row['sum_max_score'])*100; |
|
| 2779 | + return ($row['sum_score'] / $row['sum_max_score']) * 100; |
|
| 2780 | 2780 | |
| 2781 | 2781 | } |
| 2782 | 2782 | |
@@ -2806,7 +2806,7 @@ discard block |
||
| 2806 | 2806 | // Compose a filter based on optional learning paths list given |
| 2807 | 2807 | $condition_lp = ""; |
| 2808 | 2808 | if (count($lp_ids) > 0) { |
| 2809 | - $condition_lp =" AND id IN(".implode(',',$lp_ids).") "; |
|
| 2809 | + $condition_lp = " AND id IN(".implode(',', $lp_ids).") "; |
|
| 2810 | 2810 | } |
| 2811 | 2811 | |
| 2812 | 2812 | // Compose a filter based on optional session id |
@@ -2868,7 +2868,7 @@ discard block |
||
| 2868 | 2868 | |
| 2869 | 2869 | if (!empty($course)) { |
| 2870 | 2870 | |
| 2871 | - $course_id = $course['real_id']; |
|
| 2871 | + $course_id = $course['real_id']; |
|
| 2872 | 2872 | |
| 2873 | 2873 | $lp_table = Database :: get_course_table(TABLE_LP_MAIN); |
| 2874 | 2874 | $t_lpv = Database :: get_course_table(TABLE_LP_VIEW); |
@@ -2882,8 +2882,8 @@ discard block |
||
| 2882 | 2882 | // calculates last connection time |
| 2883 | 2883 | if ($count_row_lp > 0) { |
| 2884 | 2884 | $sql = 'SELECT MAX(start_time) |
| 2885 | - FROM ' . $t_lpiv . ' AS item_view |
|
| 2886 | - INNER JOIN ' . $t_lpv . ' AS view |
|
| 2885 | + FROM ' . $t_lpiv.' AS item_view |
|
| 2886 | + INNER JOIN ' . $t_lpv.' AS view |
|
| 2887 | 2887 | ON item_view.lp_view_id = view.id |
| 2888 | 2888 | WHERE |
| 2889 | 2889 | item_view.c_id = '.$course_id.' AND |
@@ -2919,15 +2919,15 @@ discard block |
||
| 2919 | 2919 | |
| 2920 | 2920 | // At first, courses where $coach_id is coach of the course // |
| 2921 | 2921 | $sql = 'SELECT session_id, c_id |
| 2922 | - FROM ' . $tbl_session_course_user . ' |
|
| 2922 | + FROM ' . $tbl_session_course_user.' |
|
| 2923 | 2923 | WHERE user_id=' . $coach_id.' AND status=2'; |
| 2924 | 2924 | |
| 2925 | 2925 | if (api_is_multiple_url_enabled()) { |
| 2926 | - $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); |
|
| 2926 | + $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); |
|
| 2927 | 2927 | $access_url_id = api_get_current_access_url_id(); |
| 2928 | 2928 | if ($access_url_id != -1) { |
| 2929 | 2929 | $sql = 'SELECT scu.session_id, scu.c_id |
| 2930 | - FROM ' . $tbl_session_course_user . ' scu |
|
| 2930 | + FROM ' . $tbl_session_course_user.' scu |
|
| 2931 | 2931 | INNER JOIN '.$tbl_session_rel_access_url.' sru |
| 2932 | 2932 | ON (scu.session_id=sru.session_id) |
| 2933 | 2933 | WHERE |
@@ -2961,28 +2961,28 @@ discard block |
||
| 2961 | 2961 | |
| 2962 | 2962 | // Then, courses where $coach_id is coach of the session // |
| 2963 | 2963 | $sql = 'SELECT session_course_user.user_id |
| 2964 | - FROM ' . $tbl_session_course_user . ' as session_course_user |
|
| 2964 | + FROM ' . $tbl_session_course_user.' as session_course_user |
|
| 2965 | 2965 | INNER JOIN '.$tbl_session_user.' sru |
| 2966 | 2966 | ON session_course_user.user_id = sru.user_id AND session_course_user.session_id = sru.session_id |
| 2967 | - INNER JOIN ' . $tbl_session_course . ' as session_course |
|
| 2967 | + INNER JOIN ' . $tbl_session_course.' as session_course |
|
| 2968 | 2968 | ON session_course.c_id = session_course_user.c_id |
| 2969 | 2969 | AND session_course_user.session_id = session_course.session_id |
| 2970 | - INNER JOIN ' . $tbl_session . ' as session |
|
| 2970 | + INNER JOIN ' . $tbl_session.' as session |
|
| 2971 | 2971 | ON session.id = session_course.session_id |
| 2972 | 2972 | AND session.id_coach = ' . $coach_id; |
| 2973 | 2973 | if (api_is_multiple_url_enabled()) { |
| 2974 | - $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); |
|
| 2974 | + $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); |
|
| 2975 | 2975 | $access_url_id = api_get_current_access_url_id(); |
| 2976 | - if ($access_url_id != -1){ |
|
| 2976 | + if ($access_url_id != -1) { |
|
| 2977 | 2977 | $sql = 'SELECT session_course_user.user_id |
| 2978 | - FROM ' . $tbl_session_course_user . ' as session_course_user |
|
| 2978 | + FROM ' . $tbl_session_course_user.' as session_course_user |
|
| 2979 | 2979 | INNER JOIN '.$tbl_session_user.' sru |
| 2980 | 2980 | ON session_course_user.user_id = sru.user_id AND |
| 2981 | 2981 | session_course_user.session_id = sru.session_id |
| 2982 | - INNER JOIN ' . $tbl_session_course . ' as session_course |
|
| 2982 | + INNER JOIN ' . $tbl_session_course.' as session_course |
|
| 2983 | 2983 | ON session_course.c_id = session_course_user.c_id AND |
| 2984 | 2984 | session_course_user.session_id = session_course.session_id |
| 2985 | - INNER JOIN ' . $tbl_session . ' as session |
|
| 2985 | + INNER JOIN ' . $tbl_session.' as session |
|
| 2986 | 2986 | ON session.id = session_course.session_id AND |
| 2987 | 2987 | session.id_coach = ' . $coach_id.' |
| 2988 | 2988 | INNER JOIN '.$tbl_session_rel_access_url.' session_rel_url |
@@ -3012,8 +3012,8 @@ discard block |
||
| 3012 | 3012 | |
| 3013 | 3013 | $students = []; |
| 3014 | 3014 | // At first, courses where $coach_id is coach of the course // |
| 3015 | - $sql = 'SELECT c_id FROM ' . $tbl_session_course_user . ' |
|
| 3016 | - WHERE session_id="' . $id_session . '" AND user_id=' . $coach_id.' AND status=2'; |
|
| 3015 | + $sql = 'SELECT c_id FROM '.$tbl_session_course_user.' |
|
| 3016 | + WHERE session_id="' . $id_session.'" AND user_id='.$coach_id.' AND status=2'; |
|
| 3017 | 3017 | $result = Database::query($sql); |
| 3018 | 3018 | |
| 3019 | 3019 | while ($a_courses = Database::fetch_array($result)) { |
@@ -3023,7 +3023,7 @@ discard block |
||
| 3023 | 3023 | FROM $tbl_session_course_user AS srcru |
| 3024 | 3024 | WHERE |
| 3025 | 3025 | c_id = '$courseId' AND |
| 3026 | - session_id = '" . $id_session . "'"; |
|
| 3026 | + session_id = '".$id_session."'"; |
|
| 3027 | 3027 | $rs = Database::query($sql); |
| 3028 | 3028 | while ($row = Database::fetch_array($rs)) { |
| 3029 | 3029 | $students[$row['user_id']] = $row['user_id']; |
@@ -3031,15 +3031,15 @@ discard block |
||
| 3031 | 3031 | } |
| 3032 | 3032 | |
| 3033 | 3033 | // Then, courses where $coach_id is coach of the session |
| 3034 | - $sql = 'SELECT id_coach FROM ' . $tbl_session . ' |
|
| 3035 | - WHERE id="' . $id_session.'" AND id_coach="' . $coach_id . '"'; |
|
| 3034 | + $sql = 'SELECT id_coach FROM '.$tbl_session.' |
|
| 3035 | + WHERE id="' . $id_session.'" AND id_coach="'.$coach_id.'"'; |
|
| 3036 | 3036 | $result = Database::query($sql); |
| 3037 | 3037 | |
| 3038 | 3038 | //He is the session_coach so we select all the users in the session |
| 3039 | 3039 | if (Database::num_rows($result) > 0) { |
| 3040 | 3040 | $sql = 'SELECT DISTINCT srcru.user_id |
| 3041 | - FROM ' . $tbl_session_course_user . ' AS srcru |
|
| 3042 | - WHERE session_id="' . $id_session . '"'; |
|
| 3041 | + FROM ' . $tbl_session_course_user.' AS srcru |
|
| 3042 | + WHERE session_id="' . $id_session.'"'; |
|
| 3043 | 3043 | $result = Database::query($sql); |
| 3044 | 3044 | while ($row = Database::fetch_array($result)) { |
| 3045 | 3045 | $students[$row['user_id']] = $row['user_id']; |
@@ -3066,8 +3066,8 @@ discard block |
||
| 3066 | 3066 | |
| 3067 | 3067 | // At first, courses where $coach_id is coach of the course // |
| 3068 | 3068 | |
| 3069 | - $sql = 'SELECT 1 FROM ' . $tbl_session_course_user . ' |
|
| 3070 | - WHERE user_id=' . $coach_id .' AND status=2'; |
|
| 3069 | + $sql = 'SELECT 1 FROM '.$tbl_session_course_user.' |
|
| 3070 | + WHERE user_id=' . $coach_id.' AND status=2'; |
|
| 3071 | 3071 | $result = Database::query($sql); |
| 3072 | 3072 | if (Database::num_rows($result) > 0) { |
| 3073 | 3073 | return true; |
@@ -3075,12 +3075,12 @@ discard block |
||
| 3075 | 3075 | |
| 3076 | 3076 | // Then, courses where $coach_id is coach of the session |
| 3077 | 3077 | $sql = 'SELECT session_course_user.user_id |
| 3078 | - FROM ' . $tbl_session_course_user . ' as session_course_user |
|
| 3079 | - INNER JOIN ' . $tbl_session_course . ' as session_course |
|
| 3078 | + FROM ' . $tbl_session_course_user.' as session_course_user |
|
| 3079 | + INNER JOIN ' . $tbl_session_course.' as session_course |
|
| 3080 | 3080 | ON session_course.c_id = session_course_user.c_id |
| 3081 | - INNER JOIN ' . $tbl_session . ' as session |
|
| 3081 | + INNER JOIN ' . $tbl_session.' as session |
|
| 3082 | 3082 | ON session.id = session_course.session_id |
| 3083 | - AND session.id_coach = ' . $coach_id . ' |
|
| 3083 | + AND session.id_coach = ' . $coach_id.' |
|
| 3084 | 3084 | WHERE user_id = ' . $student_id; |
| 3085 | 3085 | $result = Database::query($sql); |
| 3086 | 3086 | if (Database::num_rows($result) > 0) { |
@@ -3112,16 +3112,16 @@ discard block |
||
| 3112 | 3112 | // At first, courses where $coach_id is coach of the course. |
| 3113 | 3113 | |
| 3114 | 3114 | $sql = 'SELECT DISTINCT c.code |
| 3115 | - FROM ' . $tbl_session_course_user . ' sc |
|
| 3115 | + FROM ' . $tbl_session_course_user.' sc |
|
| 3116 | 3116 | INNER JOIN '.$tbl_course.' c |
| 3117 | 3117 | ON (c.id = sc.c_id) |
| 3118 | 3118 | WHERE user_id = ' . $coach_id.' AND status = 2'; |
| 3119 | 3119 | |
| 3120 | 3120 | if (api_is_multiple_url_enabled()) { |
| 3121 | 3121 | $access_url_id = api_get_current_access_url_id(); |
| 3122 | - if ($access_url_id != -1){ |
|
| 3122 | + if ($access_url_id != -1) { |
|
| 3123 | 3123 | $sql = 'SELECT DISTINCT c.code |
| 3124 | - FROM ' . $tbl_session_course_user . ' scu |
|
| 3124 | + FROM ' . $tbl_session_course_user.' scu |
|
| 3125 | 3125 | INNER JOIN '.$tbl_course.' c |
| 3126 | 3126 | ON (c.code = scu.c_id) |
| 3127 | 3127 | INNER JOIN '.$tbl_course_rel_access_url.' cru |
@@ -3134,7 +3134,7 @@ discard block |
||
| 3134 | 3134 | } |
| 3135 | 3135 | |
| 3136 | 3136 | if (!empty($id_session)) { |
| 3137 | - $sql .= ' AND session_id=' . $id_session; |
|
| 3137 | + $sql .= ' AND session_id='.$id_session; |
|
| 3138 | 3138 | } |
| 3139 | 3139 | |
| 3140 | 3140 | $courseList = array(); |
@@ -3146,25 +3146,25 @@ discard block |
||
| 3146 | 3146 | // Then, courses where $coach_id is coach of the session |
| 3147 | 3147 | |
| 3148 | 3148 | $sql = 'SELECT DISTINCT course.code |
| 3149 | - FROM ' . $tbl_session_course . ' as session_course |
|
| 3150 | - INNER JOIN ' . $tbl_session . ' as session |
|
| 3149 | + FROM ' . $tbl_session_course.' as session_course |
|
| 3150 | + INNER JOIN ' . $tbl_session.' as session |
|
| 3151 | 3151 | ON session.id = session_course.session_id |
| 3152 | - AND session.id_coach = ' . $coach_id . ' |
|
| 3153 | - INNER JOIN ' . $tbl_course . ' as course |
|
| 3152 | + AND session.id_coach = ' . $coach_id.' |
|
| 3153 | + INNER JOIN ' . $tbl_course.' as course |
|
| 3154 | 3154 | ON course.id = session_course.c_id'; |
| 3155 | 3155 | |
| 3156 | 3156 | if (api_is_multiple_url_enabled()) { |
| 3157 | 3157 | $tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); |
| 3158 | 3158 | $access_url_id = api_get_current_access_url_id(); |
| 3159 | - if ($access_url_id != -1){ |
|
| 3159 | + if ($access_url_id != -1) { |
|
| 3160 | 3160 | $sql = 'SELECT DISTINCT c.code |
| 3161 | - FROM ' . $tbl_session_course . ' as session_course |
|
| 3161 | + FROM ' . $tbl_session_course.' as session_course |
|
| 3162 | 3162 | INNER JOIN '.$tbl_course.' c |
| 3163 | 3163 | ON (c.id = session_course.c_id) |
| 3164 | - INNER JOIN ' . $tbl_session . ' as session |
|
| 3164 | + INNER JOIN ' . $tbl_session.' as session |
|
| 3165 | 3165 | ON session.id = session_course.session_id |
| 3166 | - AND session.id_coach = ' . $coach_id . ' |
|
| 3167 | - INNER JOIN ' . $tbl_course . ' as course |
|
| 3166 | + AND session.id_coach = ' . $coach_id.' |
|
| 3167 | + INNER JOIN ' . $tbl_course.' as course |
|
| 3168 | 3168 | ON course.id = session_course.c_id |
| 3169 | 3169 | INNER JOIN '.$tbl_course_rel_access_url.' course_rel_url |
| 3170 | 3170 | ON (course_rel_url.c_id = c.id)'; |
@@ -3172,12 +3172,12 @@ discard block |
||
| 3172 | 3172 | } |
| 3173 | 3173 | |
| 3174 | 3174 | if (!empty ($id_session)) { |
| 3175 | - $sql .= ' WHERE session_course.session_id=' . $id_session; |
|
| 3175 | + $sql .= ' WHERE session_course.session_id='.$id_session; |
|
| 3176 | 3176 | if (api_is_multiple_url_enabled()) |
| 3177 | - $sql .= ' AND access_url_id = '.$access_url_id; |
|
| 3178 | - } else { |
|
| 3177 | + $sql .= ' AND access_url_id = '.$access_url_id; |
|
| 3178 | + } else { |
|
| 3179 | 3179 | if (api_is_multiple_url_enabled()) |
| 3180 | - $sql .= ' WHERE access_url_id = '.$access_url_id; |
|
| 3180 | + $sql .= ' WHERE access_url_id = '.$access_url_id; |
|
| 3181 | 3181 | } |
| 3182 | 3182 | |
| 3183 | 3183 | $result = Database::query($sql); |
@@ -3233,7 +3233,7 @@ discard block |
||
| 3233 | 3233 | } |
| 3234 | 3234 | } |
| 3235 | 3235 | |
| 3236 | - $tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); |
|
| 3236 | + $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION); |
|
| 3237 | 3237 | $access_url_id = api_get_current_access_url_id(); |
| 3238 | 3238 | |
| 3239 | 3239 | $sql = " |
@@ -3353,7 +3353,7 @@ discard block |
||
| 3353 | 3353 | // table definition |
| 3354 | 3354 | $tbl_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY); |
| 3355 | 3355 | $tbl_document = Database :: get_course_table(TABLE_DOCUMENT); |
| 3356 | - $course_id = $a_course['real_id']; |
|
| 3356 | + $course_id = $a_course['real_id']; |
|
| 3357 | 3357 | if (is_array($student_id)) { |
| 3358 | 3358 | $studentList = array_map('intval', $student_id); |
| 3359 | 3359 | $condition_user = " AND ip.insert_user_id IN ('".implode(',', $studentList)."') "; |
@@ -3404,7 +3404,7 @@ discard block |
||
| 3404 | 3404 | $a_course = CourseManager::get_course_information($course_code); |
| 3405 | 3405 | if (!empty($a_course)) { |
| 3406 | 3406 | $course_id = $a_course['real_id']; |
| 3407 | - $conditions[]= " ip.c_id = $course_id AND pub.c_id = $course_id "; |
|
| 3407 | + $conditions[] = " ip.c_id = $course_id AND pub.c_id = $course_id "; |
|
| 3408 | 3408 | } |
| 3409 | 3409 | |
| 3410 | 3410 | // table definition |
@@ -3413,14 +3413,14 @@ discard block |
||
| 3413 | 3413 | |
| 3414 | 3414 | if (is_array($student_id)) { |
| 3415 | 3415 | $studentList = array_map('intval', $student_id); |
| 3416 | - $conditions[]= " ip.insert_user_id IN ('".implode("','", $studentList)."') "; |
|
| 3416 | + $conditions[] = " ip.insert_user_id IN ('".implode("','", $studentList)."') "; |
|
| 3417 | 3417 | } else { |
| 3418 | 3418 | $student_id = intval($student_id); |
| 3419 | - $conditions[]= " ip.insert_user_id = '$student_id' "; |
|
| 3419 | + $conditions[] = " ip.insert_user_id = '$student_id' "; |
|
| 3420 | 3420 | } |
| 3421 | 3421 | if (isset($session_id)) { |
| 3422 | 3422 | $session_id = intval($session_id); |
| 3423 | - $conditions[]= " pub.session_id = $session_id "; |
|
| 3423 | + $conditions[] = " pub.session_id = $session_id "; |
|
| 3424 | 3424 | } |
| 3425 | 3425 | $conditionToString = implode('AND', $conditions); |
| 3426 | 3426 | |
@@ -3453,8 +3453,8 @@ discard block |
||
| 3453 | 3453 | $courseCondition = null; |
| 3454 | 3454 | $conditions = array(); |
| 3455 | 3455 | if (!empty($courseInfo)) { |
| 3456 | - $course_id = $courseInfo['real_id']; |
|
| 3457 | - $conditions[]= " post.c_id = $course_id AND forum.c_id = $course_id "; |
|
| 3456 | + $course_id = $courseInfo['real_id']; |
|
| 3457 | + $conditions[] = " post.c_id = $course_id AND forum.c_id = $course_id "; |
|
| 3458 | 3458 | } |
| 3459 | 3459 | |
| 3460 | 3460 | // Table definition. |
@@ -3463,15 +3463,15 @@ discard block |
||
| 3463 | 3463 | |
| 3464 | 3464 | if (is_array($student_id)) { |
| 3465 | 3465 | $studentList = array_map('intval', $student_id); |
| 3466 | - $conditions[]= " post.poster_id IN ('".implode("','", $studentList)."') "; |
|
| 3466 | + $conditions[] = " post.poster_id IN ('".implode("','", $studentList)."') "; |
|
| 3467 | 3467 | } else { |
| 3468 | 3468 | $student_id = intval($student_id); |
| 3469 | - $conditions[]= " post.poster_id = '$student_id' "; |
|
| 3469 | + $conditions[] = " post.poster_id = '$student_id' "; |
|
| 3470 | 3470 | } |
| 3471 | 3471 | |
| 3472 | 3472 | if (isset($session_id)) { |
| 3473 | 3473 | $session_id = intval($session_id); |
| 3474 | - $conditions[]= " forum.session_id = $session_id"; |
|
| 3474 | + $conditions[] = " forum.session_id = $session_id"; |
|
| 3475 | 3475 | } |
| 3476 | 3476 | |
| 3477 | 3477 | $conditionsToString = implode('AND ', $conditions); |
@@ -3506,7 +3506,7 @@ discard block |
||
| 3506 | 3506 | $condition_session = ''; |
| 3507 | 3507 | if (isset($session_id)) { |
| 3508 | 3508 | $session_id = intval($session_id); |
| 3509 | - $condition_session = api_get_session_condition($session_id, true, false, 'f.session_id'); |
|
| 3509 | + $condition_session = api_get_session_condition($session_id, true, false, 'f.session_id'); |
|
| 3510 | 3510 | } |
| 3511 | 3511 | |
| 3512 | 3512 | $course_id = $courseInfo['real_id']; |
@@ -3562,7 +3562,7 @@ discard block |
||
| 3562 | 3562 | $condition_session = ''; |
| 3563 | 3563 | if (isset($session_id)) { |
| 3564 | 3564 | $session_id = intval($session_id); |
| 3565 | - $condition_session = ' AND f.session_id = '. $session_id; |
|
| 3565 | + $condition_session = ' AND f.session_id = '.$session_id; |
|
| 3566 | 3566 | } |
| 3567 | 3567 | |
| 3568 | 3568 | $groupId = intval($groupId); |
@@ -3623,7 +3623,7 @@ discard block |
||
| 3623 | 3623 | $condition_session = ''; |
| 3624 | 3624 | if (isset($session_id)) { |
| 3625 | 3625 | $session_id = intval($session_id); |
| 3626 | - $condition_session = ' AND f.session_id = '. $session_id; |
|
| 3626 | + $condition_session = ' AND f.session_id = '.$session_id; |
|
| 3627 | 3627 | } |
| 3628 | 3628 | |
| 3629 | 3629 | $groupId = intval($groupId); |
@@ -3702,7 +3702,7 @@ discard block |
||
| 3702 | 3702 | { |
| 3703 | 3703 | $student_id = intval($student_id); |
| 3704 | 3704 | $courseId = intval($courseId); |
| 3705 | - $session_id = intval($session_id); |
|
| 3705 | + $session_id = intval($session_id); |
|
| 3706 | 3706 | $date_time = ''; |
| 3707 | 3707 | |
| 3708 | 3708 | // table definition |
@@ -3771,7 +3771,7 @@ discard block |
||
| 3771 | 3771 | $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS); |
| 3772 | 3772 | |
| 3773 | 3773 | $sql = 'SELECT 1 |
| 3774 | - FROM ' . $table . ' |
|
| 3774 | + FROM ' . $table.' |
|
| 3775 | 3775 | WHERE down_user_id = '.$student_id.' |
| 3776 | 3776 | AND c_id = "'.$courseId.'" |
| 3777 | 3777 | AND down_session_id = '.$session_id.' '; |
@@ -3849,30 +3849,30 @@ discard block |
||
| 3849 | 3849 | '.$inner.' |
| 3850 | 3850 | WHERE c.id = '.$courseId.' |
| 3851 | 3851 | GROUP BY stats_login.user_id |
| 3852 | - HAVING DATE_SUB( "' . $now . '", INTERVAL '.$since.' DAY) > max_date '; |
|
| 3852 | + HAVING DATE_SUB( "' . $now.'", INTERVAL '.$since.' DAY) > max_date '; |
|
| 3853 | 3853 | |
| 3854 | 3854 | if ($since == 'never') { |
| 3855 | 3855 | if (empty($session_id)) { |
| 3856 | 3856 | $sql = 'SELECT course_user.user_id |
| 3857 | - FROM ' . $table_course_rel_user . ' course_user |
|
| 3858 | - LEFT JOIN ' . $tbl_track_login . ' stats_login |
|
| 3857 | + FROM ' . $table_course_rel_user.' course_user |
|
| 3858 | + LEFT JOIN ' . $tbl_track_login.' stats_login |
|
| 3859 | 3859 | ON course_user.user_id = stats_login.user_id AND |
| 3860 | - relation_type<>' . COURSE_RELATION_TYPE_RRHH . ' |
|
| 3861 | - INNER JOIN ' . $tableCourse . ' c |
|
| 3860 | + relation_type<>' . COURSE_RELATION_TYPE_RRHH.' |
|
| 3861 | + INNER JOIN ' . $tableCourse.' c |
|
| 3862 | 3862 | ON (c.id = course_user.c_id) |
| 3863 | 3863 | WHERE |
| 3864 | - course_user.c_id = ' . $courseId . ' AND |
|
| 3864 | + course_user.c_id = ' . $courseId.' AND |
|
| 3865 | 3865 | stats_login.login_course_date IS NULL |
| 3866 | 3866 | GROUP BY course_user.user_id'; |
| 3867 | 3867 | } else { |
| 3868 | 3868 | $sql = 'SELECT session_course_user.user_id |
| 3869 | 3869 | FROM '.$tbl_session_course_user.' session_course_user |
| 3870 | - LEFT JOIN ' . $tbl_track_login . ' stats_login |
|
| 3870 | + LEFT JOIN ' . $tbl_track_login.' stats_login |
|
| 3871 | 3871 | ON session_course_user.user_id = stats_login.user_id |
| 3872 | - INNER JOIN ' . $tableCourse . ' c |
|
| 3872 | + INNER JOIN ' . $tableCourse.' c |
|
| 3873 | 3873 | ON (c.id = session_course_user.c_id) |
| 3874 | 3874 | WHERE |
| 3875 | - session_course_user.c_id = ' . $courseId . ' AND |
|
| 3875 | + session_course_user.c_id = ' . $courseId.' AND |
|
| 3876 | 3876 | stats_login.login_course_date IS NULL |
| 3877 | 3877 | GROUP BY session_course_user.user_id'; |
| 3878 | 3878 | |
@@ -3881,7 +3881,7 @@ discard block |
||
| 3881 | 3881 | |
| 3882 | 3882 | $rs = Database::query($sql); |
| 3883 | 3883 | $inactive_users = array(); |
| 3884 | - while($user = Database::fetch_array($rs)) { |
|
| 3884 | + while ($user = Database::fetch_array($rs)) { |
|
| 3885 | 3885 | $inactive_users[] = $user['user_id']; |
| 3886 | 3886 | } |
| 3887 | 3887 | |
@@ -3903,10 +3903,10 @@ discard block |
||
| 3903 | 3903 | $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS); |
| 3904 | 3904 | |
| 3905 | 3905 | $sql = 'SELECT '.$student_id.' |
| 3906 | - FROM ' . $table . ' |
|
| 3906 | + FROM ' . $table.' |
|
| 3907 | 3907 | WHERE |
| 3908 | - access_user_id=' . $student_id . ' AND |
|
| 3909 | - c_id="' . $courseId . '" AND |
|
| 3908 | + access_user_id=' . $student_id.' AND |
|
| 3909 | + c_id="' . $courseId.'" AND |
|
| 3910 | 3910 | access_session_id = "'.$session_id.'" '; |
| 3911 | 3911 | |
| 3912 | 3912 | $rs = Database::query($sql); |
@@ -3924,13 +3924,13 @@ discard block |
||
| 3924 | 3924 | { |
| 3925 | 3925 | $hr_dept_id = intval($hr_dept_id); |
| 3926 | 3926 | $a_students = array(); |
| 3927 | - $tbl_user = Database :: get_main_table(TABLE_MAIN_USER); |
|
| 3927 | + $tbl_user = Database :: get_main_table(TABLE_MAIN_USER); |
|
| 3928 | 3928 | |
| 3929 | 3929 | $sql = 'SELECT DISTINCT user_id FROM '.$tbl_user.' as user |
| 3930 | 3930 | WHERE hr_dept_id='.$hr_dept_id; |
| 3931 | 3931 | $rs = Database::query($sql); |
| 3932 | 3932 | |
| 3933 | - while($user = Database :: fetch_array($rs)) { |
|
| 3933 | + while ($user = Database :: fetch_array($rs)) { |
|
| 3934 | 3934 | $a_students[$user['user_id']] = $user['user_id']; |
| 3935 | 3935 | } |
| 3936 | 3936 | |
@@ -3955,7 +3955,7 @@ discard block |
||
| 3955 | 3955 | $condition_session = ''; |
| 3956 | 3956 | if (isset($session_id)) { |
| 3957 | 3957 | $session_id = intval($session_id); |
| 3958 | - $condition_session = ' AND access_session_id = '. $session_id; |
|
| 3958 | + $condition_session = ' AND access_session_id = '.$session_id; |
|
| 3959 | 3959 | } |
| 3960 | 3960 | $sql = "SELECT |
| 3961 | 3961 | access_tool, |
@@ -4067,7 +4067,7 @@ discard block |
||
| 4067 | 4067 | if (!empty($date_from) && !empty($date_to)) { |
| 4068 | 4068 | $fieldStartDate = $fields['start_date']; |
| 4069 | 4069 | if (!isset($fields['end_date'])) { |
| 4070 | - $where .= sprintf(" AND ($fieldStartDate BETWEEN '%s' AND '%s' )", $date_from, $date_to) ; |
|
| 4070 | + $where .= sprintf(" AND ($fieldStartDate BETWEEN '%s' AND '%s' )", $date_from, $date_to); |
|
| 4071 | 4071 | } else { |
| 4072 | 4072 | $fieldEndDate = $fields['end_date']; |
| 4073 | 4073 | $where .= sprintf(" AND fieldStartDate >= '%s' |
@@ -4083,12 +4083,12 @@ discard block |
||
| 4083 | 4083 | $where |
| 4084 | 4084 | GROUP BY %s"; |
| 4085 | 4085 | $sql = sprintf($sql, |
| 4086 | - $fields['user'], //user field |
|
| 4087 | - $tableName, //FROM |
|
| 4088 | - $fields['course'], //course condition |
|
| 4089 | - $course['real_id'], //course condition |
|
| 4090 | - $fields['user'], //user condition |
|
| 4091 | - $userId, //user condition |
|
| 4086 | + $fields['user'], //user field |
|
| 4087 | + $tableName, //FROM |
|
| 4088 | + $fields['course'], //course condition |
|
| 4089 | + $course['real_id'], //course condition |
|
| 4090 | + $fields['user'], //user condition |
|
| 4091 | + $userId, //user condition |
|
| 4092 | 4092 | $fields['user'] //GROUP BY |
| 4093 | 4093 | ); |
| 4094 | 4094 | $rs = Database::query($sql); |
@@ -4096,7 +4096,7 @@ discard block |
||
| 4096 | 4096 | //iterate query |
| 4097 | 4097 | if (Database::num_rows($rs) > 0) { |
| 4098 | 4098 | while ($row = Database::fetch_array($rs)) { |
| 4099 | - $data[$row['user']] = (isset($data[$row['user']])) ? $data[$row['user']] + $row[total]: $row['total']; |
|
| 4099 | + $data[$row['user']] = (isset($data[$row['user']])) ? $data[$row['user']] + $row[total] : $row['total']; |
|
| 4100 | 4100 | } |
| 4101 | 4101 | } |
| 4102 | 4102 | } |
@@ -4119,11 +4119,11 @@ discard block |
||
| 4119 | 4119 | $courseId = api_get_course_int_id($course_code); |
| 4120 | 4120 | $data = array(); |
| 4121 | 4121 | |
| 4122 | - $TABLETRACK_DOWNLOADS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS); |
|
| 4122 | + $TABLETRACK_DOWNLOADS = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS); |
|
| 4123 | 4123 | $condition_session = ''; |
| 4124 | 4124 | if (isset($session_id)) { |
| 4125 | 4125 | $session_id = intval($session_id); |
| 4126 | - $condition_session = ' AND down_session_id = '. $session_id; |
|
| 4126 | + $condition_session = ' AND down_session_id = '.$session_id; |
|
| 4127 | 4127 | } |
| 4128 | 4128 | $sql = "SELECT down_doc_path, COUNT(DISTINCT down_user_id), COUNT(down_doc_path) as count_down |
| 4129 | 4129 | FROM $TABLETRACK_DOWNLOADS |
@@ -4308,7 +4308,7 @@ discard block |
||
| 4308 | 4308 | |
| 4309 | 4309 | $final_course_data = array(); |
| 4310 | 4310 | |
| 4311 | - foreach($my_course_data as $course_id => $value) { |
|
| 4311 | + foreach ($my_course_data as $course_id => $value) { |
|
| 4312 | 4312 | $final_course_data[$course_id] = $course_list[$course_id]; |
| 4313 | 4313 | } |
| 4314 | 4314 | $course_in_session[$my_session_id]['course_list'] = $final_course_data; |
@@ -4329,7 +4329,7 @@ discard block |
||
| 4329 | 4329 | '.Display::tag('th', get_lang('Course'), array('width'=>'300px')).' |
| 4330 | 4330 | '.Display::tag('th', get_lang('TimeSpentInTheCourse'), array('class'=>'head')).' |
| 4331 | 4331 | '.Display::tag('th', get_lang('Progress'), array('class'=>'head')).' |
| 4332 | - '.Display::tag('th', get_lang('Score').Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array('align' => 'absmiddle', 'hspace' => '3px')),array('class'=>'head')).' |
|
| 4332 | + '.Display::tag('th', get_lang('Score').Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array('align' => 'absmiddle', 'hspace' => '3px')), array('class'=>'head')).' |
|
| 4333 | 4333 | '.Display::tag('th', get_lang('LastConnexion'), array('class'=>'head')).' |
| 4334 | 4334 | '.Display::tag('th', get_lang('Details'), array('class'=>'head')).' |
| 4335 | 4335 | </tr>'; |
@@ -4416,7 +4416,7 @@ discard block |
||
| 4416 | 4416 | $all_exercise_start_time = array(); |
| 4417 | 4417 | |
| 4418 | 4418 | foreach ($course_in_session as $my_session_id => $session_data) { |
| 4419 | - $course_list = $session_data['course_list']; |
|
| 4419 | + $course_list = $session_data['course_list']; |
|
| 4420 | 4420 | $user_count = count(SessionManager::get_users_by_session($my_session_id)); |
| 4421 | 4421 | $exercise_graph_name_list = array(); |
| 4422 | 4422 | //$user_results = array(); |
@@ -4461,20 +4461,20 @@ discard block |
||
| 4461 | 4461 | |
| 4462 | 4462 | $score = 0; |
| 4463 | 4463 | if (!empty($user_result_data['exe_weighting']) && intval($user_result_data['exe_weighting']) != 0) { |
| 4464 | - $score = intval($user_result_data['exe_result']/$user_result_data['exe_weighting'] * 100); |
|
| 4464 | + $score = intval($user_result_data['exe_result'] / $user_result_data['exe_weighting'] * 100); |
|
| 4465 | 4465 | } |
| 4466 | 4466 | $time = api_strtotime($exercise_data['start_time']) ? api_strtotime($exercise_data['start_time'], 'UTC') : 0; |
| 4467 | 4467 | $all_exercise_start_time[] = $time; |
| 4468 | 4468 | $my_results[] = $score; |
| 4469 | - if (count($exercise_list)<=10) { |
|
| 4469 | + if (count($exercise_list) <= 10) { |
|
| 4470 | 4470 | $title = cut($course_data['title'], 30)." \n ".cut($exercise_data['title'], 30); |
| 4471 | - $exercise_graph_name_list[]= $title; |
|
| 4471 | + $exercise_graph_name_list[] = $title; |
|
| 4472 | 4472 | $all_exercise_graph_name_list[] = $title; |
| 4473 | 4473 | } else { |
| 4474 | 4474 | // if there are more than 10 results, space becomes difficult to find, so only show the title of the exercise, not the tool |
| 4475 | 4475 | $title = cut($exercise_data['title'], 30); |
| 4476 | - $exercise_graph_name_list[]= $title; |
|
| 4477 | - $all_exercise_graph_name_list[]= $title; |
|
| 4476 | + $exercise_graph_name_list[] = $title; |
|
| 4477 | + $all_exercise_graph_name_list[] = $title; |
|
| 4478 | 4478 | } |
| 4479 | 4479 | } |
| 4480 | 4480 | } |
@@ -4507,7 +4507,7 @@ discard block |
||
| 4507 | 4507 | } |
| 4508 | 4508 | |
| 4509 | 4509 | $html .= Display::page_subheader( |
| 4510 | - Display::return_icon('session.png', get_lang('Sessions'), array(), ICON_SIZE_SMALL) . ' ' . get_lang('Sessions') |
|
| 4510 | + Display::return_icon('session.png', get_lang('Sessions'), array(), ICON_SIZE_SMALL).' '.get_lang('Sessions') |
|
| 4511 | 4511 | ); |
| 4512 | 4512 | |
| 4513 | 4513 | $html .= '<table class="data_table" width="100%">'; |
@@ -4557,7 +4557,7 @@ discard block |
||
| 4557 | 4557 | $courseInfo['real_id'], |
| 4558 | 4558 | $my_session_id |
| 4559 | 4559 | ); |
| 4560 | - if ($attempts > 1) { |
|
| 4560 | + if ($attempts > 1) { |
|
| 4561 | 4561 | $answered_exercises++; |
| 4562 | 4562 | } |
| 4563 | 4563 | } |
@@ -4570,7 +4570,7 @@ discard block |
||
| 4570 | 4570 | $all_average += $average; |
| 4571 | 4571 | } |
| 4572 | 4572 | |
| 4573 | - $all_average = $all_average / count($course_list); |
|
| 4573 | + $all_average = $all_average / count($course_list); |
|
| 4574 | 4574 | |
| 4575 | 4575 | if (isset($_GET['session_id']) && $my_session_id == $_GET['session_id']) { |
| 4576 | 4576 | $html .= '<tr style="background-color:#FBF09D">'; |
@@ -4595,31 +4595,31 @@ discard block |
||
| 4595 | 4595 | $html .= '</tr>'; |
| 4596 | 4596 | } |
| 4597 | 4597 | $html .= '</table><br />'; |
| 4598 | - $html .= Display::div($main_session_graph, array('id'=>'session_graph','class'=>'chart-session', 'style'=>'position:relative; text-align: center;') ); |
|
| 4598 | + $html .= Display::div($main_session_graph, array('id'=>'session_graph', 'class'=>'chart-session', 'style'=>'position:relative; text-align: center;')); |
|
| 4599 | 4599 | |
| 4600 | 4600 | // Checking selected session. |
| 4601 | 4601 | |
| 4602 | 4602 | if (isset($_GET['session_id'])) { |
| 4603 | 4603 | $session_id_from_get = intval($_GET['session_id']); |
| 4604 | - $session_data = $course_in_session[$session_id_from_get]; |
|
| 4605 | - $course_list = $session_data['course_list']; |
|
| 4604 | + $session_data = $course_in_session[$session_id_from_get]; |
|
| 4605 | + $course_list = $session_data['course_list']; |
|
| 4606 | 4606 | |
| 4607 | - $html .= Display::tag('h3',$session_data['name'].' - '.get_lang('CourseList')); |
|
| 4607 | + $html .= Display::tag('h3', $session_data['name'].' - '.get_lang('CourseList')); |
|
| 4608 | 4608 | |
| 4609 | 4609 | $html .= '<table class="data_table" width="100%">'; |
| 4610 | 4610 | //'.Display::tag('th', get_lang('DoneExercises'), array('class'=>'head')).' |
| 4611 | 4611 | $html .= ' |
| 4612 | 4612 | <tr> |
| 4613 | 4613 | <th width="300px">'.get_lang('Course').'</th> |
| 4614 | - '.Display::tag('th', get_lang('PublishedExercises'), array('class'=>'head')).' |
|
| 4615 | - '.Display::tag('th', get_lang('NewExercises'), array('class'=>'head')).' |
|
| 4616 | - '.Display::tag('th', get_lang('MyAverage'), array('class'=>'head')).' |
|
| 4617 | - '.Display::tag('th', get_lang('AverageExerciseResult'), array('class'=>'head')).' |
|
| 4618 | - '.Display::tag('th', get_lang('TimeSpentInTheCourse'), array('class'=>'head')).' |
|
| 4619 | - '.Display::tag('th', get_lang('LPProgress') , array('class'=>'head')).' |
|
| 4620 | - '.Display::tag('th', get_lang('Score').Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array ('align' => 'absmiddle', 'hspace' => '3px')), array('class'=>'head')).' |
|
| 4621 | - '.Display::tag('th', get_lang('LastConnexion'), array('class'=>'head')).' |
|
| 4622 | - '.Display::tag('th', get_lang('Details'), array('class'=>'head')).' |
|
| 4614 | + '.Display::tag('th', get_lang('PublishedExercises'), array('class'=>'head')).' |
|
| 4615 | + '.Display::tag('th', get_lang('NewExercises'), array('class'=>'head')).' |
|
| 4616 | + '.Display::tag('th', get_lang('MyAverage'), array('class'=>'head')).' |
|
| 4617 | + '.Display::tag('th', get_lang('AverageExerciseResult'), array('class'=>'head')).' |
|
| 4618 | + '.Display::tag('th', get_lang('TimeSpentInTheCourse'), array('class'=>'head')).' |
|
| 4619 | + '.Display::tag('th', get_lang('LPProgress'), array('class'=>'head')).' |
|
| 4620 | + '.Display::tag('th', get_lang('Score').Display::return_icon('info3.gif', get_lang('ScormAndLPTestTotalAverage'), array('align' => 'absmiddle', 'hspace' => '3px')), array('class'=>'head')).' |
|
| 4621 | + '.Display::tag('th', get_lang('LastConnexion'), array('class'=>'head')).' |
|
| 4622 | + '.Display::tag('th', get_lang('Details'), array('class'=>'head')).' |
|
| 4623 | 4623 | </tr>'; |
| 4624 | 4624 | |
| 4625 | 4625 | foreach ($course_list as $course_data) { |
@@ -4635,14 +4635,14 @@ discard block |
||
| 4635 | 4635 | $count_exercises = count($exercises); |
| 4636 | 4636 | } |
| 4637 | 4637 | $answered_exercises = 0; |
| 4638 | - foreach($exercises as $exercise_item) { |
|
| 4638 | + foreach ($exercises as $exercise_item) { |
|
| 4639 | 4639 | $attempts = Event::count_exercise_attempts_by_user( |
| 4640 | 4640 | api_get_user_id(), |
| 4641 | 4641 | $exercise_item['id'], |
| 4642 | 4642 | $courseId, |
| 4643 | 4643 | $session_id_from_get |
| 4644 | 4644 | ); |
| 4645 | - if ($attempts > 1) { |
|
| 4645 | + if ($attempts > 1) { |
|
| 4646 | 4646 | $answered_exercises++; |
| 4647 | 4647 | } |
| 4648 | 4648 | } |
@@ -4651,7 +4651,7 @@ discard block |
||
| 4651 | 4651 | |
| 4652 | 4652 | // Average |
| 4653 | 4653 | $average = ExerciseLib::get_average_score_by_course($courseId, $session_id_from_get); |
| 4654 | - $my_average = ExerciseLib::get_average_score_by_course_by_user(api_get_user_id(), $courseId, $session_id_from_get); |
|
| 4654 | + $my_average = ExerciseLib::get_average_score_by_course_by_user(api_get_user_id(), $courseId, $session_id_from_get); |
|
| 4655 | 4655 | |
| 4656 | 4656 | $stats_array[$course_code] = array( |
| 4657 | 4657 | 'exercises' => $count_exercises, |
@@ -4721,11 +4721,11 @@ discard block |
||
| 4721 | 4721 | } |
| 4722 | 4722 | //Score |
| 4723 | 4723 | $html .= Display::tag('td', $percentage_score, array('align'=>'center')); |
| 4724 | - $html .= Display::tag('td', $last_connection, array('align'=>'center')); |
|
| 4724 | + $html .= Display::tag('td', $last_connection, array('align'=>'center')); |
|
| 4725 | 4725 | |
| 4726 | 4726 | if ($course_code == $courseCodeFromGet && $_GET['session_id'] == $session_id_from_get) { |
| 4727 | 4727 | $details = '<a href="#">'; |
| 4728 | - $details .=Display::return_icon('2rightarrow_na.png', get_lang('Details')); |
|
| 4728 | + $details .= Display::return_icon('2rightarrow_na.png', get_lang('Details')); |
|
| 4729 | 4729 | } else { |
| 4730 | 4730 | $details = '<a href="'.api_get_self().'?course='.$course_code.'&session_id='.$session_id_from_get.$extra_params.'">'; |
| 4731 | 4731 | $details .= Display::return_icon('2rightarrow.png', get_lang('Details')); |
@@ -4848,7 +4848,7 @@ discard block |
||
| 4848 | 4848 | ); |
| 4849 | 4849 | |
| 4850 | 4850 | $latest_attempt_url = ''; |
| 4851 | - $best_score = $position = $percentage_score_result = '-'; |
|
| 4851 | + $best_score = $position = $percentage_score_result = '-'; |
|
| 4852 | 4852 | $graph = $normal_graph = null; |
| 4853 | 4853 | |
| 4854 | 4854 | // Getting best results |
@@ -4884,7 +4884,7 @@ discard block |
||
| 4884 | 4884 | $percentage_score_result = Display::url(ExerciseLib::show_score($score, $weighting), $latest_attempt_url); |
| 4885 | 4885 | $my_score = 0; |
| 4886 | 4886 | if (!empty($weighting) && intval($weighting) != 0) { |
| 4887 | - $my_score = $score/$weighting; |
|
| 4887 | + $my_score = $score / $weighting; |
|
| 4888 | 4888 | } |
| 4889 | 4889 | //@todo this function slows the page |
| 4890 | 4890 | $position = ExerciseLib::get_exercise_result_ranking($my_score, $exe_id, $exercices['id'], $course_info['code'], $session_id, $user_list); |
@@ -4895,14 +4895,14 @@ discard block |
||
| 4895 | 4895 | } |
| 4896 | 4896 | $html .= Display::div( |
| 4897 | 4897 | $normal_graph, |
| 4898 | - array('id'=>'main_graph_'.$exercices['id'],'class'=>'dialog', 'style'=>'display:none') |
|
| 4898 | + array('id'=>'main_graph_'.$exercices['id'], 'class'=>'dialog', 'style'=>'display:none') |
|
| 4899 | 4899 | ); |
| 4900 | 4900 | |
| 4901 | 4901 | if (empty($graph)) { |
| 4902 | 4902 | $graph = '-'; |
| 4903 | 4903 | } else { |
| 4904 | 4904 | $graph = Display::url( |
| 4905 | - '<img src="' . $graph . '" >', |
|
| 4905 | + '<img src="'.$graph.'" >', |
|
| 4906 | 4906 | $normal_graph, |
| 4907 | 4907 | array( |
| 4908 | 4908 | 'id' => $exercices['id'], |
@@ -4935,7 +4935,7 @@ discard block |
||
| 4935 | 4935 | |
| 4936 | 4936 | |
| 4937 | 4937 | // LP table results |
| 4938 | - $html .='<table class="data_table">'; |
|
| 4938 | + $html .= '<table class="data_table">'; |
|
| 4939 | 4939 | $html .= Display::tag('th', get_lang('Learnpaths'), array('class'=>'head', 'style'=>'color:#000')); |
| 4940 | 4940 | $html .= Display::tag('th', get_lang('LatencyTimeSpent'), array('class'=>'head', 'style'=>'color:#000')); |
| 4941 | 4941 | $html .= Display::tag('th', get_lang('Progress'), array('class'=>'head', 'style'=>'color:#000')); |
@@ -4989,7 +4989,7 @@ discard block |
||
| 4989 | 4989 | if (!empty($last_connection_in_lp)) { |
| 4990 | 4990 | $last_connection = api_convert_and_format_date($last_connection_in_lp, DATE_TIME_FORMAT_LONG); |
| 4991 | 4991 | } |
| 4992 | - $html .= Display::tag('td', $last_connection, array('align'=>'center','width'=>'180px')); |
|
| 4992 | + $html .= Display::tag('td', $last_connection, array('align'=>'center', 'width'=>'180px')); |
|
| 4993 | 4993 | $html .= "</tr>"; |
| 4994 | 4994 | } |
| 4995 | 4995 | } else { |
@@ -4999,7 +4999,7 @@ discard block |
||
| 4999 | 4999 | </td> |
| 5000 | 5000 | </tr>'; |
| 5001 | 5001 | } |
| 5002 | - $html .='</table>'; |
|
| 5002 | + $html .= '</table>'; |
|
| 5003 | 5003 | } |
| 5004 | 5004 | |
| 5005 | 5005 | return $html; |
@@ -5026,7 +5026,7 @@ discard block |
||
| 5026 | 5026 | $myData->setSerieDescription('Serie1', get_lang('MyResults')); |
| 5027 | 5027 | $myData->setSerieDescription('Serie2', get_lang('AverageScore')); |
| 5028 | 5028 | $myData->setAxisUnit(0, '%'); |
| 5029 | - $myData->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true); |
|
| 5029 | + $myData->loadPalette(api_get_path(SYS_CODE_PATH).'palettes/pchart/default.color', true); |
|
| 5030 | 5030 | // Cache definition |
| 5031 | 5031 | $cachePath = api_get_path(SYS_ARCHIVE_PATH); |
| 5032 | 5032 | $myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1))); |
@@ -5034,9 +5034,9 @@ discard block |
||
| 5034 | 5034 | |
| 5035 | 5035 | if ($myCache->isInCache($chartHash)) { |
| 5036 | 5036 | //if we already created the img |
| 5037 | - $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash; |
|
| 5037 | + $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash; |
|
| 5038 | 5038 | $myCache->saveFromCache($chartHash, $imgPath); |
| 5039 | - $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash; |
|
| 5039 | + $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash; |
|
| 5040 | 5040 | } else { |
| 5041 | 5041 | /* Define width, height and angle */ |
| 5042 | 5042 | $mainWidth = 860; |
@@ -5065,7 +5065,7 @@ discard block |
||
| 5065 | 5065 | /* Set the default font */ |
| 5066 | 5066 | $myPicture->setFontProperties( |
| 5067 | 5067 | array( |
| 5068 | - 'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', |
|
| 5068 | + 'FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf', |
|
| 5069 | 5069 | 'FontSize' => 10) |
| 5070 | 5070 | ); |
| 5071 | 5071 | /* Write the chart title */ |
@@ -5082,7 +5082,7 @@ discard block |
||
| 5082 | 5082 | /* Set the default font */ |
| 5083 | 5083 | $myPicture->setFontProperties( |
| 5084 | 5084 | array( |
| 5085 | - 'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', |
|
| 5085 | + 'FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf', |
|
| 5086 | 5086 | 'FontSize' => 6 |
| 5087 | 5087 | ) |
| 5088 | 5088 | ); |
@@ -5124,7 +5124,7 @@ discard block |
||
| 5124 | 5124 | /* Draw the line chart */ |
| 5125 | 5125 | $myPicture->setFontProperties( |
| 5126 | 5126 | array( |
| 5127 | - 'FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', |
|
| 5127 | + 'FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf', |
|
| 5128 | 5128 | 'FontSize' => 10 |
| 5129 | 5129 | ) |
| 5130 | 5130 | ); |
@@ -5157,12 +5157,12 @@ discard block |
||
| 5157 | 5157 | ); |
| 5158 | 5158 | |
| 5159 | 5159 | $myCache->writeToCache($chartHash, $myPicture); |
| 5160 | - $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash; |
|
| 5160 | + $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash; |
|
| 5161 | 5161 | $myCache->saveFromCache($chartHash, $imgPath); |
| 5162 | - $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash; |
|
| 5162 | + $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash; |
|
| 5163 | 5163 | } |
| 5164 | 5164 | |
| 5165 | - $html = '<img src="' . $imgPath . '">'; |
|
| 5165 | + $html = '<img src="'.$imgPath.'">'; |
|
| 5166 | 5166 | |
| 5167 | 5167 | return $html; |
| 5168 | 5168 | } |
@@ -5183,12 +5183,12 @@ discard block |
||
| 5183 | 5183 | |
| 5184 | 5184 | foreach ($attempts as $attempt) { |
| 5185 | 5185 | if (api_get_user_id() == $attempt['exe_user_id']) { |
| 5186 | - if ($attempt['exe_weighting'] != 0 ) { |
|
| 5187 | - $my_exercise_result_array[]= $attempt['exe_result']/$attempt['exe_weighting']; |
|
| 5186 | + if ($attempt['exe_weighting'] != 0) { |
|
| 5187 | + $my_exercise_result_array[] = $attempt['exe_result'] / $attempt['exe_weighting']; |
|
| 5188 | 5188 | } |
| 5189 | 5189 | } else { |
| 5190 | - if ($attempt['exe_weighting'] != 0 ) { |
|
| 5191 | - $exercise_result[]= $attempt['exe_result']/$attempt['exe_weighting']; |
|
| 5190 | + if ($attempt['exe_weighting'] != 0) { |
|
| 5191 | + $exercise_result[] = $attempt['exe_result'] / $attempt['exe_weighting']; |
|
| 5192 | 5192 | } |
| 5193 | 5193 | } |
| 5194 | 5194 | } |
@@ -5197,27 +5197,27 @@ discard block |
||
| 5197 | 5197 | rsort($my_exercise_result_array); |
| 5198 | 5198 | $my_exercise_result = 0; |
| 5199 | 5199 | if (isset($my_exercise_result_array[0])) { |
| 5200 | - $my_exercise_result = $my_exercise_result_array[0] *100; |
|
| 5200 | + $my_exercise_result = $my_exercise_result_array[0] * 100; |
|
| 5201 | 5201 | } |
| 5202 | 5202 | |
| 5203 | 5203 | $max = 100; |
| 5204 | - $pieces = 5 ; |
|
| 5204 | + $pieces = 5; |
|
| 5205 | 5205 | $part = round($max / $pieces); |
| 5206 | 5206 | $x_axis = array(); |
| 5207 | 5207 | $final_array = array(); |
| 5208 | 5208 | $my_final_array = array(); |
| 5209 | 5209 | |
| 5210 | - for ($i=1; $i <=$pieces; $i++) { |
|
| 5210 | + for ($i = 1; $i <= $pieces; $i++) { |
|
| 5211 | 5211 | $sum = 1; |
| 5212 | 5212 | if ($i == 1) { |
| 5213 | 5213 | $sum = 0; |
| 5214 | 5214 | } |
| 5215 | - $min = ($i-1)*$part + $sum; |
|
| 5216 | - $max = ($i)*$part; |
|
| 5217 | - $x_axis[]= $min." - ".$max; |
|
| 5215 | + $min = ($i - 1) * $part + $sum; |
|
| 5216 | + $max = ($i) * $part; |
|
| 5217 | + $x_axis[] = $min." - ".$max; |
|
| 5218 | 5218 | $count = 0; |
| 5219 | - foreach($exercise_result as $result) { |
|
| 5220 | - $percentage = $result*100; |
|
| 5219 | + foreach ($exercise_result as $result) { |
|
| 5220 | + $percentage = $result * 100; |
|
| 5221 | 5221 | //echo $percentage.' - '.$min.' - '.$max."<br />"; |
| 5222 | 5222 | if ($percentage >= $min && $percentage <= $max) { |
| 5223 | 5223 | //echo ' is > '; |
@@ -5225,7 +5225,7 @@ discard block |
||
| 5225 | 5225 | } |
| 5226 | 5226 | } |
| 5227 | 5227 | //echo '<br />'; |
| 5228 | - $final_array[]= $count; |
|
| 5228 | + $final_array[] = $count; |
|
| 5229 | 5229 | |
| 5230 | 5230 | if ($my_exercise_result >= $min && $my_exercise_result <= $max) { |
| 5231 | 5231 | $my_final_array[] = 1; |
@@ -5235,9 +5235,9 @@ discard block |
||
| 5235 | 5235 | } |
| 5236 | 5236 | |
| 5237 | 5237 | //Fix to remove the data of the user with my data |
| 5238 | - for($i = 0; $i<=count($my_final_array); $i++) { |
|
| 5238 | + for ($i = 0; $i <= count($my_final_array); $i++) { |
|
| 5239 | 5239 | if (!empty($my_final_array[$i])) { |
| 5240 | - $my_final_array[$i] = $final_array[$i] + 1; //Add my result |
|
| 5240 | + $my_final_array[$i] = $final_array[$i] + 1; //Add my result |
|
| 5241 | 5241 | $final_array[$i] = 0; |
| 5242 | 5242 | } |
| 5243 | 5243 | } |
@@ -5247,16 +5247,16 @@ discard block |
||
| 5247 | 5247 | $dataSet->addPoints($final_array, 'Serie1'); |
| 5248 | 5248 | $dataSet->addPoints($my_final_array, 'Serie2'); |
| 5249 | 5249 | $dataSet->normalize(100, "%"); |
| 5250 | - $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true); |
|
| 5250 | + $dataSet->loadPalette(api_get_path(SYS_CODE_PATH).'palettes/pchart/default.color', true); |
|
| 5251 | 5251 | |
| 5252 | 5252 | // Cache definition |
| 5253 | 5253 | $cachePath = api_get_path(SYS_ARCHIVE_PATH); |
| 5254 | 5254 | $myCache = new pCache(array('CacheFolder' => substr($cachePath, 0, strlen($cachePath) - 1))); |
| 5255 | 5255 | $chartHash = $myCache->getHash($dataSet); |
| 5256 | 5256 | if ($myCache->isInCache($chartHash)) { |
| 5257 | - $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash; |
|
| 5257 | + $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash; |
|
| 5258 | 5258 | $myCache->saveFromCache($chartHash, $imgPath); |
| 5259 | - $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash; |
|
| 5259 | + $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash; |
|
| 5260 | 5260 | } else { |
| 5261 | 5261 | /* Create the pChart object */ |
| 5262 | 5262 | $widthSize = 80; |
@@ -5272,7 +5272,7 @@ discard block |
||
| 5272 | 5272 | $myPicture->drawRectangle(0, 0, $widthSize - 1, $heightSize - 1, array('R' => 0, 'G' => 0, 'B' => 0)); |
| 5273 | 5273 | |
| 5274 | 5274 | /* Set the default font */ |
| 5275 | - $myPicture->setFontProperties(array('FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', 'FontSize' => $fontSize)); |
|
| 5275 | + $myPicture->setFontProperties(array('FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf', 'FontSize' => $fontSize)); |
|
| 5276 | 5276 | |
| 5277 | 5277 | /* Do not write the chart title */ |
| 5278 | 5278 | |
@@ -5336,9 +5336,9 @@ discard block |
||
| 5336 | 5336 | |
| 5337 | 5337 | /* Save and write in cache */ |
| 5338 | 5338 | $myCache->writeToCache($chartHash, $myPicture); |
| 5339 | - $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash; |
|
| 5339 | + $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash; |
|
| 5340 | 5340 | $myCache->saveFromCache($chartHash, $imgPath); |
| 5341 | - $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash; |
|
| 5341 | + $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash; |
|
| 5342 | 5342 | } |
| 5343 | 5343 | |
| 5344 | 5344 | return $imgPath; |
@@ -5358,12 +5358,12 @@ discard block |
||
| 5358 | 5358 | } |
| 5359 | 5359 | foreach ($attempts as $attempt) { |
| 5360 | 5360 | if (api_get_user_id() == $attempt['exe_user_id']) { |
| 5361 | - if ($attempt['exe_weighting'] != 0 ) { |
|
| 5362 | - $my_exercise_result_array[]= $attempt['exe_result']/$attempt['exe_weighting']; |
|
| 5361 | + if ($attempt['exe_weighting'] != 0) { |
|
| 5362 | + $my_exercise_result_array[] = $attempt['exe_result'] / $attempt['exe_weighting']; |
|
| 5363 | 5363 | } |
| 5364 | 5364 | } else { |
| 5365 | - if ($attempt['exe_weighting'] != 0 ) { |
|
| 5366 | - $exercise_result[]= $attempt['exe_result']/$attempt['exe_weighting']; |
|
| 5365 | + if ($attempt['exe_weighting'] != 0) { |
|
| 5366 | + $exercise_result[] = $attempt['exe_result'] / $attempt['exe_weighting']; |
|
| 5367 | 5367 | } |
| 5368 | 5368 | } |
| 5369 | 5369 | } |
@@ -5372,32 +5372,32 @@ discard block |
||
| 5372 | 5372 | rsort($my_exercise_result_array); |
| 5373 | 5373 | $my_exercise_result = 0; |
| 5374 | 5374 | if (isset($my_exercise_result_array[0])) { |
| 5375 | - $my_exercise_result = $my_exercise_result_array[0] *100; |
|
| 5375 | + $my_exercise_result = $my_exercise_result_array[0] * 100; |
|
| 5376 | 5376 | } |
| 5377 | 5377 | |
| 5378 | 5378 | $max = 100; |
| 5379 | - $pieces = 5 ; |
|
| 5379 | + $pieces = 5; |
|
| 5380 | 5380 | $part = round($max / $pieces); |
| 5381 | 5381 | $x_axis = array(); |
| 5382 | 5382 | $final_array = array(); |
| 5383 | 5383 | $my_final_array = array(); |
| 5384 | 5384 | |
| 5385 | - for ($i=1; $i <=$pieces; $i++) { |
|
| 5385 | + for ($i = 1; $i <= $pieces; $i++) { |
|
| 5386 | 5386 | $sum = 1; |
| 5387 | 5387 | if ($i == 1) { |
| 5388 | 5388 | $sum = 0; |
| 5389 | 5389 | } |
| 5390 | - $min = ($i-1)*$part + $sum; |
|
| 5391 | - $max = ($i)*$part; |
|
| 5392 | - $x_axis[]= $min." - ".$max; |
|
| 5390 | + $min = ($i - 1) * $part + $sum; |
|
| 5391 | + $max = ($i) * $part; |
|
| 5392 | + $x_axis[] = $min." - ".$max; |
|
| 5393 | 5393 | $count = 0; |
| 5394 | - foreach($exercise_result as $result) { |
|
| 5395 | - $percentage = $result*100; |
|
| 5394 | + foreach ($exercise_result as $result) { |
|
| 5395 | + $percentage = $result * 100; |
|
| 5396 | 5396 | if ($percentage >= $min && $percentage <= $max) { |
| 5397 | 5397 | $count++; |
| 5398 | 5398 | } |
| 5399 | 5399 | } |
| 5400 | - $final_array[]= $count; |
|
| 5400 | + $final_array[] = $count; |
|
| 5401 | 5401 | |
| 5402 | 5402 | if ($my_exercise_result >= $min && $my_exercise_result <= $max) { |
| 5403 | 5403 | $my_final_array[] = 1; |
@@ -5408,9 +5408,9 @@ discard block |
||
| 5408 | 5408 | |
| 5409 | 5409 | //Fix to remove the data of the user with my data |
| 5410 | 5410 | |
| 5411 | - for($i = 0; $i<=count($my_final_array); $i++) { |
|
| 5411 | + for ($i = 0; $i <= count($my_final_array); $i++) { |
|
| 5412 | 5412 | if (!empty($my_final_array[$i])) { |
| 5413 | - $my_final_array[$i] = $final_array[$i] + 1; //Add my result |
|
| 5413 | + $my_final_array[$i] = $final_array[$i] + 1; //Add my result |
|
| 5414 | 5414 | $final_array[$i] = 0; |
| 5415 | 5415 | } |
| 5416 | 5416 | } |
@@ -5428,7 +5428,7 @@ discard block |
||
| 5428 | 5428 | $dataSet->setXAxisName(get_lang('Score')); |
| 5429 | 5429 | $dataSet->normalize(100, "%"); |
| 5430 | 5430 | |
| 5431 | - $dataSet->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true); |
|
| 5431 | + $dataSet->loadPalette(api_get_path(SYS_CODE_PATH).'palettes/pchart/default.color', true); |
|
| 5432 | 5432 | |
| 5433 | 5433 | // Cache definition |
| 5434 | 5434 | $cachePath = api_get_path(SYS_ARCHIVE_PATH); |
@@ -5436,9 +5436,9 @@ discard block |
||
| 5436 | 5436 | $chartHash = $myCache->getHash($dataSet); |
| 5437 | 5437 | |
| 5438 | 5438 | if ($myCache->isInCache($chartHash)) { |
| 5439 | - $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash; |
|
| 5439 | + $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash; |
|
| 5440 | 5440 | $myCache->saveFromCache($chartHash, $imgPath); |
| 5441 | - $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash; |
|
| 5441 | + $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash; |
|
| 5442 | 5442 | } else { |
| 5443 | 5443 | /* Create the pChart object */ |
| 5444 | 5444 | $widthSize = 480; |
@@ -5454,7 +5454,7 @@ discard block |
||
| 5454 | 5454 | $myPicture->drawRectangle(0, 0, $widthSize - 1, $heightSize - 1, array('R' => 0, 'G' => 0, 'B' => 0)); |
| 5455 | 5455 | |
| 5456 | 5456 | /* Set the default font */ |
| 5457 | - $myPicture->setFontProperties(array('FontName' => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf', 'FontSize' => 10)); |
|
| 5457 | + $myPicture->setFontProperties(array('FontName' => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf', 'FontSize' => 10)); |
|
| 5458 | 5458 | |
| 5459 | 5459 | /* Write the chart title */ |
| 5460 | 5460 | $myPicture->drawText( |
@@ -5513,9 +5513,9 @@ discard block |
||
| 5513 | 5513 | |
| 5514 | 5514 | /* Write and save into cache */ |
| 5515 | 5515 | $myCache->writeToCache($chartHash, $myPicture); |
| 5516 | - $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash; |
|
| 5516 | + $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash; |
|
| 5517 | 5517 | $myCache->saveFromCache($chartHash, $imgPath); |
| 5518 | - $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash; |
|
| 5518 | + $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash; |
|
| 5519 | 5519 | } |
| 5520 | 5520 | |
| 5521 | 5521 | return $imgPath; |
@@ -5641,7 +5641,7 @@ discard block |
||
| 5641 | 5641 | $whereSessionParams .= $sessionIdx.','; |
| 5642 | 5642 | } |
| 5643 | 5643 | } |
| 5644 | - $whereSessionParams = substr($whereSessionParams,0,-1); |
|
| 5644 | + $whereSessionParams = substr($whereSessionParams, 0, -1); |
|
| 5645 | 5645 | } |
| 5646 | 5646 | |
| 5647 | 5647 | if (!empty($exerciseId)) { |
@@ -5702,7 +5702,7 @@ discard block |
||
| 5702 | 5702 | qq.position = rq.question_order AND |
| 5703 | 5703 | ta.question_id = rq.question_id |
| 5704 | 5704 | WHERE |
| 5705 | - te.c_id = $courseIdx ".(empty($whereSessionParams)?'':"AND te.session_id IN ($whereSessionParams)")." |
|
| 5705 | + te.c_id = $courseIdx ".(empty($whereSessionParams) ? '' : "AND te.session_id IN ($whereSessionParams)")." |
|
| 5706 | 5706 | AND q.c_id = $courseIdx |
| 5707 | 5707 | $where $order $limit"; |
| 5708 | 5708 | $sql_query = vsprintf($sql, $whereParams); |
@@ -5750,7 +5750,7 @@ discard block |
||
| 5750 | 5750 | // Now fill users data |
| 5751 | 5751 | $sqlUsers = "SELECT user_id, username, lastname, firstname |
| 5752 | 5752 | FROM $tuser |
| 5753 | - WHERE user_id IN (".implode(',',$userIds).")"; |
|
| 5753 | + WHERE user_id IN (".implode(',', $userIds).")"; |
|
| 5754 | 5754 | $resUsers = Database::query($sqlUsers); |
| 5755 | 5755 | while ($rowUser = Database::fetch_assoc($resUsers)) { |
| 5756 | 5756 | $users[$rowUser['user_id']] = $rowUser; |
@@ -5846,7 +5846,7 @@ discard block |
||
| 5846 | 5846 | WHERE |
| 5847 | 5847 | track_resource.c_id = $course_id AND |
| 5848 | 5848 | track_resource.insert_user_id = user.user_id AND |
| 5849 | - session_id " .(empty($session_id) ? ' IS NULL ' : " = $session_id "); |
|
| 5849 | + session_id ".(empty($session_id) ? ' IS NULL ' : " = $session_id "); |
|
| 5850 | 5850 | |
| 5851 | 5851 | if (isset($_GET['keyword'])) { |
| 5852 | 5852 | $keyword = Database::escape_string(trim($_GET['keyword'])); |
@@ -5904,7 +5904,7 @@ discard block |
||
| 5904 | 5904 | WHERE |
| 5905 | 5905 | track_resource.c_id = $course_id AND |
| 5906 | 5906 | track_resource.insert_user_id = user.user_id AND |
| 5907 | - session_id " .(empty($session_id) ? ' IS NULL ' : " = $session_id "); |
|
| 5907 | + session_id ".(empty($session_id) ? ' IS NULL ' : " = $session_id "); |
|
| 5908 | 5908 | |
| 5909 | 5909 | if (isset($_GET['keyword'])) { |
| 5910 | 5910 | $keyword = Database::escape_string(trim($_GET['keyword'])); |
@@ -6198,7 +6198,7 @@ discard block |
||
| 6198 | 6198 | public static function display_additional_profile_fields() |
| 6199 | 6199 | { |
| 6200 | 6200 | // getting all the extra profile fields that are defined by the platform administrator |
| 6201 | - $extra_fields = UserManager :: get_extra_fields(0,50,5,'ASC'); |
|
| 6201 | + $extra_fields = UserManager :: get_extra_fields(0, 50, 5, 'ASC'); |
|
| 6202 | 6202 | |
| 6203 | 6203 | // creating the form |
| 6204 | 6204 | $return = '<form action="courseLog.php" method="get" name="additional_profile_field_form" id="additional_profile_field_form">'; |
@@ -6210,8 +6210,8 @@ discard block |
||
| 6210 | 6210 | $extra_fields_to_show = 0; |
| 6211 | 6211 | foreach ($extra_fields as $key=>$field) { |
| 6212 | 6212 | // show only extra fields that are visible + and can be filtered, added by J.Montoya |
| 6213 | - if ($field[6]==1 && $field[8] == 1) { |
|
| 6214 | - if (isset($_GET['additional_profile_field']) && $field[0] == $_GET['additional_profile_field'] ) { |
|
| 6213 | + if ($field[6] == 1 && $field[8] == 1) { |
|
| 6214 | + if (isset($_GET['additional_profile_field']) && $field[0] == $_GET['additional_profile_field']) { |
|
| 6215 | 6215 | $selected = 'selected="selected"'; |
| 6216 | 6216 | } else { |
| 6217 | 6217 | $selected = ''; |
@@ -6223,8 +6223,8 @@ discard block |
||
| 6223 | 6223 | $return .= '</select>'; |
| 6224 | 6224 | |
| 6225 | 6225 | // the form elements for the $_GET parameters (because the form is passed through GET |
| 6226 | - foreach ($_GET as $key=>$value){ |
|
| 6227 | - if ($key <> 'additional_profile_field') { |
|
| 6226 | + foreach ($_GET as $key=>$value) { |
|
| 6227 | + if ($key <> 'additional_profile_field') { |
|
| 6228 | 6228 | $return .= '<input type="hidden" name="'.Security::remove_XSS($key).'" value="'.Security::remove_XSS($value).'" />'; |
| 6229 | 6229 | } |
| 6230 | 6230 | } |
@@ -6261,21 +6261,21 @@ discard block |
||
| 6261 | 6261 | $result_extra_field = UserManager::get_extra_field_information($field_id); |
| 6262 | 6262 | |
| 6263 | 6263 | if (!empty($users)) { |
| 6264 | - if ($result_extra_field['field_type'] == UserManager::USER_FIELD_TYPE_TAG ) { |
|
| 6265 | - foreach($users as $user_id) { |
|
| 6264 | + if ($result_extra_field['field_type'] == UserManager::USER_FIELD_TYPE_TAG) { |
|
| 6265 | + foreach ($users as $user_id) { |
|
| 6266 | 6266 | $user_result = UserManager::get_user_tags($user_id, $field_id); |
| 6267 | 6267 | $tag_list = array(); |
| 6268 | - foreach($user_result as $item) { |
|
| 6268 | + foreach ($user_result as $item) { |
|
| 6269 | 6269 | $tag_list[] = $item['tag']; |
| 6270 | 6270 | } |
| 6271 | - $return[$user_id][] = implode(', ',$tag_list); |
|
| 6271 | + $return[$user_id][] = implode(', ', $tag_list); |
|
| 6272 | 6272 | } |
| 6273 | 6273 | } else { |
| 6274 | 6274 | $new_user_array = array(); |
| 6275 | 6275 | foreach ($users as $user_id) { |
| 6276 | - $new_user_array[]= "'".$user_id."'"; |
|
| 6276 | + $new_user_array[] = "'".$user_id."'"; |
|
| 6277 | 6277 | } |
| 6278 | - $users = implode(',',$new_user_array); |
|
| 6278 | + $users = implode(',', $new_user_array); |
|
| 6279 | 6279 | $extraFieldType = EntityExtraField::USER_FIELD_TYPE; |
| 6280 | 6280 | // Selecting only the necessary information NOT ALL the user list |
| 6281 | 6281 | $sql = "SELECT user.user_id, v.value |
@@ -6290,7 +6290,7 @@ discard block |
||
| 6290 | 6290 | user.user_id IN ($users)"; |
| 6291 | 6291 | |
| 6292 | 6292 | $result = Database::query($sql); |
| 6293 | - while($row = Database::fetch_array($result)) { |
|
| 6293 | + while ($row = Database::fetch_array($result)) { |
|
| 6294 | 6294 | // get option value for field type double select by id |
| 6295 | 6295 | if (!empty($row['value'])) { |
| 6296 | 6296 | if ($result_extra_field['field_type'] == |
@@ -6329,7 +6329,7 @@ discard block |
||
| 6329 | 6329 | |
| 6330 | 6330 | public function sort_users_desc($a, $b) |
| 6331 | 6331 | { |
| 6332 | - return strcmp( trim(api_strtolower($b[$_SESSION['tracking_column']])), trim(api_strtolower($a[$_SESSION['tracking_column']]))); |
|
| 6332 | + return strcmp(trim(api_strtolower($b[$_SESSION['tracking_column']])), trim(api_strtolower($a[$_SESSION['tracking_column']]))); |
|
| 6333 | 6333 | } |
| 6334 | 6334 | |
| 6335 | 6335 | /** |
@@ -6364,7 +6364,7 @@ discard block |
||
| 6364 | 6364 | // get all users data from a course for sortable with limit |
| 6365 | 6365 | if (is_array($user_ids)) { |
| 6366 | 6366 | $user_ids = array_map('intval', $user_ids); |
| 6367 | - $condition_user = " WHERE user.user_id IN (".implode(',',$user_ids).") "; |
|
| 6367 | + $condition_user = " WHERE user.user_id IN (".implode(',', $user_ids).") "; |
|
| 6368 | 6368 | } else { |
| 6369 | 6369 | $user_ids = intval($user_ids); |
| 6370 | 6370 | $condition_user = " WHERE user.user_id = $user_ids "; |
@@ -6372,7 +6372,7 @@ discard block |
||
| 6372 | 6372 | |
| 6373 | 6373 | if (!empty($_GET['user_keyword'])) { |
| 6374 | 6374 | $keyword = trim(Database::escape_string($_GET['user_keyword'])); |
| 6375 | - $condition_user .= " AND ( |
|
| 6375 | + $condition_user .= " AND ( |
|
| 6376 | 6376 | user.firstname LIKE '%".$keyword."%' OR |
| 6377 | 6377 | user.lastname LIKE '%".$keyword."%' OR |
| 6378 | 6378 | user.username LIKE '%".$keyword."%' OR |
@@ -6390,7 +6390,7 @@ discard block |
||
| 6390 | 6390 | $invitedUsersCondition = ''; |
| 6391 | 6391 | |
| 6392 | 6392 | if (!$includeInvitedUsers) { |
| 6393 | - $invitedUsersCondition = " AND user.status != " . INVITEE; |
|
| 6393 | + $invitedUsersCondition = " AND user.status != ".INVITEE; |
|
| 6394 | 6394 | } |
| 6395 | 6395 | |
| 6396 | 6396 | $sql = "SELECT user.user_id as user_id, |
@@ -6401,7 +6401,7 @@ discard block |
||
| 6401 | 6401 | FROM $tbl_user as user $url_table |
| 6402 | 6402 | $condition_user $url_condition $invitedUsersCondition"; |
| 6403 | 6403 | |
| 6404 | - if (!in_array($direction, array('ASC','DESC'))) { |
|
| 6404 | + if (!in_array($direction, array('ASC', 'DESC'))) { |
|
| 6405 | 6405 | $direction = 'ASC'; |
| 6406 | 6406 | } |
| 6407 | 6407 | |
@@ -6538,7 +6538,7 @@ discard block |
||
| 6538 | 6538 | } |
| 6539 | 6539 | |
| 6540 | 6540 | if (empty($session_id)) { |
| 6541 | - $user['survey'] = (isset($survey_user_list[$user['user_id']]) ? $survey_user_list[$user['user_id']] : 0) .' / '.$total_surveys; |
|
| 6541 | + $user['survey'] = (isset($survey_user_list[$user['user_id']]) ? $survey_user_list[$user['user_id']] : 0).' / '.$total_surveys; |
|
| 6542 | 6542 | } |
| 6543 | 6543 | |
| 6544 | 6544 | $user['link'] = '<center> |
@@ -6550,37 +6550,37 @@ discard block |
||
| 6550 | 6550 | // store columns in array $users |
| 6551 | 6551 | $is_western_name_order = api_is_western_name_order(); |
| 6552 | 6552 | $user_row = array(); |
| 6553 | - $user_row[]= $user['official_code']; //0 |
|
| 6553 | + $user_row[] = $user['official_code']; //0 |
|
| 6554 | 6554 | if ($is_western_name_order) { |
| 6555 | - $user_row[]= $user['firstname']; |
|
| 6556 | - $user_row[]= $user['lastname']; |
|
| 6555 | + $user_row[] = $user['firstname']; |
|
| 6556 | + $user_row[] = $user['lastname']; |
|
| 6557 | 6557 | } else { |
| 6558 | - $user_row[]= $user['lastname']; |
|
| 6559 | - $user_row[]= $user['firstname']; |
|
| 6558 | + $user_row[] = $user['lastname']; |
|
| 6559 | + $user_row[] = $user['firstname']; |
|
| 6560 | 6560 | } |
| 6561 | - $user_row[]= $user['username']; |
|
| 6562 | - $user_row[]= $user['time']; |
|
| 6563 | - $user_row[]= $user['average_progress']; |
|
| 6564 | - $user_row[]= $user['exercise_progress']; |
|
| 6565 | - $user_row[]= $user['exercise_average_best_attempt']; |
|
| 6566 | - $user_row[]= $user['student_score']; |
|
| 6567 | - $user_row[]= $user['count_assignments']; |
|
| 6568 | - $user_row[]= $user['count_messages']; |
|
| 6561 | + $user_row[] = $user['username']; |
|
| 6562 | + $user_row[] = $user['time']; |
|
| 6563 | + $user_row[] = $user['average_progress']; |
|
| 6564 | + $user_row[] = $user['exercise_progress']; |
|
| 6565 | + $user_row[] = $user['exercise_average_best_attempt']; |
|
| 6566 | + $user_row[] = $user['student_score']; |
|
| 6567 | + $user_row[] = $user['count_assignments']; |
|
| 6568 | + $user_row[] = $user['count_messages']; |
|
| 6569 | 6569 | |
| 6570 | 6570 | $userGroupManager = new UserGroup(); |
| 6571 | 6571 | $user_row[] = $userGroupManager->getLabelsFromNameList($user['user_id'], UserGroup::NORMAL_CLASS); |
| 6572 | 6572 | |
| 6573 | 6573 | if (empty($session_id)) { |
| 6574 | - $user_row[]= $user['survey']; |
|
| 6574 | + $user_row[] = $user['survey']; |
|
| 6575 | 6575 | } |
| 6576 | 6576 | |
| 6577 | - $user_row[]= $user['first_connection']; |
|
| 6578 | - $user_row[]= $user['last_connection']; |
|
| 6577 | + $user_row[] = $user['first_connection']; |
|
| 6578 | + $user_row[] = $user['last_connection']; |
|
| 6579 | 6579 | if (isset($_GET['additional_profile_field']) && is_numeric($_GET['additional_profile_field'])) { |
| 6580 | - $user_row[]= $user['additional']; |
|
| 6580 | + $user_row[] = $user['additional']; |
|
| 6581 | 6581 | } |
| 6582 | 6582 | |
| 6583 | - $user_row[]= $user['link']; |
|
| 6583 | + $user_row[] = $user['link']; |
|
| 6584 | 6584 | |
| 6585 | 6585 | $users[] = $user_row; |
| 6586 | 6586 | |
@@ -6625,8 +6625,8 @@ discard block |
||
| 6625 | 6625 | |
| 6626 | 6626 | $track_access_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS); |
| 6627 | 6627 | $tempView = $view; |
| 6628 | - if(substr($view,0,1) == '1') { |
|
| 6629 | - $new_view = substr_replace($view,'0',0,1); |
|
| 6628 | + if (substr($view, 0, 1) == '1') { |
|
| 6629 | + $new_view = substr_replace($view, '0', 0, 1); |
|
| 6630 | 6630 | echo " |
| 6631 | 6631 | <tr> |
| 6632 | 6632 | <td valign='top'> |
@@ -6659,9 +6659,9 @@ discard block |
||
| 6659 | 6659 | </tr>"; |
| 6660 | 6660 | $total = 0; |
| 6661 | 6661 | if (is_array($results)) { |
| 6662 | - for($j = 0 ; $j < count($results) ; $j++) { |
|
| 6662 | + for ($j = 0; $j < count($results); $j++) { |
|
| 6663 | 6663 | echo "<tr>"; |
| 6664 | - echo "<td class='content'><a href='logins_details.php?uInfo=".$user_id."&reqdate=".$results[$j][0]."&view=".Security::remove_XSS($view)."'>".$MonthsLong[date('n', $results[$j][0])-1].' '.date('Y', $results[$j][0])."</a></td>"; |
|
| 6664 | + echo "<td class='content'><a href='logins_details.php?uInfo=".$user_id."&reqdate=".$results[$j][0]."&view=".Security::remove_XSS($view)."'>".$MonthsLong[date('n', $results[$j][0]) - 1].' '.date('Y', $results[$j][0])."</a></td>"; |
|
| 6665 | 6665 | echo "<td valign='top' align='right' class='content'>".$results[$j][1]."</td>"; |
| 6666 | 6666 | echo"</tr>"; |
| 6667 | 6667 | $total = $total + $results[$j][1]; |
@@ -6678,7 +6678,7 @@ discard block |
||
| 6678 | 6678 | echo "</table>"; |
| 6679 | 6679 | echo "</td></tr>"; |
| 6680 | 6680 | } else { |
| 6681 | - $new_view = substr_replace($view,'1',0,1); |
|
| 6681 | + $new_view = substr_replace($view, '1', 0, 1); |
|
| 6682 | 6682 | echo " |
| 6683 | 6683 | <tr> |
| 6684 | 6684 | <td valign='top'> |
@@ -6701,8 +6701,8 @@ discard block |
||
| 6701 | 6701 | { |
| 6702 | 6702 | global $TBL_TRACK_HOTPOTATOES, $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $dateTimeFormatLong; |
| 6703 | 6703 | $courseId = api_get_course_int_id($courseCode); |
| 6704 | - if(substr($view,1,1) == '1') { |
|
| 6705 | - $new_view = substr_replace($view,'0',1,1); |
|
| 6704 | + if (substr($view, 1, 1) == '1') { |
|
| 6705 | + $new_view = substr_replace($view, '0', 1, 1); |
|
| 6706 | 6706 | echo "<tr> |
| 6707 | 6707 | <td valign='top'> |
| 6708 | 6708 | <font color='#0000FF'>- </font><b>".get_lang('ExercicesResults')."</b> [<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>] [<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=01000'>".get_lang('ExportAsCSV')."</a>] |
@@ -6744,7 +6744,7 @@ discard block |
||
| 6744 | 6744 | </tr>"; |
| 6745 | 6745 | |
| 6746 | 6746 | if (is_array($results)) { |
| 6747 | - for($i = 0; $i < sizeof($results); $i++) { |
|
| 6747 | + for ($i = 0; $i < sizeof($results); $i++) { |
|
| 6748 | 6748 | $display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get()); |
| 6749 | 6749 | echo "<tr>\n"; |
| 6750 | 6750 | echo "<td class='content'>".$results[$i][0]."</td>\n"; |
@@ -6759,8 +6759,8 @@ discard block |
||
| 6759 | 6759 | |
| 6760 | 6760 | // The Result of Tests |
| 6761 | 6761 | if (is_array($hpresults)) { |
| 6762 | - for($i = 0; $i < sizeof($hpresults); $i++) { |
|
| 6763 | - $title = GetQuizName($hpresults[$i][0],''); |
|
| 6762 | + for ($i = 0; $i < sizeof($hpresults); $i++) { |
|
| 6763 | + $title = GetQuizName($hpresults[$i][0], ''); |
|
| 6764 | 6764 | if ($title == '') |
| 6765 | 6765 | $title = basename($hpresults[$i][0]); |
| 6766 | 6766 | $display_date = api_convert_and_format_date($hpresults[$i][3], null, date_default_timezone_get()); |
@@ -6786,7 +6786,7 @@ discard block |
||
| 6786 | 6786 | echo "</table>"; |
| 6787 | 6787 | echo "</td>\n</tr>\n"; |
| 6788 | 6788 | } else { |
| 6789 | - $new_view = substr_replace($view,'1',1,1); |
|
| 6789 | + $new_view = substr_replace($view, '1', 1, 1); |
|
| 6790 | 6790 | echo " |
| 6791 | 6791 | <tr> |
| 6792 | 6792 | <td valign='top'> |
@@ -6805,8 +6805,8 @@ discard block |
||
| 6805 | 6805 | global $TABLETRACK_UPLOADS, $TABLECOURSE_WORK; |
| 6806 | 6806 | $_course = api_get_course_info_by_id($course_id); |
| 6807 | 6807 | |
| 6808 | - if (substr($view,2,1) == '1') { |
|
| 6809 | - $new_view = substr_replace($view,'0',2,1); |
|
| 6808 | + if (substr($view, 2, 1) == '1') { |
|
| 6809 | + $new_view = substr_replace($view, '0', 2, 1); |
|
| 6810 | 6810 | echo "<tr> |
| 6811 | 6811 | <td valign='top'> |
| 6812 | 6812 | <font color='#0000FF'>- </font><b>".get_lang('WorkUploads')."</b> [<a href='".api_get_self()."?uInfo=".Security::remove_XSS($user_id)."&view=".Security::remove_XSS($new_view)."'>".get_lang('Close')."</a>] [<a href='userLogCSV.php?".api_get_cidreq()."&uInfo=".Security::remove_XSS($_GET['uInfo'])."&view=00100'>".get_lang('ExportAsCSV')."</a>] |
@@ -6820,7 +6820,7 @@ discard block |
||
| 6820 | 6820 | AND u.c_id = '".intval($course_id)."' |
| 6821 | 6821 | ORDER BY u.upload_date DESC"; |
| 6822 | 6822 | echo "<tr><td style='padding-left : 40px;padding-right : 40px;'>"; |
| 6823 | - $results = StatsUtils::getManyResultsXCol($sql,4); |
|
| 6823 | + $results = StatsUtils::getManyResultsXCol($sql, 4); |
|
| 6824 | 6824 | echo "<table cellpadding='2' cellspacing='1' border='0' align=center>"; |
| 6825 | 6825 | echo "<tr> |
| 6826 | 6826 | <td class='secLine' width='40%'> |
@@ -6834,7 +6834,7 @@ discard block |
||
| 6834 | 6834 | </td> |
| 6835 | 6835 | </tr>"; |
| 6836 | 6836 | if (is_array($results)) { |
| 6837 | - for($j = 0 ; $j < count($results) ; $j++) { |
|
| 6837 | + for ($j = 0; $j < count($results); $j++) { |
|
| 6838 | 6838 | $pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3]; |
| 6839 | 6839 | $beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get()); |
| 6840 | 6840 | echo "<tr>"; |
@@ -6853,7 +6853,7 @@ discard block |
||
| 6853 | 6853 | echo "</table>"; |
| 6854 | 6854 | echo "</td></tr>"; |
| 6855 | 6855 | } else { |
| 6856 | - $new_view = substr_replace($view,'1',2,1); |
|
| 6856 | + $new_view = substr_replace($view, '1', 2, 1); |
|
| 6857 | 6857 | echo " |
| 6858 | 6858 | <tr> |
| 6859 | 6859 | <td valign='top'> |
@@ -6872,8 +6872,8 @@ discard block |
||
| 6872 | 6872 | { |
| 6873 | 6873 | global $TABLETRACK_LINKS, $TABLECOURSE_LINKS; |
| 6874 | 6874 | $courseId = api_get_course_int_id($courseCode); |
| 6875 | - if (substr($view,3,1) == '1') { |
|
| 6876 | - $new_view = substr_replace($view,'0',3,1); |
|
| 6875 | + if (substr($view, 3, 1) == '1') { |
|
| 6876 | + $new_view = substr_replace($view, '0', 3, 1); |
|
| 6877 | 6877 | echo " |
| 6878 | 6878 | <tr> |
| 6879 | 6879 | <td valign='top'> |
@@ -6897,7 +6897,7 @@ discard block |
||
| 6897 | 6897 | </td> |
| 6898 | 6898 | </tr>"; |
| 6899 | 6899 | if (is_array($results)) { |
| 6900 | - for($j = 0 ; $j < count($results) ; $j++) { |
|
| 6900 | + for ($j = 0; $j < count($results); $j++) { |
|
| 6901 | 6901 | echo "<tr>"; |
| 6902 | 6902 | echo "<td class='content'><a href='".$results[$j][1]."'>".$results[$j][0]."</a></td>"; |
| 6903 | 6903 | echo"</tr>"; |
@@ -6910,7 +6910,7 @@ discard block |
||
| 6910 | 6910 | echo "</table>"; |
| 6911 | 6911 | echo "</td></tr>"; |
| 6912 | 6912 | } else { |
| 6913 | - $new_view = substr_replace($view,'1',3,1); |
|
| 6913 | + $new_view = substr_replace($view, '1', 3, 1); |
|
| 6914 | 6914 | echo " |
| 6915 | 6915 | <tr> |
| 6916 | 6916 | <td valign='top'> |
@@ -6937,8 +6937,8 @@ discard block |
||
| 6937 | 6937 | $session_id = intval($session_id); |
| 6938 | 6938 | |
| 6939 | 6939 | $downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS); |
| 6940 | - if(substr($view,4,1) == '1') { |
|
| 6941 | - $new_view = substr_replace($view,'0',4,1); |
|
| 6940 | + if (substr($view, 4, 1) == '1') { |
|
| 6941 | + $new_view = substr_replace($view, '0', 4, 1); |
|
| 6942 | 6942 | echo " |
| 6943 | 6943 | <tr> |
| 6944 | 6944 | <td valign='top'> |
@@ -6964,7 +6964,7 @@ discard block |
||
| 6964 | 6964 | </td> |
| 6965 | 6965 | </tr>"; |
| 6966 | 6966 | if (is_array($results)) { |
| 6967 | - for($j = 0 ; $j < count($results) ; $j++) { |
|
| 6967 | + for ($j = 0; $j < count($results); $j++) { |
|
| 6968 | 6968 | echo "<tr>"; |
| 6969 | 6969 | echo "<td class='content'>".$results[$j]."</td>"; |
| 6970 | 6970 | echo"</tr>"; |
@@ -6977,7 +6977,7 @@ discard block |
||
| 6977 | 6977 | echo "</table>"; |
| 6978 | 6978 | echo "</td></tr>"; |
| 6979 | 6979 | } else { |
| 6980 | - $new_view = substr_replace($view,'1',4,1); |
|
| 6980 | + $new_view = substr_replace($view, '1', 4, 1); |
|
| 6981 | 6981 | echo " |
| 6982 | 6982 | <tr> |
| 6983 | 6983 | <td valign='top'> |
@@ -7011,11 +7011,11 @@ discard block |
||
| 7011 | 7011 | ORDER BY login_date DESC LIMIT 1"; |
| 7012 | 7012 | $ip = ''; |
| 7013 | 7013 | $res_ip = Database::query($sql_ip); |
| 7014 | - if ($res_ip !== false && Database::num_rows($res_ip)>0) { |
|
| 7014 | + if ($res_ip !== false && Database::num_rows($res_ip) > 0) { |
|
| 7015 | 7015 | $row_ip = Database::fetch_row($res_ip); |
| 7016 | 7016 | if ($return_as_link) { |
| 7017 | 7017 | $ip = Display::url( |
| 7018 | - (empty($body_replace)?$row_ip[1]:$body_replace), 'http://www.whatsmyip.org/ip-geo-location/?ip='.$row_ip[1], |
|
| 7018 | + (empty($body_replace) ? $row_ip[1] : $body_replace), 'http://www.whatsmyip.org/ip-geo-location/?ip='.$row_ip[1], |
|
| 7019 | 7019 | array('title'=>get_lang('TraceIP'), 'target'=>'_blank') |
| 7020 | 7020 | ); |
| 7021 | 7021 | } else { |
@@ -7051,9 +7051,9 @@ discard block |
||
| 7051 | 7051 | $course_id = intval($course_id); |
| 7052 | 7052 | |
| 7053 | 7053 | $tempView = $view; |
| 7054 | - if (substr($view,0,1) == '1') { |
|
| 7055 | - $new_view = substr_replace($view,'0',0,1); |
|
| 7056 | - $title[1]= get_lang('LoginsAndAccessTools').get_lang('LoginsDetails'); |
|
| 7054 | + if (substr($view, 0, 1) == '1') { |
|
| 7055 | + $new_view = substr_replace($view, '0', 0, 1); |
|
| 7056 | + $title[1] = get_lang('LoginsAndAccessTools').get_lang('LoginsDetails'); |
|
| 7057 | 7057 | $sql = "SELECT UNIX_TIMESTAMP(access_date), count(access_date) |
| 7058 | 7058 | FROM $track_access_table |
| 7059 | 7059 | WHERE access_user_id = $user_id |
@@ -7063,20 +7063,20 @@ discard block |
||
| 7063 | 7063 | ORDER BY YEAR(access_date),MONTH(access_date) ASC"; |
| 7064 | 7064 | //$results = getManyResults2Col($sql); |
| 7065 | 7065 | $results = getManyResults3Col($sql); |
| 7066 | - $title_line= get_lang('LoginsTitleMonthColumn').';'.get_lang('LoginsTitleCountColumn')."\n"; |
|
| 7067 | - $line=''; |
|
| 7066 | + $title_line = get_lang('LoginsTitleMonthColumn').';'.get_lang('LoginsTitleCountColumn')."\n"; |
|
| 7067 | + $line = ''; |
|
| 7068 | 7068 | $total = 0; |
| 7069 | 7069 | if (is_array($results)) { |
| 7070 | - for($j = 0 ; $j < count($results) ; $j++) { |
|
| 7070 | + for ($j = 0; $j < count($results); $j++) { |
|
| 7071 | 7071 | $line .= $results[$j][0].';'.$results[$j][1]."\n"; |
| 7072 | 7072 | $total = $total + $results[$j][1]; |
| 7073 | 7073 | } |
| 7074 | 7074 | $line .= get_lang('Total').";".$total."\n"; |
| 7075 | 7075 | } else { |
| 7076 | - $line= get_lang('NoResult')."</center></td>"; |
|
| 7076 | + $line = get_lang('NoResult')."</center></td>"; |
|
| 7077 | 7077 | } |
| 7078 | 7078 | } else { |
| 7079 | - $new_view = substr_replace($view,'1',0,1); |
|
| 7079 | + $new_view = substr_replace($view, '1', 0, 1); |
|
| 7080 | 7080 | } |
| 7081 | 7081 | return array($title_line, $line); |
| 7082 | 7082 | } |
@@ -7094,8 +7094,8 @@ discard block |
||
| 7094 | 7094 | global $TABLECOURSE_EXERCICES, $TABLETRACK_EXERCICES, $TABLETRACK_HOTPOTATOES, $dateTimeFormatLong; |
| 7095 | 7095 | $courseId = api_get_course_int_id($courseCode); |
| 7096 | 7096 | $userId = intval($userId); |
| 7097 | - if (substr($view,1,1) == '1') { |
|
| 7098 | - $new_view = substr_replace($view,'0',1,1); |
|
| 7097 | + if (substr($view, 1, 1) == '1') { |
|
| 7098 | + $new_view = substr_replace($view, '0', 1, 1); |
|
| 7099 | 7099 | $title[1] = get_lang('ExercicesDetails'); |
| 7100 | 7100 | $line = ''; |
| 7101 | 7101 | $sql = "SELECT ce.title, te.exe_result , te.exe_weighting, UNIX_TIMESTAMP(te.exe_date) |
@@ -7119,7 +7119,7 @@ discard block |
||
| 7119 | 7119 | $title_line = get_lang('ExercicesTitleExerciceColumn').";".get_lang('Date').';'.get_lang('ExercicesTitleScoreColumn')."\n"; |
| 7120 | 7120 | |
| 7121 | 7121 | if (is_array($results)) { |
| 7122 | - for($i = 0; $i < sizeof($results); $i++) |
|
| 7122 | + for ($i = 0; $i < sizeof($results); $i++) |
|
| 7123 | 7123 | { |
| 7124 | 7124 | $display_date = api_convert_and_format_date($results[$i][3], null, date_default_timezone_get()); |
| 7125 | 7125 | $line .= $results[$i][0].";".$display_date.";".$results[$i][1]." / ".$results[$i][2]."\n"; |
@@ -7131,8 +7131,8 @@ discard block |
||
| 7131 | 7131 | |
| 7132 | 7132 | // The Result of Tests |
| 7133 | 7133 | if (is_array($hpresults)) { |
| 7134 | - for($i = 0; $i < sizeof($hpresults); $i++) { |
|
| 7135 | - $title = GetQuizName($hpresults[$i][0],''); |
|
| 7134 | + for ($i = 0; $i < sizeof($hpresults); $i++) { |
|
| 7135 | + $title = GetQuizName($hpresults[$i][0], ''); |
|
| 7136 | 7136 | |
| 7137 | 7137 | if ($title == '') |
| 7138 | 7138 | $title = basename($hpresults[$i][0]); |
@@ -7146,10 +7146,10 @@ discard block |
||
| 7146 | 7146 | } |
| 7147 | 7147 | |
| 7148 | 7148 | if ($NoTestRes == 1 && $NoHPTestRes == 1) { |
| 7149 | - $line=get_lang('NoResult'); |
|
| 7149 | + $line = get_lang('NoResult'); |
|
| 7150 | 7150 | } |
| 7151 | 7151 | } else { |
| 7152 | - $new_view = substr_replace($view,'1',1,1); |
|
| 7152 | + $new_view = substr_replace($view, '1', 1, 1); |
|
| 7153 | 7153 | } |
| 7154 | 7154 | return array($title_line, $line); |
| 7155 | 7155 | } |
@@ -7165,7 +7165,7 @@ discard block |
||
| 7165 | 7165 | $user_id = intval($user_id); |
| 7166 | 7166 | $course_id = intval($course_id); |
| 7167 | 7167 | |
| 7168 | - if (substr($view,2,1) == '1') { |
|
| 7168 | + if (substr($view, 2, 1) == '1') { |
|
| 7169 | 7169 | $sql = "SELECT u.upload_date, w.title, w.author, w.url |
| 7170 | 7170 | FROM $TABLETRACK_UPLOADS u , $TABLECOURSE_WORK w |
| 7171 | 7171 | WHERE |
@@ -7173,21 +7173,21 @@ discard block |
||
| 7173 | 7173 | u.upload_user_id = '$user_id' AND |
| 7174 | 7174 | u.c_id = '$course_id' |
| 7175 | 7175 | ORDER BY u.upload_date DESC"; |
| 7176 | - $results = StatsUtils::getManyResultsXCol($sql,4); |
|
| 7176 | + $results = StatsUtils::getManyResultsXCol($sql, 4); |
|
| 7177 | 7177 | |
| 7178 | - $title[1]=get_lang('WorksDetails'); |
|
| 7179 | - $line=''; |
|
| 7180 | - $title_line=get_lang('WorkTitle').";".get_lang('WorkAuthors').";".get_lang('Date')."\n"; |
|
| 7178 | + $title[1] = get_lang('WorksDetails'); |
|
| 7179 | + $line = ''; |
|
| 7180 | + $title_line = get_lang('WorkTitle').";".get_lang('WorkAuthors').";".get_lang('Date')."\n"; |
|
| 7181 | 7181 | |
| 7182 | 7182 | if (is_array($results)) { |
| 7183 | - for($j = 0 ; $j < count($results) ; $j++) { |
|
| 7183 | + for ($j = 0; $j < count($results); $j++) { |
|
| 7184 | 7184 | $pathToFile = api_get_path(WEB_COURSE_PATH).$_course['path']."/".$results[$j][3]; |
| 7185 | 7185 | $beautifulDate = api_convert_and_format_date($results[$j][0], null, date_default_timezone_get()); |
| 7186 | 7186 | $line .= $results[$j][1].";".$results[$j][2].";".$beautifulDate."\n"; |
| 7187 | 7187 | } |
| 7188 | 7188 | |
| 7189 | 7189 | } else { |
| 7190 | - $line= get_lang('NoResult'); |
|
| 7190 | + $line = get_lang('NoResult'); |
|
| 7191 | 7191 | } |
| 7192 | 7192 | } |
| 7193 | 7193 | return array($title_line, $line); |
@@ -7203,9 +7203,9 @@ discard block |
||
| 7203 | 7203 | $courseId = api_get_course_int_id($courseCode); |
| 7204 | 7204 | $userId = intval($userId); |
| 7205 | 7205 | $line = null; |
| 7206 | - if (substr($view,3,1) == '1') { |
|
| 7207 | - $new_view = substr_replace($view,'0',3,1); |
|
| 7208 | - $title[1]=get_lang('LinksDetails'); |
|
| 7206 | + if (substr($view, 3, 1) == '1') { |
|
| 7207 | + $new_view = substr_replace($view, '0', 3, 1); |
|
| 7208 | + $title[1] = get_lang('LinksDetails'); |
|
| 7209 | 7209 | $sql = "SELECT cl.title, cl.url |
| 7210 | 7210 | FROM $TABLETRACK_LINKS AS sl, $TABLECOURSE_LINKS AS cl |
| 7211 | 7211 | WHERE sl.links_link_id = cl.id |
@@ -7213,16 +7213,16 @@ discard block |
||
| 7213 | 7213 | AND sl.links_user_id = $userId |
| 7214 | 7214 | GROUP BY cl.title, cl.url"; |
| 7215 | 7215 | $results = StatsUtils::getManyResults2Col($sql); |
| 7216 | - $title_line= get_lang('LinksTitleLinkColumn')."\n"; |
|
| 7216 | + $title_line = get_lang('LinksTitleLinkColumn')."\n"; |
|
| 7217 | 7217 | if (is_array($results)) { |
| 7218 | - for ($j = 0 ; $j < count($results) ; $j++) { |
|
| 7218 | + for ($j = 0; $j < count($results); $j++) { |
|
| 7219 | 7219 | $line .= $results[$j][0]."\n"; |
| 7220 | 7220 | } |
| 7221 | 7221 | } else { |
| 7222 | - $line=get_lang('NoResult'); |
|
| 7222 | + $line = get_lang('NoResult'); |
|
| 7223 | 7223 | } |
| 7224 | 7224 | } else { |
| 7225 | - $new_view = substr_replace($view,'1',3,1); |
|
| 7225 | + $new_view = substr_replace($view, '1', 3, 1); |
|
| 7226 | 7226 | } |
| 7227 | 7227 | return array($title_line, $line); |
| 7228 | 7228 | } |
@@ -7244,9 +7244,9 @@ discard block |
||
| 7244 | 7244 | |
| 7245 | 7245 | $downloads_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_DOWNLOADS); |
| 7246 | 7246 | |
| 7247 | - if (substr($view,4,1) == '1') { |
|
| 7248 | - $new_view = substr_replace($view,'0',4,1); |
|
| 7249 | - $title[1]= get_lang('DocumentsDetails'); |
|
| 7247 | + if (substr($view, 4, 1) == '1') { |
|
| 7248 | + $new_view = substr_replace($view, '0', 4, 1); |
|
| 7249 | + $title[1] = get_lang('DocumentsDetails'); |
|
| 7250 | 7250 | |
| 7251 | 7251 | $sql = "SELECT down_doc_path |
| 7252 | 7252 | FROM $downloads_table |
@@ -7259,14 +7259,14 @@ discard block |
||
| 7259 | 7259 | $title_line = get_lang('DocumentsTitleDocumentColumn')."\n"; |
| 7260 | 7260 | $line = null; |
| 7261 | 7261 | if (is_array($results)) { |
| 7262 | - for ($j = 0 ; $j < count($results) ; $j++) { |
|
| 7262 | + for ($j = 0; $j < count($results); $j++) { |
|
| 7263 | 7263 | $line .= $results[$j]."\n"; |
| 7264 | 7264 | } |
| 7265 | 7265 | } else { |
| 7266 | 7266 | $line = get_lang('NoResult'); |
| 7267 | 7267 | } |
| 7268 | 7268 | } else { |
| 7269 | - $new_view = substr_replace($view,'1',4,1); |
|
| 7269 | + $new_view = substr_replace($view, '1', 4, 1); |
|
| 7270 | 7270 | } |
| 7271 | 7271 | return array($title_line, $line); |
| 7272 | 7272 | } |