From b91c802e3352b908a75adf4bcea985a8b25fcbae Mon Sep 17 00:00:00 2001 From: vgilc Date: Thu, 16 Feb 2012 12:06:25 +0000 Subject: [PATCH] 2012-02-16 Vanessa Gil * operation/events/events.php operation/events/events_list: Show checkbox 'Set alert on stand by' when the event is "In process". git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5612 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 ++++ pandora_console/operation/events/events.php | 24 ++++++++++++------- .../operation/events/events_list.php | 2 +- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index deaf656999..69f2836612 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2012-02-16 Vanessa Gil + * operation/events/events.php + operation/events/events_list: Show checkbox 'Set alert on stand by' + when the event is "In process". + 2012-02-16 Vanessa Gil * include/functions_events.php operation/events/events_list: In event list: display always user name, diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index 9a9d4fe345..83e2db5e3f 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -366,15 +366,14 @@ $(document).ready( function() { $("input[name=allbox]").change (function() { $("input[name='eventid[]']").attr('checked', $(this).attr('checked')); }); + - $('.select_validate').change (function() { - display = $(".standby_alert_checkbox").css('display'); - - if (display != 'none') { - $(".standby_alert_checkbox").css('display', 'none'); - } - else { + $('#select_validate').change (function() { + $option = $('#select_validate').val(); + if ($option == 2) { $(".standby_alert_checkbox").css('display', ''); + } else { + $(".standby_alert_checkbox").css('display', 'none'); } }); @@ -394,7 +393,7 @@ $(document).ready( function() { $tr = $(this).parents ("tr"); id = this.id.split ("-").pop (); var comment = $('#textarea_comment_'+id).val(); - var select_validate = $('#select_validate_'+id).val(); // 1 validate, 2 in process + var select_validate = $('#select_validate_'+id).val(); // 1 validate, 2 in process, 3 add comment var checkbox_standby_alert = $('#checkbox-standby-alert-'+id).attr('checked'); var similars = $('#group_rep').val(); @@ -482,6 +481,15 @@ $(document).ready( function() { function toggleCommentForm(id_event) { display = $('.event_form_' + id_event).css('display'); + $('#select_validate_' + id_event).change (function() { + $option = $('#select_validate_' + id_event).val(); + if ($option == 2) { + $("#standby_alert_checkbox_" + id_event).css('display', ''); + } else { + $("#standby_alert_checkbox_" + id_event).css('display', 'none'); + } + }); + if (display != 'none') { $('.event_form_' + id_event).css('display', 'none'); // Hide All showed rows diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php index 731d589bf5..66b457db88 100644 --- a/pandora_console/operation/events/events_list.php +++ b/pandora_console/operation/events/events_list.php @@ -863,7 +863,7 @@ foreach ($result as $event) { $string .= ''; $string .= ''; if($event["id_alert_am"] != 0) { - $string .= ''; + $string .= ''; } $string .= ''; //';