From 2881319247fe639a1ce1ce9c8c336a41563ae4cb Mon Sep 17 00:00:00 2001 From: Thilina Hasantha Date: Sun, 11 Oct 2015 08:26:10 +0530 Subject: [PATCH] Fix dashboard leave issue --- ext/admin/dashboard/index.php | 15 --------------- .../dashboard/api/DashboardActionManager.php | 9 +-------- ext/modules/dashboard/index.php | 17 ----------------- 3 files changed, 1 insertion(+), 40 deletions(-) diff --git a/ext/admin/dashboard/index.php b/ext/admin/dashboard/index.php index 574b4088..0e6c6581 100644 --- a/ext/admin/dashboard/index.php +++ b/ext/admin/dashboard/index.php @@ -134,21 +134,6 @@ include APP_BASE_PATH.'modulejslibs.inc.php'; Monitor Attendance - -
- -
-
-

..

-

Upcoming Leaves

-
-
- -
- - Leave Management - -
diff --git a/ext/modules/dashboard/api/DashboardActionManager.php b/ext/modules/dashboard/api/DashboardActionManager.php index c57257e1..1a5fa324 100644 --- a/ext/modules/dashboard/api/DashboardActionManager.php +++ b/ext/modules/dashboard/api/DashboardActionManager.php @@ -21,19 +21,12 @@ Original work Copyright (c) 2012 [Gamonoid Media Pvt. Ltd] Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilinah) */ -include (APP_BASE_PATH."modules/leaves/api/LeavesActionManager.php"); class DashboardActionManager extends SubActionManager{ public function getPendingLeaves($req){ - $lam = new LeavesActionManager(); - $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)); + return new IceResponse(IceResponse::SUCCESS,0); } diff --git a/ext/modules/dashboard/index.php b/ext/modules/dashboard/index.php index ed2d320e..f6b4feb0 100644 --- a/ext/modules/dashboard/index.php +++ b/ext/modules/dashboard/index.php @@ -46,23 +46,6 @@ include APP_BASE_PATH.'modulejslibs.inc.php'; Record Attendance
- -
- -
-
-

..

-

- Pending Leaves -

-
-
- -
- - Check Leave Status - -