galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix dashboard leave issue

Browse Source
This commit is contained in:
Thilina Hasantha
2015-10-11 08:26:10 +05:30
parent ca5b7c0e11
commit 2881319247
3 changed files with 1 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ext/admin/dashboard/index.php
View File

@@ -134,21 +134,6 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
Monitor Attendance <i class="fa fa-arrow-circle-right"></i> Monitor Attendance <i class="fa fa-arrow-circle-right"></i>
</a> </a>
</div> </div>
</div><!-- ./col -->
<div class="col-lg-3 col-xs-6">
<!-- small box -->
<div class="small-box bg-red">
<div class="inner">
<h3 id="numberOfLeaves">..</h3>
<p >Upcoming Leaves</p>
</div>
<div class="icon">
<i class="ion ion-calendar"></i>
</div>
<a href="#" class="small-box-footer" id="leaveLink">
Leave Management <i class="fa fa-arrow-circle-right"></i>
</a>
</div>
</div><!-- ./col --> </div><!-- ./col -->
<div class="col-lg-3 col-xs-6"> <div class="col-lg-3 col-xs-6">
<!-- small box --> <!-- small box -->

9
ext/modules/dashboard/api/DashboardActionManager.php
View File

@@ -21,19 +21,12 @@ Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd]
Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah) Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah)
*/ */
include (APP_BASE_PATH."modules/leaves/api/LeavesActionManager.php");
class DashboardActionManager extends SubActionManager{ class DashboardActionManager extends SubActionManager{
public function getPendingLeaves($req){ public function getPendingLeaves($req){
$lam = new LeavesActionManager(); return new IceResponse(IceResponse::SUCCESS,0);
$leavePeriod = $lam->getCurrentLeavePeriod(date("Y-m-d H:i:s"), date("Y-m-d H:i:s"));
$leave = new EmployeeLeave();
$pendingLeaves = $leave->Find("status = ? and employee = ?",array("Pending", $this->getCurrentProfileId()));
return new IceResponse(IceResponse::SUCCESS,count($pendingLeaves));
} }

17
ext/modules/dashboard/index.php
View File

@@ -46,23 +46,6 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
Record Attendance <i class="fa fa-arrow-circle-right"></i> Record Attendance <i class="fa fa-arrow-circle-right"></i>
</a> </a>
</div> </div>
</div><!-- ./col -->
<div class="col-lg-3 col-xs-6">
<!-- small box -->
<div class="small-box bg-green">
<div class="inner">
<h3 id="pendingLeaveCount">..</h3>
<p>
Pending Leaves
</p>
</div>
<div class="icon">
<i class="ion ion-calendar"></i>
</div>
<a href="#" class="small-box-footer" id="leavesLink">
Check Leave Status <i class="fa fa-arrow-circle-right"></i>
</a>
</div>
</div><!-- ./col --> </div><!-- ./col -->
<div class="col-lg-3 col-xs-6"> <div class="col-lg-3 col-xs-6">
<!-- small box --> <!-- small box -->