Bigbamboo/bbone
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:venbaittech/ams

Browse Source
This commit is contained in:
sriramv 2023-01-18 08:41:44 +05:30
commit 8f7f138a80
6 changed files with 76 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/modules/Business/views/business_list.php
View File

@ -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="col-md-12 col-sm-12 ">
<div class="x_panel"> <div class="x_panel">
<div class="x_title"> <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> <a href="<?php echo base_url()?>business/delete_business/<?php echo md5($value->id);?>" ><i class="fa fa-trash"></i></a>
&nbsp; &nbsp;
<a> <i id="<?php echo md5($value->id);?>" class="fa fa-eye"></i></a> <a> <i id="<?php echo md5($value->id);?>" class="bi bi-card-list" title="History"></i></a>
</td> </td>
</tr> </tr>
@ -83,7 +85,7 @@
<div class="modal fade bs-example-modal-lg" id="ItemModal" tabindex="-1" role="dialog" aria-hidden="true"></div> <div class="modal fade bs-example-modal-lg" id="ItemModal" tabindex="-1" role="dialog" aria-hidden="true"></div>
<script> <script>
$(document).on('click','.fa-eye',function(){ $(document).on('click','.bi-card-list',function(){
var id = $(this).attr("id") var id = $(this).attr("id")
$.ajax({ $.ajax({
type: "get", type: "get",

13
application/modules/Dashboard/controllers/Dashboard.php
View File

@ -63,11 +63,22 @@ public function index()
$amc = $this->Dashboard_model->get_amc(user()->business_id); $amc = $this->Dashboard_model->get_amc(user()->business_id);
//print_r(json_encode($amc)); //print_r(json_encode($amc));
$this->layout->set('amc', $amc); $this->layout->set('amc', $amc);
//echo "</br></br></br>"; //echo "</br></br></br>";
$insurence = $this->Dashboard_model->get_insurence(user()->business_id); $insurence = $this->Dashboard_model->get_insurence(user()->business_id);
//print_r(json_encode($insurence));die(); //print_r(json_encode($insurence));die();
$this->layout->set('insurence', $insurence); $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->buffer('main_content', 'dashboard/dashboard');
$this->layout->render('default_layout'); $this->layout->render('default_layout');

11
application/modules/Dashboard/models/Dashboard_model.php
View File

@ -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;
}
} }

134
application/modules/Dashboard/views/dashboard.php
View File

@ -2,41 +2,67 @@
<!-- top tiles --> <!-- top tiles -->
<div class="row" style="display: inline-block;" > <div class="row" style="display: inline-block;" >
<div class="tile_count"> <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> <span class="count_top"><i class="fa fa-user"></i> Total Users</span>
<div class="count"><?php echo $user_count; ?></div> <div class="count"><?php echo $user_count; ?></div>
<!--<span class="count_bottom"><i class="green">4% </i> From last Week</span> --> <!--<span class="count_bottom"><i class="green">4% </i> From last Week</span> -->
</div> </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-university"></i> Total Assets</span> <span class="count_top"><i class="fa fa-university"></i> Total Assets</span>
<div class="count"><?php echo $asset_count; ?></div> <div class="count"><?php echo $asset_count; ?></div>
<!--<span class="count_bottom"><i class="green">4% </i> From last Week</span> --> <!--<span class="count_bottom"><i class="green">4% </i> From last Week</span> -->
</div> </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> <span class="count_top"><i class="fa fa-certificate"></i> Total AMC</span>
<div class="count"><?php echo $amc_count; ?></div> <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> <span class="count_bottom"><i class="red"><i class="fa fa-sort-desc"></i>below 30 </i>days left</span>
</div> </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> <span class="count_top"><i class="fa fa-certificate"></i> Total AMC</span>
<div class="count"><?php echo $expired_amc_count; ?></div> <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> <span class="count_bottom"><i class="red"><i class="fa fa-warning"></i> Date Expired</i></span>
</div> </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 Insurance</span> <span class="count_top"><i class="fa fa-certificate"></i> Total Insurance</span>
<div class="count"><?php echo $insurance_count; ?></div> <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> <span class="count_bottom"><i class="red"><i class="fa fa-sort-desc"></i>below 30 </i>days left</span>
</div> </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 Insurance</span> <span class="count_top"><i class="fa fa-certificate"></i> Total Insurance</span>
<div class="count"><?php echo $expired_insurance_count; ?></div> <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> <span class="count_bottom"><i class="red"><i class="fa fa-warning"></i> Date Expired</i></span>
</div> </div>
<?php } ?>
</div> </div>
</div> </div>
<!-- /top tiles --> <!-- /top tiles -->
@ -45,6 +71,7 @@
<div class="row"> <div class="row">
<?php if (is_admin()) { ?>
<div class="col-md-6 col-sm-6 "> <div class="col-md-6 col-sm-6 ">
<div class="x_panel tile "> <div class="x_panel tile ">
@ -85,7 +112,7 @@
$date2 = new DateTime(date('d-m-Y')); //Future date $date2 = new DateTime(date('d-m-Y')); //Future date
$diff = $date2->diff($date1)->format("%a"); //find difference $diff = $date2->diff($date1)->format("%a"); //find difference
$days = - intval($diff); //rounding days $days = - intval($diff); //rounding days
$days_count = $days; $days_count = 100;
//it return 365 days omitting current day //it return 365 days omitting current day
} }
else{ else{
@ -94,12 +121,12 @@
$date2 = new DateTime(date('d-m-Y')); //Future date $date2 = new DateTime(date('d-m-Y')); //Future date
$diff = $date2->diff($date1)->format("%a"); //find difference $diff = $date2->diff($date1)->format("%a"); //find difference
$days = intval($diff); //rounding days $days = intval($diff); //rounding days
$days_count = $days; $days_count = 100 - $days;
//it return 365 days omitting current day //it return 365 days omitting current day
} }
?> ?>
<?php <?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,'%'; ?>"> <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> <span class="sr-only">60% Complete</span>
</div> </div>
@ -170,7 +197,7 @@
$date2 = new DateTime(date('d-m-Y')); //Future date $date2 = new DateTime(date('d-m-Y')); //Future date
$diff = $date2->diff($date1)->format("%a"); //find difference $diff = $date2->diff($date1)->format("%a"); //find difference
$days = - intval($diff); //rounding days $days = - intval($diff); //rounding days
$days_count = $days; $days_count = 100;
//it return 365 days omitting current day //it return 365 days omitting current day
} }
else{ else{
@ -179,12 +206,12 @@
$date2 = new DateTime(date('d-m-Y')); //Future date $date2 = new DateTime(date('d-m-Y')); //Future date
$diff = $date2->diff($date1)->format("%a"); //find difference $diff = $date2->diff($date1)->format("%a"); //find difference
$days = intval($diff); //rounding days $days = intval($diff); //rounding days
$days_count = $days; $days_count = 100 - $days;
//it return 365 days omitting current day //it return 365 days omitting current day
} }
?> ?>
<?php <?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,'%'; ?>"> <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> <span class="sr-only">60% Complete</span>
</div> </div>
@ -216,94 +243,7 @@
</div> </div>
<?php } ?>
<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>

