Skip to content

Commit

Permalink
[#431] Fix several 'undefined constant' warnings.
Browse files Browse the repository at this point in the history 
There were several errors like this in the logs:

PHP Warning:  Use of undefined constant header - assumed 'header'
(this will throw an Error in a future version of PHP) in
/var/www/html/phpreport/web/services/getProjectUserWeeklyHoursReportJsonService.php on line 168
  • Loading branch information
@jaragunde
jaragunde committed Dec 1, 2018
1 parent f6a4831 commit 54f798a
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 86 deletions.
111 changes: 56 additions & 55 deletions web/services/getProjectUserCustomerReportJsonService.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

do {

$response[pid] = $projectId;
$response['pid'] = $projectId;


/* We check authentication and authorization */
Expand All @@ -56,26 +56,26 @@
if (!LoginManager::isLogged($sid))
{
if ($init!="")
$response[init] = $init;
$response['init'] = $init;
if ($end!="")
$response[end] = $end;
$response[success] = false;
$error[id] = 2;
$error[message] = "You must be logged in";
$response[error] = $error;
$response['end'] = $end;
$response['success'] = false;
$error['id'] = 2;
$error['message'] = "You must be logged in";
$response['error'] = $error;
break;
}

if (!LoginManager::isAllowed($sid))
{
if ($init!="")
$response[init] = $init;
$response['init'] = $init;
if ($end!="")
$response[end] = $end;
$response[success] = false;
$error[id] = 3;
$error[message] = "Forbidden service for this User";
$response[error] = $error;
$response['end'] = $end;
$response['success'] = false;
$error['id'] = 3;
$error['message'] = "Forbidden service for this User";
$response['error'] = $error;
break;
}

Expand All @@ -89,10 +89,10 @@
}
}
if(!$userCanViewProject) {
$response[success] = false;
$error[id] = 3;
$error[message] = "Forbidden service for this User";
$response[error] = $error;
$response['success'] = false;
$error['id'] = 3;
$error['message'] = "Forbidden service for this User";
$response['error'] = $error;
break;
}
}
Expand All @@ -102,7 +102,7 @@

