tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '890-No-esta-funcionando-el-GIS-en-Pandora-dev' into 'develop' 

Fixed display of data

See merge request !617
This commit is contained in:
vgilc 2017-07-13 11:53:00 +02:00
parent 24728cc062 8d378b4b60
commit bbc54cfcfc
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pandora_console/operation/agentes/gis_view.php
View File

@ -141,9 +141,29 @@ $result = db_get_all_rows_sql ($sql, true);
if ($result === false) {
ui_print_empty_data( __('This agent doesn\'t have any GIS data.') );
$sql2 = sprintf ("
SELECT current_longitude AS longitude, current_latitude AS latitude, current_altitude AS altitude,
start_timestamp, description, number_of_packages, manual_placement
FROM tgis_data_status
WHERE tagente_id_agente = %d
ORDER BY start_timestamp DESC
LIMIT %d OFFSET %d", $agentId, $config['block_size'], (int)get_parameter ('offset'));
$result2 = db_get_all_rows_sql ($sql2, true);
if ($result2 === false) {
ui_print_empty_data( __('This agent doesn\'t have any GIS data.') );
} else {
$result2[0]['end_timestamp'] = date('Y-m-d H:i:s');
$result = $result2;
}
}
else {
if ($result !== false) {
if(!$countData){
$countData = 1;
}
ui_pagination ($countData, false) ;
$table->data = array();
foreach ($result as $key => $row) {