Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop

pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

@@ -158,6 +158,8 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_pur
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 0);
 UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
+DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '700');
 
 -- ---------------------------------------------------------------------
 -- Table `tplanned_downtime_agents`

pandora_console/extras/pandoradb_migrate_6.0_to_7.0.oracle.sql

@@ -81,6 +81,8 @@ INSERT INTO tconfig (token, value) VALUES ('small_operation_step_datos_purge', '
 INSERT INTO tconfig (token, value) VALUES ('days_autodisable_deletion', '30');
 INSERT INTO tconfig (token, value) VALUES ('MR', 0);
 UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
+DELETE FROM tconfig WHERE token = 'current_package_enterprise';
+INSERT INTO tconfig (token, value) VALUES ('current_package_enterprise', 700);
 
 -- ---------------------------------------------------------------------
 -- Table `tplanned_downtime_agents`

pandora_console/godmode/reporting/reporting_builder.list_items.php

@@ -299,7 +299,7 @@ if ($items) {
 		$table->head[3] .= ' <a onclick="return message_check_sort_items();" href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=up&field=module&id_report=' . $idReport . $urlFilter . '&pure=' . $config['pure'] . '">' . html_print_image("images/sort_up.png", true, array("title" => __('Ascendent'))) . '</a>' .
 			'<a onclick="return message_check_sort_items();" href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=down&field=module&id_report=' . $idReport . $urlFilter . '&pure=' . $config['pure'] . '">' . html_print_image("images/sort_down.png", true, array("title" => __('Descent'))) . '</a>';
 	}
-	$table->head[4] = __('Period');
+	$table->head[4] = __('Time lapse');
 	$table->head[5] = __('Name') . " / " . __('Description');
 	if (check_acl ($config['id_user'], 0, "RM")) {
 		$table->head[6] = '<span title="' . __('Options') . '">' . __('Op.') . '</span>';

pandora_console/include/functions_visual_map.php

@@ -906,7 +906,8 @@ else{
 				}
 			}
 			
-			$only_image = !$graph_javascript || $isExternalLink;
+			$only_image = !$graph_javascript && $isExternalLink;
+			
 			if ($layoutData['id_custom_graph'] != 0) {
 				// Show only avg on the visual console
 				if (get_parameter('action') == 'edit') {

pandora_console/include/help/en/help_reporting_time_lapse.php

@@ -0,0 +1,8 @@
+<?php
+/**
+ * @package Include/help/en
+ */
+?>
+<h1>Reports - Time lapse</h1>
+<br>
+This is the range, or period of time over which the report renders the information for this report type. For example, a week means data from a week ago from now. 

pandora_console/include/help/es/help_reporting_time_lapse.php

@@ -0,0 +1,8 @@
+<?php
+/**
+ * @package Include/help/en
+ */
+?>
+<h1>Reports - Time lapse</h1>
+<br>
+Este es el lapso de tiempo que refleja el informe. Si es una semana, por ejemplo, el informe mostrará los datos desde hace una semana hasta ahora

pandora_console/include/help/ja/help_reporting_time_lapse.php

@@ -0,0 +1,8 @@
+<?php
+/**
+ * @package Include/help/en
+ */
+?>
+<h1>Reports - Time lapse</h1>
+<br>
+This is the range, or period of time over which the report renders the information for this report type. For example, a week means data from a week ago from now. 

pandora_console/operation/events/sound_events.php

@@ -141,8 +141,7 @@ function changeGroup() {
 		},
 		function (data) {
 			$("#id_agents").empty();
-			$("#id_agents").style("size", 0);
-
+			
 			jQuery.each (data, function (id, value) {
 				if (value != "") {
 					$("#id_agents").append('<option value="' + id + '">' + value + '</option>');

pandora_console/operation/visual_console/render_view.php

@@ -149,7 +149,7 @@ if ($config['pure']) {
 	// Container of the visual map (ajax loaded)
 	echo '<div id="vc-container">' .
 		visual_map_print_visual_map ($id_layout, true, true, 
-			null, null, '', false, $graph_javascript)
+			null, null, '', false, true)
 	. '</div>';
 	
 	// Floating menu - Start
@@ -204,7 +204,7 @@ if ($config['pure']) {
 	<?php
 }
 else {
-	visual_map_print_visual_map ($id_layout, true, true, null, null, '', false, $graph_javascript, true);
+	visual_map_print_visual_map ($id_layout, true, true, null, null, '', false, true, true);
 }
 
 ui_require_javascript_file('wz_jsgraphics');

pandora_console/pandoradb.data.oracle.sql

@@ -138,6 +138,7 @@ INSERT INTO tconfig (token, value) VALUES ('custom_report_front_footer', '');
 INSERT INTO tconfig (token, value) VALUES ('identification_reminder', 1);
 INSERT INTO tconfig (token, value) VALUES ('identification_reminder_timestamp', 0);
 INSERT INTO tconfig (token, value) VALUES ('MR', 0);
+INSERT INTO tconfig (token, value) VALUES ('current_package_enterprise', 700);
 INSERT INTO tconfig (token, value) VALUES ('post_process_custom_values', '{"0.00000038580247":"Seconds to months","0.00000165343915":"Seconds to weeks","0.00001157407407":"Seconds to days","0.01666666666667":"Seconds to minutes","0.00000000093132":"Bytes to Gigabytes","0.00000095367432":"Bytes to Megabytes","0.0009765625":"Bytes to Kilobytes","0.00000001653439":"Timeticks to weeks","0.00000011574074":"Timeticks to days"}');
 
 COMMIT;

pandora_console/pandoradb_data.sql

@@ -112,6 +112,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('MR', 0),
 ('identification_reminder', 1),
 ('identification_reminder_timestamp', 0),
+('current_package_enterprise', '700'),
 ('post_process_custom_values', '{"0.00000038580247":"Seconds to months","0.00000165343915":"Seconds to weeks","0.00001157407407":"Seconds to days","0.01666666666667":"Seconds to minutes","0.00000000093132":"Bytes to Gigabytes","0.00000095367432":"Bytes to Megabytes","0.0009765625":"Bytes to Kilobytes","0.00000001653439":"Timeticks to weeks","0.00000011574074":"Timeticks to days"}');
 
 UNLOCK TABLES;