adminnistrateur
/
backoffice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

+ Fix demandes de credits for Superviseur_dash

This commit is contained in:
DJERY-TOM 2020-04-27 15:31:38 +01:00
parent 1460f920f0
commit 09de7da955
4 changed files with 475 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
application/controllers/Superviseur_dash.php
View File

@ -39,7 +39,8 @@ class Superviseur_dash extends CI_Controller
$data['category'] = $this->session->userdata('category'); $data['category'] = $this->session->userdata('category');
$data['network'] = $this->session->userdata('network'); $data['network'] = $this->session->userdata('network');
$data['code_parrain'] = $this->session->userdata('parrain'); $data['code_parrain'] = $this->session->userdata('parrain');
$data['listdem'] = $this->user_model->getDemandesForSuper($this->session->userdata('member_code')); $data['listdem'] = $this->user_model->getAllDemandesForSuper($this->session->userdata('member_code'));
$data['geolocated_user'] = $this->user_model->getSuperNameAndCodeForSup($this->session->userdata('member_code'));
$data['count_g_users'] = $count_g; $data['count_g_users'] = $count_g;
$data['count_d_users'] = $count_d; $data['count_d_users'] = $count_d;
$data['count_d_traite'] = $count_d_traite; $data['count_d_traite'] = $count_d_traite;
@ -51,6 +52,9 @@ class Superviseur_dash extends CI_Controller
} }
} }
/**
* Affiche la table des points agents du superviseur
*/
public function getAllUser_g(){ public function getAllUser_g(){
if (!$this->session->userdata('email')) { if (!$this->session->userdata('email')) {
@ -88,6 +92,7 @@ class Superviseur_dash extends CI_Controller
$data['adresse'] = $this->session->userdata('adresse'); $data['adresse'] = $this->session->userdata('adresse');
$data['category'] = $this->session->userdata('category'); $data['category'] = $this->session->userdata('category');
$data['network'] = $this->session->userdata('network'); $data['network'] = $this->session->userdata('network');
$data['geolocated_user'] = $this->user_model->getSuperNameAndCodeForSup($this->session->userdata('member_code'));
$data['alert'] = ""; $data['alert'] = "";
$data['hasWallet'] = $this->user_model->getConfigWallet($this->session->userdata('network_id')); $data['hasWallet'] = $this->user_model->getConfigWallet($this->session->userdata('network_id'));
$this->load->view('header_sup', $data); $this->load->view('header_sup', $data);
@ -96,6 +101,9 @@ class Superviseur_dash extends CI_Controller
} }
} }
/**
* Affiche les demandes de credits
*/
public function getDemandes(){ public function getDemandes(){
if (!$this->session->userdata('email')) { if (!$this->session->userdata('email')) {
@ -104,8 +112,14 @@ class Superviseur_dash extends CI_Controller
$data['message'] = "Login first!"; $data['message'] = "Login first!";
$this->load->view('login', $data); $this->load->view('login', $data);
} else { } else {
$network = $this->session->userdata('network');
if($this->input->get("u") !== null){
$user_geo = $this->input->get("u");
$debut = $this->input->get("d");
$fin = $this->input->get("f");
$network = $this->session->userdata('network');
$data['active'] = "demandes"; $data['active'] = "demandes";
$data['type'] = $this->lang->line('crédits'); $data['type'] = $this->lang->line('crédits');
$data['alert'] = ""; $data['alert'] = "";
@ -118,21 +132,30 @@ class Superviseur_dash extends CI_Controller
$data['adresse'] = $this->session->userdata('adresse'); $data['adresse'] = $this->session->userdata('adresse');
$data['category'] = $this->session->userdata('category'); $data['category'] = $this->session->userdata('category');
$data['network'] = $this->session->userdata('network'); $data['network'] = $this->session->userdata('network');
$data['tab_fastDemande'] = $this->user_model->getRangeASCDemandes($this->session->userdata('member_code')); $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_fastDemande_s'] = $this->user_model->getRangeASCDemandesOut($this->session->userdata('member_code'));
$data['tab_slowDemande'] = $this->user_model->getRangeDESCDemandes($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['tab_slowDemande_s'] = $this->user_model->getRangeDESCDemandesOut($this->session->userdata('member_code'));
$data['mydem'] = $this->user_model->getDemandesHyperForSuper($this->session->userdata('member_code')); $data['mydem'] = $this->user_model->getDemandesHyperForSuper($this->session->userdata('member_code'));
$data['temp_moyen'] = $this->user_model->getTempsMoyen($this->session->userdata('member_code')); $data['temp_moyen'] = $this->user_model->getTempsMoyen($user_geo,$debut,$fin,$this->session->userdata('member_code'));
$data['temp_moyen_mine'] = $this->user_model->getTempsMoyenDemandeSup($this->session->userdata('member_code')); $data['temp_moyen_mine'] = $this->user_model->getTempsMoyenDemandeSup($this->session->userdata('member_code'));
$data['list'] = $this->user_model->getDemandesForSuper($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')); $data['hasWallet'] = $this->user_model->getConfigWallet($this->session->userdata('network_id'));
$this->load->view('header_sup', $data); $this->load->view('header_sup', $data);
$this->load->view('demande'); $this->load->view('demande');
$this->load->view('footer'); $this->load->view('footer');
}else{
}
} }
} }
/**
* Afficher les demandes d'adhesion
*/
public function getDemandesAd(){ public function getDemandesAd(){
if (!$this->session->userdata('email')) { if (!$this->session->userdata('email')) {
@ -160,7 +183,6 @@ class Superviseur_dash extends CI_Controller
$data['temp_moyen'] = $this->user_model->getTempsMoyenAd($this->session->userdata('member_code')); $data['temp_moyen'] = $this->user_model->getTempsMoyenAd($this->session->userdata('member_code'));
$data['list'] = $this->user_model->getDemandesAdForSuper($this->session->userdata('member_code')); $data['list'] = $this->user_model->getDemandesAdForSuper($this->session->userdata('member_code'));
$data['type'] = 'adhésions'; $data['type'] = 'adhésions';
$data['hasWallet'] = $this->user_model->getConfigWallet($this->session->userdata('network_id'));
$this->load->view('header_sup', $data); $this->load->view('header_sup', $data);
$this->load->view('demande'); $this->load->view('demande');
$this->load->view('footer'); $this->load->view('footer');
@ -242,6 +264,7 @@ class Superviseur_dash extends CI_Controller
$data['pays'] = $this->user_model->getAllGameCountries(); $data['pays'] = $this->user_model->getAllGameCountries();
$data['networks'] = $this->user_model->getActiveNetwork(); $data['networks'] = $this->user_model->getActiveNetwork();
$data['agentWalletInfos'] = $this->user_model->getInfosWalletAgentForHyper($id_network); $data['agentWalletInfos'] = $this->user_model->getInfosWalletAgentForHyper($id_network);
$data['geolocated_user'] = $this->user_model->getSuperNameAndCodeForSup($this->session->userdata('member_code'));
$this->load->view('header_sup',$data); $this->load->view('header_sup',$data);
$this->load->view('gestion_wallet_sup'); $this->load->view('gestion_wallet_sup');
$this->load->view('footer'); $this->load->view('footer');

59
application/models/User_model.php
View File

@ -282,11 +282,12 @@ class User_model extends CI_Model
} }
public function getDemandesForSuper($member_code){ public function getDemandesForSuper($user_geo, $debut, $fin, $member_code){
$query = $this->db->query("SELECT * $query = $this->db->query("SELECT *
FROM info_demandeCredits AS d FROM info_demandeCredits AS d
WHERE d.codeParrain='".$member_code."' WHERE d.codeParrain='".$member_code."'
AND d.codeMembre='".$user_geo."'AND d.dateAjout BETWEEN '".$debut."' AND '".$fin."'
ORDER BY dateAjout"); ORDER BY dateAjout");
if($query->num_rows()>0){ if($query->num_rows()>0){
@ -388,6 +389,19 @@ class User_model extends CI_Model
} }
} }
public function getAllDemandesForSuper($member_code){
$query = $this->db->query("SELECT *
FROM info_demandeCredits AS d
WHERE d.codeParrain='".$member_code."'
ORDER BY dateAjout");
if($query->num_rows()>0){
return $query;
}else{
return false;
}
}
public function getCountDemande($codeParrain){ public function getCountDemande($codeParrain){
if($codeParrain=='all'){ if($codeParrain=='all'){
@ -472,7 +486,7 @@ class User_model extends CI_Model
} }
} }
public function getRangeASCDemandes($codeParrain){ public function getRangeASCDemandes($user_geo, $debut, $fin, $codeParrain){
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, $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,
@ -486,7 +500,8 @@ class User_model extends CI_Model
}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 $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 FROM info_demandeCredits AS d
WHERE statut=1 AND d.codeParrain='".$codeParrain."' WHERE statut=1 AND d.codeParrain='".$codeParrain."' AND d.codeMembre='".$user_geo."'
AND d.dateAjout BETWEEN '".$debut."' AND '".$fin."'
ORDER BY temps ORDER BY temps
LIMIT 5"); LIMIT 5");
} }
@ -574,7 +589,7 @@ class User_model extends CI_Model
} }
public function getRangeDESCDemandes($codeParrain){ public function getRangeDESCDemandes($user_geo, $debut, $fin, $codeParrain){
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, $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,
@ -588,7 +603,8 @@ class User_model extends CI_Model
}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 $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 FROM info_demandeCredits AS d
WHERE statut=1 AND d.codeParrain='".$codeParrain."' WHERE statut=1 AND d.codeParrain='".$codeParrain."' AND d.codeMembre='".$user_geo."'
AND d.dateAjout BETWEEN '".$debut."' AND '".$fin."'
ORDER BY temps DESC ORDER BY temps DESC
LIMIT 5"); LIMIT 5");
} }
@ -676,12 +692,16 @@ class User_model extends CI_Model
} }
public function getTempsMoyen($codeParrain){ public function getTempsMoyen($user_geo, $debut, $fin, $codeParrain){
if($codeParrain=='all'){ if($codeParrain=='all'){
$query = $this->db->query("SELECT AVG(TIMESTAMPDIFF(SECOND,dateAjout,dateModif)) AS temps FROM demande_credit WHERE statut=1"); $query = $this->db->query("SELECT AVG(TIMESTAMPDIFF(SECOND,dateAjout,dateModif)) AS temps FROM demande_credit WHERE statut=1");
}else{ }else{
$query = $this->db->query("SELECT AVG(temps) AS temps FROM info_demandeCredits WHERE statut=1 AND codeParrain='".$codeParrain."'"); $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){
@ -2007,6 +2027,31 @@ class User_model extends CI_Model
return $query; return $query;
} }
public function getSuperNameAndCodeForSup($codeSup){
$query = $this->db->query("SELECT child.lastname AS lastname, child.code_membre AS member_code
FROM super_infos AS child
INNER JOIN super_infos AS dad
ON child.code_parrain='".$codeSup."'
WHERE child.category='geolocated' AND dad.category='super' AND dad.code_membre='".$codeSup."'
");
if($query->num_rows()>0){
return $query;
}else{
return false;
}
}
public function nameOfCurrentGeolocatedUser_forSuper($geolocatedUser_memberCode){
$query = $this->db->query("SELECT lastname FROM `super_infos` WHERE `code_membre`='".$geolocatedUser_memberCode."' ");
if($query->num_rows()>0){
return $query->row()->lastname;
}else{
return null;
}
}
// Wallet // Wallet
public function getAllActivatedNetworks(){ public function getAllActivatedNetworks(){

2
application/views/demande.php
View File

@ -96,7 +96,7 @@
?> ?>
<span class="info-box-text">Période </span> <span class="info-box-text">Période </span>
<span class="info-box-number"> <span class="info-box-number">
<input style="background: #fff; cursor: pointer; padding: 1px 1px; border: 1px solid #ccc; width: 100%" type="text" name="daterange" value="01/01/2018 - 01/15/2018" /> <input style="background: #fff; cursor: pointer; padding: 1px 1px; border: 1px solid #ccc; width: 100%" type="text" name="daterange" value="01/01/2020 - 12/31/2020" />
</span> </span>
</span> </span>

103
application/views/header_sup.php
View File

@ -113,7 +113,7 @@
</a> </a>
</li> </li>
<li class="<?php if($active=="demandes"){echo "active ";} ?>"> <li class="<?php if($active=="demandes"){echo "active ";} ?>">
<a href="<?php echo base_url('index.php/Superviseur_dash/getDemandes') ?>"> <a href="#" data-toggle="modal" data-target="#modal-choix-geo-user">
<i class="fa fa-users"></i> <span><?php echo $this->lang->line('Demandes de crédits'); ?></span> <i class="fa fa-users"></i> <span><?php echo $this->lang->line('Demandes de crédits'); ?></span>
</a> </a>
</li> </li>
@ -134,3 +134,104 @@
</section> </section>
<!-- /.sidebar --> <!-- /.sidebar -->
</aside> </aside>
<div class="modal fade" id="modal-choix-geo-user">
<div class="modal-dialog">
<div class="modal-content">
<form action="#" method="post" id="getDemandes">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title"><?php echo $this->lang->line('Utilisateurs_géolocalisés'); ?></h4>
</div>
<div class="modal-body">
<div class="form-group">
<?php
$result=$geolocated_user;
$numrows=$result->num_rows();
if ($numrows > 0) { ?>
<label for="selected-geo-user">Utilisateur géolocalisé</label>
<select class="form-control input-lg" name="geo_user" id="selected-geo-user" required>
<?php foreach($result->result() as $row) {
echo "<option value='".$row->member_code."'>".$row->lastname." - ".$row->member_code."</option>";
} ?>
</select>
<?php }else{
echo "Aucun utilisateur gééolocalisé";
}
?>
</div>
<div class="info-box-content">
<span class="info-box-text">Période </span>
<span class="info-box-number">
<div id="reportrange" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
<i class="fa fa-calendar"></i>&nbsp;
<span></span> <i class="fa fa-caret-down"></i>
</div>
</span>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default pull-left" data-dismiss="modal"><?php echo $this->lang->line('Fermer'); ?></button>
<button type="button" id="send-getDemandes" class="btn btn-primary"><?php echo $this->lang->line('Continuer'); ?></button>
</div>
</form>
</div>
</div>
</div>
<!-- /.modal -->
<script type="text/javascript" src="https://cdn.jsdelivr.net/jquery/latest/jquery.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/momentjs/latest/moment.min.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.min.js"></script>
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.css" />
<script type="text/javascript">
var startDate;
var endDate;
$(function() {
var start = moment().subtract(29, 'days');
var end = moment();
startDate = start;
endDate = end;
function cb(start, end) {
$('#reportrange span').html(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));
startDate = start;
endDate = end;
}
$('#reportrange').daterangepicker({
startDate: start,
endDate: end,
ranges: {
'Today': [moment(), moment()],
'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
'Last 7 Days': [moment().subtract(6, 'days'), moment()],
'Last 30 Days': [moment().subtract(29, 'days'), moment()],
'This Month': [moment().startOf('month'), moment().endOf('month')],
'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
}
}, cb);
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-geo-user').find(":selected").val();
window.location.replace("<?php echo base_url('index.php/Superviseur_dash/getDemandes')?>"+"?d="+debut+"&f="+fin+"&u="+user_geo);
});
</script>