Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2379 from AndreasK79/fix_oqrs_result_logic

Browse Source
This commit is contained in:
Andreas Kristiansen
2025-10-04 17:46:15 +02:00
committed by GitHub
parent ddb409db59 f5eaaa131b
commit 5a7fa97843
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
application/models/Oqrs_model.php
View File

@@ -502,18 +502,21 @@ class Oqrs_model extends CI_Model {
$where = "AND $where";
}
$limit = $searchCriteria['oqrsResults'];
$sql = "
SELECT *, DATE_FORMAT(requesttime, \"%Y-%m-%d %H:%i\") as requesttime, DATE_FORMAT(time, \"%H:%i\") as time
FROM oqrs
INNER JOIN station_profile ON (oqrs.station_id=station_profile.station_id and station_profile.oqrs='1')
WHERE station_profile.user_id = ?
$where
ORDER BY oqrs.id
LIMIT $limit
SELECT *, DATE_FORMAT(requesttime, \"%Y-%m-%d %H:%i\") as requesttime, DATE_FORMAT(time, \"%H:%i\") as time
FROM oqrs
INNER JOIN station_profile ON (oqrs.station_id=station_profile.station_id and station_profile.oqrs='1')
WHERE station_profile.user_id = ?
$where
ORDER BY oqrs.id
";
if ($searchCriteria['oqrsResults'] !== 'All') {
$limit = $searchCriteria['oqrsResults'];
$sql .= "LIMIT $limit";
}
$data = $this->db->query($sql, $binding);
return $data->result('array');