diff --git a/application/controllers/ValidatingDoctor.php b/application/controllers/ValidatingDoctor.php index 5c4ff467..71d6649d 100755 --- a/application/controllers/ValidatingDoctor.php +++ b/application/controllers/ValidatingDoctor.php @@ -22,6 +22,7 @@ class ValidatingDoctor extends CI_Controller $data['count_d_traite'] = $this->nano_health_model->getCountCareRequests(null,$this->session->userdata('agent_id'), 'ACCEPTED'); $data['count_d_no_traite'] = $this->nano_health_model->getCountCareRequests($data['network_id'], null, 'UNDER_VALIDATION'); $data['count_d_no_canceled'] = $this->nano_health_model->getCountCareRequests(null,$this->session->userdata('agent_id'), 'REJECTED'); + $data['count_d_no_used'] = $this->nano_health_model->getCountCareRequests(null,$this->session->userdata('agent_id'), 'USED'); $this->load->view('nano_health/validating_doctor/header', $data); $this->load->view('nano_health/validating_doctor/dashboard', $data); diff --git a/application/controllers/pagination/CareRequests.php b/application/controllers/pagination/CareRequests.php index 7ed7d361..73bba710 100755 --- a/application/controllers/pagination/CareRequests.php +++ b/application/controllers/pagination/CareRequests.php @@ -36,7 +36,11 @@ class CareRequests extends CI_Controller $buttons = "". ""; - $data[] = array($row->request_id , $row->user_lastname.' '.$row->user_firstname , $row->user_phone, $row->act_code , $row->act_name, + $insured = $row->user_lastname.' '.$row->user_firstname; + if(isset($row->beneficiary_id)){ + $insured = $row->beneficiary_lastname.' '.$row->beneficiary_firstname; + } + $data[] = array($row->request_id , $insured, $this->lang->line($row->to), $row->user_phone, $row->act_code , $row->act_name, mb_strtoupper($this->lang->line($row->state),'UTF-8'), $row->created_at , $row->state === 'UNDER_VALIDATION' ? $buttons : null); } diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php index 7fa412f2..bb9aa267 100755 --- a/application/language/english/message_lang.php +++ b/application/language/english/message_lang.php @@ -860,4 +860,6 @@ $lang['care_requests_history'] = "Care request history"; $lang['no_demand'] = "No requests"; $lang['request_id'] = "Request ID"; $lang['export_request_list'] = "Export request list"; +$lang['USED'] = "Used"; +$lang['used_care_requests'] = "Used care requests"; ?> diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php index 79836438..912e286e 100755 --- a/application/language/french/message_lang.php +++ b/application/language/french/message_lang.php @@ -871,4 +871,6 @@ $lang['care_requests_history'] = "Historique des demandes de soins"; $lang['no_demand'] = "Aucune demande"; $lang['request_id'] = "ID de la demande"; $lang['export_request_list'] = "Exporter la liste des demandes"; +$lang['USED'] = "Utilisée"; +$lang['used_care_requests'] = "Demandes de soins utilisées"; ?> diff --git a/application/views/nano_health/validating_doctor/care_requests.php b/application/views/nano_health/validating_doctor/care_requests.php index 5ae2a1ae..4ee88a23 100755 --- a/application/views/nano_health/validating_doctor/care_requests.php +++ b/application/views/nano_health/validating_doctor/care_requests.php @@ -53,6 +53,7 @@
= $this->lang->line("used_care_requests"); ?>
+