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

2012-02-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* operation/events/events_list.php
	 operation/events/events.php: Changed functionality of state events
	 to javascript. Don't need to refresh all view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5640 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-02-23 19:24:07 +00:00
parent ce4951a364
commit f3f9cbd5b9
3 changed files with 171 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-02-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/events/events_list.php
operation/events/events.php: Changed functionality of state events
to javascript. Don't need to refresh all view.
2012-02-23 Sancho Lerena <slerena@artica.es>
* include/help/en/help_ff_threshold.php

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

@ -37,6 +37,8 @@ if (is_ajax ()) {
$delete_event = (bool) get_parameter ('delete_event');
$get_events_fired = (bool) get_parameter('get_events_fired');
$standby_alert = (bool) get_parameter('standby_alert');
$get_comment = (bool) get_parameter('get_comment');
$get_comment_header = (bool) get_parameter('get_comment_header');
if ($get_event_tooltip) {
$id = (int) get_parameter ('id');
@ -149,6 +151,26 @@ if (is_ajax ()) {
echo json_encode($return);
}
if ($get_comment){
$id = (int) get_parameter ("id");
$event = events_get_event ($id);
if ($event === false)
echo '';
else
echo $event['user_comment'];
}
if ($get_comment_header){
$id = (int) get_parameter ("id");
$event = events_get_event ($id);
if ($event === false)
echo '';
else
echo ui_print_truncate_text(strip_tags($event["user_comment"]));
}
return;
}
@ -402,6 +424,11 @@ $(document).ready( function() {
$("a.validate_event").click (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, 3 add comment
@ -439,8 +466,140 @@ $(document).ready( function() {
},
function (data, status) {
if (data == "ok") {
$("#status_img_"+id).attr ("src", "images/spinner.gif");
location.reload();
// Refresh interface elements, don't reload (awfull)
// Validate
if (select_validate == 1){
$("#status_img_"+id).attr ("src", "images/spinner.gif");
// Change status description
$("#status_row_"+id).html(<?php echo "'" . __('Event validated') . "'"; ?>);
// Get event comment
jQuery.post ("ajax.php",
{"page" : "operation/events/events",
"get_comment" : 1,
"id" : id
},
function (data, status) {
$("#comment_row_"+id).html(data);
});
// Get event comment in header
jQuery.post ("ajax.php",
{"page" : "operation/events/events",
"get_comment_header" : 1,
"id" : id
},
function (data, status) {
$("#comment_header_"+id).html(data);
});
// Change state image
$("#validate-"+id).css("display", "none");
$("#status_img_"+id).attr ("src", "images/tick.png");
$("#status_img_"+id).attr ("title", <?php echo "'" . __('Event validated') . "'"; ?>);
$("#status_img_"+id).attr ("alt", <?php echo "'" . __('Event validated') . "'"; ?>);
// Remove row due to new state
if (($("#status").val() == 2) || ($("#status").val() == 0) || ($("#status").val() == 3)){
$.each($tr, function(index, value){
row = value;
if ($(row).attr('id') != ''){
row_id_name = $(row).attr('id').split('-').shift();
row_id_number = $(row).attr('id').split('-').pop() - 1;
previous_row_id = $(row).attr('id');
current_row_id = row_id_name + "-" + row_id_number;
selected_row_id = row_id_name + "-" + row_id_number + "-0";
$("#"+previous_row_id).css('display', 'none');
$("#"+current_row_id).css('display', 'none');
$("#"+selected_row_id).css('display', 'none');
}
});
}
} // In process
else if (select_validate == 2){
$("#status_img_"+id).attr ("src", "images/spinner.gif");
// Change status description
$("#status_row_"+id).html(<?php echo "'" . __('Event in process') . "'"; ?>);
// Get event comment
jQuery.post ("ajax.php",
{"page" : "operation/events/events",
"get_comment" : 1,
"id" : id
},
function (data, status) {
$("#comment_row_"+id).html(data);
});
// Get event comment in header
jQuery.post ("ajax.php",
{"page" : "operation/events/events",
"get_comment_header" : 1,
"id" : id
},
function (data, status) {
$("#comment_header_"+id).html(data);
});
// Remove delete link
$("#delete-"+id).replaceWith('<img alt="' + <?php echo "'" . __('Is not allowed delete events in process') . "'"; ?> + '" title="' + <?php echo "'" . __('Is not allowed delete events in process') . "'"; ?> + '" src="/trunk/pandora_console/images/cross.disabled.png">');
// Change state image
$("#status_img_"+id).attr ("src", "images/hourglass.png");
$("#status_img_"+id).attr ("title", <?php echo "'" . __('Event in process') . "'"; ?>);
$("#status_img_"+id).attr ("alt", <?php echo "'" . __('Event in process') . "'"; ?>);
// Remove row due to new state
if (($("#status").val() == 0) || ($("#status").val() == 1)){
$.each($tr, function(index, value){
row = value;
if ($(row).attr('id') != ''){
row_id_name = $(row).attr('id').split('-').shift();
row_id_number = $(row).attr('id').split('-').pop() - 1;
previous_row_id = $(row).attr('id');
current_row_id = row_id_name + "-" + row_id_number;
selected_row_id = row_id_name + "-" + row_id_number + "-0";
$("#"+previous_row_id).css('display', 'none');
$("#"+current_row_id).css('display', 'none');
$("#"+selected_row_id).css('display', 'none');
}
});
}
} // Add comment
else if (select_validate == 3){
// Get event comment
jQuery.post ("ajax.php",
{"page" : "operation/events/events",
"get_comment" : 1,
"id" : id
},
function (data, status) {
$("#comment_row_"+id).html(data);
});
// Get event comment in header
jQuery.post ("ajax.php",
{"page" : "operation/events/events",
"get_comment_header" : 1,
"id" : id
},
function (data, status) {
$("#comment_header_"+id).html(data);
});
}
//location.reload();
} else {
$("#result")
.showMessage ("<?php echo __('Could not be validated')?>")

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

@ -772,7 +772,7 @@ foreach ($result as $event) {
}
if (in_array('user_comment',$show_fields)) {
$data[$i] = ui_print_truncate_text(strip_tags($event["user_comment"]), 30);
$data[$i] = '<span id="comment_header_' . $event['id_evento'] . '">' .ui_print_truncate_text(strip_tags($event["user_comment"])) . '</span>';
$i++;
}
@ -825,7 +825,7 @@ foreach ($result as $event) {
if($event['estado'] != 2) {
$data[$i] .= '<a class="delete_event" href="#" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;" id="delete-'.$event['id_evento'].'">';
$data[$i] .= html_print_image ("images/cross.png", true,
array ("title" => __('Delete event')));
array ("title" => __('Delete event'), "id" => 'delete_cross_' . $event['id_evento']));
$data[$i] .= '</a>&nbsp;';
}
else {
@ -918,7 +918,7 @@ foreach ($result as $event) {
$string .= events_print_type_img ($event["event_type"], true).' '.events_print_type_description($event["event_type"], true);
$string .= '</td></tr><tr>';
$string .= '<td align="left" valign="top" width="15%">';
$string .= '<b>' . __('Status') . '</b></td><td align="left">';
$string .= '<b>' . __('Status') . '</b></td><td id="status_row_' . $event["id_evento"] . '" align="left">';
$string .= $title_st;
$string .= '</td></tr><tr style="border-left: solid 1px; #D3D3D3;" class="rowOdd">';
$string .= '<td align="left" valign="top" width="15%">';
@ -1030,7 +1030,7 @@ foreach ($result as $event) {
$string .= '</td></tr>';
$odd = ($odd == '')? 'rowOdd' : '';
$string .= '<tr class="' . $odd . '"><td align="left" valign="top">' . '<b>' . __('Comments') . '</td><td align="left">';
$string .= '<tr class="' . $odd . '"><td align="left" valign="top">' . '<b>' . __('Comments') . '</td><td id="comment_row_' . $event['id_evento'] . '" align="left">';
if($event["user_comment"] != '') {
$string .= $event["user_comment"];
} else {