4
application/modules/User/controllers/User.php
View File

@ -225,7 +225,7 @@ public function view_user_history($id)
{ {
$table = 'users'; $table = 'users';
$user_history = $this->audit_model->get_history( $id , $table , user()->business_id); $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); $htmlPage = $this->load->view('view_history.php',$data,true);
echo json_encode($htmlPage); echo json_encode($htmlPage);
} }
@ -235,7 +235,7 @@ public function view_business_history($id)
{ {
$table = 'business'; $table = 'business';
$user_history = $this->audit_model->get_history( $id , $table , user()->business_id); $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); $htmlPage = $this->load->view('view_history.php',$data,true);
echo json_encode($htmlPage); echo json_encode($htmlPage);
} }

10
application/modules/User/views/user_list.php
View File

@ -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="col-md-12 col-sm-12 ">
<div class="x_panel"> <div class="x_panel">
<div class="x_title"> <div class="x_title">
@ -38,13 +40,13 @@
<a href="<?php echo base_url()?>user/deleteUser/<?php echo md5($value->id);?>" > <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> <i class="#008000 fa fa-check-circle" style="font-size:20px;" title="deactivate"></i></a>
&nbsp; &nbsp;
<a> <i id="<?php echo md5($value->id);?>" class="fa fa-eye"></i></a> <a> <i id="<?php echo md5($value->id);?>" class="bi bi-card-list" title="History"></i></a>
<?php } ?> <?php } ?>
<?php if ($value->is_active == 0) { ?> <?php if ($value->is_active == 0) { ?>
<a href="<?php echo base_url()?>user/activateUser/<?php echo md5($value->id);?>" > <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> <i class="green fa fa-check-circle" style="font-size:20px;" title="activate"></i></a>
&nbsp; &nbsp;
<a> <i id="<?php echo md5($value->id);?>" class="fa fa-eye"></i></a> <a> <i id="<?php echo md5($value->id);?>" class="bi bi-card-list" title="History"></i></a>
&nbsp; &nbsp;
<?php } ?> <?php } ?>
</td> </td>
@ -68,7 +70,7 @@
</div> </div>
<script> <script>
$(document).on('click','.fa-eye',function(){ $(document).on('click','.bi-card-list',function(){
var id = $(this).attr("id") var id = $(this).attr("id")
$.ajax({ $.ajax({
type: "get", type: "get",