chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Internal: fix code to adapt to field name changed in extra_field_value from value to field_value - refs bt#21900

Browse Source
pull/5750/head
NicoDucou 1 year ago
parent 72e5c1d222
commit fc4761c643
1 changed files with 9 additions and 9 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      public/main/admin/statistics/index.php

18
public/main/admin/statistics/index.php
Unescape View File

@ -990,7 +990,7 @@ switch ($report) {
$sql = "SELECT count(id) count $sql = "SELECT count(id) count
FROM $extraFieldValueUser->table_field_values FROM $extraFieldValueUser->table_field_values
WHERE WHERE
value = '$value' AND field_value = '$value' AND
item_id IN ('$userIdListToString') AND item_id IN ('$userIdListToString') AND
field_id = ".$extraField['id']; field_id = ".$extraField['id'];
$query = Database::query($sql); $query = Database::query($sql);
@ -1074,7 +1074,7 @@ switch ($report) {
$sql = "SELECT count(id) count $sql = "SELECT count(id) count
FROM $extraFieldValueUser->table_field_values FROM $extraFieldValueUser->table_field_values
WHERE WHERE
value = '$value' AND field_value = '$value' AND
item_id IN ('$userIdListToString') AND item_id IN ('$userIdListToString') AND
field_id = ".$extraField['id']; field_id = ".$extraField['id'];
$query = Database::query($sql); $query = Database::query($sql);
@ -1117,7 +1117,7 @@ switch ($report) {
$all = []; $all = [];
$total = count($users); $total = count($users);
$sql = "SELECT value $sql = "SELECT field_value
FROM $extraFieldValueUser->table_field_values FROM $extraFieldValueUser->table_field_values
WHERE WHERE
item_id IN ('$userIdListToString') AND item_id IN ('$userIdListToString') AND
@ -1134,11 +1134,11 @@ switch ($report) {
while ($row = Database::fetch_array($query)) { while ($row = Database::fetch_array($query)) {
$usersFound++; $usersFound++;
if (!empty($row['value'])) { if (!empty($row['field_value'])) {
$validDate = DateTime::createFromFormat('Y-m-d', $row['value']); $validDate = DateTime::createFromFormat('Y-m-d', $row['field_value']);
$validDate = $validDate && $validDate->format('Y-m-d') === $row['value']; $validDate = $validDate && $validDate->format('Y-m-d') === $row['field_value'];
if ($validDate) { if ($validDate) {
$date1 = new DateTime($row['value']); $date1 = new DateTime($row['field_value']);
$interval = $now->diff($date1); $interval = $now->diff($date1);
$years = $interval->y; $years = $interval->y;
@ -1192,7 +1192,7 @@ switch ($report) {
$sql = "SELECT count(id) count $sql = "SELECT count(id) count
FROM $extraFieldValueUser->table_field_values FROM $extraFieldValueUser->table_field_values
WHERE WHERE
value = '$value' AND field_value = '$value' AND
item_id IN ('$userIdListToString') AND item_id IN ('$userIdListToString') AND
field_id = ".$extraField['id']; field_id = ".$extraField['id'];
$query = Database::query($sql); $query = Database::query($sql);
@ -1238,7 +1238,7 @@ switch ($report) {
$sql = "SELECT count(id) count $sql = "SELECT count(id) count
FROM $extraFieldValueUser->table_field_values FROM $extraFieldValueUser->table_field_values
WHERE WHERE
value = 1 AND field_value = 1 AND
item_id IN ('$userIdListToString') AND item_id IN ('$userIdListToString') AND
field_id = ".$extraField['id']; field_id = ".$extraField['id'];
$query = Database::query($sql); $query = Database::query($sql);

Write Preview
Loading…
Cancel
Save