From f20d641d9ead6d8d2deb31e7a9ea5ff4b5db7087 Mon Sep 17 00:00:00 2001 From: raulmateos Date: Fri, 22 Jun 2007 07:25:15 +0000 Subject: [PATCH] 2007-06-22 Raul Mateos * include/languages/language_en.php: More strings. * pandoradb_data.sql: Solved small problem with language strings. * operation/visual_console/index.php: Added code to show text if no layout defined. * godmode/reporting/*builder.php: Added code to show text if no reporting defined. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@532 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 18 +- .../godmode/reporting/map_builder.php | 239 +++++++++--------- .../godmode/reporting/reporting_builder.php | 73 +++--- .../include/languages/language_en.php | 5 + .../operation/visual_console/index.php | 35 ++- pandora_console/pandoradb_data.sql | 2 +- 6 files changed, 209 insertions(+), 163 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 79f16ec9c1..e7a5c2691b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2007-06-22 Raul Mateos + + * include/languages/language_en.php: More strings. + + * pandoradb_data.sql: Solved small problem with language strings. + + * operation/visual_console/index.php: Added code to show + text if no layout defined. + + * godmode/reporting/*builder.php: Added code to show text + if no reporting defined. + 2007-06-21 Sancho Lerena * include/languages/language_en.php: More strings. @@ -28,6 +40,8 @@ * godmode/admin_access_logs.php: Added graph to header. * godmode/reporting/map_builder.php: Removed debug stuff + +2007-06-21 Raul Mateos * images/op*.gif, god*.gif: deleted. Also deleted several other GIF files. @@ -709,7 +723,7 @@ :( * pandora_graphical_console_data.sql: Cleanup. - + * godmode/agentes/module_manager.php: Added wizard button. * pandora_graphical_console.sql: Cleanup. @@ -717,7 +731,7 @@ 2007-05-02 Sancho Lerena - * pandoradb.sql: Fixed small problem with tgrupos + * pandoradb.sql: Fixed small problem with tgrupos 2007-05-01 Raul Mateos diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index 0973d30476..097c0eb83d 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -110,6 +110,7 @@ if (isset($_GET["update_module"])){ $result = "

".$lang_label["modify_ok"]."

"; else { $result = "

".$lang_label["modify_no"]."

"; + echo $sql; echo "

"; } echo $result; @@ -144,8 +145,6 @@ if (isset($_GET["add_module"])){ $result = "

".$lang_label["create_ok"]."

"; else { $result = "

".$lang_label["create_no"]."

"; - echo $sql; - echo "

"; } echo $result; } @@ -157,6 +156,7 @@ if (isset($_POST["createmode"])){ $map_background = entrada_limpia($_POST["map_background"]); $map_width = entrada_limpia($_POST["map_width"]); $map_height = entrada_limpia($_POST["map_height"]); + // INSERT REPORT DATA if ($createmode == 1){ @@ -448,139 +448,150 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_map"]))) { echo ""; - - echo "
"; // Part 3 - List of already assigned report items // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo "

".$lang_label["report_items"]."

"; - echo ""; - echo " - - - - - - - - - - "; $sql = "SELECT * FROM tlayout_data WHERE id_layout = $id_map"; $res=mysql_query($sql); - $color = 0; - while ($row = mysql_fetch_array($res)){ - // Calculate table line color - if ($color == 1){ - $tdcolor = "datos"; - $color = 0; - } - else { - $tdcolor = "datos2"; - $color = 1; - } - $id_layoutdata = $row["id"]; - $type = $row["type"]; - switch ($type){ - case "0": $type_desc = "Single graph"; break; - case "1": $type_desc = "Module graph"; break; - case "2": $type_desc = "Line"; break; - } - $id_element = $row["id"]; - $period = $row["period"]; - $id_am = $row["id_agente_modulo"]; - $x = $row["pos_x"]; - $y = $row["pos_y"]; - $myimage = $row["image"]; - $width= $row["width"]; - $height = $row["height"]; - $label = $row["label"]; - $name = "N/A"; - $agent_name = "N/A"; - if ($id_am != ""){ - $agent_name = dame_nombre_agente_agentemodulo ($id_am); - $module_name = dame_nombre_modulo_agentemodulo ($id_am); - } - echo ""; - echo ""; - echo ""; - - echo ""; - - echo ""; - - echo ""; - echo ""; - echo ""; - echo ""; - echo "
".$lang_label["type"]."".$lang_label["module_name"]."".$lang_label["label"]."".$lang_label["image"]."".$lang_label["pos_x"]."".$lang_label["pos_y"]."".$lang_label["width"]."".$lang_label["height"]."".$lang_label["delete"]."".$lang_label["update"]."
".$type_desc."".$agent_name." / "; - echo $module_name.""; - echo ""; - echo ''; - - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - } - echo "
"; + if (mysql_num_rows($res)) { + echo ""; + echo " + + + + + + + + + + "; + + $color = 0; + while ($row = mysql_fetch_array($res)){ + // Calculate table line color + if ($color == 1){ + $tdcolor = "datos"; + $color = 0; + } + else { + $tdcolor = "datos2"; + $color = 1; + } + $id_layoutdata = $row["id"]; + $type = $row["type"]; + switch ($type){ + case "0": $type_desc = "Single graph"; break; + case "1": $type_desc = "Module graph"; break; + case "2": $type_desc = "Line"; break; + } + $id_element = $row["id"]; + $period = $row["period"]; + $id_am = $row["id_agente_modulo"]; + $x = $row["pos_x"]; + $y = $row["pos_y"]; + $myimage = $row["image"]; + $width= $row["width"]; + $height = $row["height"]; + $label = $row["label"]; + $name = "N/A"; + $agent_name = "N/A"; + if ($id_am != ""){ + $agent_name = dame_nombre_agente_agentemodulo ($id_am); + $module_name = dame_nombre_modulo_agentemodulo ($id_am); + } + echo ""; + echo ""; + echo ""; + + echo ""; + + echo ""; + + echo "'; + + echo ""; + echo ""; + echo ""; + echo ""; + echo "
".$lang_label["type"]."".$lang_label["module_name"]."".$lang_label["label"]."".$lang_label["image"]."".$lang_label["pos_x"]."".$lang_label["pos_y"]."".$lang_label["width"]."".$lang_label["height"]."".$lang_label["delete"]."".$lang_label["update"]."
".$type_desc."".$agent_name." / "; + echo $module_name.""; + echo ""; + echo '"; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + } + echo "
"; + } else { + echo "
".$lang_label["no_repitem_def"]."
"; + } } } else { // Map LIST Selection screen // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo "

".$lang_label["reporting"]." > "; echo $lang_label["map_builder"]."

"; - echo ""; - echo " - - - - - - "; + $color=1; $sql="SELECT * FROM tlayout"; $res=mysql_query($sql); - while ($row = mysql_fetch_array($res)){ - if ((dame_admin($id_user)==1)){ - // Calculate table line color - if ($color == 1){ - $tdcolor = "datos"; - $color = 0; + + if (mysql_num_rows($res)) { + echo "
".$lang_label["map_name"]."".$lang_label["background"]."".$lang_label["size"]."".$lang_label["Manage"]."".$lang_label["delete"]."
"; + echo " + + + + + + "; + + while ($row = mysql_fetch_array($res)){ + if ((dame_admin($id_user)==1)){ + // Calculate table line color + if ($color == 1){ + $tdcolor = "datos"; + $color = 0; + } + else { + $tdcolor = "datos2"; + $color = 1; + } + echo ""; + echo ""; + echo ""; + echo ""; + $id_map = $row["id"]; + echo ""; + echo ""; } - else { - $tdcolor = "datos2"; - $color = 1; - } - echo ""; - echo ""; - echo ""; - echo ""; - $id_map = $row["id"]; - echo "
".$lang_label["map_name"]."".$lang_label["background"]."".$lang_label["size"]."".$lang_label["Manage"]."".$lang_label["delete"]."
".$row["name"]."".$row["background"]."".$row["width"]."x".$row["height"]."
".$row["name"]."".$row["background"]."".$row["width"]."x".$row["height"].""; - echo ""; } + echo "
"; + echo ""; + } else { + echo "
".$lang_label["no_map_def"]."
"; + echo "
"; } - echo "
"; - echo ""; echo ""; echo ""; - echo ""; + echo ""; echo ""; echo ""; // Component type echo ""; echo ""; // Custom graph // ----------------------- echo ""; echo ""; echo ""; // SLA Max echo ""; // SLA Min echo ""; echo ""; // SLA limit echo ""; echo ""; - echo "
"; echo ""; diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index b7d7bd63a3..1fb2da5942 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -48,9 +48,9 @@ if (isset($_GET["delete"])){ $id_content = $_GET["delete"]; $sql = "DELETE FROM treport_content WHERE id_rc = $id_content"; if ($res=mysql_query($sql)) - $result = "

".$lang_label["delete_ok"]."

"; + $result = "

".$lang_label["delete_ok"]."

"; else - $result = "

".$lang_label["delete_no"]."

"; + $result = "

".$lang_label["delete_no"]."

"; echo $result; } @@ -124,9 +124,9 @@ if (isset($_POST["createmode"])){ $id_report = $form_id_report; $sql = "UPDATE treport SET name = '$form_report_name', description = '$form_report_description', private = '$form_report_private' WHERE id_report = $form_id_report"; if ($res=mysql_query($sql)) - $result = "

".$lang_label["modify_ok"]."

"; + $result = "

".$lang_label["modify_ok"]."

"; else - $result = "

".$lang_label["modify_no"]."

"; + $result = "

".$lang_label["modify_no"]."

"; } echo $result; if ($id_report != ""){ @@ -176,34 +176,35 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo ""; echo ""; echo ""; echo ""; echo ""; echo ""; echo "
"; - echo $lang_label["report_name"]; + echo $lang_label["report_name"].""; echo ""; echo "
"; - echo $lang_label["private"]; + echo $lang_label["private"].""; if ($form_report_private == 1) echo ""; else echo ""; - + echo "
"; - echo $lang_label["description"]; + echo $lang_label["description"].""; echo ""; - - - // Button + echo "
"; + + // Button echo ""; echo ""; echo "
"; if ($createmode == 0) echo ""; else echo ""; + echo "
"; echo ""; @@ -221,8 +222,7 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo ""; echo "
".$lang_label["source_agent"]; - echo "".$lang_label["source_agent"]."
"; echo "".$lang_label["modules"].""; + echo ""; echo ""; + echo "
"; - echo "".$lang_label["reporting_type"].""; + echo "".$lang_label["reporting_type"].""; echo ""; + echo "
"; - echo "".$lang_name["custom_graph_name"].""; + echo "".$lang_name["custom_graph_name"].""; echo ""; // Period echo "
"; - echo "".$lang_label["period"].""; + echo "".$lang_label["period"].""; echo ""; + echo "
"; @@ -316,20 +317,21 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo ""; - echo "".$lang_label["sla_min"].""; + echo "".$lang_label["sla_min"].""; echo "
"; - echo "".$lang_label["sla_limit"].""; + echo "".$lang_label["sla_limit"].""; echo "
"; + echo ""; echo ""; echo ""; echo "
"; echo ""; + echo "
"; echo ""; @@ -380,15 +382,16 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { $module_name = dame_nombre_modulo_agentemodulo ($id_am); } echo ""; - echo "".$type_desc; - echo "".$agent_name; - echo "".$module_name; - echo "".$period; + echo "".$type_desc.""; + echo "".$agent_name.""; + echo "".$module_name.""; + echo "".$period.""; echo ""; if ($form_id_user == $id_user){ echo ""; } - } + echo ""; + } echo ""; } } else { @@ -398,15 +401,17 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo "

".$lang_label["reporting"]." > "; echo $lang_label["custom_reporting"]."

"; + + $sql="SELECT * FROM treport"; + $res=mysql_query($sql); + if (mysql_num_rows($res)) { echo ""; echo ""; - $color=1; - $sql="SELECT * FROM treport"; - $res=mysql_query($sql); + $color=1; while ($row = mysql_fetch_array($res)){ if (($row["private"]==0) || ($row["id_user"] == $id_user)){ // Calculate table line color @@ -432,6 +437,10 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { } echo "
".$lang_label["report_name"]." ".$lang_label["description"]." ".$lang_label["Manage"]." ".$lang_label["delete"]."
"; echo ""; +} else { + echo "
".$lang_label["no_reporting_def"]."
"; + echo "
"; +} echo ""; echo "
"; echo ""; diff --git a/pandora_console/include/languages/language_en.php b/pandora_console/include/languages/language_en.php index b19f31b526..eca1b39932 100644 --- a/pandora_console/include/languages/language_en.php +++ b/pandora_console/include/languages/language_en.php @@ -876,6 +876,11 @@ $lang_label["map_item_add"] = "Add map item"; $lang_label["graph_event_total"] = "Event graph"; $lang_label["graph_event_group"] = "Event graph by group"; $lang_label["graph_event_user"] = "Event graph by user"; +$lang_label["no_layout_def"] = "There are no defined layouts"; +$lang_label["no_reporting_def"] = "There are no defined reportings"; +$lang_label["no_map_def"] = "There are no defined maps"; +$lang_label["no_repitem_def"] = "There are no defined report items"; + global $lang_label; global $help_label; ?> diff --git a/pandora_console/operation/visual_console/index.php b/pandora_console/operation/visual_console/index.php index 6b95444c83..f4a804a20b 100644 --- a/pandora_console/operation/visual_console/index.php +++ b/pandora_console/operation/visual_console/index.php @@ -27,12 +27,20 @@ if (comprueba_login() != 0) { exit; } -echo "

".$lang_label["visual_console"]."

"; -echo ""; -echo "
".$lang_label["name"]."".$lang_label["group"]."".$lang_label["elements"]."".$lang_label["view"]; -$color=1; +echo "

".$lang_label["visual_console"]." > "; +echo $lang_label["summary"]."

"; $sql="SELECT * FROM tlayout"; -if ($res=mysql_query($sql)) +$res=mysql_query($sql); + +if (mysql_num_rows($res)) { + + echo ""; + echo " + + + + "; + $color=1; while ($row = mysql_fetch_array($res)){ // Calculate table line color if ($color == 1){ @@ -45,22 +53,21 @@ if ($res=mysql_query($sql)) } echo ""; // Name - echo ""; $id_layout = $row["id"]; // Group - echo ""; // # elements $sql2="SELECT COUNT(*) FROM tlayout_data WHERE id_layout = $id_layout"; $res2=mysql_query($sql2); $row2 = mysql_fetch_array($res2); - echo ""; // View icon - echo ""; } -echo "
".$lang_label["name"]."".$lang_label["group"]."".$lang_label["elements"]."".$lang_label["view"]."
".$row["name"]; + echo "".$row["name"].""; + echo "".$row2[0]; + echo "".$row2[0].""; + echo "
"; - - - - + echo "
"; +} else { + echo "
".$lang_label["no_layout_def"]."
"; +} ?> diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 1cf637ed95..3109e70dd8 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -55,7 +55,7 @@ UNLOCK TABLES; /*!40000 ALTER TABLE `tlanguage` DISABLE KEYS */; LOCK TABLES `tlanguage` WRITE; -INSERT INTO `tlanguage` VALUES ('bb','Bable'),('ca','Català'),('de','German'),('en','English'),('es','Español'),('es_gl','Gallego'),('es_la','Español-Latinoamérica'),('eu','Euskera'),('fr','Français'),('pt_br','Portuguese-Brazil'); +INSERT INTO `tlanguage` VALUES ('bb','Bable'),('ca','Català'),('de','Deutch'),('en','English'),('es_es','Español'),('es_gl','Gallego'),('es_la','Español-Latinoamérica'),('eu','Euskera'),('fr','Français'),('pt_br','Portuguese-Brazil'); UNLOCK TABLES; /*!40000 ALTER TABLE `tlanguage` ENABLE KEYS */;