From dcdfc586e875d32a2ff2732e5e2f1243eff6a681 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 4 Sep 2024 18:03:32 +0200 Subject: [PATCH] Show open and total number of OQRS requests --- application/models/Oqrs_model.php | 17 ++++++++++++++--- application/views/interface_assets/header.php | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/application/models/Oqrs_model.php b/application/models/Oqrs_model.php index ccc12ef9e..396294250 100644 --- a/application/models/Oqrs_model.php +++ b/application/models/Oqrs_model.php @@ -366,10 +366,21 @@ class Oqrs_model extends CI_Model { public function oqrs_requests($location_list) { if ($location_list != "") { - $sql = 'SELECT COUNT(*) AS number FROM oqrs JOIN station_profile ON oqrs.station_id = station_profile.station_id WHERE oqrs.station_id IN ('.$location_list.') AND status < 2'; + $sql = 'SELECT status, COUNT(*) AS number FROM oqrs JOIN station_profile ON oqrs.station_id = station_profile.station_id WHERE oqrs.station_id IN ('.$location_list.') GROUP BY status'; $query = $this->db->query($sql); - $row = $query->row(); - return $row->number; + $sum = 0; + $open = 0; + foreach ($query->result_array() as $row) { + $sum += $row['number']; + if ($row['status'] == 1) { + $open += $row['number']; + } + } + if ($open == 0 && $sum == 0) { + return 0; + } else { + return $open."/".$sum; + } } else { return 0; } diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index d8a81c6f0..9c0d977bd 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -416,7 +416,7 @@ ?>
  • 0) { - echo "" . $oqrs_requests . ""; + echo "" . $oqrs_requests . ""; } ?>
  • ">