if ($init!="")
{
$response[init] = $init;
$response['init'] = $init;

$initParse = date_parse_from_format($dateFormat, $init);

Expand All @@ -115,7 +115,7 @@

if ($end!="")
{
$response[end] = $end;
$response['end'] = $end;

$endParse = date_parse_from_format($dateFormat, $end);

Expand All @@ -133,7 +133,7 @@

$count = 0;

$totalHours[total] = 0;
$totalHours['total'] = 0;

foreach((array) $report as $login => $hours)
{
Expand All @@ -142,69 +142,70 @@
$record = array();

$totalHours[$login] = 0;
$record[login] = $login;
$record['login'] = $login;

$totalHours[$login] += round($hours, 2, PHP_ROUND_HALF_DOWN);
$totalHours[total] += round($hours, 2, PHP_ROUND_HALF_DOWN);
$totalHours['total'] += round($hours, 2, PHP_ROUND_HALF_DOWN);

$record[total] = $totalHours[$login];
$record['total'] = $totalHours[$login];

$records[] = $record;
}

foreach($records as $record) {
$record[percentage] = round(100 * $totalHours[$record[login]]/$totalHours[total], 2, PHP_ROUND_HALF_DOWN);
$response[records][] = $record;
$record['percentage'] = round(100 * $totalHours[$record['login']]/$totalHours['total'],
2, PHP_ROUND_HALF_DOWN);
$response['records'][] = $record;
}

$response[total] = $count;
$response['total'] = $count;

$metaData[totalProperty] = "total";
$metaData[root] = "records";
$metaData[id] = "login";
$metaData['totalProperty'] = "total";
$metaData['root'] = "records";
$metaData['id'] = "login";

$metaData[sortInfo][field] = 'login';
$metaData[sortInfo][direction] = 'ASC';
$metaData['sortInfo']['field'] = 'login';
$metaData['sortInfo']['direction'] = 'ASC';

$field[name] = "login";
$field[type] = "string";
$field['name'] = "login";
$field['type'] = "string";

$metaData[fields][] = $field;
$metaData['fields'][] = $field;

$field[name] = "total";
$field[type] = "float";
$field['name'] = "total";
$field['type'] = "float";

$metaData[fields][] = $field;
$metaData['fields'][] = $field;

$field[name] = "percentage";
$field[type] = "float";
$field['name'] = "percentage";
$field['type'] = "float";

$metaData[fields][] = $field;
$metaData['fields'][] = $field;

$column[header] = "Login";
$column[dataIndex] = "login";
$column[sortable] = true;
$column['header'] = "Login";
$column['dataIndex'] = "login";
$column['sortable'] = true;
$column['width'] = 100;

$response[columns][] = $column;
$response['columns'][] = $column;

$field[type] = "float";
$field['type'] = "float";

$column[header] = "Total";
$column[dataIndex] = "total";
$column[sortable] = true;
$column['header'] = "Total";
$column['dataIndex'] = "total";
$column['sortable'] = true;

$response[columns][] = $column;
$response['columns'][] = $column;

$column[header] = "%";
$column[dataIndex] = "percentage";
$column[sortable] = true;
$column['header'] = "%";
$column['dataIndex'] = "percentage";
$column['sortable'] = true;

$response[columns][] = $column;
$response['columns'][] = $column;

$response[metaData] = $metaData;
$response['metaData'] = $metaData;

$response[success] = true;
$response['success'] = true;

} while (False);

Expand Down
62 changes: 31 additions & 31 deletions web/services/getProjectUserWeeklyHoursReportJsonService.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,21 @@

do {

$response[pid] = $projectId;
$response['pid'] = $projectId;

/* We check authentication and authorization */
require_once(PHPREPORT_ROOT . '/util/LoginManager.php');

if (!LoginManager::isLogged($sid))
{
if ($init!="")
$response[init] = $init;
$response['init'] = $init;
if ($end!="")
$response[end] = $end;
$response[success] = false;
$error[id] = 2;
$error[message] = "You must be logged in";
$response[error] = $error;
$response['end'] = $end;
$response['success'] = false;
$error['id'] = 2;
$error['message'] = "You must be logged in";
$response['error'] = $error;
break;
}
if (!LoginManager::isAllowed($sid))
Expand All @@ -79,7 +79,7 @@

if ($init!="")
{
$response[init] = $init;
$response['init'] = $init;

$initParse = date_parse_from_format($dateFormat, $init);

Expand All @@ -92,7 +92,7 @@

if ($end!="")
{
$response[end] = $end;
$response['end'] = $end;

$endParse = date_parse_from_format($dateFormat, $end);

Expand Down Expand Up @@ -127,35 +127,35 @@

foreach($records as $record)
{
$response[records][] = $record;
$response['records'][] = $record;
}

$metaData[totalProperty] = "total";
$metaData[root] = "records";
$metaData[id] = "login";
$metaData['totalProperty'] = "total";
$metaData['root'] = "records";
$metaData['id'] = "login";

$metaData[sortInfo][field] = 'login';
$metaData[sortInfo][direction] = 'ASC';
$metaData['sortInfo']['field'] = 'login';
$metaData['sortInfo']['direction'] = 'ASC';

$field[name] = "login";
$field[type] = "string";
$field['name'] = "login";
$field['type'] = "string";

$metaData[fields][] = $field;
$metaData['fields'][] = $field;

$field[name] = "week";
$field[type] = "string";
$field['name'] = "week";
$field['type'] = "string";

$metaData[fields][] = $field;
$metaData['fields'][] = $field;


$column[header] = "Login";
$column[dataIndex] = "login";
$column[sortable] = true;
$column['header'] = "Login";
$column['dataIndex'] = "login";
$column['sortable'] = true;
$column['width'] = 100;


$response[columns][] = $column;
$field[type] = "float";
$response['columns'][] = $column;
$field['type'] = "float";

// The weeks should show up in ascending order, sorted by week number
ksort($weeklyRecords);
Expand All @@ -165,15 +165,15 @@
$field['name'] = $week."-".$year;
$metaData['fields'][] = $field;

$column[header] = "Week " . $week . ", $year";
$column[dataIndex] = $week."-".$year;
$response[columns][] = $column;
$column['header'] = "Week " . $week . ", $year";
$column['dataIndex'] = $week."-".$year;
$response['columns'][] = $column;
}
}

$response[metaData] = $metaData;
$response['metaData'] = $metaData;

$response[success] = true;
$response['success'] = true;

} while (false);

Expand Down

0 comments on commit 54f798a

Please sign in to comment.