From 43dae70858f5157bf1798261597395a608f41bde Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Tue, 4 Aug 2020 09:08:30 +0100 Subject: [PATCH] + Distinction of outgoing credit requests from incoming requests --- application/controllers/Hyperviseur_dash.php | 75 +- application/controllers/Superviseur_dash.php | 73 +- application/language/english/message_lang.php | 4 + application/language/french/message_lang.php | 4 + application/models/User_model.php | 302 ++-- application/views/demande_credit.php | 1383 +++++++++-------- application/views/header_hyp.php | 117 +- application/views/header_sup.php | 123 +- 8 files changed, 1019 insertions(+), 1062 deletions(-) diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php index 10eb1001..61236e35 100755 --- a/application/controllers/Hyperviseur_dash.php +++ b/application/controllers/Hyperviseur_dash.php @@ -196,51 +196,40 @@ class Hyperviseur_dash extends CI_Controller $data['message'] = "Login first!"; $this->load->view('login', $data); } else { - if ($this->input->get("u") !== null) { - $super = $this->input->get("u"); - $this->session->set_userdata("current_super_demande", $super); - $debut = ""; - $fin = ""; - if ($this->input->get("d") !== null) { - $debut = $this->input->get("d"); - $fin = $this->input->get("f"); - } else { - $fin = date('Y-m-d'); - $debut = Date('Y-m-d', strtotime("-5 days")); - } - $format = $this->session->userdata('site_lang') === 'french' ? 'd-m-Y' : 'Y-m-d'; - $data['debut'] = $debut ? date($format, strtotime($debut)) : null; - $data['fin'] = $fin ? date($format, strtotime($fin)) : null; - $fin = Date('Y-m-d', strtotime($fin . "+1 day")); + $debut = $this->input->get("d"); + $fin = $this->input->get("f"); + $format = $this->session->userdata('site_lang') === 'french' ? 'd-m-Y' : 'Y-m-d'; + $data['debut'] = $debut ? date($format, strtotime($debut)) : null; + $data['fin'] = $fin ? date($format, strtotime($fin)) : null; + $fin = Date('Y-m-d', strtotime($fin . "+1 day")); + + $ville = $this->session->userdata('ville'); + $data['active'] = "demandes"; + $data['type'] = 'incoming'; + $data['demand_type'] = 'credit'; + $data['alert'] = ""; + $data['token'] = $this->session->userdata('token'); + $data['email'] = $this->session->userdata('email'); + $data['firstname'] = $this->session->userdata('firstname'); + $data['lastname'] = $this->session->userdata('lastname'); + $data['code_parrain'] = $this->session->userdata('code_parrain'); + $data['phone'] = $this->session->userdata('phone'); + $data['adresse'] = $this->session->userdata('adresse'); + $data['category'] = $this->session->userdata('category'); + $data['network'] = $this->session->userdata('network'); + $data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays')); + $data['superviseurs'] = $this->user_model->getSuperNameAndCodeForHyp($this->session->userdata('member_code')); + $data['tab_fastDemande'] = $this->user_model->getRangeASCDemandesByNetwork($debut, $fin, $this->session->userdata('member_code'), $this->session->userdata('current_demande_ville')); + $data['tab_slowDemande'] = $this->user_model->getRangeDESCDemandesByNetwork($debut, $fin, $this->session->userdata('member_code'), $this->session->userdata('current_demande_ville')); + $data['list'] = $this->user_model->getDemandesBySuper($debut, $fin, $this->session->userdata('member_code')); + $data['temp_moyen'] = $this->user_model->getTempsMoyenByVille($this->session->userdata('member_code'), $this->session->userdata('network')); + $data['networks'] = $this->user_model->getNetworkByHyp($this->session->userdata('member_code')); + $data['hasWallet'] = $this->user_model->getConfigWallet($this->session->userdata('network_id')); + $this->load->view('header_hyp', $data); + $this->load->view('demande_credit'); + $this->load->view('footer'); - $ville = $this->session->userdata('ville'); - $data['active'] = "demandes"; - $data['type'] = $this->lang->line('crédits'); - $data['demand_type'] = 'credit'; - $data['alert'] = ""; - $data['token'] = $this->session->userdata('token'); - $data['email'] = $this->session->userdata('email'); - $data['firstname'] = $this->session->userdata('firstname'); - $data['lastname'] = $this->session->userdata('lastname'); - $data['code_parrain'] = $this->session->userdata('code_parrain'); - $data['phone'] = $this->session->userdata('phone'); - $data['adresse'] = $this->session->userdata('adresse'); - $data['category'] = $this->session->userdata('category'); - $data['network'] = $this->session->userdata('network'); - $data['villes'] = $this->user_model->getVilleByUserGeo($data['network'], $this->session->userdata('current_pays')); - $data['superviseurs'] = $this->user_model->getSuperNameAndCodeForHyp($this->session->userdata('member_code')); - $data['tab_fastDemande'] = $this->user_model->getRangeASCDemandesByNetwork($debut, $fin, $this->session->userdata('member_code'), $this->session->userdata('current_demande_ville'), $super); - $data['tab_slowDemande'] = $this->user_model->getRangeDESCDemandesByNetwork($debut, $fin, $this->session->userdata('member_code'), $this->session->userdata('current_demande_ville'), $super); - $data['list'] = $this->user_model->getDemandesBySuper($this->session->userdata('member_code'), $super); - $data['temp_moyen'] = $this->user_model->getTempsMoyenByVille($this->session->userdata('member_code'), $super, $this->session->userdata('network')); - $data['networks'] = $this->user_model->getNetworkByHyp($this->session->userdata('member_code')); - $data['hasWallet'] = $this->user_model->getConfigWallet($this->session->userdata('network_id')); - $data['nameOfcurentGeolocatedUser'] = $this->user_model->nameOfCurrentGeolocatedUser_forSuper($super); - $this->load->view('header_hyp', $data); - $this->load->view('demande_credit'); - $this->load->view('footer'); - } } } diff --git a/application/controllers/Superviseur_dash.php b/application/controllers/Superviseur_dash.php index 5512409a..2369d058 100755 --- a/application/controllers/Superviseur_dash.php +++ b/application/controllers/Superviseur_dash.php @@ -117,48 +117,49 @@ class Superviseur_dash extends CI_Controller $data['message'] = "Login first!"; $this->load->view('login', $data); } else { + $type = $this->input->get("type"); + $data['type'] = $type; - if($this->input->get("u") !== null){ + $debut = $this->input->get("d"); + $fin = $this->input->get("f"); + $format = $this->session->userdata('site_lang') === 'french' ? 'd-m-Y' : 'Y-m-d'; + $data['debut'] = $debut ? date($format, strtotime($debut)) : null; + $data['fin'] = $fin ? date($format, strtotime($fin)) : null; + $fin = Date('Y-m-d', strtotime($fin . "+1 day")); // Increment date because SQL BETWEEN - $user_geo = $this->input->get("u"); - $debut = $this->input->get("d"); - $fin = $this->input->get("f"); - $format = $this->session->userdata('site_lang') === 'french' ? 'd-m-Y' : 'Y-m-d' ; - $data['debut'] = $debut ? date($format, strtotime($debut)) : null ; - $data['fin'] = $fin ?date($format, strtotime($fin)): null ; - $fin = Date('Y-m-d', strtotime($fin."+1 day")); // Increment date because SQL BETWEEN + $network = $this->session->userdata('network'); +// $data['type'] = $this->lang->line('crédits'); + $data['demand_type'] = 'credit'; + $data['alert'] = ""; + $data['token'] = $this->session->userdata('token'); + $data['email'] = $this->session->userdata('email'); + $data['firstname'] = $this->session->userdata('firstname'); + $data['lastname'] = $this->session->userdata('lastname'); + $data['code_parrain'] = $this->session->userdata('code_parrain'); + $data['phone'] = $this->session->userdata('phone'); + $data['adresse'] = $this->session->userdata('adresse'); + $data['category'] = $this->session->userdata('category'); + $data['network'] = $this->session->userdata('network'); + if ($type == 'incoming') { + $data['active'] = "demandes_credits_entrantes"; + $data['tab_fastDemande'] = $this->user_model->getRangeASCDemandes($debut, $fin, $this->session->userdata('member_code')); + $data['tab_slowDemande'] = $this->user_model->getRangeDESCDemandes($debut, $fin, $this->session->userdata('member_code')); + $data['temp_moyen'] = $this->user_model->getTempsMoyen($debut, $fin, $this->session->userdata('member_code')); + $data['list'] = $this->user_model->getDemandesForSuper($debut, $fin, $this->session->userdata('member_code')); - $network = $this->session->userdata('network'); - $data['active'] = "demandes"; - $data['type'] = $this->lang->line('crédits'); - $data['demand_type'] = 'credit'; - $data['alert'] = ""; - $data['token'] = $this->session->userdata('token'); - $data['email'] = $this->session->userdata('email'); - $data['firstname'] = $this->session->userdata('firstname'); - $data['lastname'] = $this->session->userdata('lastname'); - $data['code_parrain'] = $this->session->userdata('code_parrain'); - $data['phone'] = $this->session->userdata('phone'); - $data['adresse'] = $this->session->userdata('adresse'); - $data['category'] = $this->session->userdata('category'); - $data['network'] = $this->session->userdata('network'); - $data['tab_fastDemande'] = $this->user_model->getRangeASCDemandes($user_geo,$debut,$fin,$this->session->userdata('member_code')); - $data['tab_fastDemande_s'] = $this->user_model->getRangeASCDemandesOut($this->session->userdata('member_code')); - $data['tab_slowDemande'] = $this->user_model->getRangeDESCDemandes($user_geo,$debut,$fin,$this->session->userdata('member_code')); - $data['tab_slowDemande_s'] = $this->user_model->getRangeDESCDemandesOut($this->session->userdata('member_code')); - $data['mydem'] = $this->user_model->getDemandesHyperForSuper($this->session->userdata('member_code')); - $data['temp_moyen'] = $this->user_model->getTempsMoyen($user_geo,$debut,$fin,$this->session->userdata('member_code')); + } else if ($type = 'outgoing') { + $data['active'] = "demandes_credits_sortantes"; + $data['tab_fastDemande_s'] = $this->user_model->getRangeASCDemandesOut($debut, $fin, $this->session->userdata('member_code')); + $data['tab_slowDemande_s'] = $this->user_model->getRangeDESCDemandesOut($debut, $fin, $this->session->userdata('member_code')); + $data['mydem'] = $this->user_model->getDemandesHyperForSuper($debut, $fin, $this->session->userdata('member_code')); $data['temp_moyen_mine'] = $this->user_model->getTempsMoyenDemandeSup($this->session->userdata('member_code')); - $data['list'] = $this->user_model->getDemandesForSuper($user_geo,$debut,$fin,$this->session->userdata('member_code')); - $data['geolocated_user'] = $this->user_model->getSuperNameAndCodeForSup($this->session->userdata('member_code')); - $data['nameOfcurentGeolocatedUser'] = $this->user_model->nameOfCurrentGeolocatedUser_forSuper($user_geo); - $data['hasWallet'] = $this->user_model->getConfigWallet($this->session->userdata('network_id')); - $this->load->view('header_sup', $data); - $this->load->view('demande_credit'); - $this->load->view('footer'); - }else{ } + $data['geolocated_user'] = $this->user_model->getSuperNameAndCodeForSup($this->session->userdata('member_code')); + $data['hasWallet'] = $this->user_model->getConfigWallet($this->session->userdata('network_id')); + $this->load->view('header_sup', $data); + $this->load->view('demande_credit'); + $this->load->view('footer'); } } diff --git a/application/language/english/message_lang.php b/application/language/english/message_lang.php index 063bf3c1..47e55a9c 100755 --- a/application/language/english/message_lang.php +++ b/application/language/english/message_lang.php @@ -440,4 +440,8 @@ $lang ['remaining_amount'] = 'Remaining amount'; $lang ['amount_greater_than_balance'] = 'Amount greater than the compensation balance'; $lang['no_refund'] = 'No refund'; $lang['final_currency'] = 'Currency of the country of arrival'; +$lang['incoming_requests'] = 'Incoming requests'; +$lang['outgoing_requests'] = 'Outgoing requests'; +$lang['incoming_credits_requests'] = 'Incoming credit requests'; +$lang['outgoing_credits_requests'] = 'Outgoing credit requests'; ?> diff --git a/application/language/french/message_lang.php b/application/language/french/message_lang.php index 5c8507d9..15a5c44e 100755 --- a/application/language/french/message_lang.php +++ b/application/language/french/message_lang.php @@ -452,5 +452,9 @@ $lang['remaining_amount'] = 'Montant restant'; $lang['amount_greater_than_balance'] = 'Montant supérieur au solde de compensation'; $lang['no_refund'] = 'Aucun remboursement'; $lang['final_currency'] = 'Monnaie du pays d\'arrivée'; +$lang['incoming_requests'] = 'Demandes entrantes'; +$lang['outgoing_requests'] = 'Demandes sortantes'; +$lang['incoming_credits_requests'] = 'Demandes de crédits entrantes'; +$lang['outgoing_credits_requests'] = 'Demandes de crédits sortantes'; ?> diff --git a/application/models/User_model.php b/application/models/User_model.php index 1fe05fd3..57443f9e 100755 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -272,46 +272,48 @@ class User_model extends CI_Model FROM info_demandeCredits AS d WHERE d.codeParrain='".$code_membre."' AND d.ville='".$ville."' ORDER BY dateAjout"); - } + } - if($query->num_rows()>0){ - return $query; - }else{ - return false; - } - - } - - public function getDemandesForSuper($user_geo, $debut, $fin, $member_code){ - - $query = $this->db->query("SELECT * - FROM info_demandeCredits AS d - WHERE d.codeParrain='".$member_code."' - AND d.codeMembre='".$user_geo."'AND d.dateAjout BETWEEN '".$debut."' AND '".$fin."' - ORDER BY dateAjout"); - - if($query->num_rows()>0){ + if ($query->num_rows() > 0) { return $query; - }else{ + } else { return false; } } - public function getDemandesHyperForSuper($member_code){ + public function getDemandesForSuper($debut, $fin, $member_code) + { - $query = $this->db->query("SELECT * + $query = $this->db->query("SELECT * FROM info_demandeCredits AS d - WHERE d.codeMembre='".$member_code."' + WHERE d.codeParrain='" . $member_code . "' + AND d.dateAjout BETWEEN '" . $debut . "' AND '" . $fin . "' + ORDER BY dateAjout"); + + if ($query->num_rows() > 0) { + return $query; + } else { + return false; + } + + } + + public function getDemandesHyperForSuper($debut, $fin, $member_code) + { + + $query = $this->db->query("SELECT * + FROM info_demandeCredits AS d + WHERE d.codeMembre='" . $member_code . "' AND d.dateAjout BETWEEN '" . $debut . "' AND '" . $fin . "' ORDER BY dateAjout DESC"); - if($query->num_rows()>0){ - return $query; - }else{ - return false; - } + if ($query->num_rows() > 0) { + return $query; + } else { + return false; + } - } + } public function getDemandesAdForSuper($debut , $fin , $member_code){ $chain = $debut ? "AND d.date_creation BETWEEN '".$debut."' AND '".$fin."'" : ""; @@ -476,20 +478,21 @@ class User_model extends CI_Model $this->db->from('demande_credit'); $this->db->where('code',$codeParrain); $this->db->where('Statut',$statut); - $query=$this->db->get(); - } + $query = $this->db->get(); + } - if($query->num_rows()>0){ - return $query->row()->c; - }else{ - return 0; - } - } + if ($query->num_rows() > 0) { + return $query->row()->c; + } else { + return 0; + } + } - public function getRangeASCDemandes($user_geo, $debut, $fin, $codeParrain){ + public function getRangeASCDemandes($debut, $fin, $codeParrain) + { - if($codeParrain=='all'){ - $query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM, + if ($codeParrain == 'all') { + $query = $this->db->query("SELECT d.agent , d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM, (SELECT TIMESTAMPDIFF(SECOND,dateAjout,dateModif) FROM demande_credit AS req_im WHERE req_im.statut='1' AND req_im.id=d.id) AS temps @@ -497,54 +500,57 @@ class User_model extends CI_Model WHERE statut='1' ORDER BY temps LIMIT 5"); - }else{ - $query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps + } else { + $query = $this->db->query("SELECT d.agent, d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps FROM info_demandeCredits AS d - WHERE statut='1' AND d.codeParrain='".$codeParrain."' AND d.codeMembre='".$user_geo."' - AND d.dateAjout BETWEEN '".$debut."' AND '".$fin."' + WHERE statut='1' AND d.codeParrain='" . $codeParrain . "' + AND d.dateAjout BETWEEN '" . $debut . "' AND '" . $fin . "' ORDER BY temps LIMIT 5"); } - if($query->num_rows()>0){ + if ($query->num_rows() > 0) { return $query; - }else{ + } else { return false; } } - public function getRangeASCDemandesOut($codeParrain){ + public function getRangeASCDemandesOut($debut, $fin, $codeParrain) + { - $query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps + $query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps FROM info_demandeCredits AS d - WHERE statut='1' AND d.codeMembre='".$codeParrain."' + WHERE statut='1' AND d.codeMembre='" . $codeParrain . "' + AND d.dateAjout BETWEEN '" . $debut . "' AND '" . $fin . "' ORDER BY temps LIMIT 5"); - if($query->num_rows()>0){ - return $query; - }else{ - return false; - } + if ($query->num_rows() > 0) { + return $query; + } else { + return false; + } - } + } - public function getRangeASCDemandesByNetwork($debut, $fin, $codeParrain, $ville, $super){ + public function getRangeASCDemandesByNetwork($debut, $fin, $codeParrain, $ville) + { - if($codeParrain=='all'){ + if ($codeParrain == 'all') { $query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM, (SELECT TIMESTAMPDIFF(SECOND,dateAjout,dateModif) FROM demande_credit AS req_im WHERE req_im.statut='1' AND req_im.id=d.id) AS temps FROM demande_credit AS d - WHERE statut='1' AND d.reseau='".$ville."' AND date_creation BETWEEN '".$debut."' AND '".$fin."' + WHERE statut='1' AND d.reseau='" . $ville . "' AND date_creation BETWEEN '" . $debut . "' AND '" . $fin . "' ORDER BY temps LIMIT 5"); - }else{ + } else { $query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps FROM info_demandeCredits AS d - WHERE statut='1' AND d.codeParrain='".$codeParrain."' AND d.codeMembre='".$super."' + WHERE statut='1' AND d.codeParrain='" . $codeParrain . "' AND dateAjout BETWEEN '".$debut."' AND '".$fin."' ORDER BY temps LIMIT 5"); @@ -580,20 +586,21 @@ class User_model extends CI_Model WHERE etat=1 AND d.code_membre='".$codeParrain."'". $chain ."ORDER BY temps LIMIT 5"); - } + } - if($query->num_rows()>0){ - return $query; - }else{ - return false; - } + if ($query->num_rows() > 0) { + return $query; + } else { + return false; + } - } + } - public function getRangeDESCDemandes($user_geo, $debut, $fin, $codeParrain){ + public function getRangeDESCDemandes($debut, $fin, $codeParrain) + { - if($codeParrain=='all'){ - $query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM, + if ($codeParrain == 'all') { + $query = $this->db->query("SELECT d.agent, d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM, (SELECT TIMESTAMPDIFF(SECOND,dateAjout,dateModif) FROM demande_credit AS req_im WHERE req_im.statut='1' AND req_im.id=d.id) AS temps @@ -601,54 +608,57 @@ class User_model extends CI_Model WHERE statut='1' ORDER BY temps DESC LIMIT 5"); - }else{ - $query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps + } else { + $query = $this->db->query("SELECT d.agent, d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps FROM info_demandeCredits AS d - WHERE statut='1' AND d.codeParrain='".$codeParrain."' AND d.codeMembre='".$user_geo."' - AND d.dateAjout BETWEEN '".$debut."' AND '".$fin."' + WHERE statut='1' AND d.codeParrain='" . $codeParrain . "' + AND d.dateAjout BETWEEN '" . $debut . "' AND '" . $fin . "' ORDER BY temps DESC LIMIT 5"); } - if($query->num_rows()>0){ + if ($query->num_rows() > 0) { return $query; - }else{ + } else { return false; } } - public function getRangeDESCDemandesOut($codeParrain){ + public function getRangeDESCDemandesOut($debut, $fin, $codeParrain) + { - $query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps + $query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps FROM info_demandeCredits AS d - WHERE statut='1' AND d.codeMembre='".$codeParrain."' + WHERE statut='1' AND d.codeMembre='" . $codeParrain . "' + AND d.dateAjout BETWEEN '" . $debut . "' AND '" . $fin . "' ORDER BY temps DESC LIMIT 5"); - if($query->num_rows()>0){ - return $query; - }else{ - return false; - } + if ($query->num_rows() > 0) { + return $query; + } else { + return false; + } - } + } - public function getRangeDESCDemandesBynetwork($debut, $fin, $codeParrain, $ville, $super){ + public function getRangeDESCDemandesBynetwork($debut, $fin, $codeParrain, $ville) + { - if($codeParrain=='all'){ + if ($codeParrain == 'all') { $query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM, (SELECT TIMESTAMPDIFF(SECOND,dateAjout,dateModif) FROM demande_credit AS req_im WHERE req_im.statut='1' AND req_im.id=d.id) AS temps FROM demande_credit AS d - WHERE statut='1' AND d.reseau='".$ville."' AND date_creation BETWEEN '".$debut."' AND '".$fin."' + WHERE statut='1' AND d.reseau='" . $ville . "' AND date_creation BETWEEN '" . $debut . "' AND '" . $fin . "' ORDER BY temps DESC LIMIT 5"); - }else{ + } else { $query = $this->db->query("SELECT d.codeMembre AS emetteur, d.codeParrain AS superviseur, d.montant AS montant,d.dateAjout AS dateA,d.dateModif AS dateM,d.temps AS temps FROM info_demandeCredits AS d - WHERE statut='1' AND d.codeParrain='".$codeParrain."' AND d.codeMembre='".$super."' + WHERE statut='1' AND d.codeParrain='" . $codeParrain . "' AND dateAjout BETWEEN '".$debut."' AND '".$fin."' ORDER BY temps DESC LIMIT 5"); @@ -684,29 +694,29 @@ class User_model extends CI_Model WHERE etat=1 AND d.code_membre='".$codeParrain."'".$chain. "ORDER BY temps DESC LIMIT 5"); - } - - if($query->num_rows()>0){ - return $query; - }else{ - return false; - } - - } - - public function getTempsMoyen($user_geo, $debut, $fin, $codeParrain){ - - if($codeParrain=='all'){ - $query = $this->db->query("SELECT AVG(TIMESTAMPDIFF(SECOND,dateAjout,dateModif)) AS temps FROM demande_credit WHERE statut='1'"); - }else{ - $query = $this->db->query("SELECT AVG(temps) AS temps - FROM info_demandeCredits - WHERE statut= '1' AND codeParrain='".$codeParrain."' - AND codeMembre='".$user_geo."' - AND dateAjout BETWEEN '".$debut."' AND '".$fin."'"); } - if($query->num_rows()>0){ + if ($query->num_rows() > 0) { + return $query; + } else { + return false; + } + + } + + public function getTempsMoyen($debut, $fin, $codeParrain) + { + + if ($codeParrain == 'all') { + $query = $this->db->query("SELECT AVG(TIMESTAMPDIFF(SECOND,dateAjout,dateModif)) AS temps FROM demande_credit WHERE statut='1'"); + } else { + $query = $this->db->query("SELECT AVG(temps) AS temps + FROM info_demandeCredits + WHERE statut= '1' AND codeParrain='" . $codeParrain . "' + AND dateAjout BETWEEN '" . $debut . "' AND '" . $fin . "'"); + } + + if ($query->num_rows() > 0) { return $query->row()->temps; }else{ return false; @@ -720,31 +730,32 @@ class User_model extends CI_Model $query = $this->db->query("SELECT AVG(TIMESTAMPDIFF(SECOND,dateAjout,dateModif)) AS temps FROM demande_credit WHERE statut='1'"); }else{ $query = $this->db->query("SELECT AVG(temps) AS temps FROM info_demandeCredits WHERE statut='1' AND codeMembre='".$codeParrain."'"); - } + } - if($query->num_rows()>0){ - return $query->row()->temps; - }else{ - return false; - } + if ($query->num_rows() > 0) { + return $query->row()->temps; + } else { + return false; + } - } + } - public function getTempsMoyenByVille($codeParrain,$super){ + public function getTempsMoyenByVille($codeParrain, $network) + { - if($codeParrain=='all'){ - $query = $this->db->query("SELECT AVG(TIMESTAMPDIFF(SECOND,dateAjout,dateModif)) AS temps FROM demande_credit WHERE statut='1'AND reseau='".$network."' "); - }else{ - $query = $this->db->query("SELECT AVG(temps) AS temps FROM info_demandeCredits WHERE statut='1' AND codeParrain='".$codeParrain."' AND codeMembre='".$super."' "); - } + if ($codeParrain == 'all') { + $query = $this->db->query("SELECT AVG(TIMESTAMPDIFF(SECOND,dateAjout,dateModif)) AS temps FROM demande_credit WHERE statut='1'AND reseau='" . $network . "' "); + } else { + $query = $this->db->query("SELECT AVG(temps) AS temps FROM info_demandeCredits WHERE statut='1' AND codeParrain='" . $codeParrain . "' "); + } - if($query->num_rows()>0){ - return $query->row()->temps; - }else{ - return false; - } + if ($query->num_rows() > 0) { + return $query->row()->temps; + } else { + return false; + } - } + } public function getTempsMoyenAd($debut, $fin, $codeParrain){ @@ -1690,30 +1701,31 @@ class User_model extends CI_Model FROM super_infos AS child INNER JOIN hyper_infos AS dad ON child.code_parrain='".$codeHyp."' - WHERE child.category='super' AND dad.category='hyper' AND dad.code_membre='".$codeHyp."' + WHERE child.category='super' AND dad.category='hyper' AND dad.code_membre='" . $codeHyp . "' "); - if($query->num_rows()>0){ - return $query; - }else{ - return false; - } - } + if ($query->num_rows() > 0) { + return $query; + } else { + return false; + } + } - public function getDemandesBySuper($code_parrain, $code_membre){ + public function getDemandesBySuper($debut, $fin, $code_parrain) + { - $query = $this->db->query("SELECT * + $query = $this->db->query("SELECT * FROM info_demandeCredits AS d - WHERE d.codeParrain='".$code_parrain."' AND d.codeMembre='".$code_membre."' + WHERE d.codeParrain='" . $code_parrain . "' AND d.dateAjout BETWEEN '" . $debut . "' AND '" . $fin . "' ORDER BY dateAjout"); - if($query->num_rows()>0){ - return $query; - }else{ - return false; - } + if ($query->num_rows() > 0) { + return $query; + } else { + return false; + } - } + } public function getGameCountry(){ $query = $this->db->query("SELECT countries.id,countries.name diff --git a/application/views/demande_credit.php b/application/views/demande_credit.php index 4b1d1108..657866eb 100755 --- a/application/views/demande_credit.php +++ b/application/views/demande_credit.php @@ -1,10 +1,14 @@ + +
86400, @@ -75,7 +79,7 @@

- lang->line('Demandes de crédits'); ?> + lang->line('outgoing_credits_requests') : $this->lang->line('incoming_credits_requests'); ?>

-
-
- + session->userdata('category') == 'hyper')) { ?> +
+
+ -
- lang->line('Temps moyen de traitement entrant'); ?> - +
+ lang->line('Temps moyen de traitement entrant'); ?> + +
-
+
- session->userdata('category') == "super") { - if (isset($nameOfcurentGeolocatedUser)) - echo "" . $nameOfcurentGeolocatedUser . ""; -// } - ?> lang->line('Période') ?>
- session->userdata('category') == 'super') { ?> + session->userdata('category') == 'super') && ($type == 'outgoing')) { ?>
@@ -183,28 +183,29 @@
session->userdata('category') == 'super') { ?>
-
-
-
-

lang->line('Demandes'); ?> lang->line('entrantes'); ?>

-
-
+ +
+
+
+

lang->line('incoming_credits_requests'); ?>

+
+
- num_rows(); - $num = 0; - if ($numrows > 0) { - - ?> - - - + + $result = $list; + if ($result != false){ + + $numrows = $result->num_rows(); + $num = 0; + if ($numrows > 0) { + + ?> + +
+ + @@ -214,24 +215,26 @@ "; - ?> - - + ?> + + - result() as $row) { - $num++; + result() as $row) { + $num++; $etat = $this->lang->line("Non traitée"); + $disabled = "disabled"; if ($row->statut == 1) { + $disabled = ""; $etat = $this->lang->line("Acceptée"); } else if ($row->statut == 2) { $etat = $this->lang->line("Annulée"); } - $origin = $row->codeMembre; + $origin = $row->agent; $destination = $row->codeParrain; if ($row->codeMembre == $this->session->userdata('member_code')) { $origin = $this->lang->line('Vous'); @@ -243,57 +246,59 @@ - - + + + "; - } - ?> - + } + ?> + - lang->line('Aucune demande'); - } - } else { - echo $this->lang->line('Aucune demande'); - } + lang->line('Aucune demande'); + } + } else { + echo $this->lang->line('Aucune demande'); + } - ?> + ?> -
" . $this->lang->line('Telephone') . " " . $this->lang->line('Emetteur') . " " . $this->lang->line('Montant') . "" . $this->lang->line('Délai de traitement') . "
$row->phone $origin $row->montant".toLocateDate($row->dateAjout,$this->session->userdata('timezone'))." ".toLocateDate($row->dateModif,$this->session->userdata('timezone'))."" . toLocateDate($row->dateAjout, $this->session->userdata('timezone')) . " " . toLocateDate($row->dateModif, $this->session->userdata('timezone')) . " $etat " . traitementTemps($row->temps, $row->dateAjout) . "
+ +
-
-
-
-
-

