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

2010-03-01 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_gis.php: in fuction "getAgentsLayer" fix when none data
	for agents in this layer.
	
	* operation/gis_maps/render_view.php: fix link to edit map and fix the text
	of header.
	
	operation/gis_maps/index.php: use function "print_page_header".



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2437 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2010-03-01 11:40:07 +00:00
parent f1b67fc083
commit 8ae77f92d1
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2010-03-01 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: in fuction "getAgentsLayer" fix when none data
for agents in this layer.
* operation/gis_maps/render_view.php: fix link to edit map and fix the text
of header.
operation/gis_maps/index.php: use function "print_page_header".
2010-03-01 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: now function "getAgentMap" return true or false

9
pandora_console/include/functions_gis.php
View File

@ -374,8 +374,13 @@ function getAgentsLayer($idLayer, $fields = null) {
$agents = get_db_all_rows_sql('SELECT ' . $select . ' FROM tagente WHERE id_agente IN (
SELECT tagente_id_agente FROM tgis_map_layer_has_tagente WHERE tgis_map_layer_id_tmap_layer = ' . $idLayer . ');');
foreach ($agents as $index => $agent) {
$agents[$index] = $agent['nombre'];
if ($agents !== false) {
foreach ($agents as $index => $agent) {
$agents[$index] = $agent['nombre'];
}
}
else {
return array();
}

2
pandora_console/operation/gis_maps/index.php
View File

@ -23,7 +23,7 @@ require_once ('include/functions_gis.php');
require_javascript_file('openlayers.pandora');
echo "<h2>".__('GIS Maps')." &raquo; ".__('Summary')."</h2>";
print_page_header(__('GIS Maps')." &raquo; ".__('Summary'), "images/server_web.png", false, "gis_map_summary");
$maps = getMaps();

4
pandora_console/operation/gis_maps/render_view.php
View File

@ -76,7 +76,7 @@ else {
}
if (give_acl ($config["id_user"], $map['group_id'], "AW"))
$buttons [] = '<a href="index.php?sec=gismaps&sec2=operation/gis_maps/render_view&map_id='. $idMap.'">'.print_image ("images/setup.png", true, array ("title" => __('Setup'))).'</a>';
$buttons [] = '<a href="index.php?sec=godgismaps&sec2=godmode/gis_maps/configure_gis_map&action=edit_map&map_id='. $idMap.'">'.print_image ("images/setup.png", true, array ("title" => __('Setup'))).'</a>';
$buttonsString = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=3"><img src="images/bricks.png" class="top" border="0">&nbsp; Agent&nbsp;-&nbsp;test_gis1</a></li></ul></div><div id="menu_tab"><ul class="mn"><li class="nomn"><a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente=3"><img src="images/setup.png" class="top" title="Manage" border="0" width="16">&nbsp;</a></li><li class="nomn_high"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=3"><img src="images/monitor.png" class="top" title="Main" border="0">&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=3&amp;tab=data"><img src="images/lightbulb.png" class="top" title="Data" border="0">&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente=3&amp;tab=alert"><img src="images/bell.png" class="top" title="Alerts" border="0">&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;tab=sla&amp;id_agente=3"><img src="images/images.png" class="top" title="S.L.A." border="0">&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;group_id=2"><img src="images/agents_group.png" class="top" title="Group" border="0">&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;tab=inventory&amp;id_agente=3"><img src="images/page_white_text.png" class="top" title="Inventory" border="0" width="16">&nbsp;</a></li><li class="nomn"><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;tab=gis&amp;id_agente=3"><img src="images/world.png" class="top" title="GIS data" border="0">&nbsp;</a>';
@ -102,7 +102,7 @@ $buttons[] = '<a id="button_status_default" href="javascript: changeShowStatus(\
$buttons[] = __('Show agents in state: ');
print_page_header(__('Visual console') . " &raquo; " . __('Map') . "&nbsp;" . $map['map_name'], "", false, "", false, $buttons);
print_page_header(__('Map') . " &raquo; " . __('Map') . "&nbsp;" . $map['map_name'], "", false, "", false, $buttons);
printMap('map', $map['zoom_level'], $numZoomLevels, $map['initial_latitude'],
$map['initial_longitude'], $baselayers, $controls);