+ Fix bugs

This commit is contained in:
DJERY-TOM 2020-05-06 07:36:54 +01:00
parent f310c6417b
commit eb893a50fd
5 changed files with 21 additions and 13 deletions

View File

@ -228,6 +228,7 @@ class Hyperviseur_dash extends CI_Controller
$data['temp_moyen'] = $this->user_model->getTempsMoyenByVille($this->session->userdata('member_code'),$super,$this->session->userdata('network')); $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['networks'] = $this->user_model->getNetworkByHyp($this->session->userdata('member_code'));
$data['hasWallet'] = $this->user_model->getConfigWallet($this->session->userdata('network_id')); $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('header_hyp', $data);
$this->load->view('demande_credit'); $this->load->view('demande_credit');
$this->load->view('footer'); $this->load->view('footer');
@ -372,6 +373,7 @@ class Hyperviseur_dash extends CI_Controller
$data["principal"] = "N/A"; $data["principal"] = "N/A";
$data["totalCommissionBanque"] = "N/A"; $data["totalCommissionBanque"] = "N/A";
$data["transactions"] = false; $data["transactions"] = false;
$data['wallet_id'] = null;
} }
$res = $this->user_model->getWalletPassword($id_network); $res = $this->user_model->getWalletPassword($id_network);

View File

@ -125,10 +125,10 @@
<span class="info-box-icon bg-aqua"><i class="ion ion-android-time"></i></span> <span class="info-box-icon bg-aqua"><i class="ion ion-android-time"></i></span>
<div class="info-box-content"> <div class="info-box-content">
<?php <?php
if ($this->session->userdata('category') == "super") { // if ($this->session->userdata('category') == "super") {
if (isset($nameOfcurentGeolocatedUser)) if (isset($nameOfcurentGeolocatedUser))
echo "<span class='info-box-number'>" . $nameOfcurentGeolocatedUser . "</span>"; echo "<span class='info-box-number'>" . $nameOfcurentGeolocatedUser . "</span>";
} // }
?> ?>
<span class="info-box-text"> <?php echo $this->lang->line('Période') ?> </span> <span class="info-box-text"> <?php echo $this->lang->line('Période') ?> </span>
<span class="info-box-number"> <span class="info-box-number">
@ -396,7 +396,7 @@
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('entrantes'); ?><?php echo $this->lang->line('les plus rapidement traitées'); ?></h3> <h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('entrantes'); ?> <?php echo $this->lang->line('les plus rapidement traitées'); ?></h3>
</div> </div>
<div class="box-body"> <div class="box-body">
@ -492,7 +492,7 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('Sortantes'); ?><?php echo $this->lang->line('les plus rapidement traitées'); ?></h3> <h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('Sortantes'); ?> <?php echo $this->lang->line('les plus rapidement traitées'); ?></h3>
</div> </div>
<div class="box-body"> <div class="box-body">
@ -587,7 +587,7 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?><?php echo $type ?><?php echo $this->lang->line('entrantes'); ?><?php echo $this->lang->line('les plus tardivement traitées'); ?></h3> <h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('entrantes'); ?> <?php echo $this->lang->line('les plus tardivement traitées'); ?></h3>
</div> </div>
<div class="box-body"> <div class="box-body">
@ -678,7 +678,7 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?><?php echo $this->lang->line('Sortantes'); ?> <?php echo $this->lang->line('les plus tardivement traitées'); ?></h3> <h3 class="box-title"><?php echo $this->lang->line('Demandes'); ?> <?php echo $type ?> <?php echo $this->lang->line('Sortantes'); ?> <?php echo $this->lang->line('les plus tardivement traitées'); ?></h3>
</div> </div>
<div class="box-body"> <div class="box-body">

View File

@ -254,7 +254,9 @@
</div> </div>
<div class="modal-footer"> <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" class="btn btn-default pull-left" data-dismiss="modal"><?php echo $this->lang->line('Fermer'); ?></button>
<?php if($result){ ?>
<button type="button" id="send-getDemandes" class="btn btn-primary"><?php echo $this->lang->line('Continuer'); ?></button> <button type="button" id="send-getDemandes" class="btn btn-primary"><?php echo $this->lang->line('Continuer'); ?></button>
<?php } ?>
</div> </div>
</form> </form>
</div> </div>

View File

@ -117,11 +117,11 @@
<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>
<li class="<?php if($active=="demandesAd"){echo "active ";} ?>"> <!-- <li class="--><?php // if($active=="demandesAd"){echo "active ";} ?><!--">-->
<a href="<?php echo base_url('index.php/Superviseur_dash/getDemandesAd') ?>"> <!-- <a href="--><?php // echo base_url('index.php/Superviseur_dash/getDemandesAd') ?><!--">-->
<i class="fa fa-users"></i> <span> <?php echo $this->lang->line('Demandes adhésion'); ?></span> <!-- <i class="fa fa-users"></i> <span> --><?php //echo $this->lang->line('Demandes adhésion'); ?><!--</span>-->
</a> <!-- </a>-->
</li> <!-- </li>-->
<?php if($hasWallet){ <?php if($hasWallet){
?> ?>
<li class="<?php if($active=="wallet"){echo "active";} ?>"> <li class="<?php if($active=="wallet"){echo "active";} ?>">
@ -184,7 +184,9 @@
</div> </div>
<div class="modal-footer"> <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" class="btn btn-default pull-left" data-dismiss="modal"><?php echo $this->lang->line('Fermer'); ?></button>
<?php if($result){ ?>
<button type="button" id="send-getDemandes" class="btn btn-primary"><?php echo $this->lang->line('Continuer'); ?></button> <button type="button" id="send-getDemandes" class="btn btn-primary"><?php echo $this->lang->line('Continuer'); ?></button>
<?php } ?>
</div> </div>
</form> </form>
</div> </div>

View File

@ -334,6 +334,8 @@
<script src="<?php echo base_url('dist/js/adminlte.min.js') ?>"></script> <script src="<?php echo base_url('dist/js/adminlte.min.js') ?>"></script>
<!-- AdminLTE for demo purposes --> <!-- AdminLTE for demo purposes -->
<script src="<?php echo base_url('dist/js/demo.js') ?>"></script> <script src="<?php echo base_url('dist/js/demo.js') ?>"></script>
<script src="<?php echo base_url('bower_components/bootstrap-daterangepicker/daterangepicker.js') ?>"></script>
<script src="<?php echo base_url('bower_components/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js') ?>"></script>
<script type="text/javascript"> <script type="text/javascript">
$(window).load(function() { $(window).load(function() {