From eb893a50fd770109b8ab5a9159f78c0a8442c6a4 Mon Sep 17 00:00:00 2001
From: DJERY-TOM <dietchidjery@gmail.com>
Date: Wed, 6 May 2020 07:36:54 +0100
Subject: [PATCH] + Fix bugs

---
 application/controllers/Hyperviseur_dash.php |  2 ++
 application/views/demande_credit.php         | 12 ++++++------
 application/views/header_hyp.php             |  4 +++-
 application/views/header_sup.php             | 14 ++++++++------
 application/views/listeadmin.php             |  2 ++
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/application/controllers/Hyperviseur_dash.php b/application/controllers/Hyperviseur_dash.php
index 3f2a440e..904718aa 100644
--- a/application/controllers/Hyperviseur_dash.php
+++ b/application/controllers/Hyperviseur_dash.php
@@ -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['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');
@@ -372,6 +373,7 @@ class Hyperviseur_dash extends CI_Controller
 					$data["principal"] = "N/A";
 					$data["totalCommissionBanque"] = "N/A";
 					$data["transactions"] = false;
+					$data['wallet_id'] = null;
 				}
 
 				$res = $this->user_model->getWalletPassword($id_network);
diff --git a/application/views/demande_credit.php b/application/views/demande_credit.php
index 9c5ae970..d8068802 100644
--- a/application/views/demande_credit.php
+++ b/application/views/demande_credit.php
@@ -125,10 +125,10 @@
 					<span class="info-box-icon bg-aqua"><i class="ion ion-android-time"></i></span>
 					<div class="info-box-content">
 						<?php
-						if ($this->session->userdata('category') == "super") {
+//						if ($this->session->userdata('category') == "super") {
 							if (isset($nameOfcurentGeolocatedUser))
 								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-number">
@@ -396,7 +396,7 @@
 					<div class="box">
 
 						<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 class="box-body">
 
@@ -492,7 +492,7 @@
 				<div class="col-md-6">
 					<div class="box">
 						<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 class="box-body">
 
@@ -587,7 +587,7 @@
 				<div class="col-md-6">
 					<div class="box">
 						<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 class="box-body">
 
@@ -678,7 +678,7 @@
 				<div class="col-md-6">
 					<div class="box">
 						<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 class="box-body">
 
diff --git a/application/views/header_hyp.php b/application/views/header_hyp.php
index b638e3af..efd77246 100644
--- a/application/views/header_hyp.php
+++ b/application/views/header_hyp.php
@@ -254,7 +254,9 @@
 					</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>
+						<?php if($result){ ?>
+							<button type="button" id="send-getDemandes" class="btn btn-primary"><?php echo $this->lang->line('Continuer'); ?></button>
+						<?php } ?>
 					</div>
 				</form>
 			</div>
diff --git a/application/views/header_sup.php b/application/views/header_sup.php
index d762c44d..488f6fbe 100644
--- a/application/views/header_sup.php
+++ b/application/views/header_sup.php
@@ -117,11 +117,11 @@
 						<i class="fa fa-users"></i> <span><?php echo $this->lang->line('Demandes de crédits'); ?></span>
 					</a>
 				</li>
-				<li class="<?php  if($active=="demandesAd"){echo "active ";}  ?>">
-                            <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>
-                            </a>
-				</li>
+<!--				<li class="--><?php // if($active=="demandesAd"){echo "active ";}  ?><!--">-->
+<!--                            <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>-->
+<!--                            </a>-->
+<!--				</li>-->
 				<?php if($hasWallet){
 					?>
 					<li class="<?php if($active=="wallet"){echo "active";}  ?>">
@@ -184,7 +184,9 @@
 					</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>
+						<?php if($result){ ?>
+							<button type="button" id="send-getDemandes" class="btn btn-primary"><?php echo $this->lang->line('Continuer'); ?></button>
+						<?php } ?>
 					</div>
 				</form>
 			</div>
diff --git a/application/views/listeadmin.php b/application/views/listeadmin.php
index ff05cafb..29ef3e24 100644
--- a/application/views/listeadmin.php
+++ b/application/views/listeadmin.php
@@ -334,6 +334,8 @@
 <script src="<?php echo base_url('dist/js/adminlte.min.js') ?>"></script>
 <!-- AdminLTE for demo purposes -->
 <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">
     $(window).load(function() {