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

2013-03-22 Ramon Novoa <rnovoa@artica.es> 

* operation/gis_maps/ajax.php,
	  godmode/agentes/agent_conf_gis.php: Fixed coordinate precision and
	  display order. Fixes bug #3608628.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7879 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2013-03-22 11:55:42 +00:00
parent 59754bfdf6
commit 925b3f9308
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-03-22 Ramon Novoa <rnovoa@artica.es>
* operation/gis_maps/ajax.php,
godmode/agentes/agent_conf_gis.php: Fixed coordinate precision and
display order. Fixes bug #3608628.
2013-03-22 Junichi Satoh <junichi@rworks.jp> 2013-03-22 Junichi Satoh <junichi@rworks.jp>
* extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql: Added missing * extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql: Added missing

4
pandora_console/godmode/agentes/agent_conf_gis.php
View File

@ -52,11 +52,11 @@ $table->head[0] =__('Agent position');
$table->head_colspan[0] = 2; $table->head_colspan[0] = 2;
$table->data[1][0] = __('Latitude: '); $table->data[1][0] = __('Latitude: ');
$table->data[1][1] = html_print_input_text_extended ('latitude', $agentData['stored_latitude'], 'text-latitude', '', 10, 10, false, '', $table->data[1][1] = html_print_input_text_extended ('latitude', $agentData['stored_latitude'], 'text-latitude', '', 20, 20, false, '',
array('onchange' => "setIgnoreGISDataEnabled()", 'onkeyup' => "setIgnoreGISDataEnabled()"), true); array('onchange' => "setIgnoreGISDataEnabled()", 'onkeyup' => "setIgnoreGISDataEnabled()"), true);
$table->data[2][0] = __('Longitude: '); $table->data[2][0] = __('Longitude: ');
$table->data[2][1] = html_print_input_text_extended ('longitude', $agentData['stored_longitude'], 'text-longitude', '', 10, 10, false, '', $table->data[2][1] = html_print_input_text_extended ('longitude', $agentData['stored_longitude'], 'text-longitude', '', 20, 20, false, '',
array('onchange' => "setIgnoreGISDataEnabled()", 'onkeyup' => "setIgnoreGISDataEnabled()"), true); array('onchange' => "setIgnoreGISDataEnabled()", 'onkeyup' => "setIgnoreGISDataEnabled()"), true);
$table->data[3][0] = __('Altitude: '); $table->data[3][0] = __('Altitude: ');

6
pandora_console/operation/gis_maps/ajax.php
View File

@ -139,7 +139,7 @@ switch ($opt) {
$returnJSON = array(); $returnJSON = array();
$returnJSON['correct'] = 1; $returnJSON['correct'] = 1;
$returnJSON['content'] = __('Agent') . ': <a style="font-weight: bolder;" href="?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $row['tagente_id_agente'] . '">'.agents_get_name($row['tagente_id_agente']).'</a><br />'; $returnJSON['content'] = __('Agent') . ': <a style="font-weight: bolder;" href="?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $row['tagente_id_agente'] . '">'.agents_get_name($row['tagente_id_agente']).'</a><br />';
$returnJSON['content'] .= __('Position (Long, Lat, Alt)') . ': (' . $row['longitude'] . ', ' . $row['latitude'] . ', ' . $row['altitude'] . ') <br />'; $returnJSON['content'] .= __('Position (Lat, Long, Alt)') . ': (' . $row['latitude'] . ', ' . $row['longitude'] . ', ' . $row['altitude'] . ') <br />';
$returnJSON['content'] .= __('Start contact') . ': ' . $row['start_timestamp'] . '<br />'; $returnJSON['content'] .= __('Start contact') . ': ' . $row['start_timestamp'] . '<br />';
$returnJSON['content'] .= __('Last contact') . ': ' . $row['end_timestamp'] . '<br />'; $returnJSON['content'] .= __('Last contact') . ': ' . $row['end_timestamp'] . '<br />';
$returnJSON['content'] .= __('Num reports') . ': '.$row['number_of_packages'].'<br />'; $returnJSON['content'] .= __('Num reports') . ': '.$row['number_of_packages'].'<br />';
@ -160,11 +160,11 @@ switch ($opt) {
//it's positioned in default position of map. //it's positioned in default position of map.
if ($agentDataGIS === false) { if ($agentDataGIS === false) {
$returnJSON['content'] .= __('Position (Long, Lat, Alt)') . ': ' . __("Default position of map.") . '<br />'; $returnJSON['content'] .= __('Position (Lat, Long, Alt)') . ': ' . __("Default position of map.") . '<br />';
} }
else else
{ {
$returnJSON['content'] .= __('Position (Long, Lat, Alt)') . ': (' . $agentDataGIS['stored_longitude'] . ', ' . $agentDataGIS['stored_latitude'] . ', ' . $agentDataGIS['stored_altitude'] . ') <br />'; $returnJSON['content'] .= __('Position (Lat, Long, Alt)') . ': (' . $agentDataGIS['stored_latitude'] . ', ' . $agentDataGIS['stored_longitude'] . ', ' . $agentDataGIS['stored_altitude'] . ') <br />';
} }
$agent_ip_address = agents_get_address ($id_agente); $agent_ip_address = agents_get_address ($id_agente);
if ($agent_ip_address || $agent_ip_address != '') { if ($agent_ip_address || $agent_ip_address != '') {