lang->line('Demandes'); ?> lang->line('Sortantes'); ?>

-
-
+ +
+
+
+

lang->line('outgoing_credits_requests'); ?>

+
+
- num_rows(); - $num = 0; - if ($numrows > 0) { - - ?> - - - + $result = $mydem; + if ($result != false){ + + $numrows = $result->num_rows(); + $num = 0; + if ($numrows > 0) { + + ?> + +
+ + @@ -301,17 +306,17 @@ "; - ?> - - + ?> + + - result() as $row) { - $num++; + result() as $row) { + $num++; $etat = $this->lang->line("Non traitée"); if ($row->statut == 1) { @@ -330,18 +335,440 @@ echo " - - + + "; + } + ?> + + + + lang->line('Aucune demande'); + } + } else { + echo $this->lang->line('Aucune demande'); + } + ?> + +
" . $this->lang->line('Montant') . " " . $this->lang->line('Date de la demande') . " " . $this->lang->line('Date de traitement') . "" . $this->lang->line('Délai de traitement') . "
$row->montant".toLocateDate($row->dateAjout,$this->session->userdata('timezone'))." ".toLocateDate($row->dateModif,$this->session->userdata('timezone'))."" . toLocateDate($row->dateAjout, $this->session->userdata('timezone')) . " " . toLocateDate($row->dateModif, $this->session->userdata('timezone')) . " $etat " . traitementTemps($row->temps, $row->dateAjout) . "
+ + +
+
+
+ +
+
+ +
+
+ +
+

lang->line('incoming_credits_requests'); ?>lang->line('les plus rapidement traitées'); ?>

+
+
+ + num_rows(); + $num = 0; + if ($numrows > 0) { + + ?> + + + + + + + + + + + + "; + + ?> + + + + + result() as $row) { + $num++; + $superviseur = $row->superviseur; + if ($row->superviseur == $this->session->userdata('member_code')) { + $superviseur = $this->lang->line('Vous'); + } + + echo " + + + + + + + + + + "; + + } + ?> + + + + lang->line('Aucune demande'); + } + } else { + echo $this->lang->line('Aucune demande'); + } + + ?> + +
N°" . $this->lang->line('Membre') . "" . $this->lang->line('Parrain') . "" . $this->lang->line('Montant') . "" . $this->lang->line('Date de la demande') . "" . $this->lang->line('Date de traitement') . "" . $this->lang->line('Délai de traitement') . "
$num$row->agent$superviseur$row->montant" . toLocateDate($row->dateA, $this->session->userdata('timezone')) . " " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . "" . duree($row->temps) . "
+ + +
+
+
+ +
+
+
+

lang->line('outgoing_credits_requests'); ?>lang->line('les plus rapidement traitées'); ?>

+
+
+ + num_rows(); + $num = 0; + if ($numrows > 0) { + + ?> + + + + + + + + + + "; + + ?> + + + + + result() as $row) { + $num++; + $superviseur = $row->superviseur; + if ($row->superviseur == $this->session->userdata('member_code')) { + $superviseur = $this->lang->line('Vous'); + } + + echo " + + + + + + + + "; + + } + ?> + + + + lang->line('Aucune demande'); + } + } else { + echo $this->lang->line('Aucune demande'); + } + + + ?> + +
N°" . $this->lang->line('Montant') . "" . $this->lang->line('Date de la demande') . "" . $this->lang->line('Date de traitement') . "" . $this->lang->line('Délai de traitement') . "
$num$row->montant" . toLocateDate($row->dateA, $this->session->userdata('timezone')) . " " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . "" . duree($row->temps) . "
+ + +
+
+
+ +
+
+ +
+
+
+

lang->line('incoming_credits_requests'); ?>lang->line('les plus tardivement traitées'); ?>

+
+
+ + num_rows(); + $num = 0; + if ($numrows > 0) { + + ?> + + + + + + + + + + + + "; + ?> + + + + + result() as $row) { + $num++; + $superviseur = $row->superviseur; + if ($row->superviseur == $this->session->userdata('member_code')) { + $superviseur = $this->lang->line('Vous'); + } + + echo " + + + + + + + + + + "; + + } + ?> + + + + lang->line('Aucune demande'); + } + } else { + echo $this->lang->line('Aucune demande'); + } + + + ?> + +
N°" . $this->lang->line('Membre') . "" . $this->lang->line('Parrain') . "" . $this->lang->line('Montant') . "" . $this->lang->line('Date de la demande') . "" . $this->lang->line('Date de traitement') . "" . $this->lang->line('Délai de traitement') . "
$num$row->agent$superviseur$row->montant" . toLocateDate($row->dateA, $this->session->userdata('timezone')) . " " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . "" . duree($row->temps) . "
+ + +
+
+
+ +
+
+
+

lang->line('outgoing_credits_requests'); ?>lang->line('les plus tardivement traitées'); ?>

+
+
+ + num_rows(); + $num = 0; + if ($numrows > 0) { + + ?> + + + + + + + + + + "; + ?> + + + + + result() as $row) { + $num++; + $superviseur = $row->superviseur; + if ($row->superviseur == $this->session->userdata('member_code')) { + $superviseur = $this->lang->line('Vous'); + } + + echo " + + + + + + + + "; + + } + ?> + + + + lang->line('Aucune demande'); + } + } else { + echo $this->lang->line('Aucune demande'); + } + + ?> + +
N°" . $this->lang->line('Montant') . "" . $this->lang->line('Date de la demande') . "" . $this->lang->line('Date de traitement') . "" . $this->lang->line('Délai de traitement') . "
$num$row->montant" . toLocateDate($row->dateA, $this->session->userdata('timezone')) . " " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . "" . duree($row->temps) . "
+ + +
+
+
+ +
+ +
+
+
+ +
+

lang->line('incoming_credits_requests'); ?>

+
+
+ + num_rows(); + $num = 0; + if ($numrows > 0) { + + ?> + + + + + + + + + + + + + "; + ?> + + + + result() as $row) { + $num++; + $disabled = "disabled"; + $etat = $this->lang->line("Non traitée"); + if ($row->statut == 1) { + $disabled = ""; + $etat = $this->lang->line("Acceptée"); + } else if ($row->statut == 2) { + $etat = $this->lang->line("Annulée"); + } + $origin = $row->agent; + $destination = $row->codeParrain; + if ($row->codeMembre == $this->session->userdata('member_code')) { + $origin = $this->lang->line('Vous'); + } + if ($row->codeParrain == $this->session->userdata('member_code')) { + $destination = $this->lang->line('Vous'); + } + echo " + + + + + + + + + + + "; + } ?> - lang->line('Aucune demande'); @@ -349,6 +776,7 @@ } else { echo $this->lang->line('Aucune demande'); } + ?>
" . $this->lang->line('Reseau') . "" . $this->lang->line('Téléphone utilisateur') . "" . $this->lang->line('Emetteur') . "" . $this->lang->line('Parrain') . "" . $this->lang->line('Montant') . "" . $this->lang->line('Date de la demande') . "" . $this->lang->line('Date de traitement') . "" . $this->lang->line('Statut') . "" . $this->lang->line('Délai de traitement') . "
$row->reseau $row->phone $origin $destination $row->montant" . toLocateDate($row->dateAjout, $this->session->userdata('timezone')) . " " . toLocateDate($row->dateModif, $this->session->userdata('timezone')) . "$etat" . traitementTemps($row->temps, $row->dateAjout) . "
@@ -359,13 +787,13 @@
-
+
-

lang->line('Demandes'); ?> lang->line('entrantes'); ?> lang->line('les plus rapidement traitées'); ?>

+

lang->line('incoming_credits_requests'); ?>lang->line('les plus rapidement traitées'); ?>

-
+
- N° - " . $this->lang->line('Membre') . " - " . $this->lang->line('Parrain') . " - " . $this->lang->line('Montant') . " - " . $this->lang->line('Date de la demande') . " - " . $this->lang->line('Date de traitement') . " - " . $this->lang->line('Délai de traitement') . " - "; - + N° + " . $this->lang->line('Membre') . " + " . $this->lang->line('Parrain') . " + " . $this->lang->line('Montant') . " + " . $this->lang->line('Date de la demande') . " + " . $this->lang->line('Date de traitement') . " + " . $this->lang->line('Délai de traitement') . " + "; ?> @@ -407,17 +834,17 @@ $superviseur = $this->lang->line('Vous'); } - echo " - - $num - $row->emetteur - $superviseur - $row->montant - ".toLocateDate($row->dateA,$this->session->userdata('timezone'))." - ".toLocateDate($row->dateM,$this->session->userdata('timezone'))." - " . duree($row->temps) . " - - "; + echo " + + $num + $row->emetteur + $superviseur + $row->montant + " . toLocateDate($row->dateA, $this->session->userdata('timezone')) . " + " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . " + " . duree($row->temps) . " + + "; } ?> @@ -437,98 +864,17 @@ -
-
-
-
-
-
-

lang->line('Demandes'); ?> lang->line('Sortantes'); ?> lang->line('les plus rapidement traitées'); ?>

-
-
- - num_rows(); - $num = 0; - if ($numrows > 0) { - - ?> - - - - - - - - - - - - "; - - ?> - - - - - result() as $row) { - $num++; - $superviseur = $row->superviseur; - if ($row->superviseur == $this->session->userdata('member_code')) { - $superviseur = $this->lang->line('Vous'); - } - - echo " - - - - - - - - - - "; - - } - ?> - - - - lang->line('Aucune demande'); - } - } else { - echo $this->lang->line('Aucune demande'); - } - - - ?> - -
N°" . $this->lang->line('Membre') . "" . $this->lang->line('Parrain') . "" . $this->lang->line('Montant') . "" . $this->lang->line('Date de la demande') . "" . $this->lang->line('Date de traitement') . "" . $this->lang->line('Délai de traitement') . "
$num$row->emetteur$superviseur$row->montant".toLocateDate($row->dateA,$this->session->userdata('timezone'))." ".toLocateDate($row->dateM,$this->session->userdata('timezone'))."" . duree($row->temps) . "
- -
-
+
-

lang->line('Demandes'); ?> lang->line('entrantes'); ?> lang->line('les plus tardivement traitées'); ?>

+

lang->line('incoming_credits_requests'); ?>lang->line('les plus tardivement traitées'); ?>

-
+
- N° - " . $this->lang->line('Membre') . " - " . $this->lang->line('Parrain') . " - " . $this->lang->line('Montant') . " - " . $this->lang->line('Date de la demande') . " - " . $this->lang->line('Date de traitement') . " - " . $this->lang->line('Délai de traitement') . " - "; + N° + " . $this->lang->line('Membre') . " + " . $this->lang->line('Parrain') . " + " . $this->lang->line('Montant') . " + " . $this->lang->line('Date de la demande') . " + " . $this->lang->line('Date de traitement') . " + " . $this->lang->line('Délai de traitement') . " + "; + ?> - - result() as $row) { $num++; @@ -569,115 +914,22 @@ $superviseur = $this->lang->line('Vous'); } - echo " - - $num - $row->emetteur - $superviseur - $row->montant - ".toLocateDate($row->dateA,$this->session->userdata('timezone'))." - ".toLocateDate($row->dateM,$this->session->userdata('timezone'))." - " . duree($row->temps) . " - - "; + echo " + + $num + $row->emetteur + $superviseur + $row->montant + " . toLocateDate($row->dateA, $this->session->userdata('timezone')) . " + " . toLocateDate($row->dateM, $this->session->userdata('timezone')) . " + " . duree($row->temps) . " + + "; } ?> - - lang->line('Aucune demande'); - } - } else { - echo $this->lang->line('Aucune demande'); - } - - - ?> - - - - -
-
-
-
-
-
-

lang->line('Demandes'); ?> lang->line('Sortantes'); ?> lang->line('les plus tardivement traitées'); ?>

-
-
- - num_rows(); - $num = 0; - if ($numrows > 0) { - - ?> - - - - lang->line('Adhésion')) { - echo " - - - - - - - - "; - } else { - echo " - - - - - - - - "; - } - ?> - - - - - result() as $row) { - $num++; - $superviseur = $row->superviseur; - if ($row->superviseur == $this->session->userdata('member_code')) { - $superviseur = $this->lang->line('Vous'); - } - - echo " - - - - - - - - - - "; - - } - ?> - - - lang->line('Aucune demande'); @@ -692,254 +944,6 @@ - - - - -
-
- -
-

lang->line('Demandes'); ?>

-
-
- - num_rows(); - $num = 0; - if ($numrows > 0) { - - ?> -
N°" . $this->lang->line('Contact') . "" . $this->lang->line('Parrain') . "" . $this->lang->line('Date de la demande') . "" . $this->lang->line('Date de traitement') . "" . $this->lang->line('Délai de traitement') . "
N°" . $this->lang->line('Membre') . "" . $this->lang->line('Parrain') . "" . $this->lang->line('Montant') . "" . $this->lang->line('Date de la demande') . "" . $this->lang->line('Date de traitement') . "" . $this->lang->line('Délai de traitement') . "
$num$row->emetteur$superviseur$row->montant".toLocateDate($row->dateA,$this->session->userdata('timezone'))." ".toLocateDate($row->dateM,$this->session->userdata('timezone'))."" . duree($row->temps) . "
- - - - - - - - - - - - "; - ?> - - - - result() as $row) { - $num++; - $etat = $this->lang->line("Non traitée"); - if ($row->statut == 1) { - $etat = $this->lang->line("Acceptée"); - } else if ($row->statut == 2) { - $etat = $this->lang->line("Annulée"); - } - $origin = $row->codeMembre; - $destination = $row->codeParrain; - if ($row->codeMembre == $this->session->userdata('member_code')) { - $origin = $this->lang->line('Vous'); - } - if ($row->codeParrain == $this->session->userdata('member_code')) { - $destination = $this->lang->line('Vous'); - } - echo " - - - - - - - - - - - "; - - } - ?> - - - lang->line('Aucune demande'); - } - } else { - echo $this->lang->line('Aucune demande'); - } - - ?> - -
" . $this->lang->line('Reseau') . "" . $this->lang->line('Téléphone utilisateur') . "" . $this->lang->line('Emetteur') . "" . $this->lang->line('Parrain') . "" . $this->lang->line('Montant') . "" . $this->lang->line('Date de la demande') . "" . $this->lang->line('Date de traitement') . "" . $this->lang->line('Statut') . "" . $this->lang->line('Délai de traitement') . "
$row->reseau $row->phone $origin $destination $row->montant".toLocateDate($row->dateAjout,$this->session->userdata('timezone'))." ".toLocateDate($row->dateModif,$this->session->userdata('timezone'))."$etat" . traitementTemps($row->temps, $row->dateAjout) . "
- - -
-
-
-
-
- -
-

lang->line('Demandes'); ?> lang->line('les plus rapidement traitées'); ?>

-
-
- - num_rows(); - $num = 0; - if ($numrows > 0) { - - ?> - - - - - - - - - - - - "; - ?> - - - - - result() as $row) { - $num++; - $superviseur = $row->superviseur; - if ($row->superviseur == $this->session->userdata('member_code')) { - $superviseur = $this->lang->line('Vous'); - } - - echo " - - - - - - - - - - "; - - } - ?> - - - - lang->line('Aucune demande'); - } - } else { - echo $this->lang->line('Aucune demande'); - } - - ?> - -
N°" . $this->lang->line('Membre') . "" . $this->lang->line('Parrain') . "" . $this->lang->line('Montant') . "" . $this->lang->line('Date de la demande') . "" . $this->lang->line('Date de traitement') . "" . $this->lang->line('Délai de traitement') . "
$num$row->emetteur$superviseur$row->montant".toLocateDate($row->dateA,$this->session->userdata('timezone'))." ".toLocateDate($row->dateM,$this->session->userdata('timezone'))."" . duree($row->temps) . "
- - -
-
-
-
-
-
-

lang->line('Demandes'); ?> lang->line('les plus tardivement traitées'); ?>

-
-
- - num_rows(); - $num = 0; - if ($numrows > 0) { - - ?> - - - - - - - - - - - - "; - - ?> - - - result() as $row) { - $num++; - $superviseur = $row->superviseur; - if ($row->superviseur == $this->session->userdata('member_code')) { - $superviseur = $this->lang->line('Vous'); - } - - echo " - - - - - - - - - - "; - - } - ?> - - - lang->line('Aucune demande'); - } - } else { - echo $this->lang->line('Aucune demande'); - } - - ?> - -
N°" . $this->lang->line('Membre') . "" . $this->lang->line('Parrain') . "" . $this->lang->line('Montant') . "" . $this->lang->line('Date de la demande') . "" . $this->lang->line('Date de traitement') . "" . $this->lang->line('Délai de traitement') . "
$num$row->emetteur$superviseur$row->montant".toLocateDate($row->dateA,$this->session->userdata('timezone'))." ".toLocateDate($row->dateM,$this->session->userdata('timezone'))."" . duree($row->temps) . "
- -
@@ -969,6 +973,15 @@ + + + + + + + + + @@ -1080,10 +1192,11 @@ const debut = start.format('YYYY-MM-DD'); const fin = end.format('YYYY-MM-DD'); const user_geo = GetURLParameter("u"); + const type = GetURLParameter("type"); if (category == 'super') { - window.location.replace("" + "?d=" + debut + "&f=" + fin + "&u=" + user_geo); + window.location.replace("" + type + "&d=" + debut + "&f=" + fin); } else if (category == 'hyper') { - window.location.replace("" + "?d=" + debut + "&f=" + fin + "&u=" + user_geo); + window.location.replace("" + "?d=" + debut + "&f=" + fin); } }); $('input[name="daterange"]').on('cancel.daterangepicker', function (ev, picker) { @@ -1094,113 +1207,35 @@ - diff --git a/application/views/header_hyp.php b/application/views/header_hyp.php index baf19edc..f7505c89 100755 --- a/application/views/header_hyp.php +++ b/application/views/header_hyp.php @@ -120,31 +120,40 @@
  • "> - - lang->line('Utilisateurs géolocalisés'); ?> - + + + lang->line('Utilisateurs géolocalisés'); ?> + -
    • -
  • "> - - lang->line('Superviseur'); ?> - +
    • +
  • "> + + lang->line('Superviseur'); ?> + -
    • -
  • "> - - lang->line('Demandes de crédits'); ?> - +
    • +
  • "> + + lang->line('Demandes de crédits'); ?> + -
    • -
  • "> - - lang->line('Demandes adhésion'); ?> - -
    • - -
  • "> +
    • +
  • "> + + lang->line('Demandes adhésion'); ?> + +
    • + +
  • "> Walletlang->line('Game'); ?> @@ -211,64 +220,7 @@
    • - @@ -311,11 +263,4 @@ cb(start, end); }); - - $('#send-getDemandes').click(function(){ - var debut = startDate.format('YYYY-MM-DD'); - var fin = endDate.format('YYYY-MM-DD'); - var user_geo = $('#selected-super').find(":selected").val(); - window.location.replace(""+"?d="+debut+"&f="+fin+"&u="+user_geo); - }); diff --git a/application/views/header_sup.php b/application/views/header_sup.php index 488f6fbe..86a79774 100755 --- a/application/views/header_sup.php +++ b/application/views/header_sup.php @@ -102,30 +102,60 @@