diff --git a/application/controllers/user.php b/application/controllers/user.php
index 6d385dcb..ae2fcd46 100755
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -86,37 +86,72 @@ class user extends BaseController
$data['emplist'] = $this->dahsboard_Model->emplist();
+
+
+
+
$date = date('Y-m');
//echo $date; die;
$date = $date . '-01';
$dat = date('d');
+
+ // $hoilday = 0;
+
+ // $month = date('m');
+ // //echo $month;
+ // $year = date('Y');
+ // // echo $year;
+ // $hoilday= $year.'-'.$month .'-01';
+ // // echo $hoilday;
+
+ // $holiDaySalaryMonth = $this->dahsboard_Model->holiDaySalaryMonth($month,$year);
+
+ // //print_r( $holiDaySalaryMonth);
+
+
+ // foreach ($holiDaySalaryMonth as $holidays) {
+
+ // //print_r($holidays);
+ // $holiday [] = date('j', strtotime($holidays->H_Date));
+ // }
+
+ //print_r($holiday);
+ //$month=date('m')
+
// $currentdaydates =date('d');
$working = array();
$overtime = array();
+ //$holid = array();
for ($i = 1; $i <= $dat; $i++) //echo $dat; die;
{
+
+
$Working [] = 'WH' . $i;
$overtime [] = 'OT' . $i;
$CUR_month = date('t');
// echo $CUR_month; die;
+ // foreach ($holiday as $value)
+ // {
+ // //$holid []= 'WH'.$value;
+ // if($i==$value) {
+ // $holid []=$value;
+ // }
+ // }
+
}
//print_r($WH);die;
$WH = implode(",", $Working);
+
+
$OT = implode(",", $overtime);
$salarycurrentdate = array();
- $toDayEmployee = $this->dahsboard_Model->dayAllPersentEmpSalary($WH, $OT, $date);
- //$EmpID = $toDayEmployee[0]->EmpID;
- //
- // print_r($toDayEmployee); die;
-
- $employeeSalary = 0;
-
- // for($i=1;$i<=$dat;$i++)
- // {
+
+ $toDayEmployee = $this->dahsboard_Model->dayAllPersentEmpSalary($WH, $OT, $date);
+
$totalSalary = 0;
$working = explode(",", $WH);
@@ -136,7 +171,7 @@ class user extends BaseController
//echo $Empid;
$totalEmployeePersent = $this->dahsboard_Model->persentEmployeeDetails($Empid);
- //print_r($totalEmployeePersent);
+ if(!empty($totalEmployeePersent)) {
$HRA_Amount = $totalEmployeePersent[0]->HRA_Amount;
$Basic_Pay = $totalEmployeePersent[0]->Basic_Pay;
@@ -190,14 +225,15 @@ class user extends BaseController
$totalSalary = round($totalSalarys);
// $salarycurrentdate[] = $salaryInCurrentday;;
+ // echo 'totalSalary';
}
-//
+ }
}
}
$data['totalSalary'] = $totalSalary;
- //}
+ // print_r( 'totalSalary');die;
$this->loadViews("dashboard", $this->global, $data, NULL);
@@ -238,7 +274,7 @@ function dateFunctionChangeVales()
- $date = $this->input->post("id");
+ $date = $this->input->post("id");
// echo $date;
$daydate = date('Y-m',strtotime($date));
//echo $date; die;
@@ -246,10 +282,10 @@ function dateFunctionChangeVales()
//$dat = date('d');
// echo $daydate; echo "";
$WH = 'WH' . date('j',strtotime($date));
- //echo $WH;
+ // echo $WH;
$yesterday = $this->dahsboard_Model->attyesterday($WH, $daydate);
- // print_r($yesterday);die;
+ // print_r($yesterday);
//$absEmp =array($absEmp);
@@ -257,21 +293,15 @@ function dateFunctionChangeVales()
$absEmp = array();
//echo $value; die;
foreach ($yesterday as $weekda => $value) {
+ // echo $value[$WH];
if ($value[$WH] == 0) {
$values++;
$absendId = $value['EmpID'];
$absendName = $value['FirstName'];
-
-
$absEmp [] = $absendId . "-" . $absendName; //absend empid and name list
-
-
-
}
-
-
}
//print_r($absentName);die;
@@ -282,7 +312,7 @@ function dateFunctionChangeVales()
$CUR_month = date('t');
//echo $CUR_month;
-//echo $daydate;
+ //echo $daydate;
$toDayEmployee = $this->dahsboard_Model->dayAllPersentEmpSalary($WH, $OT, $daydate);
//$EmpID = $toDayEmployee[0]->EmpID;
@@ -308,6 +338,10 @@ function dateFunctionChangeVales()
$totalEmployeePersent = $this->dahsboard_Model->persentEmployeeDetails($Empid);
+ // echo $Empid;
+ // print_r($totalEmployeePersent);
+
+ if(!empty($totalEmployeePersent)) {
$HRA_Amount = $totalEmployeePersent[0]->HRA_Amount;
$Basic_Pay = $totalEmployeePersent[0]->Basic_Pay;
@@ -356,6 +390,8 @@ function dateFunctionChangeVales()
$salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances;
$salaryInCurrentday = $salaryInCurrentdays - ($esiAmount + $pfAmount);
$employeeSalary += round($salaryInCurrentday);
+
+ }
// echo $employeeSalary;
}
@@ -429,7 +465,7 @@ function dateFunctionChangeVales()
function monthattendance($empID ='')
{
- $CUR_date = date('m');
+ $CUR_date = date('m');
//echo $CUR_date;
$date = $this->input->post('datepick');
// echo $date;die;
@@ -492,6 +528,309 @@ function monthattendance($empID ='')
$CUR_month = date('t'); //current month of days 31
+ $CURYEAR = date('Y');
+ $CURMONTH = date('m');
+
+ $datejoin = $this->dahsboard_Model->joindate($EmpID);
+ // print_r($datejoin);die;
+ $DateofJoiningInString = $datejoin[0]->DateofJoining;
+ $DateofJoining = date_create($DateofJoiningInString);
+ $doj_month = date_format($DateofJoining, "n");
+ $doj_year = date_format($DateofJoining, "Y");
+ $doj_day = date_format($DateofJoining, "j");
+ //echo $doj_day;
+ for ($i = 1; $i <= $persent_month; $i++)
+ {
+ $weekdays[] = 'WH' . $i;
+ $otHours[] = 'OT' . $i;
+ }
+ $totalwhhours=0;
+ foreach ($monthabs as $weekda)
+ {
+ //print_r($weekda);
+ foreach ($weekda as $key => $value)
+ {
+ //print_r($key);
+ foreach ($weekdays as $weeks)
+ {
+ if ($weeks == $key)
+ {
+
+ if ($value != 0)
+ {
+ // echo $value;
+ $values[] = $value;
+ // $totalwhhours=$values;
+ //echo $values;
+
+
+ }
+ //echo $values;
+ }
+
+ }
+ foreach ($otHours as $ot)
+ {
+ if ($ot == $key)
+ {
+ if ($value != 0)
+ {
+ $otvalues [] = $value;
+
+ }
+
+ }
+ }
+
+ }
+ }
+
+ $totalwhhours = array_sum($values);
+ //echo $totalwhhours;
+ $totalothour = array_sum($otvalues);
+ //$totalwhhour = sizeof($values);
+
+
+ $totalwhhour = $totalwhhours/8;
+ //echo $totalwhhour;
+ if ($CURMONTH == $doj_month && $CURYEAR == $doj_year)
+ {
+ //echo $doj_day;
+ $month['CUR_month'] = $CURDATE - $doj_day + 1;
+ //print_r($month);
+ }
+ else
+ {
+ $month['CUR_month'] = $date;
+ }
+
+ if ($totalwhhour != 0)
+ {
+
+
+ $year = date('Y');
+ $current_month = date('m');
+
+ $month['values'] = $totalwhhour;
+ //$data['salaryInCurrentday'] = round($salaryInCurrentday);
+ $month['present_percentage'] = round(($totalwhhour / $month['CUR_month']) * 100);
+
+ }
+
+ else {
+
+ $month['values'] = 0;
+ //$data['salaryInCurrentday'] = 0;
+ $month['present_percentage'] = 0;
+
+ }
+
+ }
+ if(empty($empID)){
+ echo json_encode($month);
+ }
+ else{
+ return $month;
+ }
+ }
+
+
+ /*Permission Month Reports*/
+ function monthattendance1($empID ='')
+{
+
+ $date = date('Y-m');
+ //echo $date;
+ $dates = $date . '-01';
+ $EmpID = '';
+ if(empty($empID)){
+ $EmpID = $this->input->post('id');
+ }
+ else
+ {
+ $EmpID = $empID;
+ }
+ // echo $EmpID;die;
+ $monthabs = $this->dahsboard_Model->attendance($EmpID, $dates);
+ $persent_month = date('t');//current month of days 31
+ $values = array();
+ $otvalues = array();
+
+ $weekdays = array();
+ $otHours = array();
+ $date = date('j');//current month current date
+
+
+ $CURDATE =date('d');//current month current date
+
+ $CUR_month = date('t'); //current month of days 31
+
+
+ $CURYEAR = date('Y');
+ $CURMONTH = date('m');
+
+ $datejoin = $this->dahsboard_Model->joindate($EmpID);
+ $DateofJoiningInString = $datejoin[0]->DateofJoining;
+ $DateofJoining = date_create($DateofJoiningInString);
+ $doj_month = date_format($DateofJoining, "n");
+ $doj_year = date_format($DateofJoining, "Y");
+ $doj_day = date_format($DateofJoining, "j");
+ //echo $doj_day;
+ for ($i = 1; $i <= $persent_month; $i++)
+ {
+ $weekdays[] = 'WH' . $i;
+ $otHours[] = 'OT' . $i;
+ }
+
+ foreach ($monthabs as $weekda)
+ {
+ //print_r($weekda);
+ foreach ($weekda as $key => $value)
+ {
+ //print_r($key);
+ foreach ($weekdays as $weeks)
+ {
+ if ($weeks == $key)
+ {
+ //print_r($key);
+ if ($value != 0)
+ {
+ //echo $value;
+ $values[] = $value;
+
+ }
+ //echo $values;
+ }
+
+ }
+ foreach ($otHours as $ot)
+ {
+ if ($ot == $key)
+ {
+ if ($value != 0)
+ {
+ $otvalues [] = $value;
+
+ }
+
+ }
+ }
+
+ }
+ }
+
+
+ $totalothour = array_sum($otvalues);
+
+ $totalwhhours = array_sum($values);
+ $totalwhhour = $totalwhhours/8;
+ //echo $totalwhhour;
+ if ($CURMONTH == $doj_month && $CURYEAR == $doj_year)
+ {
+ //echo $doj_day;
+ $month['CUR_month'] = $CURDATE - $doj_day + 1;
+ //print_r($month);
+ }
+ else
+ {
+ $month['CUR_month'] = $date;
+ }
+
+ if ($totalwhhour != 0)
+ {
+
+ $year = date('Y');
+ $current_month = date('m');
+
+ $month['values'] = $totalwhhour;
+ //$data['salaryInCurrentday'] = round($salaryInCurrentday);
+ $month['present_percentage'] = round(($totalwhhour / $month['CUR_month']) * 100);
+
+ }
+
+ else {
+
+ $month['values'] = 0;
+ //$data['salaryInCurrentday'] = 0;
+ $month['present_percentage'] = 0;
+
+ }
+ if(empty($empID)){
+ echo json_encode($month);
+ }
+ else{
+ return $month;
+ }
+ }
+/*monthperformances report*/
+ function monthattendance2($empID ='',$date)
+{
+ // echo $date;
+
+ $CUR_date = date('m');
+ //echo $CUR_date;
+ // $date = $this->input->post('datepick');
+ // echo $date;die;
+ $per_month = date('m',strtotime($date));
+
+ if($per_month > $CUR_date and empty($empID))
+ {
+
+ $noofdays=0;
+ $workdays=0;
+ $EmpID = $this->input->post('id');
+ //$date = $this->input->post('datepick');
+ //echo $date;
+ $daydate = date('Y-m',strtotime($date));
+
+ $dates =$daydate . '-01';
+
+ $monthabs = $this->dahsboard_Model->attendance($EmpID, $dates);
+ // print_r($monthabs);
+ $TotalNoofDays = $monthabs[0]->NoofDays;
+ $TotalWorkingDays = $monthabs[0]->Days_Worked;
+ // print_r($TotalNoofDays);die;
+
+ $noofdays =$TotalNoofDays;
+ $workdays =$TotalWorkingDays;
+ $performances = round(($workdays / $noofdays) * 100);
+ $month['CUR_month']=$noofdays;
+ $month['values']=$workdays;
+ $month['present_percentage']= $performances;
+
+ }
+ else
+ {
+ $date = date('Y-m');
+ //echo $date;
+ $dates = $date . '-01';
+
+ //$EmpID = '';
+
+ //if(empty($empID))
+ // {
+ $EmpID = $this->input->post('id');
+ //}
+ //else
+ // {
+ //$EmpID = $empID;
+ //}
+ // echo $EmpID;die;
+ $monthabs = $this->dahsboard_Model->attendance($EmpID, $dates);
+ $persent_month = date('t');//current month of days 31
+ $values = array();
+ $otvalues = array();
+
+ $weekdays = array();
+ $otHours = array();
+ $date = date('j');//current month current date
+
+
+ $CURDATE =date('d');//current month current date
+
+ $CUR_month = date('t'); //current month of days 31
+
+
$CURYEAR = date('Y');
$CURMONTH = date('m');
@@ -588,136 +927,9 @@ function monthattendance($empID ='')
}
else{
return $month;
- }
- }
+ } }
- /*Permission Month Reports*/
- function monthattendance1($empID ='')
-{
-
- $date = date('Y-m');
- //echo $date;
- $dates = $date . '-01';
- $EmpID = '';
- if(empty($empID)){
- $EmpID = $this->input->post('id');
- }
- else
- {
- $EmpID = $empID;
- }
- // echo $EmpID;die;
- $monthabs = $this->dahsboard_Model->attendance($EmpID, $dates);
- $persent_month = date('t');//current month of days 31
- $values = array();
- $otvalues = array();
-
- $weekdays = array();
- $otHours = array();
- $date = date('j');//current month current date
-
-
- $CURDATE =date('d');//current month current date
-
- $CUR_month = date('t'); //current month of days 31
-
-
- $CURYEAR = date('Y');
- $CURMONTH = date('m');
-
- $datejoin = $this->dahsboard_Model->joindate($EmpID);
- $DateofJoiningInString = $datejoin[0]->DateofJoining;
- $DateofJoining = date_create($DateofJoiningInString);
- $doj_month = date_format($DateofJoining, "n");
- $doj_year = date_format($DateofJoining, "Y");
- $doj_day = date_format($DateofJoining, "j");
- //echo $doj_day;
- for ($i = 1; $i <= $persent_month; $i++)
- {
- $weekdays[] = 'WH' . $i;
- $otHours[] = 'OT' . $i;
- }
-
- foreach ($monthabs as $weekda)
- {
- //print_r($weekda);
- foreach ($weekda as $key => $value)
- {
- //print_r($key);
- foreach ($weekdays as $weeks)
- {
- if ($weeks == $key)
- {
- //print_r($key);
- if ($value != 0)
- {
- //echo $value;
- $values[] = $value;
-
- }
- //echo $values;
- }
-
- }
- foreach ($otHours as $ot)
- {
- if ($ot == $key)
- {
- if ($value != 0)
- {
- $otvalues [] = $value;
-
- }
-
- }
- }
-
- }
- }
-
-
- $totalothour = array_sum($otvalues);
- $totalwhhour = sizeof($values);
- //echo $totalwhhour;
- if ($CURMONTH == $doj_month && $CURYEAR == $doj_year)
- {
- //echo $doj_day;
- $month['CUR_month'] = $CURDATE - $doj_day + 1;
- //print_r($month);
- }
- else
- {
- $month['CUR_month'] = $date;
- }
-
- if ($totalwhhour != 0)
- {
-
- $year = date('Y');
- $current_month = date('m');
-
- $month['values'] = $totalwhhour;
- //$data['salaryInCurrentday'] = round($salaryInCurrentday);
- $month['present_percentage'] = round(($totalwhhour / $month['CUR_month']) * 100);
-
- }
-
- else {
-
- $month['values'] = 0;
- //$data['salaryInCurrentday'] = 0;
- $month['present_percentage'] = 0;
-
- }
- if(empty($empID)){
- echo json_encode($month);
- }
- else{
- return $month;
- }
- }
-
/*this function used to speedometer year emp performances display*/
@@ -947,6 +1159,48 @@ $this->loadViews("empperform", $this->global, $data, NULL);
+}
+
+
+
+/*Performeans report datepicker click on partculars month reports display*/
+function monthwiserepoarts()
+{
+ echo "hi";
+
+$EmpLists =$this->dahsboard_Model->getEmployee();
+$datepicker=$this->input->post('month');
+
+// print_r (explode("-",$datepicker));
+
+$dates = date("Y-m",strtotime($datepicker));
+$date = $dates . '-01';
+//echo $dates;
+
+ //print_r($EmpLists);die;
+//echo $date;
+ $index = 0;
+ $data['emp_performence_details'] = array();
+
+ foreach ($EmpLists as $Emp) {
+ $EmpID = $Emp->EmpID;
+ $FirstName =$Emp->FirstName;
+ $LastName =$Emp->LastName;
+ $IsActive =$Emp->IsActive;
+
+//echo $EmpID;
+ $currentmonthemp = $this-> monthattendance2($EmpID,$date);
+ $fineyearemp = $this->attendanceyear2($EmpID,$date);
+$a = array($EmpID,$FirstName,$LastName,$IsActive,$currentmonthemp,$fineyearemp);
+ $data['emp_performence_details'][$index]= $a;
+ //pre($data[$EmpID]['month']);die;
+$index++;
+}
+
+ //print_r($data['emp_performence_details']);die;
+
+$this->loadViews("empperform", $this->global, $data, NULL);
+
}
/*this function used dashboard to month and year of the date wise cilck on emp perform in speedometer */
@@ -991,10 +1245,238 @@ echo json_encode($data);
}
+function attendanceyear2($empID ='',$date)
+{
+ $CUR_dates = date('Y-04');
+ $CUR_date = $CUR_dates .'-01';
+ $date = $this->input->post('datepick');
+ // echo $date;die;
+ $per_months = date('Y-03',strtotime($date));
+ $per_month = $per_months.'-01';
+
+ if($per_month > $CUR_date and empty($empID))
+ {
+
+ $noofdays=0;
+ $workdays=0;
+ // $EmpID = $this->input->post('id');
+ // $date = $this->input->post('datepick');
+ //echo $date;
+ $daydate = date('Y-m',strtotime($date));
+
+ $dates =$daydate . '-01';
+
+ $monthabs = $this->dahsboard_Model->attendance($EmpID, $dates);
+ // print_r($monthabs);
+ foreach ($monthabs as $days)
+ {
+ $TotalNoofDays = $days->NoofDays;
+ $TotalWorkingDays = $days->Days_Worked;
+ }
+
+ // print_r($TotalNoofDays);die;
+
+ $noofdays =$TotalNoofDays;
+ $workdays =$TotalWorkingDays;
+ $performances = round(($workdays / $noofdays) * 100);
+ $month['CUR_month']=$noofdays;
+ $month['values']=$workdays;
+ $month['present_percentage']= $performances;
+
+ }
+ $CURMONTH = date('m');
+ $CURDATE = date('d');
+ $CURYEAR = date('Y');
+ $EmpID = '';
+ if(empty($empID)){
+ $EmpID = $this->input->post('id');
+ }
+ else
+ {
+ $EmpID = $empID;
+ }
+ $day = array();
+ $datejoin = $this->dahsboard_Model->joindate($EmpID);
+ $DateofJoiningInString = $datejoin[0]->DateofJoining;
+ $DateofJoining = date_create($DateofJoiningInString);
+ // print_r($DateofJoining);
+ $doj_month = date_format($DateofJoining, "n");
+ $doj_year = date_format($DateofJoining, "Y");
+ $doj_day = date_format($DateofJoining, "j");
+
+ $finStart = $this->getFinancialStartDate();
+ $finEnd = $this->getFinancialEndDate();
+
+ $JoinedMonth = date_format($DateofJoining, "n");
+
+// print_r($finStart);print_r($finEnd);
+ // print $JoinedMonth;
+
+ if ($DateofJoining >= $finStart && $DateofJoining <= $finEnd)
+ {
+ $JoinedMonthAttendance = $this->dahsboard_Model->getAllAttendances($EmpID,$JoinedMonth);
+ $joinedMonthDaysCount = cal_days_in_month(CAL_GREGORIAN, $doj_month, $doj_year);
+
+ if ($CURMONTH == $doj_month && $CURYEAR == $doj_year)
+ {
+ $joinedMonthWorkingDayCount = $CURDATE - $doj_day +1;
+ }
+ else
+ {
+ $joinedMonthWorkingDayCount = $joinedMonthDaysCount - $doj_day;
+ }
+
+ $joinedMonthDays = 0;
+ for ($j = $doj_day; $j <= $joinedMonthDaysCount; $j++)
+ {
+ $weekdays[] = 'WH' . $j;
+ }
+ foreach ($JoinedMonthAttendance as $day)
+ {
+ foreach ($day as $key => $value)
+ {
+ foreach ($weekdays as $weeks)
+ {
+ if ($weeks == $key)
+ {
+ if ($value != 0)
+ {
+ //echo $value;
+ $joinedMonthDays++;
+ }
+ }
+
+ }
+ }
+
+ }
+
+ // echo $joinedMonthWorkingDayCount;die;
+
+ $result = $this->dahsboard_Model->attendanceyear($EmpID, $JoinedMonth + 1);
+
+ // print_r($result); die;
+ $yearabs = $this->dahsboard_Model->getAllAttendance($EmpID, $CURMONTH);
+ $TotalNoofDays = $result[0]->TotalWorkingDays;
+ $DaysWorked = $result[0]->DaysWorked;
+
+ //echo $TotalNoofDays;
+ // echo $DaysWorked;die;
+ $values = 0;
+ $weekdays = array();
+ $date = date('d');
+
+ $Work = array_sum($weekdays);
+
+ for ($j = 1; $j <= $date; $j++)
+ {
+ $weekdays[] = 'WH' . $j;
+ }
+
+ foreach ($yearabs as $day)
+ {
+ foreach ($day as $key => $value)
+ {
+ foreach ($weekdays as $weeks)
+ {
+ if ($weeks == $key)
+ {
+ if ($value != 0)
+ {
+ $values++;
+ }
+ }
+
+ }
+ }
+ }
+
+ $DaysWorked = 0;
+ if ($CURMONTH == $doj_month && $CURYEAR == $doj_year)
+ {
+ $TotalNoofDays = $TotalNoofDays + $joinedMonthWorkingDayCount;
+ $DaysWorked = $joinedMonthDays;
+ }
+ else
+ {
+ $TotalNoofDays = $TotalNoofDays + $CURDATE + $joinedMonthWorkingDayCount;
+ $DaysWorked = $DaysWorked + $joinedMonthDays + $values;
+ }
+
+
+
+
+ $final_res = round(($DaysWorked / $TotalNoofDays) * 100);
+ // echo "------";
+ //echo $final_res;exit();
+ $data['workeds'] = $DaysWorked;
+ $data['yeardata'] = $final_res;
+ $data['totaldays'] = $TotalNoofDays;
+
+ }
+
+ else
+ {
+ $result = $this->dahsboard_Model->attendanceyear($EmpID, 4);
+ $yearabs = $this->dahsboard_Model->getAllAttendance($EmpID, $CURMONTH);
+ $TotalNoofDays = $result[0]->TotalWorkingDays;
+ $DaysWorked = $result[0]->DaysWorked;
+
+
+ $values = 0;
+
+ $weekdays = array();
+ $date = date('d');
+
+ $Work = array_sum($weekdays);
+
+ for ($j = 1; $j <= $date; $j++)
+ {
+ $weekdays[] = 'WH' . $j;
+ }
+ foreach ($yearabs as $day)
+ {
+ foreach ($day as $key => $value)
+ {
+ foreach ($weekdays as $weeks)
+ {
+ if ($weeks == $key)
+ {
+ if ($value != 0)
+ {
+
+ $values++;
+ }
+ }
+
+ }
+ }
+ }
+
+ $TotalNoofDays = $TotalNoofDays + $CURDATE;
+ $DaysWorked = $DaysWorked + $values;
+ $final_res = round(($DaysWorked / $TotalNoofDays) * 100);
+ // echo "------";
+ //echo $final_res;exit();
+ $data['workeds'] = $DaysWorked;
+ $data['yeardata'] = $final_res;
+ $data['totaldays'] = $TotalNoofDays;
+
+
+ }
+
+ if(empty($empID)){
+
+ echo json_encode($data);
+ }
+ else{
+ return $data;
+ }
+}
+
/****************HR DASHBOART Controller END **************************************/
-
/**
* This function is used to load the user list
*/
diff --git a/application/models/dahsboard_model.php b/application/models/dahsboard_model.php
index 93c94efe..02dc2a49 100755
--- a/application/models/dahsboard_model.php
+++ b/application/models/dahsboard_model.php
@@ -213,7 +213,12 @@ function get_all_employee1($finStart,$finEnd)
return $query->result();
}
-
+function holiDaySalaryMonth($month,$year)
+{
+ $sql="SELECT H_Date FROM T_Public_Holidays where MONTH(H_Date)= ? and YEAR(H_Date) = ? ";
+ $query = $this->db->query($sql,array($month,$year));
+ return $query->result();
+}
@@ -222,6 +227,7 @@ function get_all_employee1($finStart,$finEnd)
/* HR DASHBOARD Model END*/
+
function totalpurchaseorder(){
diff --git a/application/views/dashboard.php b/application/views/dashboard.php
index 2b2c4f88..d203589a 100755
--- a/application/views/dashboard.php
+++ b/application/views/dashboard.php
@@ -53,14 +53,15 @@ if(!empty($EmpCount))
-
+
@@ -181,9 +182,9 @@ if(!empty($EmpCount))
SALARY COST
TOTAL EMPLOYEES ABSENT
ABSENT