From 4d719a4bc1dddfef62bf4e5e8a1360b40bc5606e Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Tue, 17 Jan 2023 10:34:24 +0530
Subject: [PATCH 1/2] suseendhiran

---
 application/modules/Business/views/business_list.php | 2 +-
 application/modules/User/views/user_list.php         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/application/modules/Business/views/business_list.php b/application/modules/Business/views/business_list.php
index 8ad1976..46ea4da 100644
--- a/application/modules/Business/views/business_list.php
+++ b/application/modules/Business/views/business_list.php
@@ -58,7 +58,7 @@
 	                 <a href="<?php echo base_url()?>business/delete_business/<?php echo md5($value->id);?>" ><i class="fa fa-trash"></i></a>
 						
                      &nbsp;
-                    <a> <i id="<?php echo md5($value->id);?>" class="fa fa-eye"></i></a>
+                    <a> <i id="<?php echo md5($value->id);?>" class="fa fa-eye" title="History"></i></a>
                            </td>
                           
                             </tr>
diff --git a/application/modules/User/views/user_list.php b/application/modules/User/views/user_list.php
index c4a7059..7dea450 100644
--- a/application/modules/User/views/user_list.php
+++ b/application/modules/User/views/user_list.php
@@ -38,13 +38,13 @@
 	            <a href="<?php echo base_url()?>user/deleteUser/<?php echo md5($value->id);?>" >           
               <i class="#008000 fa fa-check-circle" style="font-size:20px;" title="deactivate"></i></a>
 						  &nbsp;
-              <a> <i id="<?php echo md5($value->id);?>" class="fa fa-eye"></i></a>
+              <a> <i id="<?php echo md5($value->id);?>" class="fa fa-eye" title="History"></i></a>
               <?php } ?>
               <?php if ($value->is_active == 0) { ?>
                 <a href="<?php echo base_url()?>user/activateUser/<?php echo md5($value->id);?>" >           
                 <i class="green fa fa-check-circle" style="font-size:20px;" title="activate"></i></a>
                 &nbsp;
-                <a> <i id="<?php echo md5($value->id);?>" class="fa fa-eye"></i></a>
+                <a> <i id="<?php echo md5($value->id);?>" class="fa fa-eye" title="History"></i></a>
 						  &nbsp;
               <?php } ?>
           </td>

From 1000dd24fd79c9512ce81caa805675fa5d1d1238 Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Tue, 17 Jan 2023 16:52:39 +0530
Subject: [PATCH 2/2] suseendhiran

---
 .../modules/Business/views/business_list.php  |   8 +-
 .../Dashboard/controllers/Dashboard.php       |  13 +-
 .../Dashboard/models/Dashboard_model.php      |  11 ++
 .../modules/Dashboard/views/dashboard.php     | 140 +++++-------------
 application/modules/User/controllers/User.php |   4 +-
 application/modules/User/views/user_list.php  |  10 +-
 6 files changed, 76 insertions(+), 110 deletions(-)

diff --git a/application/modules/Business/views/business_list.php b/application/modules/Business/views/business_list.php
index 46ea4da..ee3a7c3 100644
--- a/application/modules/Business/views/business_list.php
+++ b/application/modules/Business/views/business_list.php
@@ -1,4 +1,6 @@
-
+<head>
+<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css'> 
+</head>
 <div class="col-md-12 col-sm-12 ">
                 <div class="x_panel">
                    <div class="x_title">
@@ -58,7 +60,7 @@
 	                 <a href="<?php echo base_url()?>business/delete_business/<?php echo md5($value->id);?>" ><i class="fa fa-trash"></i></a>
 						
                      &nbsp;
-                    <a> <i id="<?php echo md5($value->id);?>" class="fa fa-eye" title="History"></i></a>
+                    <a> <i id="<?php echo md5($value->id);?>" class="bi bi-card-list" title="History"></i></a>
                            </td>
                           
                             </tr>
@@ -83,7 +85,7 @@
 <div class="modal fade bs-example-modal-lg" id="ItemModal" tabindex="-1" role="dialog" aria-hidden="true"></div>
 			  
 <script>
