From 94f8b058b6757306a7fc7a6f5e1e91f146df1057 Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Wed, 9 Feb 2022 13:22:17 +0100 Subject: [PATCH] Add state to insured list pagination --- application/language/english/message_lang.php | 1 + application/language/french/message_lang.php | 3 ++- application/models/pagination/Insurances_model.php | 6 ++++++ application/views/nano_health/hyper/insurances_insured.php | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php index e0557a88..a591ab54 100755 --- a/application/language/english/message_lang.php +++ b/application/language/english/message_lang.php @@ -865,4 +865,5 @@ $lang['used_care_requests'] = "Used care requests"; $lang['beneficiaries_deletion_history'] = "Deletion history of beneficiaries"; $lang['deletion_date'] = "Date of deletion"; $lang['STOP_INSURANCE'] = "Stopping insurance"; +$lang['RENEWAL'] = "Insurance renewal"; ?> diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php index 748548dd..e9044d25 100755 --- a/application/language/french/message_lang.php +++ b/application/language/french/message_lang.php @@ -875,5 +875,6 @@ $lang['USED'] = "Utilisée"; $lang['used_care_requests'] = "Demandes de soins utilisées"; $lang['beneficiaries_deletion_history'] = "Historique de suppression des ayants droit"; $lang['deletion_date'] = "Date de suppression"; -$lang['STOP_INSURANCE'] = "Arrêt de l'assurance" +$lang['STOP_INSURANCE'] = "Arrêt de l'assurance"; +$lang['RENEWAL'] = "Renouvellement de l'assurance"; ?> diff --git a/application/models/pagination/Insurances_model.php b/application/models/pagination/Insurances_model.php index 9069c460..86b9cc94 100644 --- a/application/models/pagination/Insurances_model.php +++ b/application/models/pagination/Insurances_model.php @@ -38,6 +38,9 @@ class Insurances_model extends CI_Model { $this->db->from($this->table); $this->db->where('network_id', $postData['id_network']); + if (!empty($postData['state'])) { + $this->db->where('state', $postData['state']); + } return $this->db->count_all_results(); } @@ -65,6 +68,9 @@ class Insurances_model extends CI_Model $this->db->where('created_at >=', date('Y-m-d', strtotime($postData['startDate']))); $this->db->where('created_at <', date('Y-m-d', strtotime($postData['endDate']. "+1 day"))); } + if (!empty($postData['state'])) { + $this->db->where('state', $postData['state']); + } $i = 0; // loop searchable columns diff --git a/application/views/nano_health/hyper/insurances_insured.php b/application/views/nano_health/hyper/insurances_insured.php index 90179c44..69f68359 100755 --- a/application/views/nano_health/hyper/insurances_insured.php +++ b/application/views/nano_health/hyper/insurances_insured.php @@ -125,6 +125,7 @@ "ajax": { "url": "", "data":{ + "state" : "PAID", "startDate" : "", "endDate" : "", "id_network" : "",