diff --git a/application/models/system/PersonLog_model.php b/application/models/system/PersonLog_model.php index 777c6eeeb..e5f2c543d 100644 --- a/application/models/system/PersonLog_model.php +++ b/application/models/system/PersonLog_model.php @@ -101,7 +101,11 @@ class PersonLog_model extends CI_Model $this->db->order_by('zeitpunkt', 'DESC'); $this->db->order_by('log_id', 'DESC'); - $result = $this->db->get_where($this->dbTable, "person_id=".$this->db->escape($person_id)." AND zeitpunkt > now()"); + $where = "logtype_kurzbz = 'Processstate' + AND person_id=".$this->db->escape($person_id)." + AND zeitpunkt >= now()"; + + $result = $this->db->get_where($this->dbTable, $where); return success($result->result()); } @@ -113,10 +117,6 @@ class PersonLog_model extends CI_Model */ public function deleteLog($log_id) { - $this->load->library('PermissionLib'); - if(!$this->permissionlib->isEntitled('system.tbl_log', PermissionLib::DELETE_RIGHT)) - show_error('Permission denied - You need Access to system.tbl_log'); - $this->db->where('log_id', $log_id); $result = $this->db->delete($this->dbTable); diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php index 68b7d28a9..14ce21217 100755 --- a/application/views/system/infocenter/infocenterData.php +++ b/application/views/system/infocenter/infocenterData.php @@ -158,8 +158,9 @@ LEFT JOIN ( SELECT person_id, zeitpunkt as parkdate FROM system.tbl_log - WHERE logdata->>\'name\' = \'Parked\' - AND zeitpunkt > now() + WHERE logtype_kurzbz = \'Processstate\' + AND logdata->>\'name\' = \'Parked\' + AND zeitpunkt >= now() ) pd USING(person_id) WHERE EXISTS( @@ -255,6 +256,11 @@ $datasetRaw->{'LockUser'} = '-'; } + if ($datasetRaw->{'ParkDate'} == null) + { + $datasetRaw->{'ParkDate'} = '-'; + } + if ($datasetRaw->{'StgAbgeschickt'} == null) { $datasetRaw->{'StgAbgeschickt'} = '-'; diff --git a/application/views/system/messageList.php b/application/views/system/messageList.php index 44779ad2c..6edd4f4b1 100644 --- a/application/views/system/messageList.php +++ b/application/views/system/messageList.php @@ -43,6 +43,9 @@ $widthColumn = $msgExists === true ? 8 : 12; selector: "#msgbody", statusbar: false, plugins: "autoresize", + autoresize_bottom_margin: 10, + autoresize_min_height: 140, + autoresize_max_height: 495, //callback to avoid conflict with ajax (for getting body of first message) init_instance_callback: "initMsgBody" }); diff --git a/public/js/infocenter/infocenterDetails.js b/public/js/infocenter/infocenterDetails.js index 90509e288..f3b4839ca 100644 --- a/public/js/infocenter/infocenterDetails.js +++ b/public/js/infocenter/infocenterDetails.js @@ -32,7 +32,7 @@ $(document).ready( addTablesorter("doctable", [[2, 1], [1, 0]], ["zebra"]); addTablesorter("nachgdoctable", [[2, 0], [1, 1]], ["zebra"]); addTablesorter("msgtable", [[0, 1], [2, 0]], ["zebra", "filter"], 2); - tablesortAddPager("msgtable", "msgpager", 10); + tablesortAddPager("msgtable", "msgpager", 14); formatNotizTable(); formatLogTable(); @@ -403,7 +403,7 @@ function refreshLog() function formatLogTable() { addTablesorter("logtable", [[0, 1]], ["filter"], 2); - tablesortAddPager("logtable", "logpager", 23); + tablesortAddPager("logtable", "logpager", 22); $("#logtable").addClass("table-condensed"); } @@ -467,7 +467,7 @@ function refreshParking(date) function formatNotizTable() { addTablesorter("notiztable", [[0, 1]], ["filter"], 2); - tablesortAddPager("notiztable", "notizpager", 10); + tablesortAddPager("notiztable", "notizpager", 11); $("#notiztable").addClass("table-condensed"); } diff --git a/public/js/tablesort/tablesort.js b/public/js/tablesort/tablesort.js index 7ee70a002..ee386bb7d 100644 --- a/public/js/tablesort/tablesort.js +++ b/public/js/tablesort/tablesort.js @@ -46,7 +46,7 @@ function tablesortAddPager(tableid, pagerid, size) '' + ''; - var rowcount = $("#" + tableid + " tr").length; + var rowcount = $("#" + tableid + " tbody tr").length; //not show pager if only one table page if (rowcount > size)