Adapted query for infocenter parking, replaced null in parkdate with -, set min and max size for messages, increased msglist size, pager counts now only trs in tbody

This commit is contained in:
alex
2018-05-17 17:46:00 +02:00
parent 6a67183738
commit 45c3aad94d
5 changed files with 20 additions and 11 deletions
@@ -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);
@@ -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'} = '-';
+3
View File
@@ -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"
});