From 6885e4d492afbdc52a12f5a2321dccaca3204130 Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Thu, 17 Feb 2022 15:15:10 +0100 Subject: [PATCH] Add family coverage sharing --- application/controllers/Agent.php | 2 +- application/controllers/Hyperviseur_dash.php | 10 ++-- application/language/english/message_lang.php | 1 + application/language/french/message_lang.php | 1 + .../nano_health/hyper/gestion_wallet.php | 49 ++++++++++++++----- .../hyper/infos_health_care_sheet.php | 4 +- 6 files changed, 46 insertions(+), 21 deletions(-) diff --git a/application/controllers/Agent.php b/application/controllers/Agent.php index e310ed5c..e61e523d 100755 --- a/application/controllers/Agent.php +++ b/application/controllers/Agent.php @@ -44,7 +44,7 @@ class Agent extends CI_Controller $data['prescriptions'] = $this->nano_health_model->getHealthCareSheetPrescriptions($data['health_care_sheet']->id ?? null); // Calcul par assuré et assurance - $data['amounts'] = $this->nano_health_model->calculateSheetAmountsParts($data['health_care_sheet']->id ?? null, $data['health_care_sheet']->type ?? null); +// $data['amounts'] = $this->nano_health_model->calculateSheetAmountsParts($data['health_care_sheet']->id ?? null, $data['health_care_sheet']->type ?? null); $this->load->view('header_agent', $data); $this->load->view('nano_health/hyper/infos_health_care_sheet'); diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php index f06c8899..7eb63dea 100755 --- a/application/controllers/Hyperviseur_dash.php +++ b/application/controllers/Hyperviseur_dash.php @@ -426,7 +426,7 @@ class Hyperviseur_dash extends CI_Controller $data['exams'] = $this->nano_health_model->getHealthCareSheetExams($data['health_care_sheet']->id ?? null); $data['prescriptions'] = $this->nano_health_model->getHealthCareSheetPrescriptions($data['health_care_sheet']->id ?? null); // Calcul par assuré et assurance - $data['amounts'] = $this->nano_health_model->calculateSheetAmountsParts($data['health_care_sheet']->id ?? null, $data['health_care_sheet']->type ?? null); +// $data['amounts'] = $this->nano_health_model->calculateSheetAmountsParts($data['health_care_sheet']->id ?? null, $data['health_care_sheet']->type ?? null); $this->load->view('header_hyp', $data); $this->load->view('nano_health/hyper/infos_health_care_sheet'); @@ -666,7 +666,7 @@ class Hyperviseur_dash extends CI_Controller $oldAgent = ''; foreach ($query->result() as $r){ if($oldAgent != $r->agent) - array_push($data,[]); + $data[] = []; $row = []; @@ -688,11 +688,11 @@ class Hyperviseur_dash extends CI_Controller foreach ($r as $k => $val){ if($k == 'type_transac'){ - array_push($row,$val =='credit' ? $this->lang->line('DEPOT') : $this->lang->line('RETRAIT')); + $row[] = $val == 'credit' ? $this->lang->line('DEPOT') : $this->lang->line('RETRAIT'); } else - array_push($row,$val); + $row[] = $val; } - array_push($data,$row); + $data[] = $row; $oldAgent = $r->agent; } echo json_encode($data); diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php index cddf6f44..afe8c3a8 100755 --- a/application/language/english/message_lang.php +++ b/application/language/english/message_lang.php @@ -867,4 +867,5 @@ $lang['deletion_date'] = "Date of deletion"; $lang['STOP_INSURANCE'] = "Stopping insurance"; $lang['RENEWAL'] = "Insurance renewal"; $lang['expired_insurance'] = "Insurance expired"; +$lang['family_coverage_sharing'] = "Mutualisation de la couverture familiale" ?> diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php index d9f2fd31..63632144 100755 --- a/application/language/french/message_lang.php +++ b/application/language/french/message_lang.php @@ -878,4 +878,5 @@ $lang['deletion_date'] = "Date de suppression"; $lang['STOP_INSURANCE'] = "Arrêt de l'assurance"; $lang['RENEWAL'] = "Renouvellement de l'assurance"; $lang['expired_insurance'] = "Assurances arrivées à échéance"; +$lang['family_coverage_sharing'] = "Mutualisation de la couverture familiale" ?> diff --git a/application/views/nano_health/hyper/gestion_wallet.php b/application/views/nano_health/hyper/gestion_wallet.php index 2abab45d..47bccee8 100755 --- a/application/views/nano_health/hyper/gestion_wallet.php +++ b/application/views/nano_health/hyper/gestion_wallet.php @@ -104,7 +104,7 @@ $careRequests = [];
-
+

lang->line($nh_config->provider_billing_period ?? ''); ?>

@@ -115,7 +115,7 @@ $careRequests = [];
-
+

