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

2013-07-05 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_events.php: erased lost debug trace.
	
	* mobile/operation/events.php: some fixes in the pagination, and
	now the events from the system show the name "system".
	
	MERGED FROM BRANCH 4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8487 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-07-05 14:29:35 +00:00
parent d18474f6f5
commit c76b397df7
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2013-07-05 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_events.php: erased lost debug trace.
* mobile/operation/events.php: some fixes in the pagination, and
now the events from the system show the name "system".
MERGED FROM BRANCH 4.0
2013-07-05 Miguel de Dios <miguel.dedios@artica.es>
* mobile/operation/agents.php, mobile/include/style/main.css: some

2
pandora_console/include/functions_events.php
View File

@ -1237,8 +1237,6 @@ function events_get_group_events_steps ($begin, &$result, $id_group, $period, $d
ORDER BY utimestamp ASC',
$datelimit, $date, implode (",", $id_group));
//html_debug_print($sql);
return db_get_all_row_by_steps_sql($begin, $result, $sql);
}

10
pandora_console/mobile/operation/events.php
View File

@ -100,8 +100,14 @@ class Events {
$row[] = '<b class="ui-table-cell-label">' . __('Timestamp') . '</b>' .
ui_print_timestamp ($event['timestamp_rep'], true);
if ($event["id_agente"] == 0) {
$agent_name = __('System');
}
else {
$agent_name = ui_print_agent_name ($event["id_agente"], true);
}
$row[] = '<b class="ui-table-cell-label">' . __('Agent') . '</b>' .
ui_print_agent_name ($event["id_agente"], true);
$agent_name;
$status =
html_print_image ("mobile/images/" .
@ -302,6 +308,7 @@ class Events {
$this->status = 3;
}
else {
$this->status = (int)$this->status;
$this->default = false;
}
@ -676,6 +683,7 @@ class Events {
//--------------------------------------------------------------
$events_db = events_get_events_grouped($sql_post,
$page * $system->getPageSize(), $system->getPageSize(), false, false);
if (empty($events_db)) {