dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- added "no data found" information in case system jump/kill data not found for a k-space system (e.g. cronjob has not imported data)

Browse Source 
- fixed a bug in /setup page where "eve_universe" could not be created properly
- fixed a bug with drag&drop re-order of module positions
This commit is contained in:
Mark Friedrich
2018-09-16 15:18:23 +02:00
parent 712764294c
commit baf524a350
12 changed files with 82 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/main/controller/api/system.php
View File

@@ -118,24 +118,29 @@ class System extends Controller\AccessController {
// 10min cache (could be up to 1h cache time)
$systemLogModel->getByForeignKey('systemId', $systemId, [], 60 * 10);
$systemLogExists = !$systemLogModel->dry();
if( !$systemLogModel->dry() ){
$counter = 0;
for( $i = $logEntryCount; $i >= 1; $i--){
$column = 'value' . $i;
// podKills share graph with shipKills -> skip
if($label != 'podKills'){
$graphData[$systemId][$label]['logExists'] = $systemLogExists;
}
// ship and pod kills should be merged into one table
if($label == 'podKills'){
$graphData[$systemId]['shipKills'][$counter]['z'] = $systemLogModel->$column;
}else{
$dataSet = [
'x' => ($i - 1) . 'h',
'y' => $systemLogModel->$column
];
$graphData[$systemId][$label][] = $dataSet;
}
$counter++;
$counter = 0;
for( $i = $logEntryCount; $i >= 1; $i--){
$column = 'value' . $i;
$value = $systemLogExists ? $systemLogModel->$column : 0;
// ship and pod kills should be merged into one table
if($label == 'podKills'){
$graphData[$systemId]['shipKills']['data'][$counter]['z'] = $value;
}else{
$dataSet = [
'x' => ($i - 1) . 'h',
'y' => $value
];
$graphData[$systemId][$label]['data'][] = $dataSet;
}
$counter++;
}
}
}