coverage_limit_per_insured_per_year ?? 0, 2), $curreny_code, $context)->formatTo('fr_FR'); ?>

@@ -126,7 +126,20 @@ $careRequests = [];
-
+
+
+
+

lang->line($nh_config->family_coverage_sharing ? 'Oui' : 'Non'); ?>

+

lang->line('family_coverage_sharing') ?>

+
+
+ +
+
+
+
+
+

max_number_of_beneficiaries ?? ''; ?>

@@ -137,7 +150,7 @@ $careRequests = [];
-
+

age_limit_of_insured_and_spouse ?? ''; ?>

@@ -148,7 +161,7 @@ $careRequests = [];
-
+

age_limit_of_child_beneficiary ?? ''; ?>

@@ -452,6 +465,10 @@ $careRequests = [];
+
+ + +
@@ -796,21 +813,26 @@ $careRequests = []; var selectedActId = null; var selectedClassId = null; + // Init checkbox + $('input[name=family_coverage_sharing]').prop("checked", family_coverage_sharing ?>); + $('#updateWallet').click(function () { var network_id = $(this).data('network-id'); if ($('#walletForm')[0].checkValidity()) { - var age_limit_of_insured_and_spouse = parseFloat($('input[name=age_limit_of_insured_and_spouse]').val()); - var age_limit_of_child_beneficiary = parseFloat($('input[name=age_limit_of_child_beneficiary]').val()); + const family_coverage_sharing = $('input[name=family_coverage_sharing]').prop('checked') ? 1 : 0; - var current_affection_percentage_insurer = parseFloat($('input[name=current_affection_percentage_insurer]').val()); - var current_affection_percentage_insured = parseFloat($('input[name=current_affection_percentage_insured]').val()); + const age_limit_of_insured_and_spouse = parseFloat($('input[name=age_limit_of_insured_and_spouse]').val()); + const age_limit_of_child_beneficiary = parseFloat($('input[name=age_limit_of_child_beneficiary]').val()); - var long_term_affection_percentage_insurer = parseFloat($('input[name=long_term_affection_percentage_insurer]').val()); - var long_term_affection_percentage_insured = parseFloat($('input[name=long_term_affection_percentage_insured]').val()); + const current_affection_percentage_insurer = parseFloat($('input[name=current_affection_percentage_insurer]').val()); + const current_affection_percentage_insured = parseFloat($('input[name=current_affection_percentage_insured]').val()); - var exoneration_percentage_insurer = parseFloat($('input[name=exoneration_percentage_insurer]').val()); - var exoneration_percentage_insured = parseFloat($('input[name=exoneration_percentage_insured]').val()); + const long_term_affection_percentage_insurer = parseFloat($('input[name=long_term_affection_percentage_insurer]').val()); + const long_term_affection_percentage_insured = parseFloat($('input[name=long_term_affection_percentage_insured]').val()); + + const exoneration_percentage_insurer = parseFloat($('input[name=exoneration_percentage_insurer]').val()); + const exoneration_percentage_insured = parseFloat($('input[name=exoneration_percentage_insured]').val()); if(age_limit_of_insured_and_spouse < age_limit_of_child_beneficiary){ toastr.error("lang->line('age_limit_rule')?>", "lang->line('management_rule')?>"); @@ -832,6 +854,7 @@ $careRequests = []; "age_limit_of_insured_and_spouse": $("input[name=age_limit_of_insured_and_spouse]").val(), "age_limit_of_child_beneficiary": $("input[name=age_limit_of_child_beneficiary]").val(), "coverage_limit_per_insured_per_year": $("input[name=coverage_limit_per_insured_per_year]").val(), + "family_coverage_sharing" : family_coverage_sharing, "current_affection_percentage_insurer": current_affection_percentage_insurer, "current_affection_percentage_insured": current_affection_percentage_insured, "long_term_affection_percentage_insurer": long_term_affection_percentage_insurer, diff --git a/application/views/nano_health/hyper/infos_health_care_sheet.php b/application/views/nano_health/hyper/infos_health_care_sheet.php index 2cba9b24..670f76fe 100755 --- a/application/views/nano_health/hyper/infos_health_care_sheet.php +++ b/application/views/nano_health/hyper/infos_health_care_sheet.php @@ -225,7 +225,7 @@
-

currency_code, $this->context)->formatTo('fr_FR')?>

+

insured_amount, 2), $health_care_sheet->currency_code, $this->context)->formatTo('fr_FR')?>

lang->line('percentage_insured') ?>

@@ -237,7 +237,7 @@
-

currency_code, $this->context)->formatTo('fr_FR')?>

+

insurance_amount, 2), $health_care_sheet->currency_code, $this->context)->formatTo('fr_FR')?>

lang->line('percentage_insurer') ?>