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

2012-02-16 Vanessa Gil <vanessa.gil@artica.es> 

* 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
This commit is contained in:
vgilc 2012-02-16 12:06:25 +00:00
parent 33cf99885d
commit 5f4195902a
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-02-16 Vanessa Gil <vanessa.gil@artica.es>
* 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 <vanessa.gil@artica.es>
* include/functions_events.php
operation/events/events_list: In event list: display always user name,

24
pandora_console/operation/events/events.php
View File

@ -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

2
pandora_console/operation/events/events_list.php
View File

@ -863,7 +863,7 @@ foreach ($result as $event) {
$string .= '</a>';
$string .= '</td><td width="400px">';
if($event["id_alert_am"] != 0) {
$string .= '<div class="standby_alert_checkbox" style="display: none">'.__('Set alert on standby').'<br>'.html_print_checkbox('standby-alert-'.$event["id_evento"], 'ff2', false, true).'</div>';
$string .= '<div id="standby_alert_checkbox_' . $event['id_evento']. '" class="standby_alert_checkbox" style="display: none">'.__('Set alert on standby').'<br>'.html_print_checkbox('standby-alert-'.$event["id_evento"], 'ff2', false, true).'</div>';
}
$string .= '</td></tr></table>'; //</form>';