-$(document).on('click','.fa-eye',function(){
+$(document).on('click','.bi-card-list',function(){
   var id = $(this).attr("id")
     $.ajax({ 
       type: "get",
diff --git a/application/modules/Dashboard/controllers/Dashboard.php b/application/modules/Dashboard/controllers/Dashboard.php
index 8c25e66..af405b4 100644
--- a/application/modules/Dashboard/controllers/Dashboard.php
+++ b/application/modules/Dashboard/controllers/Dashboard.php
@@ -63,11 +63,22 @@ public function index()
         $amc = $this->Dashboard_model->get_amc(user()->business_id);
         //print_r(json_encode($amc));
         $this->layout->set('amc', $amc);
-//echo "</br></br></br>";
+        //echo "</br></br></br>";
         $insurence = $this->Dashboard_model->get_insurence(user()->business_id);
         //print_r(json_encode($insurence));die();
         $this->layout->set('insurence', $insurence);
         }
+
+
+        
+        else if(is_superadmin())
+		{
+		$user_count = $this->Dashboard_model->get_users_count(user()->business_id);
+		$this->layout->set('user_count', $user_count);
+
+        $business_count = $this->Dashboard_model->get_business_count(user()->business_id);
+		$this->layout->set('business_count', $business_count);
+        }
         $this->layout->buffer('main_content', 'dashboard/dashboard');
         $this->layout->render('default_layout');
 
diff --git a/application/modules/Dashboard/models/Dashboard_model.php b/application/modules/Dashboard/models/Dashboard_model.php
index 3b2c47e..62e66cd 100644
--- a/application/modules/Dashboard/models/Dashboard_model.php
+++ b/application/modules/Dashboard/models/Dashboard_model.php
@@ -133,4 +133,15 @@ public function get_insurence($business_id)
     }
 
 
+    public function get_business_count()
+    {
+        $this->db->select();
+        $this->db->from('business');
+		$this->db->where('is_active', 1);
+        $query = $this->db->get();
+        $query = $query->num_rows(); 
+        return $query;
+    }
+
+
 }
\ No newline at end of file
diff --git a/application/modules/Dashboard/views/dashboard.php b/application/modules/Dashboard/views/dashboard.php
index 694d253..01cab39 100644
--- a/application/modules/Dashboard/views/dashboard.php
+++ b/application/modules/Dashboard/views/dashboard.php
@@ -2,41 +2,67 @@
           <!-- top tiles -->
           <div class="row" style="display: inline-block;" >
           <div class="tile_count">
-		   <div class="col-md-2 col-sm-4  tile_stats_count">
+
+          <?php if (is_superadmin()) { ?>
+
+          <div class="col-md-6 col-sm-4  tile_stats_count">
+            <span class="count_top"><i class="fa fa-building"></i> Total Business</span>
+            <div class="count"><?php echo $business_count; ?></div>
+            <!--<span class="count_bottom"><i class="green">4% </i> From last Week</span> -->
+          </div>
+
+          <div class="col-md-6 col-sm-4  tile_stats_count">
+            <span class="count_top"><i class="fa fa-user"></i> Total Users</span>
+            <div class="count"><?php echo $user_count; ?></div>
+            <!--<span class="count_bottom"><i class="green">4% </i> From last Week</span> -->
+          </div>
+          
+          <div class="col-md-6 col-sm-4 "></div>
+          
+          <?php } ?>
+
+          <?php if (is_admin()) { ?>
+
+		        <div class="col-md-2 col-sm-4  tile_stats_count">
               <span class="count_top"><i class="fa fa-user"></i> Total Users</span>
               <div class="count"><?php echo $user_count; ?></div>
               <!--<span class="count_bottom"><i class="green">4% </i> From last Week</span> -->
             </div>
-			
+
+
             <div class="col-md-2 col-sm-4  tile_stats_count">
               <span class="count_top"><i class="fa fa-university"></i> Total Assets</span>
               <div class="count"><?php echo $asset_count; ?></div>
               <!--<span class="count_bottom"><i class="green">4% </i> From last Week</span> -->
             </div>
            
+            
             <div class="col-md-2 col-sm-4  tile_stats_count">
               <span class="count_top"><i class="fa fa-certificate"></i> Total AMC</span>
               <div class="count"><?php echo $amc_count; ?></div>
               <span class="count_bottom"><i class="red"><i class="fa fa-sort-desc"></i>below 30 </i>days left</span>
             </div>
-			
-			 <div class="col-md-2 col-sm-4  tile_stats_count">
+
+			      <div class="col-md-2 col-sm-4  tile_stats_count">
               <span class="count_top"><i class="fa fa-certificate"></i> Total AMC</span>
               <div class="count"><?php echo $expired_amc_count; ?></div>
               <span class="count_bottom"><i class="red"><i class="fa fa-warning"></i> Date Expired</i></span>
             </div>
-			
             <div class="col-md-2 col-sm-4  tile_stats_count">
               <span class="count_top"><i class="fa fa-certificate"></i> Total Insurance</span>
               <div class="count"><?php echo $insurance_count; ?></div>
               <span class="count_bottom"><i class="red"><i class="fa fa-sort-desc"></i>below 30 </i>days left</span>
             </div>
-			
+         
+
             <div class="col-md-2 col-sm-4  tile_stats_count">
               <span class="count_top"><i class="fa fa-certificate"></i> Total Insurance</span>
               <div class="count"><?php echo $expired_insurance_count; ?></div>
               <span class="count_bottom"><i class="red"><i class="fa fa-warning"></i> Date Expired</i></span>
             </div>
+
+            <?php } ?>
+
           </div>
         </div>
           <!-- /top tiles -->
@@ -45,6 +71,7 @@
 
           <div class="row">
 
+<?php if (is_admin()) { ?>
 
             <div class="col-md-6 col-sm-6 ">
               <div class="x_panel tile ">
@@ -85,7 +112,7 @@
                       $date2 = new DateTime(date('d-m-Y'));   //Future date
                       $diff = $date2->diff($date1)->format("%a");  //find difference
                       $days = - intval($diff);   //rounding days
-                      $days_count = $days;
+                      $days_count = 100;
                       //it return 365 days omitting current day
                       }
                       else{
@@ -94,12 +121,12 @@
                       $date2 = new DateTime(date('d-m-Y'));   //Future date
                       $diff = $date2->diff($date1)->format("%a");  //find difference
                       $days = intval($diff);   //rounding days
-                      $days_count = $days;
+                      $days_count = 100 - $days;
                       //it return 365 days omitting current day
                       }
                       ?>
                       <?php
-                      if ($days > 60) { ?>
+                      if ($days > 30) { ?>
                         <div class="progress-bar bg-green" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width:<?php echo $days_count,'%'; ?>">
                         <span class="sr-only">60% Complete</span>
                         </div>
@@ -170,7 +197,7 @@
                       $date2 = new DateTime(date('d-m-Y'));   //Future date
                       $diff = $date2->diff($date1)->format("%a");  //find difference
                       $days = - intval($diff);   //rounding days
-                      $days_count = $days;
+                      $days_count = 100;
                       //it return 365 days omitting current day
                       }
                       else{
@@ -179,12 +206,12 @@
                       $date2 = new DateTime(date('d-m-Y'));   //Future date
                       $diff = $date2->diff($date1)->format("%a");  //find difference
                       $days = intval($diff);   //rounding days
-                      $days_count = $days;
+                      $days_count = 100 - $days;
                       //it return 365 days omitting current day
                       }
                       ?>
                       <?php
-                      if ($days > 60) { ?>
+                      if ($days > 30) { ?>
                         <div class="progress-bar bg-green" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width:<?php echo $days_count,'%'; ?>">
                         <span class="sr-only">60% Complete</span>
                         </div>
@@ -216,94 +243,7 @@
 
           </div>
 
-
-         
-            <div class="col-md-6 col-sm-6 ">
-                  <div class="x_panel">
-                    <div class="x_title">
-                      <h2>Visitors location <small>geo-presentation</small></h2>
-                     
-                      <div class="clearfix"></div>
-                    </div>
-                    <div class="x_content">
-                      <div class="dashboard-widget-content">
-                        <div class="col-md-4 hidden-small">
-                          <h2 class="line_30">125.7k Views from 60 countries</h2>
-
-                          <table class="countries_list">
-                            <tbody>
-                              <tr>
-                                <td>United States</td>
-                                <td class="fs15 fw700 text-right">33%</td>
-                              </tr>
-                              <tr>
-                                <td>France</td>
-                                <td class="fs15 fw700 text-right">27%</td>
-                              </tr>
-                              <tr>
-                                <td>Germany</td>
-                                <td class="fs15 fw700 text-right">16%</td>
-                              </tr>
-                              <tr>
-                                <td>Spain</td>
-                                <td class="fs15 fw700 text-right">11%</td>
-                              </tr>
-                              <tr>
-                                <td>Britain</td>
-                                <td class="fs15 fw700 text-right">10%</td>
-                              </tr>
-                            </tbody>
-                          </table>
-                        </div>
-                        <div id="world-map-gdp" class="col-md-8 col-sm-12 " style="height:230px;"></div>
-                      </div>
-                    </div>
-                  </div>
-            </div>
-
-
-            <div class="col-md-6 col-sm-6 ">
-                  <div class="x_panel">
-                    <div class="x_title">
-                      <h2>Visitors location <small>geo-presentation</small></h2>
-                      
-                      <div class="clearfix"></div>
-                    </div>
-                    <div class="x_content">
-                      <div class="dashboard-widget-content">
-                        <div class="col-md-4 hidden-small">
-                          <h2 class="line_30">125.7k Views from 60 countries</h2>
-
-                          <table class="countries_list">
-                            <tbody>
-                              <tr>
-                                <td>United States</td>
-                                <td class="fs15 fw700 text-right">33%</td>
-                              </tr>
-                              <tr>
-                                <td>France</td>
-                                <td class="fs15 fw700 text-right">27%</td>
-                              </tr>
-                              <tr>
-                                <td>Germany</td>
-                                <td class="fs15 fw700 text-right">16%</td>
-                              </tr>
-                              <tr>
-                                <td>Spain</td>
-                                <td class="fs15 fw700 text-right">11%</td>
-                              </tr>
-                              <tr>
-                                <td>Britain</td>
-                                <td class="fs15 fw700 text-right">10%</td>
-                              </tr>
-                            </tbody>
-                          </table>
-                        </div>
-                        <div id="world-map-gdp" class="col-md-8 col-sm-12 " style="height:230px;"></div>
-                      </div>
-                    </div>
-                  </div>
-
+<?php } ?>
 
           
 			
diff --git a/application/modules/User/controllers/User.php b/application/modules/User/controllers/User.php
index 2d73d44..92a6686 100644
--- a/application/modules/User/controllers/User.php
+++ b/application/modules/User/controllers/User.php
@@ -225,7 +225,7 @@ public function view_user_history($id)
     {
         $table = 'users';
         $user_history = $this->audit_model->get_history( $id , $table , user()->business_id);
-        $data = array('title'=> "view" , 'user_history'=> $user_history );
+        $data = array('title'=> "User History" , 'user_history'=> $user_history );
         $htmlPage = $this->load->view('view_history.php',$data,true);
         echo json_encode($htmlPage);
     }
@@ -235,7 +235,7 @@ public function view_business_history($id)
     {
         $table = 'business';
         $user_history = $this->audit_model->get_history( $id , $table , user()->business_id);
-        $data = array('title'=> "User History" , 'user_history'=> $user_history );
+        $data = array('title'=> "Business History" , 'user_history'=> $user_history );
         $htmlPage = $this->load->view('view_history.php',$data,true);
         echo json_encode($htmlPage);
     }
diff --git a/application/modules/User/views/user_list.php b/application/modules/User/views/user_list.php
index 7dea450..ecdf625 100644
--- a/application/modules/User/views/user_list.php
+++ b/application/modules/User/views/user_list.php
@@ -1,4 +1,6 @@
-
+<head>
+<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css'> 
+</head>
 <div class="col-md-12 col-sm-12 ">
 <div class="x_panel">
   <div class="x_title">
@@ -38,13 +40,13 @@
 	            <a href="<?php echo base_url()?>user/deleteUser/<?php echo md5($value->id);?>" >           
               <i class="#008000 fa fa-check-circle" style="font-size:20px;" title="deactivate"></i></a>
 						  &nbsp;
-              <a> <i id="<?php echo md5($value->id);?>" class="fa fa-eye" title="History"></i></a>
+              <a> <i id="<?php echo md5($value->id);?>" class="bi bi-card-list" title="History"></i></a>
               <?php } ?>
               <?php if ($value->is_active == 0) { ?>
                 <a href="<?php echo base_url()?>user/activateUser/<?php echo md5($value->id);?>" >           
                 <i class="green fa fa-check-circle" style="font-size:20px;" title="activate"></i></a>
                 &nbsp;
-                <a> <i id="<?php echo md5($value->id);?>" class="fa fa-eye" title="History"></i></a>
+                <a> <i id="<?php echo md5($value->id);?>" class="bi bi-card-list" title="History"></i></a>
 						  &nbsp;
               <?php } ?>
           </td>
@@ -68,7 +70,7 @@
 
 </div>
 <script>
-$(document).on('click','.fa-eye',function(){
+$(document).on('click','.bi-card-list',function(){
   var id = $(this).attr("id")
     $.ajax({ 
       type: "get",
