diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 755225a96..b3d8fe0ed 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,99 +1,23 @@
 CHANGELOG Sentrifugo
 ====================
-RELEASE 2.1
------------
+RELEASE 2.1.1
+-------------
 
 Changes in Controllers
 ------------------------
-./application/modules/default/controllers/addemployeeleavesController.php 
-./application/modules/default/controllers/empleavesummaryController.php
-./application/modules/default/controllers/leaverequestController.php
-./application/modules/default/controllers/visaandimmigrationController.php
-./application/modules/default/controllers/empjobhistoryController.php
-./application/modules/default/controllers/wizardController.php
-./application/modules/default/controllers/HrwizardController.php
-./application/modules/default/controllers/appraisalinitController.php
-./application/modules/default/controllers/IndexController.php 
-./application/modules/default/controllers/policydocumentsController.php 
-./application/modules/timemanagement/controllers/clientsController.php 
-./application/modules/timemanagement/controllers/defaulttasksController.php   
-./application/modules/timemanagement/controllers/EmployeeprojectsController.php 
-./application/modules/timemanagement/controllers/EmptimesheetsController.php
-./application/modules/timemanagement/controllers/ExpensecategoryController.php 
-./application/modules/timemanagement/controllers/ExpensesController.php 
+
 ./application/modules/timemanagement/controllers/IndexController.php
-./application/modules/timemanagement/controllers/LeadprojectsController.php
-./application/modules/timemanagement/controllers/ProjectresourcesController.php
 ./application/modules/timemanagement/controllers/ProjectsController.php
-./application/modules/timemanagement/controllers/ProjecttasksController.php
-./application/modules/timemanagement/controllers/ReportsController.php
-
-- addemployeeleavesController.php
-  Add leaves for multiple employees according to BusinessUnit and Departments.
-
-- empleavesummaryController.php
-  Management can view the employee who are on leave or have applied for leave. 
-  
-- leaverequestController.php
-  Employee can directly apply for leave for the current day using 'Apply Leave'
-  
-- visaandimmigrationController.php
-  Employee can add multiple visa details.
-  
-- empjobhistoryController.php
-  Employee can add client & vendor details.
-
-- wizardController.php
-  Consists of 5 steps now for Super Admin. (add Organization,Add Business Unit & Departments, Add Service Request,modules,site configuration,)
-  
-- HrwizardController.php
-  Consists of 3 steps for HR. (Configure Leave Types, Configure Holidays, Appraisals)
 
-- appraisalinitController.php
-  The option Appraisal settings has been removed and we have its functionality in Initialize appraisal.
-
-- policydocumentsController.php
-  contains the documents about Organization.
-  
-- clientsController.php 
-  Manager can Create, edit,view, delete client information .
 
-- defaulttasksController.php 
-  Manager can Create, edit,view, delete defaulttasks.
-  
-- EmployeeprojectsController.php
-  Employee can view assigned projects and related tasks. 
-  
-- EmptimesheetsController.php
-  Manager can view employee time sheet status.
-    
+      
 - IndexController.php
   Display holidays, weekends , enter time sheet , edit time sheet , erase time sheet , submit time sheet , apply leaves.
 
-- ProjectresourcesController.php
-  view project resources.
   
 - ProjectsController.php
   Manager can create , edit , view, delete projects.
 
-- ProjecttasksController.php
-  View tasks of projects assigned to resources.  
-
-- ReportsController.php
-  Admin can view Reports.  
-
-Note: You can find the respective view files in below scripts: 
-./application/modules/default/views/scripts
-
-
-Changes in scripts
-------------------------
-./public/media/js/hrms.js
-./public/media/js/joyride.js
-./public/media/js/hrmsv2.js
-./public/media/js/pa.js
-./public/media/css/style.css
-./public/media/css/successstyle.css
   
 Note: You can find the respective view files in below scripts: 
 ./application/modules/timemanagement/views/scripts
diff --git a/Zend/View/Helper/Recentlyviewed.php b/Zend/View/Helper/Recentlyviewed.php
index dfb088f80..6d558cac0 100644
--- a/Zend/View/Helper/Recentlyviewed.php
+++ b/Zend/View/Helper/Recentlyviewed.php
@@ -393,7 +393,7 @@ public function recentlyviewed()
 	                            		if($pagesplitName == 'defaulttasks')
 	                            			$menuName ='Default Tasks';
 	                            		else if($pagesplitName == 'emptimesheets')
-	                            			$menuName ='Employee Time Sheets';
+	                            			$menuName ='Employee Timesheets';
 	                            		else if($pagesplitName == 'employeeprojects')
 	                            			$menuName ='Projects';
 	                            		else 
diff --git a/application/layouts/scripts/hrmsfooter.phtml b/application/layouts/scripts/hrmsfooter.phtml
index ee8d25c85..ff1106d5a 100644
--- a/application/layouts/scripts/hrmsfooter.phtml
+++ b/application/layouts/scripts/hrmsfooter.phtml
@@ -60,7 +60,7 @@
     	<br />
     	Here for the first time?
     	<br />
-    	For maximum assistance, using this tour maximize your browser.
+    	For the best Sentrifugo tour experience, please maximize your browser.
     </p>
 	<span class="button" id="activatetour">Start the tour<b class="start-tour-icon"></b></span>
 	<div class="nav">
diff --git a/application/layouts/scripts/timemanagementheader.phtml b/application/layouts/scripts/timemanagementheader.phtml
index df7b3f0ae..22fb0e8e5 100644
--- a/application/layouts/scripts/timemanagementheader.phtml
+++ b/application/layouts/scripts/timemanagementheader.phtml
@@ -60,6 +60,254 @@ if($auth->hasIdentity())
     $loginuserGroup = $auth->getStorage()->read()->group_id;
     $tourflag = $auth->getStorage()->read()->tourflag;
     $userfullname = $auth->getStorage()->read()->userfullname;
+	//code for notifications start
+	//if($loginuserRole == 6){
+	if(Zend_Registry::get( 'tm_role' )=='Employee'){
+		$day = date('w');
+		$week_start = date('m-d-Y', strtotime('-'.$day.' days'));
+		$week_end = date('m-d-Y', strtotime('+'.(6-$day).' days'));
+		
+		$notificationModel = new Timemanagement_Model_Notifications();
+		$usersModel = new Timemanagement_Model_Users();
+		$employeeDOJ = $usersModel->getEmployeeDoj($loginUserId);
+		$loginUserGroupId = $employeeDOJ['holiday_group'];
+		$department_id = $employeeDOJ['department_id'];
+		$weekend_date = date('Y-m-d', strtotime('last saturday'));
+		$notificationArray = array();
+		$notificationArray = $notificationModel->getnotifications($loginUserId,$weekend_date);
+		$submitted_notificationArray = array();
+		$submitted_notificationArray = $notificationModel->getSubmittedNotifications($loginUserId,$weekend_date);
+		$employeeLeaves = array();
+		$getWeekends = array();
+		$employeeLeaves = $usersModel->getEmpLeaves($loginUserId,$employeeDOJ['date_of_joining'],$weekend_date);
+		$getWeekends = $usersModel->getWeekend($employeeDOJ['date_of_joining'],$weekend_date,$department_id);
+		$between_days = array();
+		$between_days = sapp_Global::createDateRangeArray($employeeDOJ['date_of_joining'],$weekend_date);
+		$holidayDatesArr =  array();
+		$holidayDateslistArr=array();
+		if(isset($loginUserId) && $loginUserId !=''){
+			$holidaydatesmodel = new Default_Model_Holidaydates();
+			if($loginUserGroupId>0)
+			{
+				$holidayDateslistArr = $holidaydatesmodel->getHolidayDatesListForGroup($loginUserGroupId);
+			}
+			if(!empty($holidayDateslistArr))
+			{
+				for($i=0;$i<sizeof($holidayDateslistArr);$i++)
+				{
+					$holidayDatesArr[$i] = $holidayDateslistArr[$i]['holidaydate'];
+				}
+			}
+		}
+		
+		$emp_leave_days = array();
+		foreach($employeeLeaves as $empleave)
+		{
+			$emplev_start_date = $empleave['from_date'];
+			$emplev_endt_date = $empleave['to_date'];
+			$emp_leave_days[] = sapp_Global::createDateRangeArray($emplev_start_date,$emplev_endt_date);
+		}
+		$employee_leave_days = array();
+		foreach($emp_leave_days as $lev_days)
+		{
+			foreach($lev_days as $days)
+			{
+				$employee_leave_days[] = $days;
+			}
+		}
+		//merge all dates holidays,weekends,leaves 
+		$hol_leav_weknd = array();
+		$hol_leav_weknd = array_merge($holidayDatesArr,$employee_leave_days,$getWeekends);
+		$working_days = array();
+		$dates_without_status = array();
+		//remove holidays,weekend,leaves from between days
+		$working_days = array_diff($between_days, $hol_leav_weknd);
+		
+		$tsEnteredDatesArray = array();
+		if(count($submitted_notificationArray)>0)
+		{
+			$submittes_ts_dates_with_status = '';
+			foreach($submitted_notificationArray as $sub_array)
+			{
+				$submittes_ts_dates_with_status.=$sub_array['ts_week_dates'];
+				$submittes_ts_dates_with_status.='$';
+			}
+			$ts_date_with_status_array = array_filter(explode('$',$submittes_ts_dates_with_status));
+			$tsEnteredDates = implode('#',$ts_date_with_status_array);
+			$tsEnteredDatesArray = explode('#',$tsEnteredDates);
+		}
+		
+		if(count($notificationArray)>0 || count($submitted_notificationArray)>0){
+		//get entered timesheet dates
+		$timesheet_dates_with_status = '';
+		foreach($notificationArray as $array)
+		{
+			$timesheet_dates_with_status.= $array['ts_week_dates'];
+			$timesheet_dates_with_status.='$';
+		}
+		$timesheet_date_with_status_array = array_filter(explode('$',$timesheet_dates_with_status));
+		//print_r($timesheet_date_with_status_array);
+		$timesheetEnteredDates = implode('#',$timesheet_date_with_status_array);
+		//echo $timesheetEnteredDates;
+		$timesheetEnteredDates_Array = explode('#',$timesheetEnteredDates);
+		$timesheetEnteredDatesArray = $timesheetEnteredDates_Array;
+		if(count($tsEnteredDatesArray)>0)
+		{
+			$timesheetEnteredDatesArray = array_merge($timesheetEnteredDates_Array,$tsEnteredDatesArray);
+		}
+		$enteredDatesArray = array();
+		$statusArray = array('saved','enabled','rejected','blocked','no_entry','submitted','approved');
+		$enteredDateStatusArr = array();
+		foreach($timesheetEnteredDatesArray as $date)
+		{
+			if(!empty($date)){
+				if(!in_array($date,$statusArray))
+				{
+					$enteredDatesArray[] = $date;
+				}
+				else
+				{
+					$enteredDateStatusArr[] = $date;
+				}
+			}
+		}
+		$dates_with_status = array();
+		$yet_to_submit_array = array();
+		$rejected_array=array();
+		$blocked_array=array();
+		$enabled_array=array();
+		
+		foreach($enteredDatesArray as $key=>$value)
+		{
+			$dates_with_status[$value] = $enteredDateStatusArr[$key];
+		}
+		$remainingDays = array_diff($working_days,$enteredDatesArray);
+		
+		
+		foreach($remainingDays as $dates)
+		{
+			$dates_without_status[$dates] = 'no_entry';
+		}
+		$display_dates = array_merge($dates_with_status,$dates_without_status);
+		}else {
+			$remainingDays = $working_days;
+			foreach($remainingDays as $dates)
+			{
+				$dates_without_status[$dates] = 'no_entry';
+			}
+			$display_dates = $dates_without_status;
+		}
+		
+		$display_dates_array = array();
+		foreach($display_dates as $keydate => $statusarr)
+		{
+			if($keydate>=$employeeDOJ['date_of_joining'] && !($display_dates[$keydate]=='no_entry' && in_array($keydate,$hol_leav_weknd)))
+			{
+				if($display_dates[$keydate]!='submitted' && $display_dates[$keydate]!='approved') {
+					$display_dates_array[$keydate] = $statusarr;
+				}
+			}
+		}
+
+	}
+	//end notification code
+	
+	//pending submission code START
+		if(Zend_Registry::get( 'tm_role' )=='Manager') {
+			$notificationModel = new Timemanagement_Model_Notifications();
+			$getManagerEmployees = array();
+			$getManagerEmployees = $notificationModel->getManagerEmployees($loginUserId);
+			$concat_array = array();
+			$pending_submission_emp=0;
+			if(count($getManagerEmployees)>0)
+			{
+				$is_current_week = 1;
+				$usersModel = new Timemanagement_Model_Users();
+				$projmodel = new Timemanagement_Model_Projects();
+				$prevweeks = $projmodel->getprevmonthweeks(date('Y-m') , date('d'));
+				$prev_week_status = array();
+				$emp_names = array();
+				
+				
+				$end_date = max($prevweeks[count($prevweeks)]);//get previous week end date
+				$start_date = min($prevweeks[count($prevweeks)]);//get previous week start date
+				if(!($end_date>=date('Y-m-01') && $end_date<=date('Y-m-t')))//check previous week end date is in current month or not
+				{	
+					$is_current_week = 0;
+					$sunday = strtotime("last sunday");
+					$sunday = date('w', $sunday)==date('w') ? $sunday+7*86400 : $sunday;
+					$satday = strtotime(date("Y-m-d",$sunday)." +6 days");
+					$this_week_sd = date("Y-m-d",$sunday);
+					$this_week_ed = date("Y-m-d",$satday);
+					if($this_week_sd==date('Y-m-01'))//if month starts with sunday
+					{
+						$previous_week = strtotime("-1 week +1 day");
+
+						$start_week = strtotime("last sunday",$previous_week);
+						$end_week = strtotime("next saturday",$start_week);
+
+						$start_week = date("Y-m-d",$start_week);
+						$end_week = date("Y-m-d",$end_week);
+
+						//	echo $start_week.' '.$end_week ;
+						$this_week_sd = $start_week;
+						$this_week_ed = $end_week;
+					}
+					//To get day in the week
+					$weekDatesArray = sapp_Global::createDateRangeArray($this_week_sd,$this_week_ed);
+					//End
+					
+					foreach($weekDatesArray as $this_date)
+					{
+						if(!($this_date>=date('Y-m-01') && $this_date<=date('Y-m-t')))
+						{
+							$concat_array[] = $this_date;
+						}
+					}
+				}
+				if(count($concat_array)>0)
+				{
+					$prevweeks[count($prevweeks)+1] = $concat_array;
+				}
+					
+				foreach($getManagerEmployees as $emp)
+				{
+					$emp_names[$emp['user_id']] = $emp['userfullname'];
+					$empDoj = $usersModel->getEmployeeDoj($emp['user_id']);   
+					$prev_week_status[$emp['user_id']]=$projmodel->getPreviousDaysTSStatus($prevweeks,$emp['user_id'],$empDoj);
+				}
+				foreach($prev_week_status as $key => $value){
+					$pending_sheet=array();
+					$pre_mnth_dates = array();
+					
+					for($i=1;$i<=count($prevweeks);$i++)
+					{
+						if(isset($prev_week_status[$key][$i])){
+						foreach($prev_week_status[$key][$i] as $kkey => $vval)
+						{
+							if(!in_array($kkey,$prevweeks[$i]))
+							{
+								$pre_mnth_dates[$kkey] = $vval;
+							}
+						}
+						if(isset($pre_mnth_dates) && count($pre_mnth_dates)>0)
+						{
+							$prev_week_status[$key][$i] = array_diff_key($prev_week_status[$key][$i],$pre_mnth_dates);
+						}
+						if(isset($prev_week_status[$key][$i]) && (in_array('saved',$prev_week_status[$key][$i]) || in_array('No Entry',$prev_week_status[$key][$i]) || in_array('Saved',$prev_week_status[$key][$i]) || in_array('blocked',$prev_week_status[$key][$i]) || in_array('rejected',$prev_week_status[$key][$i]) || in_array('enabled',$prev_week_status[$key][$i])))
+						{
+							$pending_sheet[]=1;
+						}
+						}
+					}
+					if(in_array(1,$pending_sheet))
+					{
+						$pending_submission_emp++;
+					}
+				}
+			}
+		}
+	//pending submission code END
 
 }
  
@@ -644,10 +892,26 @@ if($loginuserRole == SUPERADMINROLE)
 		        </div> 
   			</div>
   			<div class="back-page-div-report" style = "right: 26px;top: 9px;">
-  			<a href="<?php echo $baseUrl; ?>/welcome" class="sprite reports-back-btn " style="float:left;">Back to Dashboard</a>
-  			<a target="_blank" href="<?php echo DOMAIN; ?>public/downloads/time.pdf" class="importformatlink flt_left" style="margin-top:-4px;">Help</a>
-  			</div>
-
+			<a href="<?php echo $baseUrl; ?>/welcome" class="sprite reports-back-btn " style="float:left;">Back to Dashboard</a>
+			<a target="_blank" href="<?php echo DOMAIN; ?>public/downloads/time.pdf" class="importformatlink flt_left" style="margin-top:-4px;">Help</a>
+			</div>
+			<div class="notification_icon" style = "right: 200px;top: 9px;">
+				<?php if(Zend_Registry::get( 'tm_role' )=='Employee') { 
+					if(isset($display_dates_array) && count($display_dates_array)>0 && !($employeeDOJ['date_of_joining']>=$week_start && $employeeDOJ['date_of_joining']<=$week_start)) { 
+				?>
+				<a href="<?php echo $baseUrl; ?>/timemanagement/notifications/index"><i class="fa fa-bell"></i> <span class="notif_count_txt">(<?php echo count($display_dates_array);?>)</span></a>
+				<?php } ?>
+				<?php } ?>
+			<!-- if manager is logged in show his employees pending submissions START-->
+			<?php if(Zend_Registry::get( 'tm_role' )=='Manager') { // if manager is logged in ?>
+			<?php if($pending_submission_emp>0) { ?>
+			<div>
+				<a href="<?php echo $baseUrl; ?>/timemanagement/notifications/pendingsubmissions"><i class="fa fa-bell"></i><span class="notif_count_txt">(<?php echo $pending_submission_emp;?>)</span></a>
+			</div>
+			<?php } ?>
+			<?php } ?>
+			<!-- END -->
+			</div>
 
     <div id="maincontentdiv" class="reports-block-area">	
         <div id="dialog-confirm" style="display:none;">
@@ -683,7 +947,7 @@ if($loginuserRole == SUPERADMINROLE)
 	?>          
 
 <ul class="reports-ctrl" id="scroller">
-	<li class="reports-div active" id="indexli"><a href="<?php echo $this->baseUrl("/index.php/timemanagement");?>"><span class="menu_icon"><i class="fa fa-calendar fa-2"></i></span><p class="one-line">Time Sheet</p></a></li>
+	<li class="reports-div active" id="indexli"><a href="<?php echo $this->baseUrl("/index.php/timemanagement");?>"><span class="menu_icon"><i class="fa fa-calendar fa-2"></i></span><p class="one-line">Timesheet</p></a></li>
 	
 	<?php if(Zend_Registry::get( 'tm_role' )!='Admin'){?>
 	<!--<li class="reports-div active" id="weekli"><a href="<?php //echo $this->baseUrl("/index.php/timemanagement/index/week?flag=time");?>"><span class="menu_icon"><i class="fa fa-clock-o fa-2"></i></span><p class="one-line">Enter Time</p></a></li> -->
@@ -691,7 +955,7 @@ if($loginuserRole == SUPERADMINROLE)
 	<?php }?>
 	
 	<?php if(Zend_Registry::get( 'tm_role' )!='Employee'){?>
-	       <li class="reports-div" id="emptimesheetsli"><a href="<?php echo $this->baseUrl("/index.php/timemanagement/emptimesheets/");?>"><span class="menu_icon"><i class="fa fa-users fa-2"></i></span><p class="one-line">Employee Time Sheets</p></a></li>
+	       <li class="reports-div" id="emptimesheetsli"><a href="<?php echo $this->baseUrl("/index.php/timemanagement/emptimesheets/");?>"><span class="menu_icon"><i class="fa fa-users fa-2"></i></span><p class="one-line">Employee Timesheets</p></a></li>
 	
 	     <!--  <li class="reports-div" id="defaulttasksli"><a href="<?php //echo $this->baseUrl("/index.php/timemanagement/defaulttasks/");?>"><span class="menu_icon"><i class="fa fa-tasks fa-2"></i></span><p class="one-line">Default Tasks</p></a></li> -->
 	
@@ -704,6 +968,11 @@ if($loginuserRole == SUPERADMINROLE)
 	<?php }?>
 	
 	<li class="reports-div" id="<?php echo $idli;?>"><a href="<?php echo $url;?>"><span class="menu_icon"><i class="fa fa-folder-open fa-2"></i></span><p class="one-line">Projects</p></a></li>
+	
+	<?php if(Zend_Registry::get( 'tm_role' )=='Admin'){?>
+	<li class="reports-div" id="configurationli"><a href="<?php echo $this->baseUrl("/index.php/timemanagement/configuration/");?>"><span class="menu_icon"><i class="fa fa-cogs fa-2"></i></span><p class="one-line">Configuration</p></a></li>
+	<?php }?>
+	
 	<!-- li class="reports-div" id="videoli"><a href="javascript:void(0);"  onclick="showVideoTutorial();"><span class="menu_icon"><i class="fa fa-video-camera fa-2"></i></span><p class="one-line">Video Tutorial</p></a></li -->
 	
 	<?php if(Zend_Registry::get( 'tm_role' )!='Employee' ){?>
diff --git a/application/modules/default/controllers/AnnouncementsController.php b/application/modules/default/controllers/AnnouncementsController.php
index f94371c0f..815c5ee2e 100644
--- a/application/modules/default/controllers/AnnouncementsController.php
+++ b/application/modules/default/controllers/AnnouncementsController.php
@@ -463,8 +463,12 @@ public function save($announcementsForm)
             $options = "";
             if(!empty($bu_id))
             {
-                $bu_id = implode(',', $bu_id);
-                
+				//if superadmin
+				if(strtoupper(gettype($bu_id)) == 'ARRAY')
+				{
+					$bu_id = implode(',', $bu_id);	
+				}
+
                 $dept_model = new Default_Model_Departments();
                 $dept_data = $dept_model->getDepartmentWithCodeList_bu($bu_id);
                 if(!empty($dept_data))
diff --git a/application/modules/default/controllers/CategoriesController.php b/application/modules/default/controllers/CategoriesController.php
index ebdd22db3..23f3500e2 100644
--- a/application/modules/default/controllers/CategoriesController.php
+++ b/application/modules/default/controllers/CategoriesController.php
@@ -213,7 +213,7 @@ public function addAction()
 				}
 				else
 				{
-					$this->_helper->getHelper("FlashMessenger")->addMessage(array("error" => "Failed to add new category. Please try again."));
+					$this->_helper->getHelper("FlashMessenger")->addMessage(array("failure" => "Failed to add new category. Please try again."));
 				}
 
 				$this->_redirect('categories');
@@ -323,7 +323,7 @@ public function editAction()
 						}
 						else
 						{
-							$this->_helper->getHelper("FlashMessenger")->addMessage(array("error" => "Failed to update category. Please try again."));
+							$this->_helper->getHelper("FlashMessenger")->addMessage(array("failure" => "Failed to update category. Please try again."));
 						}
 
 						$this->_redirect('categories');
diff --git a/application/modules/default/controllers/DashboardController.php b/application/modules/default/controllers/DashboardController.php
index df1281763..46f7dd2f7 100644
--- a/application/modules/default/controllers/DashboardController.php
+++ b/application/modules/default/controllers/DashboardController.php
@@ -596,8 +596,11 @@ public function updateAction()
         {
             $update_query = "update main_employees_summary set profileimg = '".$imagepath."',
                              modifieddate = utc_timestamp() where user_id = '".$userid."'";
+            $update_requesthistory_query = "update main_request_history set emp_profileimg = '".$imagepath."',
+                             modifieddate = utc_timestamp() where emp_id = '".$userid."'";
             $db = Zend_Db_Table::getDefaultAdapter();
             $result = $db->query($update_query);
+            $db->query($update_requesthistory_query);
             $auth = Zend_Auth::getInstance();
             if($auth->hasIdentity())
             {
diff --git a/application/modules/default/controllers/EmpadditionaldetailsController.php b/application/modules/default/controllers/EmpadditionaldetailsController.php
index 604b311ca..51ab21e5f 100644
--- a/application/modules/default/controllers/EmpadditionaldetailsController.php
+++ b/application/modules/default/controllers/EmpadditionaldetailsController.php
@@ -537,6 +537,7 @@ public function editpopupAction()
 				$to_date = sapp_Global::change_date($data[0]['to_date'], 'view');
 				$empadditionaldetailsform->from_date->setValue($from_date);
 				$empadditionaldetailsform->to_date->setValue($to_date);
+				$empadditionaldetailsform->submit->setLabel('Update');
 				$this->view->data = $data;
 			}
 		}
diff --git a/application/modules/default/controllers/EmployeeController.php b/application/modules/default/controllers/EmployeeController.php
index d8e728646..24a22b854 100644
--- a/application/modules/default/controllers/EmployeeController.php
+++ b/application/modules/default/controllers/EmployeeController.php
@@ -2349,7 +2349,7 @@ public function addemppopupAction()
 				$opt ='';   
 				foreach($managementUsersData as $record)
 				{
-					$opt .= sapp_Global::selectOptionBuilder($record['id'], $record['userfullname']);
+					$opt .= sapp_Global::selectOptionBuilder($record['user_id'], $record['userfullname']);
 				}
 				
 				$this->view->managementUsersData = $opt;
diff --git a/application/modules/default/controllers/MyemployeesController.php b/application/modules/default/controllers/MyemployeesController.php
index 248d67173..8cdadb843 100644
--- a/application/modules/default/controllers/MyemployeesController.php
+++ b/application/modules/default/controllers/MyemployeesController.php
@@ -3774,7 +3774,7 @@ public function empreport_heplper1($type)
                         'emailaddress' => 'Email',
                         'contactnumber' => 'Mobile',
                         'emprole_name' => 'Role',
-                        'date_of_joining' => 'Joined Date',
+                        'date_of_joining' => 'Date of Joining',
                         'modeofentry' => 'Mode of Employment',
                         'jobtitle_name' => 'Job Title',
                         'position_name' => 'Position',
@@ -3804,7 +3804,7 @@ public function empreport_heplper1($type)
                         'businessunit_name' => 'Business Unit',
                         'department_name' => 'Department',
                         'emp_status_name' => 'Employment Status',
-                        'date_of_joining' => 'Joined Date', 
+                        'date_of_joining' => 'Date of Joining', 
 						'isactive'=>'User Status'                                   
 		);
 		if($type == 'all')
diff --git a/application/modules/default/controllers/PolicydocumentsController.php b/application/modules/default/controllers/PolicydocumentsController.php
index 5cd781e98..8dffb90d3 100644
--- a/application/modules/default/controllers/PolicydocumentsController.php
+++ b/application/modules/default/controllers/PolicydocumentsController.php
@@ -325,7 +325,7 @@ public function save($documentsAddForm)
 			}
 			else
 			{
-				$this->_helper->getHelper("FlashMessenger")->addMessage(array("error" => "Failed to add policy document. Please try again."));
+				$this->_helper->getHelper("FlashMessenger")->addMessage(array("failure" => "Failed to add policy document. Please try again."));
 			}
 
 			/**
@@ -542,7 +542,7 @@ public function update($documentsAddForm,$id)
 			}
 			else
 			{
-				$this->_helper->getHelper("FlashMessenger")->addMessage(array("error" => "Failed to update policy document. Please try again."));
+				$this->_helper->getHelper("FlashMessenger")->addMessage(array("failure" => "Failed to update policy document. Please try again."));
 			}
 
 			if($redirectUrl)
diff --git a/application/modules/default/controllers/ReportsController.php b/application/modules/default/controllers/ReportsController.php
index a4c1538e0..85f98baf1 100644
--- a/application/modules/default/controllers/ReportsController.php
+++ b/application/modules/default/controllers/ReportsController.php
@@ -24,6 +24,7 @@ class Default_ReportsController extends Zend_Controller_Action
 
 	private $options;
 	private $userlog_model;
+	private $printable_interview_arr = array('interview_mode','interview_round_number','interview_round_name','created_by_name','interview_feedback','interview_comments','round_status');
 	public function preDispatch()
 	{
 
@@ -689,6 +690,11 @@ public function exportinterviewrptAction()
 		$sort_name = $this->_getParam('sort_name',null);
 		$sort_type = $this->_getParam('sort_type',null);
 		$cols_param_arr = $this->_getParam('cols_arr',array());
+		foreach($cols_param_arr as $col_key => $col_val) {
+			if(in_array($col_key,$this->printable_interview_arr)) {
+				unset($cols_param_arr[$col_key]);
+			}
+		}
 
 		$req_model = new Default_Model_Requisition();
 		$req_data = $req_model->getdata_for_interviewrpt($param_arr, $sort_name, $sort_type, $page_no, $per_page);
@@ -807,7 +813,7 @@ public function exportemployeereportAction()
 
 				if($column_key == 'userfullname')
 				{
-					$value = isset($emp_data['userfullname'])?$emp_data['prefix_name'].". ".$emp_data['userfullname']:"";
+					$value = isset($emp_data['userfullname'])?(!empty($emp_data['prefix_name'])?($emp_data['prefix_name'].". ".$emp_data['userfullname']):$emp_data['userfullname']):"";
 				}
 				elseif($column_key == 'date_of_joining')
 				{
@@ -994,7 +1000,12 @@ public function interviewrptpdfAction()
 		$sort_name = $this->_getParam('sort_name',null);
 		$sort_type = $this->_getParam('sort_type',null);
 		$cols_param_arr = $this->_getParam('cols_arr',array());
-
+		foreach($cols_param_arr as $col_key => $col_val) {
+			if(in_array($col_key,$this->printable_interview_arr)) {
+				unset($cols_param_arr[$col_key]);
+			}
+		}
+		
 		$req_model = new Default_Model_Requisition();
 		$req_data = $req_model->getdata_for_interviewrpt($param_arr, $sort_name, $sort_type, $page_no, $per_page);
 		$page_cnt = $req_data['page_cnt'];
@@ -1179,7 +1190,7 @@ public function empreport_heplper1($type)
                         'contactnumber' => 'Mobile',
                         'emprole_name' => 'Role',
                         'reporting_manager_name' => 'Reporting Manager',
-                        'date_of_joining' => 'Joined Date',
+                        'date_of_joining' => 'Date of Joining',
                         'modeofentry' => 'Mode of Employment',
                         'jobtitle_name' => 'Job Title',
                         'position_name' => 'Position',
@@ -1205,17 +1216,17 @@ public function empreport_heplper1($type)
                         'emailaddress' => 'Email',
                         'contactnumber' => 'Mobile',
                         'emprole_name' => 'Role',
-                        'reporting_manager_name' => 'Reporting Manager',                                                
+                        'reporting_manager_name' => 'Reporting Manager',
                         'jobtitle_name' => 'Job Title',
-                        'position_name' => 'Position',
+                        // 'position_name' => 'Position',
                         'businessunit_name' => 'Business Unit',
                         'department_name' => 'Department',
-                        'emp_status_name' => 'Employment Status',
-                        'date_of_joining' => 'Joined Date',                                    
+						/*'emp_status_name' => 'Employment Status',
+                        'date_of_joining' => 'Date of Joining',  */                                   
 		);
-		if($type == 'all')
+		/* if($type == 'all')
 		return $columns_array;
-		else
+		else */
 		return $mandatory_array;
 	}
 	public function empautoAction()
diff --git a/application/modules/default/controllers/ServicedeskrequestController.php b/application/modules/default/controllers/ServicedeskrequestController.php
index 10cbbc082..023db4142 100644
--- a/application/modules/default/controllers/ServicedeskrequestController.php
+++ b/application/modules/default/controllers/ServicedeskrequestController.php
@@ -331,7 +331,7 @@ public function add($servicedeskrequestsform)
 				$result = sapp_Global::logManager($menuID,$actionflag,$loginUserId,$tableid);
 			}
 				
-				$this->_helper->getHelper("FlashMessenger")->addMessage(array("success"=>"Request type added successfully."));
+				$this->_helper->getHelper("FlashMessenger")->addMessage(array("success"=>"Request types added successfully."));
 				$this->_redirect('servicedeskrequest');	
                   }
         catch(Exception $e)
diff --git a/application/modules/default/controllers/WizardController.php b/application/modules/default/controllers/WizardController.php
index 895667d9f..6dec41d47 100644
--- a/application/modules/default/controllers/WizardController.php
+++ b/application/modules/default/controllers/WizardController.php
@@ -1428,7 +1428,7 @@ public function saverequesttypes() {
 					 }                  					
                		$wizard_model->SaveorUpdateWizardData($wizardarray,'');
 				
-				$this->_helper->getHelper("FlashMessenger")->addMessage("Categories added successfully.");
+				$this->_helper->getHelper("FlashMessenger")->addMessage("Request types added successfully.");
 				$this->_redirect('wizard/configureservicerequest');	
           }
           catch(Exception $e)
diff --git a/application/modules/default/forms/Employeereport.php b/application/modules/default/forms/Employeereport.php
index 081c5f1a0..f857cbad5 100644
--- a/application/modules/default/forms/Employeereport.php
+++ b/application/modules/default/forms/Employeereport.php
@@ -36,7 +36,7 @@ public function init()
         $reporting_manager->setAttrib('id', 'idreporting_manager');
         
         $joined_date = new Zend_Form_Element_Text("date_of_joining");        
-        $joined_date->setLabel("Joined Date");
+        $joined_date->setLabel("Date of Joining");
         $joined_date->setAttrib('readonly', 'readonly');
 		
         $modeofentry = new Zend_Form_Element_Select("modeofentry");                
diff --git a/application/modules/default/forms/currency.php b/application/modules/default/forms/currency.php
index e4473cfc7..c880e0533 100644
--- a/application/modules/default/forms/currency.php
+++ b/application/modules/default/forms/currency.php
@@ -32,7 +32,7 @@ public function init()
         $id = new Zend_Form_Element_Hidden('id');
 		
 		$currencyname = new Zend_Form_Element_Text('currencyname');
-        $currencyname->setAttrib('maxLength', 50);
+        $currencyname->setAttrib('maxLength', 20);
         
         $currencyname->addFilter(new Zend_Filter_StringTrim());
         $currencyname->setRequired(true);
diff --git a/application/modules/default/forms/gender.php b/application/modules/default/forms/gender.php
index 9e9b8ef76..2fd5e4b35 100644
--- a/application/modules/default/forms/gender.php
+++ b/application/modules/default/forms/gender.php
@@ -56,7 +56,7 @@ public function init()
         $gendercode->getValidator('Db_NoRecordExists')->setMessage('Gender code already exists.'); 	
 		
 		$gendername = new Zend_Form_Element_Text('gendername');
-        $gendername->setAttrib('maxLength', 50);
+        $gendername->setAttrib('maxLength', 20);
         $gendername->setRequired(true);
         $gendername->addValidator('NotEmpty', false, array('messages' => 'Please enter gender.'));  
         $gendername->addValidator("regex",true,array(
diff --git a/application/modules/default/forms/leavemanagement.php b/application/modules/default/forms/leavemanagement.php
index b43e55c15..e17f19118 100644
--- a/application/modules/default/forms/leavemanagement.php
+++ b/application/modules/default/forms/leavemanagement.php
@@ -24,6 +24,7 @@ class Default_Form_leavemanagement extends Zend_Form
 	public function init()
 	{
 		$this->setMethod('post');
+		//$this->setAttrib('action',BASE_URL.'language/edit');
 		$this->setAttrib('id', 'formid');
 		$this->setAttrib('name', 'leavemanagement');
 
@@ -41,13 +42,13 @@ public function init()
         $weekend_startday->setRegisterInArrayValidator(false);
 		$weekend_startday->addMultiOption('','Select Weekend Start Day');
         $weekend_startday->setRequired(true);
-		$weekend_startday->addValidator('NotEmpty', false, array('messages' => 'Please select weekend 1.'));
+		$weekend_startday->addValidator('NotEmpty', false, array('messages' => 'Please select weekend day 1.'));
 				
 		$weekend_endday = new Zend_Form_Element_Select('weekend_endday');
         $weekend_endday->setRegisterInArrayValidator(false);
 		$weekend_endday->addMultiOption('','Select Weekend End Day');
         $weekend_endday->setRequired(true);
-		$weekend_endday->addValidator('NotEmpty', false, array('messages' => 'Please select weekend 2.'));
+		$weekend_endday->addValidator('NotEmpty', false, array('messages' => 'Please select weekend day 2.'));
 		
 		$businessunit = new Zend_Form_Element_Select('businessunit');
 		$businessunit->setAttrib('onchange', 'displayEmployeeDepartments(this,"department_id","leavemanagement")');
diff --git a/application/modules/default/library/sapp/Global.php b/application/modules/default/library/sapp/Global.php
index eca6c6a3c..10dc4f492 100644
--- a/application/modules/default/library/sapp/Global.php
+++ b/application/modules/default/library/sapp/Global.php
@@ -3431,9 +3431,9 @@ public static function generateAccessControl_helper6($roles_arr = array())
 		}
 		//statically add the roles, controllers and methods for time management
 		$tm_roles = array('Admin','Manager','Employee');
-		$tm_roles_controllers = array('Admin' => array('index' => array('index','week','edit','view','getstates','converdate'),'reports' => array('index','employeereports','projectsreports','getempduration','getprojecttaskduration','tmreport'),'clients' => array('index','edit','view','delete','addpopup'),'currency' => array('index'),'defaulttasks' => array('index','edit','view','delete','checkduptask'),'emptimesheets' => array('index','displayweeks','getmonthlyspan','accordion','employeetimesheet','empdisplayweeks','emptimesheetmonthly','emptimesheetweekly','getweekstartenddates'),'expenses' => array('index','edit','view','delete','download','uploadpreview','getprojectbyclientid','getfilename','submitexpense','expensereports','viewexpenses','viewexpensereports','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus'),'expensecategory' => array('index','edit','view','delete'),'projectresources' => array('index','resources','view','addresourcesproject','viewemptasks','addresources','deleteprojectresource','assigntasktoresources','taskassign','resourcetaskdelete','resourcetaskassigndelete'),'projects' => array('index','edit','view','add','tasks','addtasksproject','addtasks','delete','checkempforprojects'),'projecttasks' => array('index','viewtasksresources','deletetask','assignresourcestotask','saveresources','edittaskname')),
-		'Manager' => array('index' => array('index','week','save','submit','eraseweek','getstates','converdate'),'clients' => array('index','edit','view','delete','addpopup'),'defaulttasks' => array('index','edit','view','delete','checkduptask'),'projects' => array('index','edit','view','add','tasks','addtasksproject','addtasks','delete','checkempforprojects'),'projectresources' => array('index','resources','view','addresourcesproject','viewemptasks','addresources','deleteprojectresource','assigntasktoresources','taskassign','resourcetaskdelete','resourcetaskassigndelete'),'projecttasks' => array('index','viewtasksresources','deletetask','assignresourcestotask','saveresources','edittaskname'),'reports' => array('index','employeereports','projectsreports','getempduration','getprojecttaskduration','tmreport'),'emptimesheets' => array('index','displayweeks','getmonthlyspan','accordion','employeetimesheet','empdisplayweeks','emptimesheetmonthly','emptimesheetweekly','getweekstartenddates'),'expenses' => array('index','edit','view','delete','download','uploadpreview','getprojectbyclientid','getfilename','submitexpense','expensereports','viewexpenses','viewexpensereports','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus')),
-		'Employee' => array('index' => array('index','week','save','submit','eraseweek','getstates','converdate'),'employeeprojects' => array('index','view','emptasksgrid'),'expenses' => array('index','edit','view','delete','download','uploadpreview','getprojectbyclientid','getfilename','submitexpense','expensereports','viewexpenses','viewexpensereports','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus')));
+		$tm_roles_controllers = array('Admin' => array('index' => array('index','week','edit','view','getstates','converdate'),'reports' => array('index','employeereports','projectsreports','getempduration','getprojecttaskduration','tmreport'),'clients' => array('index','edit','view','delete','addpopup'),'configuration' => array('index','add'),'currency' => array('index'),'defaulttasks' => array('index','edit','view','delete','checkduptask'),'emptimesheets' => array('index','displayweeks','getmonthlyspan','accordion','employeetimesheet','empdisplayweeks','emptimesheetmonthly','emptimesheetweekly','enabletimesheet','approvetimesheet','rejecttimesheet','approvedaytimesheet','rejectdaytimesheet','getweekstartenddates'),'expenses' => array('index','edit','view','delete','download','uploadpreview','getprojectbyclientid','getfilename','submitexpense','expensereports','viewexpenses','viewexpensereports','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus'),'expensecategory' => array('index','edit','view','delete'),'projectresources' => array('index','resources','view','addresourcesproject','viewemptasks','addresources','deleteprojectresource','assigntasktoresources','taskassign','resourcetaskdelete','resourcetaskassigndelete'),'projects' => array('index','edit','view','add','tasks','addtasksproject','addtasks','delete','checkempforprojects'),'projecttasks' => array('index','viewtasksresources','deletetask','assignresourcestotask','saveresources','edittaskname')),
+		'Manager' => array('index' => array('index','week','save','submit','eraseweek','getstates','getapprovedtimesheet','closeapprovealert','converdate'),'notifications' => array('pendingsubmissions','pendingsubmissionsweeklyview','weeklymonthlyview'),'clients' => array('index','edit','view','delete','addpopup'),'defaulttasks' => array('index','edit','view','delete','checkduptask'),'projects' => array('index','edit','view','add','tasks','addtasksproject','addtasks','delete','checkempforprojects'),'projectresources' => array('index','resources','view','addresourcesproject','viewemptasks','addresources','deleteprojectresource','assigntasktoresources','taskassign','resourcetaskdelete','resourcetaskassigndelete'),'projecttasks' => array('index','viewtasksresources','deletetask','assignresourcestotask','saveresources','edittaskname'),'reports' => array('index','employeereports','projectsreports','getempduration','getprojecttaskduration','tmreport'),'emptimesheets' => array('index','displayweeks','getmonthlyspan','accordion','employeetimesheet','empdisplayweeks','emptimesheetmonthly','emptimesheetweekly','enabletimesheet','approvetimesheet','rejecttimesheet','approvedaytimesheet','rejectdaytimesheet','getweekstartenddates'),'expenses' => array('index','edit','view','delete','download','uploadpreview','getprojectbyclientid','getfilename','submitexpense','expensereports','viewexpenses','viewexpensereports','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus')),
+		'Employee' => array('index' => array('index','week','save','submit','eraseweek','getstates','getapprovedtimesheet','closeapprovealert','converdate'),'employeeprojects' => array('index','view','emptasksgrid'),'notifications' => array('getnotifications','index'),'expenses' => array('index','edit','view','delete','download','uploadpreview','getprojectbyclientid','getfilename','submitexpense','expensereports','viewexpenses','viewexpensereports','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus')));
 		$acl_new = array();
 		$access_str = '';
 		foreach($tm_roles as $tm_role)
diff --git a/application/modules/default/library/sapp/Helper.php b/application/modules/default/library/sapp/Helper.php
index f306fb6ee..c175c5685 100644
--- a/application/modules/default/library/sapp/Helper.php
+++ b/application/modules/default/library/sapp/Helper.php
@@ -657,7 +657,13 @@ public static function process_emp_excel($file_name)
                         	$var = $rowData[11];
                         	$date = str_replace('/', '-', $var);
                         	$test_doj = date('y-m-d', strtotime($date));
-                        	
+							//date format 2012-09-12(y-m-d)
+							if (!preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/",$var))
+							{
+									return array('status' => 'error' , 'msg' => "Date of joining is not a valid format at row ".$i.".");
+							}
+							
+						
                         } 
                         catch (Exception $ex) {
                         	
diff --git a/application/modules/default/plugins/AccessControl.php b/application/modules/default/plugins/AccessControl.php
index 5d64f12b0..b06cd0e87 100644
--- a/application/modules/default/plugins/AccessControl.php
+++ b/application/modules/default/plugins/AccessControl.php
@@ -18,6 +18,8 @@ public function preDispatch(Zend_Controller_Request_Abstract $request)
 	 $role = 'hrmanager';
 	else if($role == 5)
 	 $role = 'employee';
+	else if($role == 6)
+	 $role = 'user';
 	else if($role == 7)
 	 $role = 'agency';
 	else if($role == 8)
@@ -72,6 +74,7 @@ protected function _getAcl()
 	 $acl->addRole('manager');
 	 $acl->addRole('hrmanager');
 	 $acl->addRole('employee');
+	 $acl->addRole('user');
 	 $acl->addRole('agency');
 	 $acl->addRole('sysadmin');
 	 $acl->addRole('lead');
@@ -81,7 +84,7 @@ protected function _getAcl()
 		
 	$auth = Zend_Auth::getInstance(); 
 	$tmroleText=array();
-	$tmroleText = array('1'=>'admin','2'=>'management','3'=>'manager','4'=>'hrmanager','5'=>'employee','7'=>'agency','8'=>'sysadmin','9'=>'lead');
+	$tmroleText = array('1'=>'admin','2'=>'management','3'=>'manager','4'=>'hrmanager','5'=>'employee','6'=>'user','7'=>'agency','8'=>'sysadmin','9'=>'lead');
 	
 		if($auth->hasIdentity())
 		{
@@ -96,7 +99,7 @@ protected function _getAcl()
 	if(!isset($role))
 								$tmroleText[$role] = 'admin';
 		 $acl->addResource(new Zend_Acl_Resource('timemanagement:index'));
-									$acl->allow($tmroleText[$role], 'timemanagement:index', array('index','week','edit','view','getstates'));
+									$acl->allow($tmroleText[$role], 'timemanagement:index', array('index','week','edit','view','getstates','converdate'));
 
 		 $acl->addResource(new Zend_Acl_Resource('timemanagement:reports'));
 									$acl->allow($tmroleText[$role], 'timemanagement:reports', array('index','employeereports','projectsreports','getempduration','getprojecttaskduration','tmreport'));
@@ -104,6 +107,9 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('timemanagement:clients'));
 									$acl->allow($tmroleText[$role], 'timemanagement:clients', array('index','edit','view','delete','addpopup'));
 
+		 $acl->addResource(new Zend_Acl_Resource('timemanagement:configuration'));
+									$acl->allow($tmroleText[$role], 'timemanagement:configuration', array('index','add'));
+
 		 $acl->addResource(new Zend_Acl_Resource('timemanagement:currency'));
 									$acl->allow($tmroleText[$role], 'timemanagement:currency', array('index'));
 
@@ -111,7 +117,7 @@ protected function _getAcl()
 									$acl->allow($tmroleText[$role], 'timemanagement:defaulttasks', array('index','edit','view','delete','checkduptask'));
 
 		 $acl->addResource(new Zend_Acl_Resource('timemanagement:emptimesheets'));
-									$acl->allow($tmroleText[$role], 'timemanagement:emptimesheets', array('index','displayweeks','getmonthlyspan','accordion','employeetimesheet','empdisplayweeks','emptimesheetmonthly','emptimesheetweekly','getweekstartenddates'));
+									$acl->allow($tmroleText[$role], 'timemanagement:emptimesheets', array('index','displayweeks','getmonthlyspan','accordion','employeetimesheet','empdisplayweeks','emptimesheetmonthly','emptimesheetweekly','enabletimesheet','approvetimesheet','rejecttimesheet','approvedaytimesheet','rejectdaytimesheet','getweekstartenddates'));
 
 		 $acl->addResource(new Zend_Acl_Resource('timemanagement:expenses'));
 									$acl->allow($tmroleText[$role], 'timemanagement:expenses', array('index','edit','view','delete','download','uploadpreview','getprojectbyclientid','getfilename','submitexpense','expensereports','viewexpenses','viewexpensereports','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus'));
@@ -129,7 +135,10 @@ protected function _getAcl()
 									$acl->allow($tmroleText[$role], 'timemanagement:projecttasks', array('index','viewtasksresources','deletetask','assignresourcestotask','saveresources','edittaskname'));
  } elseif(!empty($tm_role) && $tm_role == 'Manager') { 
 		 $acl->addResource(new Zend_Acl_Resource('timemanagement:index'));
-									$acl->allow($tmroleText[$role], 'timemanagement:index', array('index','week','save','submit','eraseweek','getstates'));
+									$acl->allow($tmroleText[$role], 'timemanagement:index', array('index','week','save','submit','eraseweek','getstates','getapprovedtimesheet','closeapprovealert','converdate'));
+
+		 $acl->addResource(new Zend_Acl_Resource('timemanagement:notifications'));
+									$acl->allow($tmroleText[$role], 'timemanagement:notifications', array('pendingsubmissions','pendingsubmissionsweeklyview','weeklymonthlyview'));
 
 		 $acl->addResource(new Zend_Acl_Resource('timemanagement:clients'));
 									$acl->allow($tmroleText[$role], 'timemanagement:clients', array('index','edit','view','delete','addpopup'));
@@ -150,17 +159,20 @@ protected function _getAcl()
 									$acl->allow($tmroleText[$role], 'timemanagement:reports', array('index','employeereports','projectsreports','getempduration','getprojecttaskduration','tmreport'));
 
 		 $acl->addResource(new Zend_Acl_Resource('timemanagement:emptimesheets'));
-									$acl->allow($tmroleText[$role], 'timemanagement:emptimesheets', array('index','displayweeks','getmonthlyspan','accordion','employeetimesheet','empdisplayweeks','emptimesheetmonthly','emptimesheetweekly','getweekstartenddates'));
+									$acl->allow($tmroleText[$role], 'timemanagement:emptimesheets', array('index','displayweeks','getmonthlyspan','accordion','employeetimesheet','empdisplayweeks','emptimesheetmonthly','emptimesheetweekly','enabletimesheet','approvetimesheet','rejecttimesheet','approvedaytimesheet','rejectdaytimesheet','getweekstartenddates'));
 
 		 $acl->addResource(new Zend_Acl_Resource('timemanagement:expenses'));
 									$acl->allow($tmroleText[$role], 'timemanagement:expenses', array('index','edit','view','delete','download','uploadpreview','getprojectbyclientid','getfilename','submitexpense','expensereports','viewexpenses','viewexpensereports','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus'));
  } elseif(!empty($tm_role) && $tm_role == 'Employee') { 
 		 $acl->addResource(new Zend_Acl_Resource('timemanagement:index'));
-									$acl->allow($tmroleText[$role], 'timemanagement:index', array('index','week','save','submit','eraseweek','getstates'));
+									$acl->allow($tmroleText[$role], 'timemanagement:index', array('index','week','save','submit','eraseweek','getstates','getapprovedtimesheet','closeapprovealert','converdate'));
 
 		 $acl->addResource(new Zend_Acl_Resource('timemanagement:employeeprojects'));
 									$acl->allow($tmroleText[$role], 'timemanagement:employeeprojects', array('index','view','emptasksgrid'));
 
+		 $acl->addResource(new Zend_Acl_Resource('timemanagement:notifications'));
+									$acl->allow($tmroleText[$role], 'timemanagement:notifications', array('getnotifications','index'));
+
 		 $acl->addResource(new Zend_Acl_Resource('timemanagement:expenses'));
 									$acl->allow($tmroleText[$role], 'timemanagement:expenses', array('index','edit','view','delete','download','uploadpreview','getprojectbyclientid','getfilename','submitexpense','expensereports','viewexpenses','viewexpensereports','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus','updateexpensestatus'));
  } 
@@ -180,15 +192,15 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('default:agencylist'));
                     $acl->allow('admin', 'default:agencylist', array('index','add','view','edit','delete','deletepoc'));
 
-		 $acl->addResource(new Zend_Acl_Resource('default:allexitproc'));
-                    $acl->allow('admin', 'default:allexitproc', array('index','edit','view'));
-
 		 $acl->addResource(new Zend_Acl_Resource('default:announcements'));
                     $acl->allow('admin', 'default:announcements', array('index','add','view','edit','getdepts','delete','uploadsave','uploaddelete'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:appraisalcategory'));
                     $acl->allow('admin', 'default:appraisalcategory', array('index','add','view','edit','delete','addpopup','getappraisalcategory'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:appraisalhistory'));
+                    $acl->allow('admin', 'default:appraisalhistory', array('index','getselectedappraisaldata'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:appraisalinit'));
                     $acl->allow('admin', 'default:appraisalinit', array('checkappadmin','getdepartmentsadmin','discardsteptwo','displayline','addlinemanager','displayreport','deletelinemanager','deletereportmanager','constructreportacc','constructacc','displayemployees','displaycontentreportacc','displaycontentacc','viewconfmanagers','confmanagers','displaymanagers','displayreportmanagers','getperiod','index','add','delete','view','edit','viewassigngroups','assigngroups','displaygroupedemployees','showgroupedemployees','viewgroupedemployees','savegroupedemployeesajax','changesettings','displaysettings','deletegroupedemployees','initializegroup','completeappraisal','checkemployeeresponse','getemployeeslinemanagers','savemngrorghierarchy','getconfiglinemanagers','validateconfig'));
 
@@ -234,6 +246,9 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('default:candidatedetails'));
                     $acl->allow('admin', 'default:candidatedetails', array('index','view','edit','add','delete','chkcandidate','uploadfile','deleteresume','download','multipleresume'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:categories'));
+                    $acl->allow('admin', 'default:categories', array('index','add','edit','view','delete','addnewcategory'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:cities'));
                     $acl->allow('admin', 'default:cities', array('index','view','edit','delete','getcitiescand','addpopup','addnewcity'));
 
@@ -285,15 +300,6 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('default:ethniccode'));
                     $acl->allow('admin', 'default:ethniccode', array('index','view','edit','saveupdate','delete','addpopup'));
 
-		 $acl->addResource(new Zend_Acl_Resource('default:exitproc'));
-                    $acl->allow('admin', 'default:exitproc', array('index'));
-
-		 $acl->addResource(new Zend_Acl_Resource('default:exitprocsettings'));
-                    $acl->allow('admin', 'default:exitprocsettings', array('index','view','add','edit','delete','getdepartments','gethrmanagers'));
-
-		 $acl->addResource(new Zend_Acl_Resource('default:exittypes'));
-                    $acl->allow('admin', 'default:exittypes', array('index','add','edit','view','delete'));
-
 		 $acl->addResource(new Zend_Acl_Resource('default:feedforwardemployee'));
                     $acl->allow('admin', 'default:feedforwardemployee', array('index','edit','save'));
 
@@ -558,15 +564,15 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('default:agencylist'));
                             $acl->allow('management', 'default:agencylist', array('index','deletepoc','add','edit','delete','view','Agencies'));
 
-		 $acl->addResource(new Zend_Acl_Resource('default:allexitproc'));
-                            $acl->allow('management', 'default:allexitproc', array('index','edit','view','All Exit Procedures'));
-
 		 $acl->addResource(new Zend_Acl_Resource('default:announcements'));
                             $acl->allow('management', 'default:announcements', array('index','getdepts','uploadsave','uploaddelete','add','edit','delete','view','Announcements'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:appraisalcategory'));
                             $acl->allow('management', 'default:appraisalcategory', array('index','addpopup','getappraisalcategory','add','edit','delete','view','Parameters'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:appraisalhistory'));
+                            $acl->allow('management', 'default:appraisalhistory', array('index','getselectedappraisaldata','view','Appraisal History'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:appraisalinit'));
                             $acl->allow('management', 'default:appraisalinit', array('checkappadmin','getdepartmentsadmin','discardsteptwo','displayline','addlinemanager','displayreport','deletelinemanager','deletereportmanager','constructreportacc','constructacc','displayemployees','displaycontentreportacc','displaycontentacc','viewconfmanagers','confmanagers','displaymanagers','displayreportmanagers','getperiod','index','viewassigngroups','assigngroups','displaygroupedemployees','showgroupedemployees','viewgroupedemployees','savegroupedemployeesajax','changesettings','displaysettings','deletegroupedemployees','initializegroup','completeappraisal','checkemployeeresponse','getemployeeslinemanagers','savemngrorghierarchy','getconfiglinemanagers','validateconfig','add','edit','view','Initialize Appraisal'));
 
@@ -580,7 +586,7 @@ protected function _getAcl()
                             $acl->allow('management', 'default:appraisalratings', array('index','addratings','add','edit','view','Ratings'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:appraisalself'));
-                            $acl->allow('management', 'default:appraisalself', array('index','save','add','edit','delete','view','Self Appraisal'));
+                            $acl->allow('management', 'default:appraisalself', array('index','save','edit','view','Self Appraisal'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:appraisalskills'));
                             $appraisalskills_add = 'yes';
@@ -592,7 +598,7 @@ protected function _getAcl()
 
                                 
 		 $acl->addResource(new Zend_Acl_Resource('default:appraisalstatus'));
-                            $acl->allow('management', 'default:appraisalstatus', array('index','manager','managerstatus','checkappraisalimplementation','employee','employeestatus','employeeActi','addlinemanager','displaymanagers','updatelinemanager','add','edit','delete','view','Employee Status'));
+                            $acl->allow('management', 'default:appraisalstatus', array('index','manager','managerstatus','checkappraisalimplementation','employee','employeestatus','employeeActi','addlinemanager','displaymanagers','updatelinemanager','view','Employee Status'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:approvedleaves'));
                             $acl->allow('management', 'default:approvedleaves', array('index','view','Approved Leaves'));
@@ -618,6 +624,9 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('default:candidatedetails'));
                             $acl->allow('management', 'default:candidatedetails', array('index','chkcandidate','uploadfile','deleteresume','download','multipleresume','add','edit','delete','view','CV Management'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:categories'));
+                            $acl->allow('management', 'default:categories', array('index','addnewcategory','add','edit','delete','view','Categories'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:cities'));
                             $cities_add = 'yes';
                                 if($this->id_param == '' && $cities_add == 'yes')
@@ -631,8 +640,14 @@ protected function _getAcl()
                             $acl->allow('management', 'default:competencylevel', array('index','addpopup','add','edit','delete','view','Competency Levels'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:countries'));
-                            $acl->allow('management', 'default:countries', array('index','saveupdate','getcountrycode','addpopup','addnewcountry','add','edit','delete','view','Countries'));
+                            $countries_add = 'yes';
+                                if($this->id_param == '' && $countries_add == 'yes')
+                                    $acl->allow('management', 'default:countries', array('index','saveupdate','getcountrycode','addpopup','addnewcountry','add','delete','view','Countries','edit'));
+
+                                else
+                                    $acl->allow('management', 'default:countries', array('index','saveupdate','getcountrycode','addpopup','addnewcountry','add','delete','view','Countries'));
 
+                                
 		 $acl->addResource(new Zend_Acl_Resource('default:currency'));
                             $acl->allow('management', 'default:currency', array('index','addpopup','gettargetcurrency','add','edit','delete','view','Currencies'));
 
@@ -675,17 +690,8 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('default:ethniccode'));
                             $acl->allow('management', 'default:ethniccode', array('index','saveupdate','addpopup','add','edit','delete','view','Ethnic Codes'));
 
-		 $acl->addResource(new Zend_Acl_Resource('default:exitproc'));
-                            $acl->allow('management', 'default:exitproc', array('index','add','edit','delete','view','Initiate/Check Status'));
-
-		 $acl->addResource(new Zend_Acl_Resource('default:exitprocsettings'));
-                            $acl->allow('management', 'default:exitprocsettings', array('index','getdepartments','gethrmanagers','add','edit','delete','view','Settings'));
-
-		 $acl->addResource(new Zend_Acl_Resource('default:exittypes'));
-                            $acl->allow('management', 'default:exittypes', array('index','add','edit','delete','view','Exit Types'));
-
 		 $acl->addResource(new Zend_Acl_Resource('default:feedforwardemployee'));
-                            $acl->allow('management', 'default:feedforwardemployee', array('index','save','add','edit','delete','view','Appraise Your Manager'));
+                            $acl->allow('management', 'default:feedforwardemployee', array('index','save','edit','view','Appraise Your Manager'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:feedforwardinit'));
                             $acl->allow('management', 'default:feedforwardinit', array('index','getappraisaldetails','add','edit','view','Initialize Feedforward'));
@@ -706,7 +712,7 @@ protected function _getAcl()
                             $acl->allow('management', 'default:geographygroup', array('index','add','edit','delete','view','Geo Groups'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:heirarchy'));
-                            $acl->allow('management', 'default:heirarchy', array('index','addlist','editlist','saveadddata','saveeditdata','deletelist','add','edit','view','Organization Hierarchy'));
+                            $acl->allow('management', 'default:heirarchy', array('index','addlist','editlist','saveadddata','saveeditdata','deletelist','Organization Hierarchy'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:holidaydates'));
                             $acl->allow('management', 'default:holidaydates', array('index','addpopup','viewpopup','editpopup','add','edit','delete','view','Manage Holidays'));
@@ -715,7 +721,7 @@ protected function _getAcl()
                             $acl->allow('management', 'default:holidaygroups', array('index','getempnames','getholidaynames','addpopup','add','edit','delete','view','Manage Holiday Group'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:identitycodes'));
-                            $acl->allow('management', 'default:identitycodes', array('index','addpopup','add','edit','Identity Codes'));
+                            $acl->allow('management', 'default:identitycodes', array('index','addpopup','edit','Identity Codes'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:identitydocuments'));
                             $acl->allow('management', 'default:identitydocuments', array('index','add','edit','delete','view','Identity Documents'));
@@ -744,9 +750,6 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('default:licensetype'));
                             $acl->allow('management', 'default:licensetype', array('index','add','edit','delete','view','License Types'));
 
-		 $acl->addResource(new Zend_Acl_Resource('default:managemenus'));
-                            $acl->allow('management', 'default:managemenus', array('index','save','add','edit','delete','view','Modules'));
-
 		 $acl->addResource(new Zend_Acl_Resource('default:manageremployeevacations'));
                             $acl->allow('management', 'default:manageremployeevacations', array('index','edit','view','Manager Employee Leaves'));
 
@@ -778,7 +781,7 @@ protected function _getAcl()
                             $acl->allow('management', 'default:numberformats', array('index','add','edit','delete','view','Number Formats'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:organisationinfo'));
-                            $acl->allow('management', 'default:organisationinfo', array('index','edit_old','saveupdate','uploadpreview','validateorgstartdate','getcompleteorgdata','addorghead','add','edit','view','Organization Info'));
+                            $acl->allow('management', 'default:organisationinfo', array('index','edit_old','saveupdate','uploadpreview','validateorgstartdate','getcompleteorgdata','addorghead','edit','view','Organization Info'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:payfrequency'));
                             $acl->allow('management', 'default:payfrequency', array('index','addpopup','add','edit','delete','view','Pay Frequency'));
@@ -808,7 +811,7 @@ protected function _getAcl()
                             $acl->allow('management', 'default:remunerationbasis', array('index','add','edit','delete','view','Remuneration Basis'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:reports'));
-                            $acl->allow('management', 'default:reports', array('getrolepopup','emprolesgrouppopup','performancereport','previousappraisals','getselectedappraisaldata','getinterviewroundsdata','interviewrounds','rolesgroup','exportemprolesgroup','exportrolesgroupreport','exportinterviewrpt','exportactiveuserrpt','exportemployeereport','rolesgrouprptpdf','activeuserrptpdf','emprptpdf','interviewrptpdf','rolesgroupdata','emprolesgroup','emprolesgroupdata','activeuser','getactiveuserdata','getempreportdata','empauto','servicedeskreport','getsddata','servicedeskpdf','servicedeskexcel','employeereport','getdeptsemp','index','holidaygroupreports','getpdfreportholiday','getexcelreportholiday','leavesreport','getpdfreportleaves','getexcelreportleaves','leavesreporttabheader','leavemanagementreport','getpdfreportleavemanagement','getexcelreportleavemanagement','bunitauto','bunitcodeauto','getexcelreportbusinessunit','getbusinessunitspdf','businessunits','userlogreport','departments','exportdepartmentpdf','getexcelreportdepartment','candidaterptexcel','candidaterptpdf','getcandidatesreportdata','candidatesreport','requisitionauto','requisitionrptexcel','requisitionrptpdf','getrequisitionsstatusreportdata','requisitionstatusreport','activitylogreport','downloadreport','agencylistreport','agencynameauto','agencysebsiteauto','empscreening','getspecimennames','getagencynames','getexcelreportempscreening','getempscreeningpdf','add','edit','delete','view','Analytics'));
+                            $acl->allow('management', 'default:reports', array('getrolepopup','emprolesgrouppopup','performancereport','previousappraisals','getselectedappraisaldata','getinterviewroundsdata','interviewrounds','rolesgroup','exportemprolesgroup','exportrolesgroupreport','exportinterviewrpt','exportactiveuserrpt','exportemployeereport','rolesgrouprptpdf','activeuserrptpdf','emprptpdf','interviewrptpdf','rolesgroupdata','emprolesgroup','emprolesgroupdata','activeuser','getactiveuserdata','getempreportdata','empauto','servicedeskreport','getsddata','servicedeskpdf','servicedeskexcel','employeereport','getdeptsemp','index','holidaygroupreports','getpdfreportholiday','getexcelreportholiday','leavesreport','getpdfreportleaves','getexcelreportleaves','leavesreporttabheader','leavemanagementreport','getpdfreportleavemanagement','getexcelreportleavemanagement','bunitauto','bunitcodeauto','getexcelreportbusinessunit','getbusinessunitspdf','businessunits','userlogreport','departments','exportdepartmentpdf','getexcelreportdepartment','candidaterptexcel','candidaterptpdf','getcandidatesreportdata','candidatesreport','requisitionauto','requisitionrptexcel','requisitionrptpdf','getrequisitionsstatusreportdata','requisitionstatusreport','activitylogreport','downloadreport','agencylistreport','agencynameauto','agencysebsiteauto','empscreening','getspecimennames','getagencynames','getexcelreportempscreening','getempscreeningpdf','Analytics'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:requisition'));
                             $acl->allow('management', 'default:requisition', array('index','viewhr','approverequisition','addcandidate','interview','getdepartments','getpositions','viewpopup','getapprreqdata','chkreqforclose','getempreportingmanagers','getemailcount','getapprovers','add','edit','delete','view','Openings/Positions'));
@@ -955,15 +958,15 @@ protected function _getAcl()
                             $acl->allow('management', 'default:userloginlog', array('index','empnameauto','empidauto','empipaddressauto','empemailauto','index','empnameauto','empidauto','empipaddressauto','empemailauto'));
 }if($role == 3 )
            {
-		 $acl->addResource(new Zend_Acl_Resource('default:allexitproc'));
-                            $acl->allow('manager', 'default:allexitproc', array('index','edit','view','All Exit Procedures'));
-
 		 $acl->addResource(new Zend_Acl_Resource('default:announcements'));
                             $acl->allow('manager', 'default:announcements', array('index','getdepts','uploadsave','uploaddelete','view','Announcements'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:appraisalcategory'));
                             $acl->allow('manager', 'default:appraisalcategory', array('index','addpopup','getappraisalcategory','view','Parameters'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:appraisalhistory'));
+                            $acl->allow('manager', 'default:appraisalhistory', array('index','getselectedappraisaldata','view','Appraisal History'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:appraisalmanager'));
                             $acl->allow('manager', 'default:appraisalmanager', array('submitmanager','deletemanagergroup','savemanagergroup','index','viewgroup','createnewgroup','showgroups','showviewgroups','edit','view','Manager Appraisal'));
 
@@ -1006,9 +1009,6 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('default:employee'));
                             $acl->allow('manager', 'default:employee', array('getemprequi','index','changeorghead','getdepartments','getpositions','getempreportingmanagers','makeactiveinactive','changereportingmanager','addemppopup','uploadexcel','getindividualempdetails','view','Employees'));
 
-		 $acl->addResource(new Zend_Acl_Resource('default:exitproc'));
-                            $acl->allow('manager', 'default:exitproc', array('index','add','edit','view','Initiate/Check Status'));
-
 		 $acl->addResource(new Zend_Acl_Resource('default:feedforwardemployee'));
                             $acl->allow('manager', 'default:feedforwardemployee', array('index','save','edit','view','Appraise Your Manager'));
 
@@ -1142,15 +1142,15 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('default:agencylist'));
                             $acl->allow('hrmanager', 'default:agencylist', array('index','deletepoc','add','edit','delete','view','Agencies'));
 
-		 $acl->addResource(new Zend_Acl_Resource('default:allexitproc'));
-                            $acl->allow('hrmanager', 'default:allexitproc', array('index','edit','view','All Exit Procedures'));
-
 		 $acl->addResource(new Zend_Acl_Resource('default:announcements'));
                             $acl->allow('hrmanager', 'default:announcements', array('index','getdepts','uploadsave','uploaddelete','add','edit','delete','view','Announcements'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:appraisalcategory'));
                             $acl->allow('hrmanager', 'default:appraisalcategory', array('index','addpopup','getappraisalcategory','add','edit','delete','view','Parameters'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:appraisalhistory'));
+                            $acl->allow('hrmanager', 'default:appraisalhistory', array('index','getselectedappraisaldata','view','Appraisal History'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:appraisalinit'));
                             $acl->allow('hrmanager', 'default:appraisalinit', array('checkappadmin','getdepartmentsadmin','discardsteptwo','displayline','addlinemanager','displayreport','deletelinemanager','deletereportmanager','constructreportacc','constructacc','displayemployees','displaycontentreportacc','displaycontentacc','viewconfmanagers','confmanagers','displaymanagers','displayreportmanagers','getperiod','index','viewassigngroups','assigngroups','displaygroupedemployees','showgroupedemployees','viewgroupedemployees','savegroupedemployeesajax','changesettings','displaysettings','deletegroupedemployees','initializegroup','completeappraisal','checkemployeeresponse','getemployeeslinemanagers','savemngrorghierarchy','getconfiglinemanagers','validateconfig','add','edit','view','Initialize Appraisal'));
 
@@ -1202,6 +1202,9 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('default:candidatedetails'));
                             $acl->allow('hrmanager', 'default:candidatedetails', array('index','chkcandidate','uploadfile','deleteresume','download','multipleresume','add','edit','view','CV Management'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:categories'));
+                            $acl->allow('hrmanager', 'default:categories', array('index','addnewcategory','add','edit','delete','view','Categories'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:competencylevel'));
                             $acl->allow('hrmanager', 'default:competencylevel', array('index','addpopup','add','edit','view','Competency Levels'));
 
@@ -1235,15 +1238,6 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('default:empscreening'));
                             $acl->allow('hrmanager', 'default:empscreening', array('index','getemployeedata','getagencylist','getpocdata','forcedfullupdate','checkscreeningstatus','uploadfeedback','download','deletefeedback','add','edit','view','Employee/Candidate Screening'));
 
-		 $acl->addResource(new Zend_Acl_Resource('default:exitproc'));
-                            $acl->allow('hrmanager', 'default:exitproc', array('index','add','edit','view','Initiate/Check Status'));
-
-		 $acl->addResource(new Zend_Acl_Resource('default:exitprocsettings'));
-                            $acl->allow('hrmanager', 'default:exitprocsettings', array('index','getdepartments','gethrmanagers','add','edit','delete','view','Settings'));
-
-		 $acl->addResource(new Zend_Acl_Resource('default:exittypes'));
-                            $acl->allow('hrmanager', 'default:exittypes', array('index','add','edit','delete','view','Exit Types'));
-
 		 $acl->addResource(new Zend_Acl_Resource('default:feedforwardemployee'));
                             $acl->allow('hrmanager', 'default:feedforwardemployee', array('index','save','edit','view','Appraise Your Manager'));
 
@@ -1437,8 +1431,11 @@ protected function _getAcl()
                             $acl->allow('hrmanager', 'default:empsalarydetails', array('index','view','index','edit','view'));
 }if($role == 5 )
            {
-		 $acl->addResource(new Zend_Acl_Resource('default:allexitproc'));
-                            $acl->allow('employee', 'default:allexitproc', array('index','edit','view','All Exit Procedures'));
+		 $acl->addResource(new Zend_Acl_Resource('default:announcements'));
+                            $acl->allow('employee', 'default:announcements', array('index','getdepts','uploadsave','uploaddelete','view','Announcements'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:appraisalhistory'));
+                            $acl->allow('employee', 'default:appraisalhistory', array('index','getselectedappraisaldata','view','Appraisal History'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:appraisalmanager'));
                             $acl->allow('employee', 'default:appraisalmanager', array('submitmanager','deletemanagergroup','savemanagergroup','index','viewgroup','createnewgroup','showgroups','showviewgroups','edit','view','Manager Appraisal'));
@@ -1449,18 +1446,27 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('default:approvedleaves'));
                             $acl->allow('employee', 'default:approvedleaves', array('index','view','Approved Leaves'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:businessunits'));
+                            $acl->allow('employee', 'default:businessunits', array('index','getdeptnames','view','Business Units'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:cancelleaves'));
                             $acl->allow('employee', 'default:cancelleaves', array('index','view','Cancelled Leaves'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:dashboard'));
                         $acl->allow('employee', 'default:dashboard', array('index','saveuserdashboard','getwidgtes','upgradeapplication','emailsettings','changepassword','editpassword','update','uploadpreview','viewprofile','viewsettings','savemenuwidgets','getmenuname','fetchmenuname','getnavids','getopeningpositondate','menuwork'));
 
-		 $acl->addResource(new Zend_Acl_Resource('default:exitproc'));
-                            $acl->allow('employee', 'default:exitproc', array('index','add','edit','view','Initiate/Check Status'));
+		 $acl->addResource(new Zend_Acl_Resource('default:departments'));
+                            $acl->allow('employee', 'default:departments', array('index','viewpopup','editpopup','getdepartments','getempnames','view','Departments'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:employee'));
+                            $acl->allow('employee', 'default:employee', array('getemprequi','index','changeorghead','getdepartments','getpositions','getempreportingmanagers','makeactiveinactive','changereportingmanager','addemppopup','uploadexcel','getindividualempdetails','view','Employees'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:feedforwardemployee'));
                             $acl->allow('employee', 'default:feedforwardemployee', array('index','save','edit','view','Appraise Your Manager'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:heirarchy'));
+                            $acl->allow('employee', 'default:heirarchy', array('index','addlist','editlist','saveadddata','saveeditdata','deletelist','Organization Hierarchy'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:index'));
                         $acl->allow('employee', 'default:index', array('index','loginpopupsave','logout','clearsessionarray','forcelogout','browserfailure','sendpassword','updatecontactnumber','getstates','getstatesnormal','getcities','getcitiesnormal','getdepartments','getpositions','gettargetcurrency','calculatedays','calculatebusinessdays','calculatecalendardays','fromdatetodate','fromdatetodateorg','validateorgheadjoiningdate','medicalclaimdates','gettimeformat','chkcurrenttime','popup','createorremoveshortcut','sessiontour','getissuingauthority','setsessionval','checkisactivestatus','updatetheme','welcome','getmultidepts','getmultiemps'));
 
@@ -1488,9 +1494,15 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('default:myteamappraisal'));
                             $acl->allow('employee', 'default:myteamappraisal', array('savelineresponse','savemngresponse','getempcontent','index','getsearchedempcontent','getsearchedstatus','My Team Appraisal'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:organisationinfo'));
+                            $acl->allow('employee', 'default:organisationinfo', array('index','edit_old','saveupdate','uploadpreview','validateorgstartdate','getcompleteorgdata','addorghead','Organization Info'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:pendingleaves'));
                             $acl->allow('employee', 'default:pendingleaves', array('index','delete','view','Pending Leaves'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:policydocuments'));
+                            $acl->allow('employee', 'default:policydocuments', array('index','uploaddoc','deletedocument','addmultiple','uploadmultipledocs','view','View/Manage Policy Documents'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:rejectedleaves'));
                             $acl->allow('employee', 'default:rejectedleaves', array('index','view','Rejected Leaves'));
 
@@ -1506,6 +1518,9 @@ protected function _getAcl()
                                     $acl->allow('employee', 'default:servicerequests', array('index','uploadsave','uploaddelete','view','getrequests','changestatus','checkrequeststatus','index','add','uploadsave','uploaddelete','view','getrequests','changestatus','checkrequeststatus'));
 
                                 
+		 $acl->addResource(new Zend_Acl_Resource('default:structure'));
+                            $acl->allow('employee', 'default:structure', array('index','Organization Structure'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:emppersonaldetails'));
                             $acl->allow('employee', 'default:emppersonaldetails', array('index','view','index','view','edit'));
 
@@ -1562,6 +1577,34 @@ protected function _getAcl()
 
 		 $acl->addResource(new Zend_Acl_Resource('default:apprreqcandidates'));
                             $acl->allow('employee', 'default:apprreqcandidates', array('index','viewpopup'));
+}if($role == 6 )
+           {
+		 $acl->addResource(new Zend_Acl_Resource('default:announcements'));
+                            $acl->allow('user', 'default:announcements', array('index','getdepts','uploadsave','uploaddelete','view','Announcements'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:businessunits'));
+                            $acl->allow('user', 'default:businessunits', array('index','getdeptnames','view','Business Units'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:dashboard'));
+                        $acl->allow('user', 'default:dashboard', array('index','saveuserdashboard','getwidgtes','upgradeapplication','emailsettings','changepassword','editpassword','update','uploadpreview','viewprofile','viewsettings','savemenuwidgets','getmenuname','fetchmenuname','getnavids','getopeningpositondate','menuwork'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:departments'));
+                            $acl->allow('user', 'default:departments', array('index','viewpopup','editpopup','getdepartments','getempnames','view','Departments'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:heirarchy'));
+                            $acl->allow('user', 'default:heirarchy', array('index','addlist','editlist','saveadddata','saveeditdata','deletelist','Organization Hierarchy'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:index'));
+                        $acl->allow('user', 'default:index', array('index','loginpopupsave','logout','clearsessionarray','forcelogout','browserfailure','sendpassword','updatecontactnumber','getstates','getstatesnormal','getcities','getcitiesnormal','getdepartments','getpositions','gettargetcurrency','calculatedays','calculatebusinessdays','calculatecalendardays','fromdatetodate','fromdatetodateorg','validateorgheadjoiningdate','medicalclaimdates','gettimeformat','chkcurrenttime','popup','createorremoveshortcut','sessiontour','getissuingauthority','setsessionval','checkisactivestatus','updatetheme','welcome','getmultidepts','getmultiemps'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:organisationinfo'));
+                            $acl->allow('user', 'default:organisationinfo', array('index','edit_old','saveupdate','uploadpreview','validateorgstartdate','getcompleteorgdata','addorghead','Organization Info'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:structure'));
+                            $acl->allow('user', 'default:structure', array('index','Organization Structure'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:processes'));
+                            $acl->allow('user', 'default:processes', array('index','editpopup','viewpopup','savecomments','displaycomments','savefeedback'));
 }if($role == 7 )
            {
 		 $acl->addResource(new Zend_Acl_Resource('default:announcements'));
@@ -1595,8 +1638,14 @@ protected function _getAcl()
                             $acl->allow('agency', 'default:processes', array('index','editpopup','viewpopup','savecomments','displaycomments','savefeedback'));
 }if($role == 8 )
            {
-		 $acl->addResource(new Zend_Acl_Resource('default:allexitproc'));
-                            $acl->allow('sysadmin', 'default:allexitproc', array('index','edit','view','All Exit Procedures'));
+		 $acl->addResource(new Zend_Acl_Resource('default:accountclasstype'));
+                            $acl->allow('sysadmin', 'default:accountclasstype', array('index','addpopup','saveupdate','add','edit','delete','view','Account Class Types'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:announcements'));
+                            $acl->allow('sysadmin', 'default:announcements', array('index','getdepts','uploadsave','uploaddelete','view','Announcements'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:appraisalhistory'));
+                            $acl->allow('sysadmin', 'default:appraisalhistory', array('index','getselectedappraisaldata','view','Appraisal History'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:appraisalmanager'));
                             $acl->allow('sysadmin', 'default:appraisalmanager', array('submitmanager','deletemanagergroup','savemanagergroup','index','viewgroup','createnewgroup','showgroups','showviewgroups','edit','view','Manager Appraisal'));
@@ -1607,21 +1656,69 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('default:approvedleaves'));
                             $acl->allow('sysadmin', 'default:approvedleaves', array('index','view','Approved Leaves'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:businessunits'));
+                            $acl->allow('sysadmin', 'default:businessunits', array('index','getdeptnames','view','Business Units'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:cancelleaves'));
                             $acl->allow('sysadmin', 'default:cancelleaves', array('index','view','Cancelled Leaves'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:categories'));
+                            $acl->allow('sysadmin', 'default:categories', array('index','addnewcategory','add','edit','view','Categories'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:cities'));
+                            $cities_add = 'yes';
+                                if($this->id_param == '' && $cities_add == 'yes')
+                                    $acl->allow('sysadmin', 'default:cities', array('index','getcitiescand','addpopup','addnewcity','add','delete','view','Cities','edit'));
+
+                                else
+                                    $acl->allow('sysadmin', 'default:cities', array('index','getcitiescand','addpopup','addnewcity','add','delete','view','Cities'));
+
+                                
+		 $acl->addResource(new Zend_Acl_Resource('default:countries'));
+                            $countries_add = 'yes';
+                                if($this->id_param == '' && $countries_add == 'yes')
+                                    $acl->allow('sysadmin', 'default:countries', array('index','saveupdate','getcountrycode','addpopup','addnewcountry','add','delete','view','Countries','edit'));
+
+                                else
+                                    $acl->allow('sysadmin', 'default:countries', array('index','saveupdate','getcountrycode','addpopup','addnewcountry','add','delete','view','Countries'));
+
+                                
+		 $acl->addResource(new Zend_Acl_Resource('default:currency'));
+                            $acl->allow('sysadmin', 'default:currency', array('index','addpopup','gettargetcurrency','add','edit','delete','view','Currencies'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:currencyconverter'));
+                            $acl->allow('sysadmin', 'default:currencyconverter', array('index','add','edit','delete','view','Currency Conversions'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:dashboard'));
                         $acl->allow('sysadmin', 'default:dashboard', array('index','saveuserdashboard','getwidgtes','upgradeapplication','emailsettings','changepassword','editpassword','update','uploadpreview','viewprofile','viewsettings','savemenuwidgets','getmenuname','fetchmenuname','getnavids','getopeningpositondate','menuwork'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:departments'));
+                            $acl->allow('sysadmin', 'default:departments', array('index','viewpopup','editpopup','getdepartments','getempnames','view','Departments'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:emailcontacts'));
+                            $acl->allow('sysadmin', 'default:emailcontacts', array('index','getgroupoptions','getmailcnt','add','edit','delete','view','Email Contacts'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:employee'));
                             $acl->allow('sysadmin', 'default:employee', array('getemprequi','index','changeorghead','getdepartments','getpositions','getempreportingmanagers','makeactiveinactive','changereportingmanager','addemppopup','uploadexcel','getindividualempdetails','view','Employees'));
 
-		 $acl->addResource(new Zend_Acl_Resource('default:exitproc'));
-                            $acl->allow('sysadmin', 'default:exitproc', array('index','add','edit','view','Initiate/Check Status'));
+		 $acl->addResource(new Zend_Acl_Resource('default:ethniccode'));
+                            $acl->allow('sysadmin', 'default:ethniccode', array('index','saveupdate','addpopup','add','edit','delete','view','Ethnic Codes'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:feedforwardemployee'));
                             $acl->allow('sysadmin', 'default:feedforwardemployee', array('index','save','edit','view','Appraise Your Manager'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:gender'));
+                            $acl->allow('sysadmin', 'default:gender', array('index','saveupdate','addpopup','add','edit','delete','view','Gender'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:geographygroup'));
+                            $acl->allow('sysadmin', 'default:geographygroup', array('index','add','edit','delete','view','Geo Groups'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:heirarchy'));
+                            $acl->allow('sysadmin', 'default:heirarchy', array('index','addlist','editlist','saveadddata','saveeditdata','deletelist','Organization Hierarchy'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:identitycodes'));
+                            $acl->allow('sysadmin', 'default:identitycodes', array('index','addpopup','add','edit','Identity Codes'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:index'));
                         $acl->allow('sysadmin', 'default:index', array('index','loginpopupsave','logout','clearsessionarray','forcelogout','browserfailure','sendpassword','updatecontactnumber','getstates','getstatesnormal','getcities','getcitiesnormal','getdepartments','getpositions','gettargetcurrency','calculatedays','calculatebusinessdays','calculatecalendardays','fromdatetodate','fromdatetodateorg','validateorgheadjoiningdate','medicalclaimdates','gettimeformat','chkcurrenttime','popup','createorremoveshortcut','sessiontour','getissuingauthority','setsessionval','checkisactivestatus','updatetheme','welcome','getmultidepts','getmultiemps'));
 
@@ -1634,9 +1731,15 @@ protected function _getAcl()
                                     $acl->allow('sysadmin', 'default:leaverequest', array('index','saveleaverequestdetails','gethalfdaydetails','add','Leave Request'));
 
                                 
+		 $acl->addResource(new Zend_Acl_Resource('default:licensetype'));
+                            $acl->allow('sysadmin', 'default:licensetype', array('index','add','edit','delete','view','License Types'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:manageremployeevacations'));
                             $acl->allow('sysadmin', 'default:manageremployeevacations', array('index','edit','view','Manager Employee Leaves'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:maritalstatus'));
+                            $acl->allow('sysadmin', 'default:maritalstatus', array('index','saveupdate','addpopup','add','edit','delete','view','Marital Status'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:mydetails'));
                             $acl->allow('sysadmin', 'default:mydetails', array('index','personaldetailsview','personal','communicationdetailsview','communication','skills','education','experience','leaves','holidays','salarydetailsview','salarydetails','certification','creditcarddetailsview','creditcard','visadetailsview','visa','medicalclaims','disabilitydetailsview','disability','dependency','workeligibilitydetailsview','workeligibility','additionaldetailsedit','jobhistory','documents','add','edit','delete','view','My Details'));
 
@@ -1649,9 +1752,30 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('default:myteamappraisal'));
                             $acl->allow('sysadmin', 'default:myteamappraisal', array('savelineresponse','savemngresponse','getempcontent','index','getsearchedempcontent','getsearchedstatus','My Team Appraisal'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:nationality'));
+                            $acl->allow('sysadmin', 'default:nationality', array('index','addpopup','add','edit','delete','view','Nationalities'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:nationalitycontextcode'));
+                            $acl->allow('sysadmin', 'default:nationalitycontextcode', array('index','add','edit','delete','view','Nationality Context Codes'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:numberformats'));
+                            $acl->allow('sysadmin', 'default:numberformats', array('index','add','edit','delete','view','Number Formats'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:organisationinfo'));
+                            $acl->allow('sysadmin', 'default:organisationinfo', array('index','edit_old','saveupdate','uploadpreview','validateorgstartdate','getcompleteorgdata','addorghead','Organization Info'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:pendingleaves'));
                             $acl->allow('sysadmin', 'default:pendingleaves', array('index','delete','view','Pending Leaves'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:policydocuments'));
+                            $acl->allow('sysadmin', 'default:policydocuments', array('index','uploaddoc','deletedocument','addmultiple','uploadmultipledocs','add','edit','view','View/Manage Policy Documents'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:prefix'));
+                            $acl->allow('sysadmin', 'default:prefix', array('index','saveupdate','addpopup','add','edit','delete','view','Prefixes'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:racecode'));
+                            $acl->allow('sysadmin', 'default:racecode', array('index','saveupdate','addpopup','add','edit','delete','view','Race Codes'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:rejectedleaves'));
                             $acl->allow('sysadmin', 'default:rejectedleaves', array('index','view','Rejected Leaves'));
 
@@ -1670,6 +1794,24 @@ protected function _getAcl()
                                     $acl->allow('sysadmin', 'default:servicerequests', array('index','uploadsave','uploaddelete','view','getrequests','changestatus','checkrequeststatus','index','add','uploadsave','uploaddelete','view','getrequests','changestatus','checkrequeststatus'));
 
                                 
+		 $acl->addResource(new Zend_Acl_Resource('default:sitepreference'));
+                            $acl->allow('sysadmin', 'default:sitepreference', array('index','view','add','edit','Site Preferences'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:states'));
+                            $states_add = 'yes';
+                                if($this->id_param == '' && $states_add == 'yes')
+                                    $acl->allow('sysadmin', 'default:states', array('index','getstates','getstatescand','addpopup','addnewstate','add','delete','view','States','edit'));
+
+                                else
+                                    $acl->allow('sysadmin', 'default:states', array('index','getstates','getstatescand','addpopup','addnewstate','add','delete','view','States'));
+
+                                
+		 $acl->addResource(new Zend_Acl_Resource('default:structure'));
+                            $acl->allow('sysadmin', 'default:structure', array('index','Organization Structure'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:timezone'));
+                            $acl->allow('sysadmin', 'default:timezone', array('index','saveupdate','addpopup','add','edit','delete','view','Time Zones'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:usermanagement'));
                             $acl->allow('sysadmin', 'default:usermanagement', array('index','saveupdate','getemailofuser','add','edit','view','Manage External Users'));
 
@@ -1734,8 +1876,11 @@ protected function _getAcl()
                             $acl->allow('sysadmin', 'default:apprreqcandidates', array('index','viewpopup'));
 }if($role == 9 )
            {
-		 $acl->addResource(new Zend_Acl_Resource('default:allexitproc'));
-                            $acl->allow('lead', 'default:allexitproc', array('index','edit','view','All Exit Procedures'));
+		 $acl->addResource(new Zend_Acl_Resource('default:announcements'));
+                            $acl->allow('lead', 'default:announcements', array('index','getdepts','uploadsave','uploaddelete','view','Announcements'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:appraisalhistory'));
+                            $acl->allow('lead', 'default:appraisalhistory', array('index','getselectedappraisaldata','view','Appraisal History'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:appraisalmanager'));
                             $acl->allow('lead', 'default:appraisalmanager', array('submitmanager','deletemanagergroup','savemanagergroup','index','viewgroup','createnewgroup','showgroups','showviewgroups','edit','view','Manager Appraisal'));
@@ -1746,18 +1891,27 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('default:approvedleaves'));
                             $acl->allow('lead', 'default:approvedleaves', array('index','view','Approved Leaves'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:businessunits'));
+                            $acl->allow('lead', 'default:businessunits', array('index','getdeptnames','view','Business Units'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:cancelleaves'));
                             $acl->allow('lead', 'default:cancelleaves', array('index','view','Cancelled Leaves'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:dashboard'));
                         $acl->allow('lead', 'default:dashboard', array('index','saveuserdashboard','getwidgtes','upgradeapplication','emailsettings','changepassword','editpassword','update','uploadpreview','viewprofile','viewsettings','savemenuwidgets','getmenuname','fetchmenuname','getnavids','getopeningpositondate','menuwork'));
 
-		 $acl->addResource(new Zend_Acl_Resource('default:exitproc'));
-                            $acl->allow('lead', 'default:exitproc', array('index','add','edit','view','Initiate/Check Status'));
+		 $acl->addResource(new Zend_Acl_Resource('default:departments'));
+                            $acl->allow('lead', 'default:departments', array('index','viewpopup','editpopup','getdepartments','getempnames','view','Departments'));
+
+		 $acl->addResource(new Zend_Acl_Resource('default:employee'));
+                            $acl->allow('lead', 'default:employee', array('getemprequi','index','changeorghead','getdepartments','getpositions','getempreportingmanagers','makeactiveinactive','changereportingmanager','addemppopup','uploadexcel','getindividualempdetails','view','Employees'));
 
 		 $acl->addResource(new Zend_Acl_Resource('default:feedforwardemployee'));
                             $acl->allow('lead', 'default:feedforwardemployee', array('index','save','edit','view','Appraise Your Manager'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:heirarchy'));
+                            $acl->allow('lead', 'default:heirarchy', array('index','addlist','editlist','saveadddata','saveeditdata','deletelist','Organization Hierarchy'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:index'));
                         $acl->allow('lead', 'default:index', array('index','loginpopupsave','logout','clearsessionarray','forcelogout','browserfailure','sendpassword','updatecontactnumber','getstates','getstatesnormal','getcities','getcitiesnormal','getdepartments','getpositions','gettargetcurrency','calculatedays','calculatebusinessdays','calculatecalendardays','fromdatetodate','fromdatetodateorg','validateorgheadjoiningdate','medicalclaimdates','gettimeformat','chkcurrenttime','popup','createorremoveshortcut','sessiontour','getissuingauthority','setsessionval','checkisactivestatus','updatetheme','welcome','getmultidepts','getmultiemps'));
 
@@ -1785,9 +1939,15 @@ protected function _getAcl()
 		 $acl->addResource(new Zend_Acl_Resource('default:myteamappraisal'));
                             $acl->allow('lead', 'default:myteamappraisal', array('savelineresponse','savemngresponse','getempcontent','index','getsearchedempcontent','getsearchedstatus','My Team Appraisal'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:organisationinfo'));
+                            $acl->allow('lead', 'default:organisationinfo', array('index','edit_old','saveupdate','uploadpreview','validateorgstartdate','getcompleteorgdata','addorghead','Organization Info'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:pendingleaves'));
                             $acl->allow('lead', 'default:pendingleaves', array('index','delete','view','Pending Leaves'));
 
+		 $acl->addResource(new Zend_Acl_Resource('default:policydocuments'));
+                            $acl->allow('lead', 'default:policydocuments', array('index','uploaddoc','deletedocument','addmultiple','uploadmultipledocs','view','View/Manage Policy Documents'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:rejectedleaves'));
                             $acl->allow('lead', 'default:rejectedleaves', array('index','view','Rejected Leaves'));
 
@@ -1803,6 +1963,9 @@ protected function _getAcl()
                                     $acl->allow('lead', 'default:servicerequests', array('index','uploadsave','uploaddelete','view','getrequests','changestatus','checkrequeststatus','index','add','uploadsave','uploaddelete','view','getrequests','changestatus','checkrequeststatus'));
 
                                 
+		 $acl->addResource(new Zend_Acl_Resource('default:structure'));
+                            $acl->allow('lead', 'default:structure', array('index','Organization Structure'));
+
 		 $acl->addResource(new Zend_Acl_Resource('default:emppersonaldetails'));
                             $acl->allow('lead', 'default:emppersonaldetails', array('index','view','index','view','edit'));
 
diff --git a/application/modules/default/views/scripts/dashboard/viewsettings.ajax.phtml b/application/modules/default/views/scripts/dashboard/viewsettings.ajax.phtml
index e28df2ecd..c3c3ed808 100644
--- a/application/modules/default/views/scripts/dashboard/viewsettings.ajax.phtml
+++ b/application/modules/default/views/scripts/dashboard/viewsettings.ajax.phtml
@@ -124,7 +124,7 @@ if($this->menuidcount > 0){
 			<div id="shortcutspan" onClick="showshortcuticons()" class="no_loader shortcuts-div">Shortcuts</div>
 			<div id="loaderdragimg" style="display:none;"><img src="<?php echo $this->baseUrl("public/media/images/loaderwhite_21X21.gif");?>"/></div>
          </div>
-         <div class="drag-text">Drag &amp; Drop the selected menu to the below box</div>
+         <div class="drag-text">Drag &amp; Drop the menu items on the left into the box below</div>
          <div id="settingstab" class="settings-block"></div>
          <div id="shortcuticontab" class="settings-block" style="display:none;"></div>
 		 <span class="settingserror" id="error-set" style="display:none"></span>
diff --git a/application/modules/default/views/scripts/dashboard/viewsettings.phtml b/application/modules/default/views/scripts/dashboard/viewsettings.phtml
index f5ef0b626..54beccb19 100644
--- a/application/modules/default/views/scripts/dashboard/viewsettings.phtml
+++ b/application/modules/default/views/scripts/dashboard/viewsettings.phtml
@@ -751,7 +751,7 @@ if($this->menuidcount > 0){
 			<div id="shortcutspan" onClick="showshortcuticons()" class="no_loader shortcuts-div">Shortcuts</div>
 			<div id="loaderdragimg" style="display:none;"><img src="<?php echo $this->baseUrl("public/media/images/loaderwhite_21X21.gif");?>"/></div>
          </div>
-         <div class="drag-text">Drag &amp; Drop the selected menu to the below box</div>
+         <div class="drag-text">Drag &amp; Drop the menu items on the left into the box below</div>
          <div id="settingstab" class="settings-block"></div>
          <div id="shortcuticontab" class="settings-block" style="display:none;"></div>
 		 <span class="settingserror" id="error-set" style="display:none"></span>
diff --git a/application/modules/default/views/scripts/leavemanagement/add.phtml b/application/modules/default/views/scripts/leavemanagement/add.phtml
index 2b0914b04..11f7a8ec1 100644
--- a/application/modules/default/views/scripts/leavemanagement/add.phtml
+++ b/application/modules/default/views/scripts/leavemanagement/add.phtml
@@ -75,7 +75,7 @@
 			</div>
 			
 			<div class="new-form-ui">
-			  <label class="required">Weekend 1</label>
+			  <label class="required">Weekend day 1</label>
 			<div class="division loca_state_div"><?php echo $this->form->weekend_startday; ?></div>
 			<?php if(isset($this->msgarray['weekend_startday'])){?>
 			   <span class="errors" id="errors-<?php echo $this->form->weekend_startday->getId(); ?>"><?php echo $this->msgarray['weekend_startday'];?></span>
@@ -83,7 +83,7 @@
 			</div>
 			
 			<div class="new-form-ui">
-			  <label class="required">Weekend 2</label>
+			  <label class="required">Weekend day 2</label>
 			<div class="division loca_state_div"><?php echo $this->form->weekend_endday; ?></div>
 			<?php if(isset($this->msgarray['weekend_endday'])){?>
 			   <span class="errors" id="errors-<?php echo $this->form->weekend_endday->getId(); ?>"><?php echo $this->msgarray['weekend_endday'];?></span>
diff --git a/application/modules/default/views/scripts/leavemanagement/edit.phtml b/application/modules/default/views/scripts/leavemanagement/edit.phtml
index 9d0834a8b..99d3b149e 100644
--- a/application/modules/default/views/scripts/leavemanagement/edit.phtml
+++ b/application/modules/default/views/scripts/leavemanagement/edit.phtml
@@ -66,7 +66,7 @@ sapp_Global::generateClientValidations($this->form);?>
 			</div>
 			
 			<div class="new-form-ui">
-			  <label class="required">Weekend 1</label>
+			  <label class="required">Weekend day 1</label>
 			<div class="division loca_state_div"><?php echo $this->form->weekend_startday; ?></div>
 			<?php if(isset($this->msgarray['weekend_startday'])){?>
 			   <span class="errors" id="errors-<?php echo $this->form->weekend_startday->getId(); ?>"><?php echo $this->msgarray['weekend_startday'];?></span>
@@ -74,7 +74,7 @@ sapp_Global::generateClientValidations($this->form);?>
 			</div>
 			
 			<div class="new-form-ui">
-			  <label class="required">Weekend 2</label>
+			  <label class="required">Weekend day 2</label>
 			<div class="division loca_state_div"><?php echo $this->form->weekend_endday; ?></div>
 			<?php if(isset($this->msgarray['weekend_endday'])){?>
 			   <span class="errors" id="errors-<?php echo $this->form->weekend_endday->getId(); ?>"><?php echo $this->msgarray['weekend_endday'];?></span>
diff --git a/application/modules/default/views/scripts/mailtemplates/newpassword.phtml b/application/modules/default/views/scripts/mailtemplates/newpassword.phtml
index 51faaedba..91b4ee24b 100644
--- a/application/modules/default/views/scripts/mailtemplates/newpassword.phtml
+++ b/application/modules/default/views/scripts/mailtemplates/newpassword.phtml
@@ -28,7 +28,7 @@
 	<div style='padding:20px 0 0 0;color:#3b3b3b;'>Username: <strong><?php echo $this->emp_id;?></strong></div>
 	<div style='padding:5px 0 0 0;color:#3b3b3b;'>Password: <strong><?php echo $this->password;?></strong></div>
 	
-	<div style="padding:20px 0 10px 0;">Please <a href="<?php echo BASE_URL;?>index/popup" target="_blank" style="color:#b3512f;">click here</a> to login  to your Sentrifugo account.</div>
+	<div style="padding:20px 0 10px 0;">Please <a href="<?php echo BASE_URL;?>" target="_blank" style="color:#b3512f;">click here</a> to login  to your Sentrifugo account.</div>
 
 </div>      
       
diff --git a/application/modules/default/views/scripts/reports/interviewrounds.phtml b/application/modules/default/views/scripts/reports/interviewrounds.phtml
index 665eb1263..cfeb81034 100644
--- a/application/modules/default/views/scripts/reports/interviewrounds.phtml
+++ b/application/modules/default/views/scripts/reports/interviewrounds.phtml
@@ -178,7 +178,7 @@ $(document).ready(function(){
         if(item.id != '')
         {
             return $( "<li>" )
-            .append( "<a><img class='flag' src='"+domain_data+"/public/uploads/profile/"+item.profile_img+"' onerror=\"this.src='"+domain_data+"/public/uploads/profile/profile_pic.png'\" /><span>" + item.label + "</span></a>" )
+            .append( "<a><img class='flag' src='"+domain_data+"/public/uploads/profile/"+item.profile_img+"' width='28' height='28' onerror=\"this.src='"+domain_data+"/public/uploads/profile/profile_pic.png'\" /><span style='padding-left: 6px;position: relative; top: -8px;font-size: 14px;'>" + item.label + "</span></a>")
             .appendTo( ul );
         }
         else 
@@ -208,7 +208,7 @@ $(document).ready(function(){
         if(item.id != '')
         {
             return $( "<li>" )
-            .append( "<a><img class='flag' src='"+domain_data+"/public/uploads/profile/"+item.profile_img+"' onerror=\"this.src='"+domain_data+"/public/uploads/profile/profile_pic.png'\" /><span>" + item.label + "</span></a>" )
+            .append( "<a><img class='flag' src='"+domain_data+"/public/uploads/profile/"+item.profile_img+"' width='28' height='28' onerror=\"this.src='"+domain_data+"/public/uploads/profile/profile_pic.png'\" /><span style='padding-left: 6px;position: relative; top: -8px;font-size: 14px;'>" + item.label + "</span></a>" )
             .appendTo( ul );
         }
         else 
diff --git a/application/modules/default/views/scripts/roles/getgroupmenu.ajax.phtml b/application/modules/default/views/scripts/roles/getgroupmenu.ajax.phtml
index d4acaa685..2683cdcf5 100644
--- a/application/modules/default/views/scripts/roles/getgroupmenu.ajax.phtml
+++ b/application/modules/default/views/scripts/roles/getgroupmenu.ajax.phtml
@@ -261,7 +261,7 @@ function setAccordionActive(acc_class)
 		}
 	?>
 		<input type="hidden" value="<?php echo (isset($this->act_menus[TIMEMANAGEMENT]) && $this->act_menus[TIMEMANAGEMENT]['isactive'] == 1)?1:0;?>" id="istimeactive" name="istimeactive">
-	<?php 	
+<?php	
 	}
  ?>
  </div> 
\ No newline at end of file
diff --git a/application/modules/default/views/scripts/wizard/configureunitsanddepartments.phtml b/application/modules/default/views/scripts/wizard/configureunitsanddepartments.phtml
index 1e6871020..6226d95ae 100644
--- a/application/modules/default/views/scripts/wizard/configureunitsanddepartments.phtml
+++ b/application/modules/default/views/scripts/wizard/configureunitsanddepartments.phtml
@@ -229,7 +229,7 @@ function saveBusinessUnit()
 				<div id='parent_0' class="add_request" style="margin:0;" >
 					<div class="form-ui ">
 		            <label class="required">Department </label>
-							<input type="text" maxlength="100" value="" id="department_0" name="department[]" class='cls_service_request_name' onblur='validateTextInput(this,"department")' onkeyup='validateTextInput(this,"department")'>                            
+							<input type="text" maxlength="100" value="" id="department_0" name="department[]" class='cls_service_request_name' onblur='validateTextInput(this,"department name")' onkeyup='validateTextInput(this,"department name")'>                            
 		        	</div>
 		        	
 		        	<div class="form-ui form-ui-textarea">
diff --git a/application/modules/timemanagement/controllers/ClientsController.php b/application/modules/timemanagement/controllers/ClientsController.php
index ce722e58e..ec179938d 100644
--- a/application/modules/timemanagement/controllers/ClientsController.php
+++ b/application/modules/timemanagement/controllers/ClientsController.php
@@ -42,6 +42,13 @@ class Timemanagement_ClientsController extends Zend_Controller_Action
 	 */
 	public function preDispatch()
 	{
+		/*$userModel = new Timemanagement_Model_Users();
+		$checkTmEnable = $userModel->checkTmEnable();
+
+		if(!$checkTmEnable){
+			$this->_redirect('error');
+		}*/
+		
 		//check Time management module enable
 		if(!sapp_Helper::checkTmEnable())
 			$this->_redirect('error');
diff --git a/application/modules/timemanagement/controllers/ConfigurationController.php b/application/modules/timemanagement/controllers/ConfigurationController.php
new file mode 100644
index 000000000..731a8823c
--- /dev/null
+++ b/application/modules/timemanagement/controllers/ConfigurationController.php
@@ -0,0 +1,198 @@
+<?php
+/*********************************************************************************
+ *  This file is part of Sentrifugo.
+ *  Copyright (C) 2014 Sapplica
+ *
+ *  Sentrifugo is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Sentrifugo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Sentrifugo.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  Sentrifugo Support <support@sentrifugo.com>
+ ********************************************************************************/
+
+class Timemanagement_ConfigurationController extends Zend_Controller_Action
+{
+
+	private $options;
+	public function preDispatch()
+	{
+		/*$userModel = new Timemanagement_Model_Users();
+		$checkTmEnable = $userModel->checkTmEnable();
+
+		if(!$checkTmEnable){
+			$this->_redirect('error');
+		}*/
+		
+		//check Time management module enable
+		if(!sapp_Helper::checkTmEnable())
+			$this->_redirect('error');
+
+	}
+
+	public function init()
+	{
+		$this->_options= $this->getInvokeArg('bootstrap')->getOptions();
+
+	}
+
+	public function indexAction()
+	{
+		$configurationModel = new Timemanagement_Model_Configuration();
+		$activerecordArr = $configurationModel->getActiveRecord();
+
+		$auth = Zend_Auth::getInstance();
+		if($auth->hasIdentity())
+		{
+			$sess_values = $auth->getStorage()->read();
+		}
+		if(!empty($activerecordArr))
+		$this->view->dataArray = $activerecordArr;
+
+		$this->view->messages = $this->_helper->flashMessenger->getMessages();
+		$this->view->admin = 'Yes';
+		$this->view->sess_values = $sess_values;
+	}
+
+	public function addAction()
+	{
+		$auth = Zend_Auth::getInstance();
+		if($auth->hasIdentity()){
+			$loginUserId = $auth->getStorage()->read()->id;
+			$loginuserRole = $auth->getStorage()->read()->emprole;
+			$loginuserGroup = $auth->getStorage()->read()->group_id;
+		}
+
+		$configurationForm = new Timemanagement_Form_Configuration();
+		$configurationModel = new Timemanagement_Model_Configuration();
+		$activerecordArr = $configurationModel->getActiveRecord();
+
+		$msgarray = array();
+			
+		$configurationForm->setAttrib('action',BASE_URL.'timemanagement/configuration/add');
+		$this->view->form = $configurationForm;
+		$this->view->msgarray = $msgarray;
+		if(count($activerecordArr)>0)
+		{
+			$this->view->nodata = "";
+			$activerecordArr = $configurationModel->getActiveRecord();
+			if(count($activerecordArr[0])>0)
+			{
+				foreach($activerecordArr[0] as $key=>$val)
+				{
+					$activerecordArr[$key] = htmlentities(addslashes($val), ENT_QUOTES, "UTF-8");
+				}
+			}
+
+			$configurationForm->submit->setLabel('UPDATE');
+			$configurationForm->populate($activerecordArr);
+		}
+		if($this->getRequest()->getPost()){
+			if($configurationForm->isValid($this->_request->getPost())){
+				$result = $this->save($configurationForm);
+				$this->view->msgarray = $msgarray;
+			}else
+			{
+				$messages = $configurationForm->getMessages();
+				foreach ($messages as $key => $val)
+				{
+					foreach($val as $key2 => $val2)
+					{
+						$msgarray[$key] = $val2;
+						break;
+					}
+				}
+				$this->view->msgarray = $msgarray;
+			}
+		}
+
+	}
+
+	public function save($configurationForm)
+	{
+		$auth = Zend_Auth::getInstance();
+		if($auth->hasIdentity())
+		{
+			$loginUserId = $auth->getStorage()->read()->id;
+		}
+		if($configurationForm->isValid($this->_request->getPost()))
+		{
+			$trDb = Zend_Db_Table::getDefaultAdapter();
+			// starting transaction
+			$trDb->beginTransaction();
+			try
+			{
+				$configurationModel = new Timemanagement_Model_Configuration();
+				$id = (int)$this->_request->getParam('id');
+				$id = abs($id);
+				//$ts_block_reminder_day = $this->_request->getParam('ts_block_reminder_day');
+				//$ts_blocking_day = $this->_request->getParam('ts_blocking_day');
+				$ts_weekly_reminder_day = $this->_request->getParam('ts_weekly_reminder_day');
+				$ts_block_dates_range = $this->_request->getParam('ts_block_dates_range');
+
+				$date = new Zend_Date();
+				$data = array(
+				//'ts_block_reminder_day'=>$ts_block_reminder_day,
+				// 'ts_blocking_day'=>$ts_blocking_day,
+                                'ts_weekly_reminder_day'=>$ts_weekly_reminder_day,
+				                'ts_block_dates_range'=>$ts_block_dates_range,
+                                'created_by' => $loginUserId,
+                                'modified_by'=>$loginUserId,
+                                'modified'=>$date->get('yyyy-MM-dd HH:mm:ss'),
+                                'created'=>$date->get('yyyy-MM-dd HH:mm:ss'),
+                                'is_active'=>1
+				);
+
+				$update_arr = array(
+                                    'is_active' => 0,
+                                    'modified'=>$date->get('yyyy-MM-dd HH:mm:ss'),
+                                    'modified_by'=>$loginUserId,                                                
+				);
+
+				$configurationModel->SaveorUpdateConfigurationData($update_arr, array('is_active'=>1));
+
+				$Id = $configurationModel->SaveorUpdateConfigurationData($data, $where='');
+
+				if($id!='')
+				{
+					$this->_helper->getHelper("FlashMessenger")->addMessage(array("success"=>"Configuration updated successfully."));
+				}
+				else
+				{
+					$this->_helper->getHelper("FlashMessenger")->addMessage(array("success"=>"Configuration added successfully."));
+				}
+
+				$trDb->commit();
+			}
+			catch (Exception $e)
+			{
+				$trDb->rollBack();
+				$this->_helper->getHelper("FlashMessenger")->addMessage(array("success"=>"Something went wrong,please try again later."));
+			}
+			$this->_redirect('timemanagement/configuration');
+		}
+		else
+		{
+			$messages = $configurationForm->getMessages();
+			foreach ($messages as $key => $val)
+			{
+				foreach($val as $key2 => $val2)
+				{
+					$msgarray[$key] = $val2;
+					break;
+				}
+			}
+			return $msgarray;
+		}
+	}
+
+}
+
diff --git a/application/modules/timemanagement/controllers/CronjobController.php b/application/modules/timemanagement/controllers/CronjobController.php
new file mode 100644
index 000000000..2aa2e2603
--- /dev/null
+++ b/application/modules/timemanagement/controllers/CronjobController.php
@@ -0,0 +1,850 @@
+<?php
+/*********************************************************************************
+ *  This file is part of Sentrifugo.
+ *  Copyright (C) 2014 Sapplica
+ *
+ *  Sentrifugo is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Sentrifugo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Sentrifugo.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  Sentrifugo Support <support@sentrifugo.com>
+ ********************************************************************************/
+
+class Timemanagement_CronjobController extends Zend_Controller_Action
+{
+
+	private $options;
+	public function preDispatch()
+	{
+		//check Time management module enable
+		if(!sapp_Helper::checkTmEnable())
+			$this->_redirect('error');
+
+	}
+
+	public function init()
+	{
+
+		$this->_options= $this->getInvokeArg('bootstrap')->getOptions();
+	}
+
+	public function indexAction()
+	{
+
+		$this->_helper->viewRenderer->setNoRender(true);
+		$this->_helper->layout()->disableLayout();
+
+		$date = new Zend_Date();
+		
+		//parameter wise cronjob start
+		$a_date = ($this->_getParam('date'))?$this->_getParam('date'):"";
+		//parameter wise cronjob end
+		if($a_date!="")
+		{
+			$a_date = date("Y-m-d", strtotime($a_date));
+		}
+		
+		//weekly mail reminder function
+		$this->mailreminder($a_date);
+		//monthly mail reminder function
+		$this->monthlyempblockremainder($a_date);
+		
+		//monthly block function
+		$this->monthlyblockedemp($a_date);
+
+		$tm_cronjob_statusModel = new Timemanagement_Model_Cronjobstatus;
+		$checkAnyCronRunning = $tm_cronjob_statusModel->checkCronRunning();
+		if(count($checkAnyCronRunning) == 0){
+			$cronstatusData = array('cronjob_status' => 'running',
+										'start_date' => gmdate("Y-m-d H:i:s"),
+										'end_date'=>gmdate("Y-m-d H:i:s")
+			);
+
+			$insertedCronjobStatusId = $tm_cronjob_statusModel->saveorUpdateCronjobStatusData($cronstatusData,'');
+
+			$this->tmmailscron();
+
+			$cronstatusData = array('cronjob_status' => 'stopped',
+										'end_date'=>gmdate("Y-m-d H:i:s")
+			);
+			$whereCronstatus = array('id=?'=>$insertedCronjobStatusId);
+
+			$updateCronjobStatus = $tm_cronjob_statusModel->saveorUpdateCronjobStatusData($cronstatusData,$whereCronstatus);
+
+		}else{
+			echo 'Some cron running';
+		}
+	}//end of index action
+
+	/*****Timemanagememt crons ********/
+	//weekly reminder mail cron
+	public function mailreminder($aDate)
+	{
+		$this->_helper->viewRenderer->setNoRender(true);
+		// the above is to stop search for view file
+		$this->_helper->layout()->disableLayout();
+
+		$tm_cronjob_statusModel = new Timemanagement_Model_Cronjobstatus;
+		$checkAnyCronRunning = $tm_cronjob_statusModel->checkCronRunning();
+		if(count($checkAnyCronRunning) == 0){
+			$cronstatusData = array('cronjob_status' => 'running',
+										'start_date' => gmdate("Y-m-d H:i:s"),
+										'end_date'=>gmdate("Y-m-d H:i:s")
+			);
+
+			$insertedCronjobStatusId = $tm_cronjob_statusModel->saveorUpdateCronjobStatusData($cronstatusData,'');
+
+			$tmconf_model = new Timemanagement_Model_Configuration();
+			$getTmConfig = $tmconf_model->getActiveRecord();
+
+			if(!empty($getTmConfig)){
+				try{
+
+					$weekCon_arr = array('sun'=>'Sunday','mon'=>'Monday','tue'=>'Tuesday','wed'=>'Wednesday','thu'=>'Thursday','fri'=>'Friday','sat'=>'Saturday');
+					$startday_err=array('Sunday'=>7,'Monday'=>8,'Tuesday'=>9,'Wednesday'=>10,'Thursday'=>11,'Friday'=>12,'Saturday'=>13);
+					$endday_err=array('Sunday'=>1,'Monday'=>2,'Tuesday'=>3,'Wednesday'=>4,'Thursday'=>5,'Friday'=>6,'Saturday'=>7);
+
+					//$a_date = $this->_getParam('date');
+					//$a_date = '2015-06-04';
+					$a_date=($aDate!="")?$aDate:date('Y-m-d');
+					$date = new DateTime($a_date);
+					//echo $date->format('l').'----'. $weekCon_arr[$getTmConfig[0]['ts_weekly_reminder_day']];exit;
+					if($date->format('l') == $weekCon_arr[$getTmConfig[0]['ts_weekly_reminder_day']]){
+
+						$cron_day=$date->format('l');
+
+						$start_interval='P'.$startday_err[$cron_day].'D';
+						$end_interval='P'.$endday_err[$cron_day].'D';
+						$date->sub(new DateInterval($start_interval));
+						$ls_week=$date->format('Y-m-d');
+						$date = new DateTime($a_date);
+						$date->sub(new DateInterval($end_interval));
+						$ls_day=$date->format('Y-m-d');
+						//echo $ls_week.'-----'.$ls_day;//exit;
+
+						$tmUsers_model=new Timemanagement_Model_Users();
+
+						$mgr_list=$tmUsers_model->getManagers(); //echo '<pre>';print_r($mgr_list);exit;
+
+						//reporting to managers
+						foreach($mgr_list as $mgr)
+						{
+							$emp_data = $tmUsers_model->getEmployeesReportingTo($mgr['user_id'],$cron_day);
+
+							$emp_arr=array();
+							if(count($emp_data) > 0){
+								foreach($emp_data as $emp)
+								{
+									$emp_joindate = new DateTime($emp['date_of_joining']);
+									$emp_joindate = $emp_joindate->format('Y-m-d');
+
+									$not_fill_arr = $tmUsers_model->checkweekdaysdatacron($ls_week, $ls_day, $emp['user_id'],$emp['department_id'],$emp['holiday_group'],$emp_joindate);
+									//echo "<pre>";print_r($not_fill_arr);exit;
+
+									if(count($not_fill_arr)>0)
+									{
+										$pre_fin_dates = $not_fill_arr;
+										//echo "<pre>";print_r($pre_fin_dates);
+
+										//echo "<pre>";print_r($fin_dates);
+										$fin_dates = $pre_fin_dates; //print_r($fin_dates);
+										if(count($fin_dates)>0)
+										{
+											$this->send_mail_emp($emp['user_id'],$ls_week,$ls_day,$emp['userfullname'],$emp['emailaddress'],$fin_dates,'weekly');
+											$emp_arr[$emp['user_id']]=$emp['userfullname'];
+										}
+									}
+								}
+								$this->send_mail_manager($emp_arr,$ls_week,$ls_day,$mgr['user_id'],$mgr['userfullname'],$mgr['emailaddress'],'weeklyreminder');
+							}
+
+						}
+					}else{
+						echo "Date doesn't match";
+					}
+
+					$cronstatusData = array('cronjob_status' => 'stopped',
+										'end_date'=>gmdate("Y-m-d H:i:s")
+					);
+					$whereCronstatus = array('id=?'=>$insertedCronjobStatusId);
+
+					$updateCronjobStatus = $tm_cronjob_statusModel->saveorUpdateCronjobStatusData($cronstatusData,$whereCronstatus);
+				}
+				catch(Exception $e)
+				{
+					print_r($e); die;
+				}
+			}else{
+				echo 'Timemanagement configuration not yet set.';
+				
+				$cronstatusData = array('cronjob_status' => 'stopped',
+										'end_date'=>gmdate("Y-m-d H:i:s")
+					);
+				$whereCronstatus = array('id=?'=>$insertedCronjobStatusId);
+
+				$updateCronjobStatus = $tm_cronjob_statusModel->saveorUpdateCronjobStatusData($cronstatusData,$whereCronstatus);
+			}
+		}else{
+			echo 'Cron running';
+		}
+	}
+
+	public function send_mail_emp($empid,$ls_week,$ls_day,$emp_name,$emp_email,$days,$whichremainder,$blockreminderday = '')
+	{
+		$base_url = 'http://'.$this->getRequest()->getHttpHost() . $this->getRequest()->getBaseUrl();
+		$period = $ls_week.' to '.$ls_day;
+		$view = $this->getHelper('ViewRenderer')->view;
+
+		$this->view->base_url=$base_url;
+		$this->view->emp_name=$emp_name;
+		$this->view->days=$days;
+		$this->view->period=$period;
+
+		$text = '';
+		$mail_type = '';
+		if($whichremainder == 'weekly'){
+			$text = $view->render('tmmailtemplates/ts_weekly_employee.phtml');
+			$mail_type = 'submit_pending';
+		}else if($whichremainder == 'monthly'){
+			$this->view->blockreminderday = $blockreminderday;
+			$text = $view->render('tmmailtemplates/empmonthlyremainder.phtml');
+			$mail_type = 'reminder';
+		}else if($whichremainder == 'empblock'){
+			$text = $view->render('tmmailtemplates/monthlytimesheetstatus.phtml');
+			$mail_type = 'block';
+		}
+
+		/*Insert data to send mail*/
+		$totDays = implode(",", $days);
+		$mailslist_data = array('emp_id'=>$empid,
+								'mail_type'=>$mail_type,
+								'ts_dates'=>$totDays,
+		                        'emp_full_name'=>$emp_name,
+								'email'=>$emp_email,
+								'ts_start_date'=>$ls_week,
+								'ts_end_date'=>$ls_day,
+								'mail_content'=>$text,
+								'is_mail_sent'=>0,
+								'created' => gmdate("Y-m-d H:i:s"),
+		);
+
+		$mailslist_where = '';
+
+		$tmMail_model = new Timemanagement_Model_Mailslist();
+		$id = $tmMail_model->addOrUpdateMailsList($mailslist_data,$mailslist_where);
+		/*end*/
+	}
+
+	public function send_mail_manager($emp_arr,$ls_week,$ls_day,$mgr_id,$mgr_name,$mgr_mail,$whichremainder)
+	{
+		$base_url = 'http://'.$this->getRequest()->getHttpHost() . $this->getRequest()->getBaseUrl();
+
+		$emp_names='';
+		foreach($emp_arr as $key=>$value)
+		{
+			$emp_names.=$value."<br/>";
+		}
+		if(count($emp_arr) > 0)
+		{
+			$view = $this->getHelper('ViewRenderer')->view;
+			$period = $ls_week.' to '.$ls_day;
+			$this->view->mgr_name=$mgr_name;
+			$this->view->base_url=$base_url;
+			$this->view->ls_week=$ls_week;
+			$this->view->ls_day=$ls_day;
+			$this->view->emp_names=$emp_names;
+			$this->view->emp_arr=$emp_arr;
+			$this->view->period=$period;
+
+
+
+			if($whichremainder == 'weeklyreminder'){
+				$mail_type = 'submit_pending';
+				$text = $view->render('tmmailtemplates/ts_weekly_manager.phtml');
+					
+			}else if($whichremainder == 'monthlyblock'){
+				$mail_type = 'block';
+				$text = $view->render('tmmailtemplates/monthlyemptimesheet.phtml');
+			}
+
+			$trDb = Zend_Db_Table::getDefaultAdapter();
+			// starting transaction
+			$trDb->beginTransaction();
+			try
+			{
+				$mailslist_data = array('emp_id'=>$mgr_id,
+								'mail_type'=>$mail_type,
+								'ts_dates'=>'',
+								'emp_full_name'=>$mgr_name,
+								'email'=>$mgr_mail,
+								'ts_start_date'=>$ls_week,
+								'ts_end_date'=>$ls_day,
+								'mail_content'=>$text,
+								'is_mail_sent'=>0,
+								'created' => gmdate("Y-m-d H:i:s"),
+				);
+
+				$mailslist_where = '';
+
+				$tmMail_model = new Timemanagement_Model_Mailslist();
+				$id = $tmMail_model->addOrUpdateMailsList($mailslist_data,$mailslist_where);
+				//End
+				$trDb->commit();
+			}catch (Exception $e)
+			{
+				$trDb->rollBack();
+			}
+		}
+	}
+
+	//Employee Mail remainder for blocking his monthly timesheet.
+	public function monthlyempblockremainder($aDate)
+	{
+		$this->_helper->viewRenderer->setNoRender(true);
+		// the above is to stop search for view file
+		$this->_helper->layout()->disableLayout();
+
+		$tm_cronjob_statusModel = new Timemanagement_Model_Cronjobstatus;
+		$checkAnyCronRunning = $tm_cronjob_statusModel->checkCronRunning();
+		if(count($checkAnyCronRunning) == 0){
+			$cronstatusData = array('cronjob_status' => 'running',
+										'start_date' => gmdate("Y-m-d H:i:s"),
+										'end_date'=>gmdate("Y-m-d H:i:s")
+			);
+
+			$insertedCronjobStatusId = $tm_cronjob_statusModel->saveorUpdateCronjobStatusData($cronstatusData,'');
+
+			$tmconf_model = new Timemanagement_Model_Configuration();
+			$getTmConfig = $tmconf_model->getActiveRecord();
+			$blockReminderConfigDay ='';
+
+			if(!empty($getTmConfig)){
+
+				if(trim($getTmConfig[0]['ts_block_dates_range']) == '1-31'){
+					$blockReminderConfigDay = 2;
+				}else if(trim($getTmConfig[0]['ts_block_dates_range']) == '26-25'){
+					$blockReminderConfigDay = 27;
+				}
+
+				if(strlen($blockReminderConfigDay) == 1){
+					$blockReminderConfigDay = '0'.$blockReminderConfigDay;
+				}
+
+				//$a_date = '2015-07-27';
+				 $a_date=($aDate!="")?$aDate:date('Y-m-d');
+				//$a_date = $this->_getParam('date');
+				$date = new DateTime($a_date);
+				//echo $date->format('d').'-----'.$blockReminderConfigDay.'------';exit;
+				if($date->format('d') == $blockReminderConfigDay){
+					$tmUsers_model=new Timemanagement_Model_Users();
+					$mgr_list=$tmUsers_model->getManagers();
+
+					$today = new DateTime($a_date);
+					$cron_run_date =  $today->format('Y').'-'.$today->format('m').'-'.$blockReminderConfigDay;
+					$cron_run_date = strtotime($cron_run_date);
+					$cron_run_date = date('Y-m-d',$cron_run_date);
+
+					/*$tdate = new DateTime(date('Y-m-d'));
+					 $ctdate = new DateTime(date('Y-m-d'));*/
+
+					$tdate = new DateTime($a_date);
+					$ctdate = new DateTime($a_date);
+
+					if($blockReminderConfigDay == 2){
+						//First day of the previous month:
+						$tdate->sub(new DateInterval('P1M'));
+						$firstday_prev_month =$tdate->format('Y-m-01');
+						$hidstartweek_date = $firstday_prev_month;
+
+						//Last day of the previous month:
+						$lastday_prev_month =  $tdate->format('Y').'-'.$tdate->format('m').'-31';
+						$lastday_prev_month = strtotime($lastday_prev_month);
+						$lastday_prev_month = date('Y-m-d',$lastday_prev_month);
+						$hidendweek_date = $lastday_prev_month;
+
+						$lastday_prev_month = new DateTime(date($lastday_prev_month));
+						if($lastday_prev_month->format('m') != 31){
+							$hidendweek_date = date("Y-m-t", strtotime($tdate->format('Y').'-'.$tdate->format('m').'-01'));
+						}
+
+						$month_name = date("F, Y", strtotime($hidendweek_date));
+					}else if($blockReminderConfigDay == 27){
+						//First day of the previous month:
+						$tdate->sub(new DateInterval('P1M'));
+						$firstday_prev_month =$tdate->format('Y-m-26');
+						$hidstartweek_date = $firstday_prev_month;
+
+						//Last day of the previous month:
+						$lastday_prev_month = $ctdate->format('Y-m-25');
+						$hidendweek_date = $lastday_prev_month;
+						$month_name = date("F, Y", strtotime($hidendweek_date));
+					}
+
+					//echo 'TM_BLOCK_START_DAY---'.TM_BLOCK_START_DAY.'---startdate----'.$hidstartweek_date;echo '<br>';
+					//echo 'TM_BLOCK_END_DAY---'.TM_BLOCK_END_DAY.'---enddate----'.$hidendweek_date;echo '<br>';
+
+					$month_name = date("F, Y", strtotime($hidendweek_date));
+
+					// managers loop
+					if(count($mgr_list) > 0){
+						foreach($mgr_list as $mgr)
+						{
+							$emp_data = $tmUsers_model->getEmployeesReportingTo($mgr['user_id'],$cron_run_date);
+
+							$emp_arr=array();
+							if(count($emp_data)>0){
+								foreach($emp_data as $emp)
+								{
+									$emp_joindate = new DateTime($emp['date_of_joining']);
+									$emp_joindate = $emp_joindate->format('Y-m-d');
+
+									$not_fill_arr = $tmUsers_model->checkweekdaysdatacron($hidstartweek_date, $hidendweek_date, $emp['user_id'],$emp['department_id'],$emp['holiday_group'],$emp_joindate);
+									//echo "<pre>";print_r($not_fill_arr);exit;
+
+									if(count($not_fill_arr)>0)
+									{
+										$this->send_mail_emp($emp['user_id'],$hidstartweek_date,$hidendweek_date,$emp['userfullname'],$emp['emailaddress'],$not_fill_arr,'monthly',$blockReminderConfigDay);
+										$emp_arr[$emp['user_id']]=$emp['userfullname'];
+									}
+								}
+							}
+						}
+					}
+
+					$cronstatusData = array('cronjob_status' => 'stopped',
+										'end_date'=>gmdate("Y-m-d H:i:s")
+					);
+					$whereCronstatus = array('id=?'=>$insertedCronjobStatusId);
+
+					$updateCronjobStatus = $tm_cronjob_statusModel->saveorUpdateCronjobStatusData($cronstatusData,$whereCronstatus);
+				}else{
+					echo "Date doesn't match";
+					
+					$cronstatusData = array('cronjob_status' => 'stopped',
+										'end_date'=>gmdate("Y-m-d H:i:s")
+					);
+					$whereCronstatus = array('id=?'=>$insertedCronjobStatusId);
+
+					$updateCronjobStatus = $tm_cronjob_statusModel->saveorUpdateCronjobStatusData($cronstatusData,$whereCronstatus);
+				}
+			}else{
+				echo 'Timemanagement configuration not yet set.';
+				
+				$cronstatusData = array('cronjob_status' => 'stopped',
+										'end_date'=>gmdate("Y-m-d H:i:s")
+					);
+				$whereCronstatus = array('id=?'=>$insertedCronjobStatusId);
+
+				$updateCronjobStatus = $tm_cronjob_statusModel->saveorUpdateCronjobStatusData($cronstatusData,$whereCronstatus);
+			}
+		}else{
+			echo 'Some cron running';
+		}
+	}
+	//End
+
+
+	//Block timesheet monthly and send a mails.
+	public function monthlyblockedemp($aDate)
+	{
+
+		$this->_helper->viewRenderer->setNoRender(true);
+		// the above is to stop search for view file
+		$this->_helper->layout()->disableLayout();
+
+		$tmconf_model = new Timemanagement_Model_Configuration();
+		$getTmConfig = $tmconf_model->getActiveRecord();
+		$blockConfigDay = '';
+
+		$tm_cronjob_statusModel = new Timemanagement_Model_Cronjobstatus;
+		$checkAnyCronRunning = $tm_cronjob_statusModel->checkCronRunning();
+		if(count($checkAnyCronRunning) == 0){
+			$cronstatusData = array('cronjob_status' => 'running',
+									'start_date' => gmdate("Y-m-d H:i:s"),
+									'end_date'=>gmdate("Y-m-d H:i:s")
+			);
+
+			$insertedCronjobStatusId = $tm_cronjob_statusModel->saveorUpdateCronjobStatusData($cronstatusData,'');
+
+			if(!empty($getTmConfig)){
+
+				if(trim($getTmConfig[0]['ts_block_dates_range']) == '1-31'){
+					$blockConfigDay = 3;
+				}else if(trim($getTmConfig[0]['ts_block_dates_range']) == '26-25'){
+					$blockConfigDay = 28;
+				}
+
+				if(strlen($blockConfigDay) == 1){
+					$blockConfigDay = '0'.$blockConfigDay;
+				}
+
+				//$a_date = '2015-07-28';
+				  $a_date=($aDate!="")?$aDate:date('Y-m-d');
+				//$a_date = $this->_getParam('date');
+				$date = new DateTime($a_date);
+				//echo $date->format('d').'-----'.$blockConfigDay.'------';
+				if($date->format('d') == $blockConfigDay){
+					$tmUsers_model=new Timemanagement_Model_Users();
+					$mgr_list=$tmUsers_model->getManagers();
+					//$lead_list=$tmUsers_model->getEmployees('lead');//echo '<pre>'; print_r($lead_list);exit;
+
+					$today = new DateTime($a_date);
+					$cron_run_date =  $today->format('Y').'-'.$today->format('m').'-'.$blockConfigDay;
+					$cron_run_date = strtotime($cron_run_date);
+					$cron_run_date = date('Y-m-d',$cron_run_date);
+
+					/*$tdate = new DateTime(date('Y-m-d'));
+					 $ctdate = new DateTime(date('Y-m-d'));*/
+
+					$tdate = new DateTime($a_date);
+					$ctdate = new DateTime($a_date);
+
+					if($blockConfigDay == 3){
+						//First day of the previous month:
+						$tdate->sub(new DateInterval('P1M'));
+						$firstday_prev_month =$tdate->format('Y-m-01');
+						$hidstartweek_date = $firstday_prev_month;
+
+						//Last day of the previous month:
+						$lastday_prev_month =  $tdate->format('Y').'-'.$tdate->format('m').'-31';
+						$lastday_prev_month = strtotime($lastday_prev_month);
+						$lastday_prev_month = date('Y-m-d',$lastday_prev_month);
+						$hidendweek_date = $lastday_prev_month;
+
+						$lastday_prev_month = new DateTime(date($lastday_prev_month));
+						if($lastday_prev_month->format('m') != 31){
+							$hidendweek_date = date("Y-m-t", strtotime($tdate->format('Y').'-'.$tdate->format('m').'-01'));
+						}
+
+						$month_name = date("F, Y", strtotime($hidendweek_date));
+					}else if($blockConfigDay == 28){
+						//First day of the previous month:
+						$tdate->sub(new DateInterval('P1M'));
+						$firstday_prev_month =$tdate->format('Y-m-26');
+						$hidstartweek_date = $firstday_prev_month;
+
+						//Last day of the previous month:
+						$lastday_prev_month = $ctdate->format('Y-m-25');
+						$hidendweek_date = $lastday_prev_month;
+						$month_name = date("F, Y", strtotime($hidendweek_date));
+					}
+
+					//echo 'TM_BLOCK_START_DAY---'.TM_BLOCK_START_DAY.'---startdate----'.$hidstartweek_date;echo '<br>';
+					//echo 'TM_BLOCK_END_DAY---'.TM_BLOCK_END_DAY.'---enddate----'.$hidendweek_date;echo '<br>';exit;
+
+					$month_name = date("F, Y", strtotime($hidendweek_date));
+
+					// managers loop
+					$atleastOneEmpBlocked = false;
+				    if(count($mgr_list) > 0){
+						foreach($mgr_list as $mgr)
+						{
+							$emp_data = $tmUsers_model->getEmployeesReportingTo($mgr['user_id'],$cron_run_date);
+
+							$emp_arr=array();
+							if(count($emp_data) > 0){
+								foreach($emp_data as $emp)
+								{
+									$emp_joindate = new DateTime($emp['date_of_joining']);
+									$emp_joindate = $emp_joindate->format('Y-m-d');
+
+									$not_fill_arr = $tmUsers_model->checkweekdaysdatacron($hidstartweek_date, $hidendweek_date, $emp['user_id'],$emp['department_id'],$emp['holiday_group'],$emp_joindate);
+									//echo "<pre>";print_r($not_fill_arr);exit;
+
+									if(count($not_fill_arr)>0)
+									{
+                                        $atleastOneEmpBlocked = true;
+										$this->notfilledDays($emp['user_id'],$not_fill_arr,$blockConfigDay);
+										$this->send_mail_emp($emp['user_id'],$hidstartweek_date,$hidendweek_date,$emp['userfullname'],$emp['emailaddress'],$not_fill_arr,'empblock');
+										$emp_arr[$emp['user_id']]=$emp['userfullname'];
+									}
+								}
+								$this->send_mail_manager($emp_arr,$hidstartweek_date,$hidendweek_date,$mgr['user_id'],$mgr['userfullname'],$mgr['emailaddress'],'monthlyblock');
+							}
+						}
+					}
+
+					/*insert record in mail_list table for front end use*/
+					if(!$atleastOneEmpBlocked){
+
+						$mailslistdummy_data = array('emp_id'=> NULL,
+								'mail_type'=>'block',
+								'ts_dates'=> NULL,
+								'emp_full_name'=> NULL,
+								'email'=> NULL,
+								'ts_start_date'=>$hidstartweek_date,
+								'ts_end_date'=>$hidendweek_date,
+								'mail_content'=> NULL,
+								'is_mail_sent'=>1,
+								'created' => gmdate("Y-m-d H:i:s"),
+						);
+
+						$mailslist_where = '';
+						
+						$tmMail_model = new Timemanagement_Model_Mailslist();
+						$id = $tmMail_model->addOrUpdateMailsList($mailslistdummy_data,$mailslist_where);
+					}
+						/*end insert record in mail_list table for front end use*/
+
+					// cronstatus update
+					$cronstatusData = array('cronjob_status' => 'stopped',
+										'end_date'=>gmdate("Y-m-d H:i:s")
+					);
+					$whereCronstatus = array('id=?'=>$insertedCronjobStatusId);
+
+					$updateCronjobStatus = $tm_cronjob_statusModel->saveorUpdateCronjobStatusData($cronstatusData,$whereCronstatus);
+					//end cronstatus update
+				}else{
+					echo "Date doesn't match";					
+					
+					// cronstatus update
+					$cronstatusData = array('cronjob_status' => 'stopped',
+										'end_date'=>gmdate("Y-m-d H:i:s")
+					);
+					$whereCronstatus = array('id=?'=>$insertedCronjobStatusId);
+
+					$updateCronjobStatus = $tm_cronjob_statusModel->saveorUpdateCronjobStatusData($cronstatusData,$whereCronstatus);
+					//end cronstatus update
+				}
+			}else{
+				echo 'Timemanagement configuration not yet set.';
+				
+				
+				// cronstatus update
+				$cronstatusData = array('cronjob_status' => 'stopped',
+									'end_date'=>gmdate("Y-m-d H:i:s")
+				);
+				$whereCronstatus = array('id=?'=>$insertedCronjobStatusId);
+
+				$updateCronjobStatus = $tm_cronjob_statusModel->saveorUpdateCronjobStatusData($cronstatusData,$whereCronstatus);
+				//end cronstatus update
+			}
+		}else{
+			echo 'Some cron running';
+		}
+	}
+	//End
+
+	//child function to block
+	function notfilledDays($user_id,$fin_dates,$blockConfigDay){
+		$monthCalWeek = array(); //cal_weeks in a month for notfilleddates
+		$monthCalWeekDates = array();
+
+		foreach($fin_dates as $notFilledDate){
+			//echo $notFilledDate.'<br>';
+			$cal_week = strftime('%U',strtotime($notFilledDate));
+			if(!in_array($cal_week,$monthCalWeek)){
+				$monthCalWeek[] = $cal_week;
+			}
+			/* $monthCalWeekDates(create individual cal_week dates array), This array not for specific month week */
+			$monthCalWeekDates[$cal_week][] = $notFilledDate;
+		}
+
+		if(count($monthCalWeek) > 0){
+			foreach($monthCalWeek as $key => $calWeekVal){
+				if(count($monthCalWeekDates[$calWeekVal])){
+					$calWeekDate = $monthCalWeekDates[$calWeekVal][0];
+					$ts_model = new Timemanagement_Model_Timesheetstatus();
+
+					//get start date of the week
+					$getDayString = strftime('%A',strtotime($calWeekDate));
+					if($getDayString == 'Sunday'){
+						$startDateOfWeek = date('F d, Y', strtotime($calWeekDate));
+					}else{
+						$startDateOfWeek = date('F d, Y', strtotime('last sunday', strtotime($calWeekDate)));
+					}
+
+					$YearFromStartDate = strftime('%Y',strtotime($startDateOfWeek));
+
+					$weekDates = array(date('Y-m-d', strtotime($startDateOfWeek)),
+					date('Y-m-d', strtotime($startDateOfWeek . " +1 days")),
+					date('Y-m-d', strtotime($startDateOfWeek . " +2 days")),
+					date('Y-m-d', strtotime($startDateOfWeek . " +3 days")),
+					date('Y-m-d', strtotime($startDateOfWeek . " +4 days")),
+					date('Y-m-d', strtotime($startDateOfWeek . " +5 days")),
+					date('Y-m-d', strtotime($startDateOfWeek . " +6 days")),
+					);
+
+					$loopDate = $weekDates[0];
+
+					$yearCalWeekArray = array();
+					$monthCalWeekArray = $monthWeekCalDatesArray = array();
+
+					while (strtotime($loopDate) <= strtotime($weekDates[6])) {
+
+						$dateYearVal = strftime('%Y',strtotime($loopDate));
+						$dateMonthVal = (int)strftime('%m',strtotime($loopDate));
+
+						$yearCalWeekArray[] = $dateYearVal;
+						$monthCalWeekArray[] = (int)$dateMonthVal;
+						$monthWeekCalDatesArray[$dateMonthVal][] = $loopDate;
+
+						if(!in_array($loopDate,$monthWeekCalDatesArray[$dateMonthVal])){
+							$monthCalWeekArray[$dateMonthVal][] = $loopDate;
+						}
+						$loopDate = date ("Y-m-d", strtotime("+1 day", strtotime($loopDate)));
+					}
+
+					$yearCalWeekArray = array_unique($yearCalWeekArray);
+					$monthCalWeekArray = array_unique($monthCalWeekArray);
+					//echo '<pre>';
+					//print_r($monthWeekCalDatesArray); exit;
+					foreach($monthCalWeekArray as $monthnum){
+						$monthCalFirstWeek = date("Y-m-d", strtotime(strftime('%Y',strtotime($monthWeekCalDatesArray[$monthnum][0])).'-'.strftime('%m',strtotime($monthWeekCalDatesArray[$monthnum][0])).'-01'));
+						$monthCalFirstWeek = strftime('%U',strtotime($monthCalFirstWeek));
+
+						$year = strftime('%Y',strtotime($monthWeekCalDatesArray[$monthnum][0]));
+						$week = ($calWeekVal-$monthCalFirstWeek) + 1;
+						$monthnum = (int)$monthnum;
+						$empTsDataByDate = $ts_model->getTsRecordExists($user_id,$year,$monthnum,$week,$calWeekVal);//print_r($empTsDataByDate);exit;
+
+						$weekTableDateKeys = array('sun_date','mon_date','tue_date','wed_date','thu_date','fri_date','sat_date');
+						$weekTableStatusKeys = array('sun_status','mon_status','tue_status','wed_status','thu_status','fri_status','sat_status');
+						$projWeekTableStatusKeys = array('sun_project_status','mon_project_status','tue_project_status','wed_project_status','thu_project_status','fri_project_status','sat_project_status');
+
+						if(count($empTsDataByDate) == 0){
+							$insertData = array('emp_id'=>$user_id,
+											 'ts_year'=>$year,
+											 'ts_month' => $monthnum,
+											 'ts_week' => $week,
+											 'cal_week'=>$calWeekVal,
+											 'is_active' => 1,
+						                     'created_by' => 1,
+											 'created' => gmdate("Y-m-d H:i:s"),
+											 'modified' => gmdate("Y-m-d H:i:s"),
+							);
+
+							$tableStatusArray = array();
+							$blockedFlag = false;
+							$projStatusArray = array();
+							foreach($weekTableDateKeys as $key => $tableDate){
+								$projStatusArray[$projWeekTableStatusKeys[$key]] = 'no_entry';
+								$insertData[$tableDate] = $weekDates[$key];
+
+								if(in_array($weekDates[$key],$monthCalWeekDates[$calWeekVal])){
+									if(in_array($weekDates[$key],$monthWeekCalDatesArray[$monthnum])){ 
+										$blockedFlag = true;
+										$tableStatusArray[$weekTableStatusKeys[$key]] = 'blocked';
+									}else{
+										$tableStatusArray[$weekTableStatusKeys[$key]] = 'no_entry';
+									}
+								}else{
+									$tableStatusArray[$weekTableStatusKeys[$key]] = 'no_entry';
+								}
+							}
+
+							// row not exists in tbl_ts_status, insert in 3 tables(tbl_ts_status,tm_emp_timesheets,tm_emp_ts_notes)
+							$insertedEmpTsid = $ts_model->SaveEmpTsData($insertData);
+							$insertedEmpTsNoesid = $ts_model->SaveEmpTsNotesData($insertData);
+
+							// add day status and week status to inserted array
+							if($blockedFlag){
+								$week_status = array('week_status' => 'blocked');
+							}else{
+								$week_status = array('week_status' => 'no_entry');
+							}
+
+							$tsinsertData = $insertData + $tableStatusArray+ $week_status+$projStatusArray;
+							$insertedTsid = $ts_model->SaveTsData($tsinsertData);
+
+						}else{ // update tbl_ts_status table for not not filled dates
+							$updateData = array();
+							$blockedFlag = false;
+							foreach($weekTableDateKeys as $key => $tableDate){
+								if(in_array($weekDates[$key],$monthCalWeekDates[$calWeekVal])){
+									if(in_array($weekDates[$key],$monthWeekCalDatesArray[$monthnum])){ 
+									    $blockedFlag = true;
+										$updateData[$weekTableStatusKeys[$key]] = 'blocked';
+									}else{
+										$updateData[$weekTableStatusKeys[$key]]  = 'no_entry';
+									}
+								}
+							}
+							
+							// add day status and week status to inserted array
+							if($blockedFlag){
+								$week_status_text = 'blocked';
+							}else{
+								$week_status_text = 'no_entry';
+							}
+							
+							$updateData = $updateData + array('week_status' => $week_status_text,'modified' => gmdate("Y-m-d H:i:s"));
+							$where['emp_id = ?'] = $user_id;
+							$where['ts_year = ?'] = $year;
+							$where['ts_month = ?'] = $monthnum;
+							$where['ts_week = ?'] = $week;
+							$where['cal_week = ?'] = $calWeekVal;
+
+							$updateTs = $ts_model->updateTsData($updateData,$where);
+						}
+					}
+				}//end if(dates count in a week)
+			}//end foreach $monthCalWeek Array
+		}//end if $monthCalWeek count > 0
+	}
+
+
+	//cron to send timemanagement mails from tm_mailing_list
+	function tmmailscron()
+	{
+		try{
+			$tmMail_model = new Timemanagement_Model_Mailslist();
+			$mails_data =  $tmMail_model->getPendingMailsData();
+			//echo "<pre>";print_r($mails_data);exit;
+			if(count($mails_data) > 0)
+			{
+				foreach($mails_data as $mail)
+				{
+					if($mail['mail_type'] == 'submit_pending'){
+						$options['subject'] = APPLICATION_NAME.': Pending Submission';
+						$options['header'] = 'Pending Submission';
+					}else if($mail['mail_type'] == 'reminder'){
+						$options['subject'] = $options['subject'] = APPLICATION_NAME.': Timesheet Pending Reminder';
+						$options['header'] = 'Timesheet Pending Reminder';
+					}else if($mail['mail_type'] == 'block'){
+						if(trim($mail['ts_dates']) == ''){
+							$options['subject'] = APPLICATION_NAME.': Employee Timesheet Blocked';
+							$options['header'] = 'Notification';
+						}else if(trim($mail['ts_dates']) != ''){
+							$options['subject'] = APPLICATION_NAME.': Timesheet Blocked';
+							$options['header'] = 'Notification';
+						}
+					}
+
+					$options['toEmail'] = $mail['email'];
+					$options['toName'] = $mail['emp_full_name'];
+					$options['message'] = $mail['mail_content'];
+
+					$mail_status = sapp_Mail::_email($options);
+
+					$mail_where = array('id=?' => $mail['id']);
+					$new_maildata['is_mail_sent'] = 1;
+					if($mail_status === true)
+					{
+						//to udpate email table that mail is sent.
+						$id = $tmMail_model->addOrUpdateMailsList($new_maildata,$mail_where);
+					}
+				}
+			}
+			else
+			{
+				echo "No any pending mails";
+			}
+		}
+		catch(Exception $e){
+			echo $e->getMessage();
+		}
+	}
+	/*****END Timemanagememt crons ********/
+
+}
+
diff --git a/application/modules/timemanagement/controllers/DefaulttasksController.php b/application/modules/timemanagement/controllers/DefaulttasksController.php
index c53d74d05..ac7f5153c 100644
--- a/application/modules/timemanagement/controllers/DefaulttasksController.php
+++ b/application/modules/timemanagement/controllers/DefaulttasksController.php
@@ -36,6 +36,12 @@ public function init()
 	
 	public function preDispatch()
 	{
+		/*$userModel = new Timemanagement_Model_Users();
+		$checkTmEnable = $userModel->checkTmEnable();
+
+		if(!$checkTmEnable){
+			$this->_redirect('error');
+		}*/
 		
 		//check Time management module enable
 		if(!sapp_Helper::checkTmEnable())
@@ -249,6 +255,7 @@ public function deleteAction()
 				$Id = $taskModel->SaveorUpdateTaskData($data, $where);
 				if($Id == 'update')
 				{
+					//sapp_Global::send_configuration_mail("Default Task", $taskData[0]['task']);
 					$messages['message'] = 'Default task deleted successfully.';
 					$messages['msgtype'] = 'success';
 				}
diff --git a/application/modules/timemanagement/controllers/EmptimesheetsController.php b/application/modules/timemanagement/controllers/EmptimesheetsController.php
index 651cc1087..d99b6cdff 100644
--- a/application/modules/timemanagement/controllers/EmptimesheetsController.php
+++ b/application/modules/timemanagement/controllers/EmptimesheetsController.php
@@ -39,6 +39,12 @@ class Timemanagement_EmptimesheetsController extends Zend_Controller_Action
 	 */
 	public function preDispatch()
 	{
+		/*$userModel = new Timemanagement_Model_Users();
+		$checkTmEnable = $userModel->checkTmEnable();
+
+		if(!$checkTmEnable){
+			$this->_redirect('error');
+		}*/
 		
 		//check Time management module enable
 		if(!sapp_Helper::checkTmEnable())
@@ -50,6 +56,11 @@ public function preDispatch()
 		$ajaxContext->addActionContext('accordion', 'html')->initContext();
 		$ajaxContext->addActionContext('emptimesheetmonthly', 'html')->initContext();
 		$ajaxContext->addActionContext('emptimesheetweekly', 'html')->initContext();
+		$ajaxContext->addActionContext('enabletimesheet', 'json')->initContext();
+		$ajaxContext->addActionContext('approvetimesheet', 'json')->initContext();
+		$ajaxContext->addActionContext('rejecttimesheet', 'json')->initContext();
+		$ajaxContext->addActionContext('approvedaytimesheet', 'json')->initContext();
+		$ajaxContext->addActionContext('rejectdaytimesheet', 'json')->initContext();
 		$ajaxContext->addActionContext('getweekstartenddates', 'json')->initContext();
 	}
 
@@ -188,6 +199,7 @@ public function getmonthlyspanAction()
 	 */
 	public function accordionAction()
 	{
+		//print_r($this->_getAllParams());exit();
 		$emp_list_flag=$this->_getParam('emp_list_flag','');
 		$hidweek=$this->_getParam('hidweek');
 		$type=$this->_getParam('type');
@@ -298,6 +310,7 @@ public function emptimesheetmonthlyAction(){
 		$yrMon = explode('-', $selYrMon);
 
 		$empTSModel = new Timemanagement_Model_Emptimesheets();
+		//$empMYTSModel = new Timemanagement_Model_MyTimesheet();
 
 		$empMonthTSData = $empTSModel->getMonthTimesheetData($user_id, $yrMon[0],$yrMon[1],$project_ids,$emplistflag);
 			
@@ -371,6 +384,7 @@ public function emptimesheetweeklyAction(){
 		$empDoj = $usersModel->getEmployeeDoj($user_id);
 		$dateEmpDoj = date('Y-m',strtotime($empDoj['date_of_joining']));
 
+		$approvedAlert = $usersModel->getEmpApprovalStatusDteails($user_id);
 			
 		$selYrMon = ($selYrMon != '')?$selYrMon:$now->format('Y-m');
 		$yrMon = explode('-', $selYrMon);
@@ -396,6 +410,7 @@ public function emptimesheetweeklyAction(){
 		$empHolidaysWeekendsData = $usersModel->getEmployeeHolidaysNWeekends($user_id, $yrMon[0],$yrMon[1],$calWeek);
 
 		$startDate = date("Y-m-d", strtotime("{$yrMon[0]}-W{$calWeek}-7"));
+		//$startDate =  date("Y-m-d",strtotime('last sunday', strtotime($yrMon[0].'W'.str_pad($calWeek+1, 2, 0, STR_PAD_LEFT))));
 		$endDate = date("Y-m-d",strtotime('next saturday',strtotime($startDate)));
 			
 		$empLeavesData = $usersModel->getEmpLeaves($user_id,$startDate,$endDate,'all');
@@ -416,6 +431,7 @@ public function emptimesheetweeklyAction(){
 		$this->view->weekNotesData = $weekNotes;
 		$this->view->empHolidaysWeekends = $empHolidaysWeekendsData[0];
 		$this->view->leavesData = $empLeavesData;
+		$this->view->approvedAlert =  $approvedAlert;
 		$this->view->weekDaysStatus = $weekDaysStatus;
 		$this->view->empData = $empData;
 		$this->view->emplistflag = $emplistflag;
@@ -427,20 +443,174 @@ public function emptimesheetweeklyAction(){
 
 	}
 
+	/**
+	 * Action to enable employee timesheet for month or week based on calender week.
+	 */
+	public function enabletimesheetAction (){
+		$selYrMon = $this->_getParam('selmn');
+		$emp_id = $this->_getParam('emp_id');
+		$type = $this->_getParam('type');
+		$week = $this->_getParam('hideweek');
+		$emplistflag = $this->_getParam('emplistflag');
+		$yrMon = explode('-', $selYrMon);
+		$year = $yrMon[0];
+		$month = $yrMon[1];
+
+		$result = false;
+		$empTSModel = new Timemanagement_Model_Emptimesheets();
+
+		$lastday = date("t", mktime(0, 0, 0, $month, 1, $year));
+		$firstCalWeek = strftime('%U',strtotime($year.'-'.$month.'-01'));
+		$lastCalWeek = strftime('%U',strtotime($selYrMon.'-'.$lastday));
+		$calenderWeek = array();
+		$calenderWeeksArray = range($firstCalWeek, $lastCalWeek);
+		if($type == 'month'){
+			$calenderWeek = $calenderWeeksArray;
+		}
+		if($type == 'week'){
+			$calenderWeek[0] = $calenderWeeksArray[$week-1];
+		}
+		$result = $empTSModel-> updateEmployeeTimesheet($emp_id,$year,$month,$lastday,$calenderWeek,"enable","",$emplistflag);
+		$this->_helper->json(array('saved'=>$result));
+	}
+
+	/**
+	 * Action to Approve employee timesheet for month or week based on calender week.
+	 */
+	public function approvetimesheetAction (){
+		$selYrMon = $this->_getParam('selmn');
+		$emp_id = $this->_getParam('emp_id');
+		$type = $this->_getParam('type');
+		$week = $this->_getParam('hideweek');
+		$emplistflag = $this->_getParam('emplistflag');
+		$yrMon = explode('-', $selYrMon);
+		$year = $yrMon[0];
+		$month = $yrMon[1];
+
+		$result = false;
+		$empTSModel = new Timemanagement_Model_Emptimesheets();
+
+		$lastday = date("t", mktime(0, 0, 0, $month, 1, $year));
+		$firstCalWeek = strftime('%U',strtotime($year.'-'.$month.'-01'));
+		$lastCalWeek = strftime('%U',strtotime($selYrMon.'-'.$lastday));
+
+		$calenderWeek = array();
+		$calenderWeeksArray = range($firstCalWeek, $lastCalWeek);
+		if($type == 'month'){
+			$calenderWeek = $calenderWeeksArray;
+		}
+		if($type == 'week'){
+			$calenderWeek[0] = $calenderWeeksArray[$week-1];
+		}
+		$result = $empTSModel-> updateEmployeeTimesheet($emp_id,$year,$month,$lastday,$calenderWeek,"approve","",$emplistflag);
+		$this->_helper->json(array('saved'=>$result));
+	}
+
+	/**
+	 * Action to reject employee timesheet for month or week based on calender week.
+	 */
+	public function rejecttimesheetAction (){
+		$selYrMon = $this->_getParam('selmn');
+		$emp_id = $this->_getParam('emp_id');
+		$type = $this->_getParam('type');
+		$week = $this->_getParam('hideweek');
+		$rejnote = $this->_getParam('rejnote');
+		$emplistflag = $this->_getParam('emplistflag');
+
+		$yrMon = explode('-', $selYrMon);
+		$year = $yrMon[0];
+		$month = $yrMon[1];
+
+		$result = false;
+		$empTSModel = new Timemanagement_Model_Emptimesheets();
+
+		$lastday = date("t", mktime(0, 0, 0, $month, 1, $year));
+		$firstCalWeek = strftime('%U',strtotime($year.'-'.$month.'-01'));
+		$lastCalWeek = strftime('%U',strtotime($selYrMon.'-'.$lastday));
+
+		$calenderWeek = array();
+		$calenderWeeksArray = range($firstCalWeek, $lastCalWeek);
+		if($type == 'month'){
+			$calenderWeek = $calenderWeeksArray;
+		}
+		if($type == 'week'){
+			$calenderWeek[0] = $calenderWeeksArray[$week-1];
+		}
+		$result = $empTSModel-> updateEmployeeTimesheet($emp_id,$year,$month,$lastday,$calenderWeek,"reject",$rejnote,$emplistflag);
+		$this->_helper->json(array('saved'=>$result));
+	}
+
+	/**
+	 * Action to approve employee timesheet for a particular day.
+	 */
+	public function approvedaytimesheetAction(){
+		$selYrMon = $this->_getParam('selmn');
+		$emp_id = $this->_getParam('emp_id');
+		$day = $this->_getParam('day');
+		$emplistflag = $this->_getParam('emplistflag');
+
+		$approvedDate = $selYrMon."-".$day;
+		$yrMon = explode('-', $selYrMon);
+		$year = $yrMon[0];
+		$month = $yrMon[1];
+		$empTSModel = new Timemanagement_Model_Emptimesheets();
+
+		$approvedDateTimestamp = strtotime(DATE($approvedDate));
+		$approvedDate_day = strtolower(DATE('D', $approvedDateTimestamp));
+		$approvedDate = DATE('Y-m-d', $approvedDateTimestamp);
+
+		$calweek=strftime('%U',strtotime($approvedDate));
+
+		$result = $empTSModel->updateEmployeeDayTimesheet($emp_id,$calweek,$year,$month,$approvedDate_day,$approvedDate, "approve", "",$emplistflag);
+
+		$this->_helper->json(array('saved'=>$result));
+	}
+
+	/**
+	 * Action to reject employee timesheet for a particular day.
+	 */
+	public function rejectdaytimesheetAction(){
+		$selYrMon = $this->_getParam('selmn');
+		$emp_id = $this->_getParam('emp_id');
+		$day = $this->_getParam('day');
+		$rejnote = $this->_getParam('rejnote');
+		$emplistflag = $this->_getParam('emplistflag');
+
+		$approvedDate = $selYrMon."-".$day;
+		$yrMon = explode('-', $selYrMon);
+		$year = $yrMon[0];
+		$month = $yrMon[1];
+		$empTSModel = new Timemanagement_Model_Emptimesheets();
+
+		$approvedDateTimestamp = strtotime(DATE($approvedDate));
+		$approvedDate_day = strtolower(DATE('D', $approvedDateTimestamp));
+		$approvedDate = DATE('Y-m-d', $approvedDateTimestamp);
+
+		$calweek=strftime('%U',strtotime($approvedDate));
+		$result = $empTSModel->updateEmployeeDayTimesheet($emp_id,$calweek,$year,$month,$approvedDate_day,$approvedDate, "reject",$rejnote,$emplistflag);
+
+		$this->_helper->json(array('saved'=>$result));
+
+	}
 	//function to get week start end dates
 	public function getweekstartenddatesAction()
 	{
 		$selYrMon = $this->_getParam('selmn');
 		$week = $this->_getParam('hidweek');
 		$currentMonth = date($selYrMon);
+		//$datesArray =  iterator_to_array(new DatePeriod(new DateTime("first sunday of $currentMonth"),
+		//DateInterval::createFromDateString('next sunday'),new DateTime("last day of $currentMonth")));
+		
 		
 		$selectedYrMon = explode('-', $currentMonth);
+      	//$selMonName = date('F', mktime(0, 0, 0, $selectedYrMon[1], 10)); 
       	$firstday = date("w", mktime(0, 0, 0, $selectedYrMon[1], 1, $selectedYrMon[0])); 
         $lastday = date("t", mktime(0, 0, 0, $selectedYrMon[1], 1, $selectedYrMon[0])); 
 		$noOfweeks = 1 + ceil(($lastday-7+$firstday)/7);
 		 
 		
 		$selWeek = $week;
+		//$nextMonth = $selectedYrMon[1]+1;
 		if($selectedYrMon[1] < 12) 
 			$nextMonth = $selectedYrMon[1]+1;
 		else 
@@ -456,7 +626,7 @@ public function getweekstartenddatesAction()
 			
 		if($week == 1) {
 			$startDate = $currentMonth."-1";
-			
+			//$weekStartDay = date('F d, Y', strtotime('last sunday', strtotime($startDate)));
 			$startDateName = date('D', strtotime($startDate));
 			if($startDateName != "Sun") {
 				$weekStartDay = date('F d, Y', strtotime('last sunday', strtotime($startDate)));
diff --git a/application/modules/timemanagement/controllers/IndexController.php b/application/modules/timemanagement/controllers/IndexController.php
index 94c17b39d..b53f0193e 100644
--- a/application/modules/timemanagement/controllers/IndexController.php
+++ b/application/modules/timemanagement/controllers/IndexController.php
@@ -24,12 +24,21 @@ class Timemanagement_IndexController extends Zend_Controller_Action
 	private $options;
 	public function preDispatch()
 	{
+		// $userModel = new Timemanagement_Model_Users();
+		// $checkTmEnable = $userModel->checkTmEnable();
 
+		// if(!$checkTmEnable){
+			// $this->_redirect('error');
+		// }
+		
+		
 		//check Time management module enable
 		if(!sapp_Helper::checkTmEnable())
 			$this->_redirect('error');
 
 		$ajaxContext = $this->_helper->getHelper('AjaxContext');
+		$ajaxContext->addActionContext('getapprovedtimesheet', 'html')->initContext();
+		$ajaxContext->addActionContext('closeapprovealert', 'json')->initContext();
 		$ajaxContext->addActionContext('save', 'json')->initContext();
 		$ajaxContext->addActionContext('submit', 'json')->initContext();
 		$ajaxContext->addActionContext('eraseweek', 'json')->initContext();
@@ -52,22 +61,48 @@ public function indexAction()
 			
 		$selYrMon = $this->_getParam('selYrMon');
 
+		//$startYrMon = $this->_getParam('startYrMon');
 		$flag = $this->_getParam('flag');
-	
+			
+		//        $month = $this->_getParam('month');
+		//    	$year = $this->_getParam('year');
+			
+		//$empid = $this->_getParam('empid');
+		//echo " MONTH ".$month. "  YEAR ".$year; exit;
+
+		$approvedAlert = $usersModel->getEmpApprovalStatusDteails($data->id);
+			
 		$empDoj = $usersModel->getEmployeeDoj($data->id);
-		
 		$this->view->empDoj=$empDoj['date_of_joining'];
 		$dateEmpDoj = date('Y-m',strtotime($empDoj['date_of_joining']));
 			
-		
+		//    	$datestring='2011-01 last month';
+		//		$dt=date_create($datestring);
+		//		echo $dt->format('Y-m'); //2011-02
+		//	$YrMonths = array();
 		$now = new DateTime();
-		
+		//		if($flag == 'next' || $flag == '') {
+		//			$YrMonths[3] = ($startYrMon != '')?$startYrMon: $now->format('Y-m');
+		//			for($i = 2,$j=0; $i >=0; $i--) {
+		//				$dt=date_create($YrMonths[3-$j].'last month');
+		//				$YrMonths[$i] = $dt->format('Y-m');
+		//				$j++;
+		//			}
+		//		} else {
+		//			$YrMonths[0] = ($startYrMon != '')?$startYrMon: $now->format('Y-m');
+		//			for($i = 1; $i <=3; $i++) {
+		//				$dt=date_create($YrMonths[$i-1].'next month');
+		//				$YrMonths[$i] = $dt->format('Y-m');
+		//			}
+		//		}
+		//$YrMonths[3] = ($startYrMon != '')?$startYrMon: $now->format('Y-m');
 		if($selYrMon != '') {
 			$selYrMon = date('Y-m',strtotime($selYrMon));
 			if($flag == 'next') {
 				if($selYrMon < $now->format('Y-m'))
 				$selYrMon = date_create($selYrMon.'next month')->format('Y-m');
 			}else if($flag == 'pre'){
+				//echo " selYrMon ".$selYrMon." dateEmpDoj ".$dateEmpDoj;
 				if($selYrMon > $dateEmpDoj)
 				$selYrMon = date_create($selYrMon.'last month')->format('Y-m');
 				else
@@ -78,29 +113,61 @@ public function indexAction()
 
 		$selYrMon = ($selYrMon != '')?$selYrMon:$now->format('Y-m');
 
+		//ksort($YrMonths);
 			
 		$yrMon = explode('-', $selYrMon);
 		$empTSModel = new Timemanagement_Model_MyTimesheet();
 		$empMonthTSData = $empTSModel->getMonthTimesheetData($data->id, $yrMon[0],$yrMon[1]);
-		
+		//print_r($empMonthTSData); exit;
 		$empHolidaysWeekendsData = $usersModel->getEmployeeHolidaysNWeekends($data->id, $yrMon[0],$yrMon[1]);
-		
+		//print_r($empHolidaysWeekendsData); exit;
+			
+		//echo $selYrMon;
 		$firstday = $yrMon[0]."-".$yrMon[1].'-01';
 		$noOfDaysMonth = date("t", mktime(0, 0, 0, $yrMon[1], 1, $yrMon[0]));
 		$lastday =   $yrMon[0]."-".$yrMon[1]."-".$noOfDaysMonth;
 			
 		$empLeavesData = $usersModel->getEmpLeaves($data->id,$firstday,$lastday,'all');
-		$cronDetails = array();
+
+		$cronDetails = $empTSModel->getCronDetailsForMonth($yrMon[0],$yrMon[1]);
 		$cronStartDay = "";
 		$cronEndDay = "";
+		if(!empty($cronDetails)) {
+			$cronStartDay = date('d',strtotime($cronDetails[0]['ts_start_date']));
+			if($cronStartDay != 1) {
+				$cronStartDay = 1;
+				$mon = $yrMon[1]+1;
+				$yr = ($mon == 12)?($yrMon[0] +1):$yrMon[0];
+				$nextMonCronDetails = $empTSModel->getCronDetailsForMonth($yr,$mon);
+				if(!empty($nextMonCronDetails)) {
+					$cronEndDay = $noOfDaysMonth;
+				} else {
+					$cronEndDay = date('d',strtotime($cronDetails[0]['ts_end_date']));
+				}
+			}
+		} else {
+			$mon = $yrMon[1]+1;
+			$yr = ($mon == 12)?($yrMon[0] +1):$yrMon[0];
+			$nextMonCronDetails = $empTSModel->getCronDetailsForMonth($yr,$mon);
+
+			if(!empty($nextMonCronDetails)) {
+				if($yrMon[1]  == date('m',strtotime($nextMonCronDetails[0]['ts_start_date'])))
+				$cronStartDay = date('d',strtotime($nextMonCronDetails[0]['ts_start_date']));
+				$cronEndDay = $noOfDaysMonth;
+			}
+
+		}
 
 		$this->view->empMonthTSData = $empMonthTSData;
 		$this->view->empHolidaysWeekends = $empHolidaysWeekendsData[0];
-
+		//	$this->view->month = $month;
+		//	$this->view->year = $year;
+		//$this->view->YrMonths = $YrMonths;
 		$this->view->selYrMon =  $selYrMon;
 		$this->view->leavesData = $empLeavesData;
 		$this->view->cronStartDay = $cronStartDay;
 		$this->view->cronEndDay = $cronEndDay;
+		$this->view->approvedAlert =  $approvedAlert;
 
 
 
@@ -109,7 +176,6 @@ public function indexAction()
      	if($auth->hasIdentity()){
 			$loginUserId = $auth->getStorage()->read()->id;
 		}
-		
 		$leaverequestform = new Default_Form_leaverequest();
 		$leaverequestform->setAttrib('action',BASE_URL.'leaverequest');
 		$leaverequestmodel = new Default_Model_Leaverequest();
@@ -294,6 +360,28 @@ public function indexAction()
 		$this->view->loginUserId = $loginUserId;
 		$this->view->messages = $this->_helper->flashMessenger->getMessages();
 		/*leave request code ends*/
+		
+		
+		//START code to show pending weeks for submit in current month
+
+		$projmodel = new Timemanagement_Model_Projects();
+		$prevweeks = $projmodel->getprevmonthweeks(date('Y-m') , date('d'));
+		 $end_date = max($prevweeks[count($prevweeks)]);//get previous week end date
+		 $start_date = min($prevweeks[count($prevweeks)]);//get previous week start date
+				       $prev_str='';
+		if($start_date>=date('Y-m-01') && $start_date<=date('Y-m-t'))
+		{
+		// echo " TM Role >> ".Zend_Registry::get('tm_role');
+				$prev_week_status=$projmodel->prev_weeksubmit_status($prevweeks,$data->id,$empDoj);
+
+		
+		       if($prev_week_status!='')
+		       {
+		          $this->view->prev_str=$prev_week_status;
+		       }
+		}	   
+		//END code to show pending weeks for submit in current month
+
 	}
 
 	public function weekAction()
@@ -313,6 +401,8 @@ public function weekAction()
 		if($data->id == 1)
 		$this->_redirect('error');
 
+
+		$approvedAlert = $usersModel->getEmpApprovalStatusDteails($data->id);
 		$selYrMon = ($selYrMon != '')?$selYrMon:$now->format('Y-m');
 		$yrMon = explode('-', $selYrMon);
 
@@ -324,9 +414,13 @@ public function weekAction()
 		}
 
 		$empDoj = $usersModel->getEmployeeDoj($data->id);
+		//$dateEmpDoj = date('Y-m',strtotime($empDoj['date_of_joining']));
+
 
 		$selYrMonArray = explode('-', $selYrMon);
 
+		//if($calWeek == null || $calWeek == '') {
+		//$calWeekNo = gmstrftime('%U',strtotime($selYrMon.'-01'));
 
 		if($selDay != '') {
 			$calWeek = strftime('%U',strtotime($selYrMon.'-'.$selDay));
@@ -336,38 +430,69 @@ public function weekAction()
 			if($calWeek == '')
 			$calWeek = strftime('%U',strtotime($selYrMon.'-01'));
 		}
-
+		//	}
 		$myTsModel = new Timemanagement_Model_MyTimesheet();
-		
+		//$myTsWeekData = $myTsModel->getWeeklyTimesheetData($data->id,$selYrMonArray[0],$selYrMonArray[1],$week);
 		if($timeFlag == 'time') {
 			$myTsWeekData = $myTsModel->getWeeklyTimesheetData($data->id,$selYrMonArray[0],$selYrMonArray[1],$week);
 		} else {
 			$myTsWeekData = $myTsModel->getWeeklyTimesheetData($data->id,$selYrMonArray[0],$selYrMonArray[1],$week,'view');
 		}
+		//print_r($myTsWeekData);
+		$empHolidaysWeekendsData = $usersModel->getEmployeeHolidaysNWeekends($data->id, $yrMon[0],$yrMon[1],$calWeek);
+		//echo date("Y-m-d", strtotime("{$yrMon[0]}-W{$calWeek}-7"));
 		
+		//$startDate = date("Y-m-d", strtotime("{$yrMon[0]}-W{$calWeek}-7"));
 		
-		$empHolidaysWeekendsData = $usersModel->getEmployeeHolidaysNWeekends($data->id, $yrMon[0],$yrMon[1],$calWeek);
-
-		$startDate = date("Y-m-d", strtotime("{$yrMon[0]}-W{$calWeek}-7"));
+		if($calWeek>=1 && $calWeek<=9)
+			$calWeek = '0'.$calWeek;
+		
+		$startDate = date("Y-m-d", strtotime("{$yrMon[0]}-W{$calWeek}, -1 day"));
+		
+		//$startDate =  date("Y-m-d",strtotime('last sunday', strtotime($yrMon[0].'W'.str_pad($calWeek+1, 2, 0, STR_PAD_LEFT))));
 		
 		$endDate = date("Y-m-d",strtotime('next saturday',strtotime($startDate)));
 
 		$empLeavesData = $usersModel->getEmpLeaves($data->id,$startDate,$endDate,'all');
-		
+		//print_r($empLeavesData);
 		$weekNotes = $myTsModel->getWeekNotes($data->id,$selYrMonArray[0],$selYrMonArray[1],$week);
 
-		
+		//$weekDaysStatus =  $myTsModel->getWeekDaysStatus($data->id,$selYrMonArray[0],$calWeek);
 		$weekDaysStatus =  $myTsModel->getWeekDaysStatus($data->id,$selYrMonArray[0],$selYrMonArray[1],$week);
 		$weekDaysProjStatus =  $myTsModel->getWeekDaysProjStatus($data->id,$selYrMonArray[0],$selYrMonArray[1],$week);
 		
-		
+		//print_r($weekDaysStatus);
+		//print_r($weekNotes);
+		$cronDetails = $myTsModel->getCronDetailsForMonth($selYrMonArray[0],$selYrMonArray[1]);
 		$noOfDaysMonth = date("t", mktime(0, 0, 0, $selYrMonArray[1], 1, $selYrMonArray[0]));
 		$cronStartDay = "";
 		$cronEndDay = "";
-		
-
+		if(!empty($cronDetails)) {
+			$cronStartDay = date('d',strtotime($cronDetails[0]['ts_start_date']));
+			if($cronStartDay != 1) {
+				$cronStartDay = 1;
+				$mon = $yrMon[1]+1;
+				$yr = ($mon == 12)?($selYrMonArray[0] +1):$selYrMonArray[0];
+				$nextMonCronDetails = $myTsModel->getCronDetailsForMonth($yr,$mon);
+				if(!empty($nextMonCronDetails)) {
+					$cronEndDay = $noOfDaysMonth;
+				} else {
+					$cronEndDay = date('d',strtotime($cronDetails[0]['ts_end_date']));
+				}
+			}
+		} else {
 			$mon = $yrMon[1]+1;
 			$yr = ($mon == 12)?($selYrMonArray[0] +1):$selYrMonArray[0];
+			$nextMonCronDetails = $myTsModel->getCronDetailsForMonth($yr,$mon);
+				
+			if(!empty($nextMonCronDetails)) {
+				if($yrMon[1]  == date('m',strtotime($nextMonCronDetails[0]['ts_start_date'])))
+				$cronStartDay = date('d',strtotime($nextMonCronDetails[0]['ts_start_date']));
+				$cronEndDay = $noOfDaysMonth;
+			}
+				
+		}
+
 		if($selDay != '') {
 			$this->view->selDay =  date("D",strtotime($selYrMon.'-'.$selDay));
 		}
@@ -378,19 +503,28 @@ public function weekAction()
 		$this->view->weekNotesData = $weekNotes;
 		$this->view->empHolidaysWeekends = $empHolidaysWeekendsData[0];
 		$this->view->leavesData = $empLeavesData;
-		
+		$this->view->approvedAlert =  $approvedAlert;
 		$this->view->weekDaysStatus = $weekDaysStatus;
 		$this->view->weekDaysProjStatus = $weekDaysProjStatus;		
 		$this->view->cronStartDay = $cronStartDay;
 		$this->view->cronEndDay = $cronEndDay;
 
-		
+		//if($timeFlag == 'time') $this->renderScript('index/enter_time.phtml');
+
+
 		//START code to show pending weeks for submit in current month
 
 		$projmodel = new Timemanagement_Model_Projects();
 		$prevweeks = $projmodel->getprevmonthweeks(date('Y-m') , date('d'));
-		
-		
+		// echo " TM Role >> ".Zend_Registry::get('tm_role');
+		//		$prev_week_status=$projmodel->prev_weeksubmit_status($prevweeks,$data->id,$empDoj);
+		//        $prev_str='';
+		//
+		//        if($prev_week_status!='')
+		//        {
+		//           $this->view->prev_str=$prev_week_status;
+		//        }
+		//END code to show pending weeks for submit in current month
 			
 		/*Leave request code starts*/
 		$auth = Zend_Auth::getInstance();
@@ -422,7 +556,6 @@ public function weekAction()
 		$businessunitid = '';
 		$hremailgroup = '';
 		
-		
 		/* Start
 		   Queries to fetch user details,reporting manager details and weekend details from users table and employees table
 		*/
@@ -448,6 +581,7 @@ public function weekAction()
 						$employeeDepartmentId = $loggedInEmployeeDetails[0]['department_id'];
 						$employeeEmploymentStatusId = $loggedInEmployeeDetails[0]['emp_status_id'];
 						$employeeHolidayGroupId = $loggedInEmployeeDetails[0]['holiday_group'];
+						
 						$reportingManagerDetails = $usersmodel->getUserDetailsByID($reportingmanagerId);
 						$weekendDatailsArr = $leavemanagementmodel->getWeekendDetails($employeeDepartmentId);
                         $employeeemail = $loggedinEmpId[0]['emailaddress'];
@@ -503,9 +637,9 @@ public function weekAction()
 				    	  else
 				    	  	$searchMeFlag = 'false';	
 				    	}	  	
+				    	
 				    	if($searchMeFlag == 'true')
 							$leaverequestdetails = $leaverequestmodel->getUserApprovedOrPendingLeavesData($loginUserId);
-						
 						/* Start -For Checking if logged in user is reporting manager */
 						$isReportingManager = $employeesmodel->CheckIfReportingManager($loginUserId);
 						if(!empty($isReportingManager) && $isReportingManager[0]['count']>0) {
@@ -536,6 +670,7 @@ public function weekAction()
 					}   					
 			}
 		/* End */
+		
 		/* 
 		 Start
 		 Query to fetch and build multioption for Leavetype dropdown
@@ -555,7 +690,6 @@ public function weekAction()
 				$msgarray['leavetypeid'] = ' Leave types are not configured yet.';
 			}
 			$this->view->leavetype = $leavetype;
-			
 		/* End */
 		
 		/*
@@ -575,12 +709,14 @@ public function weekAction()
 			$this->view->getavailbaleleaves = $getavailbaleleaves;	
 	    /* END */
 		
+		
 		$this->view->form = $leaverequestform; 
 		$this->view->msgarray = $msgarray;
 		$this->view->loginUserId = $loginUserId;
 		$this->view->messages = $this->_helper->flashMessenger->getMessages();
 		/*leave request code ends*/
-		
+
+
 		if($timeFlag != '') {
 			$this->_helper->viewRenderer('entertime');
 		}
@@ -589,6 +725,19 @@ public function weekAction()
 
 	public function saveAction()
 	{
+		
+		
+		$usersModel = new Timemanagement_Model_Users();
+		$storage = new Zend_Auth_Storage_Session();
+		$data = $storage->read();
+		$empDoj = $usersModel->getEmployeeDoj($data->id);
+		
+		$doj = $empDoj['date_of_joining'];
+		if($doj>date('Y-m-d'))
+		{
+			$this->view->status = 'failure';
+		}else
+		{	
 
 		$tasksHrsData = $this->_getParam('data');
 		$calWeek = $this->_getParam('calWeek');
@@ -597,7 +746,7 @@ public function saveAction()
 		$weekEndDate = $this->_getParam('weekEnd');
 		$selYrMon = $this->_getParam('selYrMon');
 		$tasksData = explode(',',$tasksHrsData);
-		
+		//echo "tasksData ".sizeof($tasksData);
 		$callval = $this->getRequest()->getParam('call');
 		$sunNote = $this->_getParam('sun_note');
 		$monNote = $this->_getParam('mon_note');
@@ -608,6 +757,8 @@ public function saveAction()
 		$satNote = $this->_getParam('sat_note');
 		$weekNote = $this->_getParam('week_note');
 
+
+		//$msgarray = array();
 		$storage = new Zend_Auth_Storage_Session();
 		$sessionData = $storage->read();
 
@@ -622,17 +773,17 @@ public function saveAction()
 			foreach($tasksData as $data) {
 
 				$taskDataArray = explode('#',$data);
-				
+				//echo " SUN ".$taskDataArray[2];
 				$sun_hrs =($taskDataArray[2] != null)? $taskDataArray[2]:0;
-				
+				//echo " sun_hrs ".$sun_hrs;
 				$sun_tot = 0;
 				if(!empty($sun_hrs)) {
 					$sun_dur = explode(':',$sun_hrs);
 					$sun_tot += $sun_dur[0] * 60;
-				
+					//echo " Hrs ".$sun_dur[0];
 					$sun_tot += $sun_dur[1];
 				}
-				
+				//echo " sun_tot ".$sun_tot;
 				$mon_hrs =($taskDataArray[3] != null)? $taskDataArray[3]:0;
 				$mon_tot = 0;
 				if(!empty($mon_hrs)) {
@@ -686,7 +837,7 @@ public function saveAction()
 				if(strlen($wkHrsPart.'') == 1) $wkHrsPart = '0'.$wkHrsPart;
 				if(strlen($wkMinsPart.'') == 1) $wkMinsPart = '0'.$wkMinsPart;
 
-				
+				//$week_tot = floor($week_tot_time / 60).':'.$week_tot_time % 60 ;
 				$week_tot = $wkHrsPart.':'.$wkMinsPart;
 
 				array_push($projTasksArray, $taskDataArray[0]);
@@ -714,9 +865,9 @@ public function saveAction()
 			  			  'sat_duration'=>($taskDataArray[8] != null)?$taskDataArray[8]:'00:00',			
 						  'week_duration'=>$week_tot,
 						  'created_by'=>$sessionData->id,
-				
+				//  'modified_by'=>NULL,
 			        	  'is_active'=>1,
-			  			  'created'=> Zend_Registry::get('currentdate') 
+			  			  'created'=> Zend_Registry::get('currentdate') //gmdate("Y-m-d H:i:s")
 				);
 				$checkProjNull = $myTsModel->getProjNullRecordCountInTimeSheet($sessionData->id,$selYrMonArray[0],$selYrMonArray[1],$week);				
 				
@@ -728,7 +879,8 @@ public function saveAction()
 					$myTsModel->updateTimesheetRecord($data,$where);
 				} else {					
 					$myTsModel->SaveOrUpdateTimesheet($data);
-				
+					//print_r($data);
+					//exit;
 				}	
 				if($projectId != $taskDataArray[1]) {
 					$projectId = $taskDataArray[1];
@@ -739,7 +891,7 @@ public function saveAction()
 			foreach($projsArray as $proj) {
 
 				$projHrsData = $myTsModel->getWeekProjectHrs($sessionData->id,$proj,$selYrMonArray[0],$selYrMonArray[1],$week);
-				
+				//	print_r($projHrsData); exit;
 
 				$statusData = array('emp_id'=>$sessionData->id,
 						  'project_id'=>$proj,
@@ -751,36 +903,43 @@ public function saveAction()
 						  'sun_project_status'=>($projHrsData[0]['sun_duration'] !='00:00')?'saved':'no_entry',
 						  'sun_status'=>($projHrsData[0]['sun_duration'] !='00:00')?'saved':'no_entry',
 						  'sun_status_date'=>Zend_Registry::get('currentdate'),
+						  'sun_reject_note'=>'',
 					 	  'mon_date'=>date('Y-m-d', strtotime('+1 day', strtotime($weekStartDate))),
 						  'mon_project_status'=>($projHrsData[0]['mon_duration'] !='00:00')?'saved':'no_entry',
 						  'mon_status'=>($projHrsData[0]['mon_duration'] !='00:00')?'saved':'no_entry',
 						  'mon_status_date'=>Zend_Registry::get('currentdate'),
+						  'mon_reject_note'=>'',
 						  'tue_date'=>date('Y-m-d', strtotime('+2 day', strtotime($weekStartDate))),
 					 	  'tue_project_status'=>($projHrsData[0]['tue_duration'] !='00:00')?'saved':'no_entry',
 						  'tue_status'=>($projHrsData[0]['tue_duration'] !='00:00')?'saved':'no_entry',
 						  'tue_status_date'=>Zend_Registry::get('currentdate'),
+						  'tue_reject_note'=>'',
 						  'wed_date'=>date('Y-m-d', strtotime('+3 day', strtotime($weekStartDate))),
 					 	  'wed_project_status'=>($projHrsData[0]['wed_duration'] !='00:00')?'saved':'no_entry',
 						  'wed_status'=>($projHrsData[0]['wed_duration'] !='00:00')?'saved':'no_entry',
 						  'wed_status_date'=>Zend_Registry::get('currentdate'),
+						  'wed_reject_note'=>'',	
 						  'thu_date'=>date('Y-m-d', strtotime('+4 day', strtotime($weekStartDate))),
 					 	  'thu_project_status'=>($projHrsData[0]['thu_duration'] !='00:00')?'saved':'no_entry',
 						  'thu_status'=>($projHrsData[0]['thu_duration'] !='00:00')?'saved':'no_entry',
 						  'thu_status_date'=>Zend_Registry::get('currentdate'),
+						  'thu_reject_note'=>'', 	
 						  'fri_date'=>date('Y-m-d', strtotime('+5 day', strtotime($weekStartDate))),	
 					 	  'fri_project_status'=>($projHrsData[0]['fri_duration'] !='00:00')?'saved':'no_entry',
 						  'fri_status'=>($projHrsData[0]['fri_duration'] !='00:00')?'saved':'no_entry',
 						  'fri_status_date'=>Zend_Registry::get('currentdate'),
+						  'fri_reject_note'=>'', 	
 						  'sat_date'=>date('Y-m-d', strtotime('+6 day', strtotime($weekStartDate))),		
 						  'sat_project_status'=>($projHrsData[0]['sat_duration'] !='00:00')?'saved':'no_entry',
 						  'sat_status'=>($projHrsData[0]['sat_duration'] !='00:00')?'saved':'no_entry',
 						  'sat_status_date'=>Zend_Registry::get('currentdate'),
+						  'sat_reject_note'=>'',		
 						  'week_status'=>($projHrsData[0]['week_duration'] !='00:00')?'saved':'no_entry',
 					 	  'created_by'=>$sessionData->id,
 			        	  'is_active'=>1,
-			  			  'created'=> Zend_Registry::get('currentdate') 
+			  			  'created'=> Zend_Registry::get('currentdate') //gmdate("Y-m-d H:i:s")
 				);
-				
+				//print_r($statusData); //exit;
 				$checkProjNull = $myTsModel->getProjNullRecordCountInStatus($sessionData->id,$selYrMonArray[0],$selYrMonArray[1],$week);				
 				
 				if($checkProjNull != 0 ) {		
@@ -793,6 +952,7 @@ public function saveAction()
 					$myTsModel->SaveOrUpdateTimesheetStatus($statusData);
 				}
 			}
+			
 			$notesData = array('emp_id'=>$sessionData->id,
 						  'ts_year'=>$selYrMonArray[0],
 						  'ts_month'=>$selYrMonArray[1],
@@ -800,28 +960,37 @@ public function saveAction()
 						  'cal_week'=>$calWeek,
 						  'sun_date'=>date('Y-m-d', strtotime($weekStartDate)),
 						  'sun_note'=> $sunNote,
+						  'sun_reject_note'=> '', 	
 						  'mon_date'=>date('Y-m-d', strtotime('+1 day', strtotime($weekStartDate))),
 						  'mon_note'=> $monNote,
+						  'mon_reject_note'=> '',	
 						  'tue_date'=>date('Y-m-d', strtotime('+2 day', strtotime($weekStartDate))),
 						  'tue_note'=>$tueNote,
+						  'tue_reject_note'=> '',
 						  'wed_date'=>date('Y-m-d', strtotime('+3 day', strtotime($weekStartDate))),
 						  'wed_note'=>$wedNote,
+						  'wed_reject_note'=> '',	
 						  'thu_date'=>date('Y-m-d', strtotime('+4 day', strtotime($weekStartDate))),
-						  'thu_note'=>$thuNote,	
+						  'thu_note'=>$thuNote,
+						  'thu_reject_note'=> '',	
 						  'fri_date'=>date('Y-m-d', strtotime('+5 day', strtotime($weekStartDate))),
-						  'fri_note'=>$friNote, 	
+						  'fri_note'=>$friNote,
+						  'fri_reject_note'=> '', 	
 						  'sat_date'=>date('Y-m-d', strtotime('+6 day', strtotime($weekStartDate))),
-						  'sat_note'=>$satNote,							  			
+						  'sat_note'=>$satNote,
+						  'sat_reject_note'=> '',							  			
 						  'week_note'=>$weekNote,	
 			 			  'created_by'=>$sessionData->id,					
 			        	  'is_active'=>1,
-			  			  'created'=> Zend_Registry::get('currentdate')
+			  			  'created'=> Zend_Registry::get('currentdate')//gmdate("Y-m-d H:i:s")
 			);
 			$myTsModel->SaveOrUpdateTimesheetNotes($notesData);
 		}
 
 		$empDeletedTasks = $myTsModel->empployeeDeletedTasks($sessionData->id, $selYrMonArray[0], $selYrMonArray[1], $week, $calWeek,$projTasksArray);
-			if(is_array($empDeletedTasks)) {
+		//print_r($empDeletedTasks);
+		//if(sizeof($empDeletedTasks) > 0 ) {
+		if(is_array($empDeletedTasks)) {
 
 			foreach($empDeletedTasks as $taskId) {
 				$deleteTasksData = array('emp_id'=>$sessionData->id,
@@ -840,19 +1009,19 @@ public function saveAction()
 						  'week_duration'=>'00:00',						
 			        	  'is_active'=>0,
 						  'modified_by'=>$sessionData->id,
-			  			  'modified'=> Zend_Registry::get('currentdate')
+			  			  'modified'=> Zend_Registry::get('currentdate') //gmdate("Y-m-d H:i:s")
 				);
 
 				$myTsModel->deleteTimesheetTask($sessionData->id,$deleteTasksData,$taskId, $selYrMonArray[0], $selYrMonArray[1], $week);
 			}
 		}
 		$empDeletedProjects = $myTsModel->empployeeDeletedProjects($sessionData->id, $selYrMonArray[0], $selYrMonArray[1], $week, $calWeek,$projsArray);
-	
+		//	if(sizeof($empDeletedProjects) > 0 ) {
 		if(is_array($empDeletedProjects)) {
 
 			foreach($empDeletedProjects as $projId) {
 				$deleteProjectsData = array('emp_id'=>$sessionData->id,
-			              'project_id'=>$taskId,						  
+			              'project_id'=>$projId,						  
 						  'ts_year'=>$selYrMonArray[0],
 						  'ts_month'=>$selYrMonArray[1],
 						  'ts_week'=>$week,
@@ -864,15 +1033,16 @@ public function saveAction()
 			   			  'thu_project_status'=>'no_entry',			  			
 			  			  'fri_project_status'=>'no_entry',			  			
 			  			  'sat_project_status'=>'no_entry',
-	
+				//  'week_status'=>'no_entry',
 			        	  'is_active'=>0,
 						  'modified_by'=>$sessionData->id,
-			  			  'modified'=> Zend_Registry::get('currentdate')
+			  			  'modified'=> Zend_Registry::get('currentdate') //gmdate("Y-m-d H:i:s")
 				);
+				
 
 				$myTsModel->deleteWeekProjectStatus($sessionData->id,$deleteProjectsData,$projId, $selYrMonArray[0], $selYrMonArray[1], $week);
 			}
-			
+			//updateDayStatus($sessionData->id,$selYrMonArray[0], $selYrMonArray[1], $week);
 		}
 		$myTsModel->updateDayStatus($sessionData->id,$selYrMonArray[0], $selYrMonArray[1], $week);
 		$myTsModel->updateWeekStatus($sessionData->id,$selYrMonArray[0], $selYrMonArray[1], $week);
@@ -880,9 +1050,27 @@ public function saveAction()
 		if($callval == 'ajaxcall')
 		$this->_helper->layout->disableLayout();
 
+		//		$usersModel = new Timemanagement_Model_Users();
+		//		$storage = new Zend_Auth_Storage_Session();
+		//        $data = $storage->read();
+		//
+		//        $selYrMon = $this->_getParam('selYrMon');
+		//        $empDoj = $usersModel->getEmployeeDoj($data->id);
+		//
+		//    	$dateEmpDoj = date('Y-m',strtotime($empDoj['date_of_joining']));
+		//
+		//    	$selYrMon = ($selYrMon != '')?$selYrMon:$now->format('Y-m');
+		//
+		//		$month = $this->_getParam('month');
+		//    	$year = $this->_getParam('year');
+		//
+		//    	$this->view->empDoj=$empDoj['date_of_joining'];
+		//    	//$empid = $this->_getParam('empid');
+		//$msgArray['status'] = 'success';
 		$this->view->status = 'success';
-		$this->view->message = 'Time sheet saved successfully.';
-		
+		$this->view->message = 'Timesheet saved successfully.';
+		//$this->_helper->getHelper("FlashMessenger")->addMessage(array("success"=>"Time sheet saved successfully."));
+		}
 	}
 
 	public function submitAction() {
@@ -914,22 +1102,24 @@ public function submitAction() {
 						  'modified'=> Zend_Registry::get('currentdate')				 	  
 		);
 		if($selDay != '') {
+			//$statusData[$dayName.'_project_status']= 'submitted';
 			$statusData[$dayName.'_status']= 'submitted';
 			$statusData[$dayName.'_status_date'] = Zend_Registry::get('currentdate');
 		} else {
 			$weekDaysStatus =  $myTsModel->getWeekDaysDailyStatus($sessionData->id,$yrMon[0],$yrMon[1],$week);
+			//print_r($weekDaysStatus);
 			foreach ($weekDaysStatus[0] as $key => $value) {				
 				if($value == 'saved') {
-					
+					//echo $key."   ".$value; 
 					$dayName =  substr($key,0,3);
-				
+					//$statusData[$dayName.'_project_status']= 'submitted';
 					$statusData[$dayName.'_status']= 'submitted';
 					$statusData[$dayName.'_status_date'] = Zend_Registry::get('currentdate');
 				}
 			}			
 		}
 		$weekDaysProjStatus =  $myTsModel->getWeekDaysProjStatus($sessionData->id,$yrMon[0],$yrMon[1],$week);
-		
+		//	foreach ($weekDaysProjStatus[0] as $key => $value) {
 		
 		$projId = '';		
 		foreach ($weekDaysProjStatus as $projStatusArray) {
@@ -947,7 +1137,9 @@ public function submitAction() {
 				}	
 			}
 		}
-	
+	//	print_r($statusData); 
+	//	print_r($weekDaysProjStatus);	
+	//exit;
 		$myTsModel->updateSubmitStatus($sessionData->id,$yrMon[0], $yrMon[1], $week,$statusData);
 		$myTsModel->updateWeekStatus($sessionData->id,$yrMon[0], $yrMon[1], $week);
 		if($callval == 'ajaxcall')
@@ -966,48 +1158,64 @@ public function eraseweekAction() {
 
 		$storage = new Zend_Auth_Storage_Session();
 		$sessionData = $storage->read();
-		$myTsModel = new Timemanagement_Model_MyTimesheet();
+		
+		$usersModel = new Timemanagement_Model_Users();
+		$data = $storage->read();
+		$empDoj = $usersModel->getEmployeeDoj($sessionData->id);
+		
+		$doj = $empDoj['date_of_joining'];
+		if($doj>date('Y-m-d'))
+		{
+			$this->view->status = 'failure';
+		}
+		else
+		{
 
-		$selYrMon = $this->_getParam('selYrMon');
-		$callval = $this->getRequest()->getParam('call');
-		$week = $this->_getParam('week');
-		$calWeek = $this->_getParam('calWeek');
-		$yrMon = explode('-', $selYrMon);
+			$myTsModel = new Timemanagement_Model_MyTimesheet();
 
-		$statusData = array('modified_by' => $sessionData->id,
-						  'modified'=> Zend_Registry::get('currentdate')				 	  
-		);
-		$TasksData = array('modified_by'=>$sessionData->id,
-			  			  'modified'=> Zend_Registry::get('currentdate') //gmdate("Y-m-d H:i:s")
-		);
-		$notesData = array('modified_by'=>$sessionData->id,
-			  			  'modified'=> Zend_Registry::get('currentdate')//gmdate("Y-m-d H:i:s")
-		);
-		$weekDaysStatus =  $myTsModel->getWeekDaysDailyStatus($sessionData->id,$yrMon[0],$yrMon[1],$week);
-		foreach ($weekDaysStatus[0] as $key => $value) {
-			if($value == 'saved') {
-				$dayName =  substr($key,0,3);
-				$statusData[$dayName.'_project_status']= 'no_entry';
-				$statusData[$dayName.'_status']= 'no_entry';
-				$statusData[$dayName.'_status_date'] = Zend_Registry::get('currentdate');
-
-				$TasksData[$dayName.'_duration']='00:00';
-				$notesData[$dayName.'_note'] = '';
+			$selYrMon = $this->_getParam('selYrMon');
+			$callval = $this->getRequest()->getParam('call');
+			$week = $this->_getParam('week');
+			$calWeek = $this->_getParam('calWeek');
+			$yrMon = explode('-', $selYrMon);
+
+			$statusData = array('modified_by' => $sessionData->id,
+							  'modified'=> Zend_Registry::get('currentdate')				 	  
+			);
+			$TasksData = array('modified_by'=>$sessionData->id,
+							  'modified'=> Zend_Registry::get('currentdate') //gmdate("Y-m-d H:i:s")
+			);
+			$notesData = array('modified_by'=>$sessionData->id,
+							  'modified'=> Zend_Registry::get('currentdate')//gmdate("Y-m-d H:i:s")
+			);
+			$weekDaysStatus =  $myTsModel->getWeekDaysDailyStatus($sessionData->id,$yrMon[0],$yrMon[1],$week);
+			foreach ($weekDaysStatus[0] as $key => $value) {
+				if($value == 'saved') {
+					$dayName =  substr($key,0,3);
+					$statusData[$dayName.'_project_status']= 'no_entry';
+					$statusData[$dayName.'_status']= 'no_entry';
+					$statusData[$dayName.'_status_date'] = Zend_Registry::get('currentdate');
+
+					$TasksData[$dayName.'_duration']='00:00';
+					$notesData[$dayName.'_note'] = '';
+				}
 			}
-		}
-		
-		if($callval == 'ajaxcall')
-		$this->_helper->layout->disableLayout();
+			//		print_r($TasksData);
+			//		print_r($statusData);
+			//		print_r($notesData);
 
-		$myTsModel->updateTimesheet($sessionData->id,$yrMon[0], $yrMon[1], $week,$TasksData);
-		$myTsModel->updateTimesheetStatus($sessionData->id,$yrMon[0], $yrMon[1], $week,$statusData);
-		$myTsModel->updateTimesheetNotes($sessionData->id,$yrMon[0], $yrMon[1], $week,$notesData);
-		$myTsModel->updateWeekStatus($sessionData->id,$yrMon[0], $yrMon[1], $week);
-		$myTsModel->updateWeekDuration($sessionData->id,$yrMon[0], $yrMon[1], $week);
+			if($callval == 'ajaxcall')
+			$this->_helper->layout->disableLayout();
 
-		$this->view->status = 'success';
-		$this->view->message = 'Timesheet erased successfully for week '.$week;
+			$myTsModel->updateTimesheet($sessionData->id,$yrMon[0], $yrMon[1], $week,$TasksData);
+			$myTsModel->updateTimesheetStatus($sessionData->id,$yrMon[0], $yrMon[1], $week,$statusData);
+			$myTsModel->updateTimesheetNotes($sessionData->id,$yrMon[0], $yrMon[1], $week,$notesData);
+			$myTsModel->updateWeekStatus($sessionData->id,$yrMon[0], $yrMon[1], $week);
+			$myTsModel->updateWeekDuration($sessionData->id,$yrMon[0], $yrMon[1], $week);
 
+			$this->view->status = 'success';
+			$this->view->message = 'Timesheet erased successfully for week '.$week.'.';
+		}
 	}
 	public function getstatesAction()
 	{
@@ -1022,12 +1230,29 @@ public function getstatesAction()
 		}
 		$this->_helper->json(array('options'=>utf8_encode($opt)));
 	}
+	//get notification alerts
+	public function getapprovedtimesheetAction()
+	{
+		$storage = new Zend_Auth_Storage_Session();
+		$data = $storage->read();
+		$usersModel = new Timemanagement_Model_Users();
+		$approvedAlert = $usersModel->getEmpApprovalStatusDteails($data->id);
+		$this->view->approvalAlertData =  $approvedAlert;
+	}
+	//update notification alert as closed
+	public function closeapprovealertAction()
+	{
+		$usersModel = new Timemanagement_Model_Users();
+		$storage = new Zend_Auth_Storage_Session();
+		$data = $storage->read();
+		$emp_approval_status = $usersModel->addOrUpdateTstatusData($data->id);
+	}
 	public function converdateAction()
 	{
-		 $selYrMon = $this->_getParam('day');
-		 $callval = $this->_getParam('yearmonth');
-		 $date = sapp_Global::change_date($callval,'view');
-		 $this->_helper->json(array('conerteddate'=>$date));
+		$selYrMon = $this->_getParam('day');
+		$callval = $this->_getParam('yearmonth');
+		$date = sapp_Global::change_date($callval,'view');
+		$this->_helper->json(array('conerteddate'=>$date));
 	}
 
 
diff --git a/application/modules/timemanagement/controllers/NotificationsController.php b/application/modules/timemanagement/controllers/NotificationsController.php
new file mode 100644
index 000000000..a872374bf
--- /dev/null
+++ b/application/modules/timemanagement/controllers/NotificationsController.php
@@ -0,0 +1,618 @@
+<?php
+/*********************************************************************************
+ *  This file is part of Sentrifugo.
+ *  Copyright (C) 2014 Sapplica
+ *
+ *  Sentrifugo is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Sentrifugo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Sentrifugo.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  Sentrifugo Support <support@sentrifugo.com>
+ ********************************************************************************/
+
+class Timemanagement_NotificationsController extends Zend_Controller_Action
+{
+	private $options;
+	public function preDispatch()
+	{
+		/*$userModel = new Timemanagement_Model_Users();
+		$checkTmEnable = $userModel->checkTmEnable();
+
+		if(!$checkTmEnable){
+			$this->_redirect('error');
+		}*/
+		
+		//check Time management module enable
+		if(!sapp_Helper::checkTmEnable())
+			$this->_redirect('error');
+		$ajaxContext = $this->_helper->getHelper('AjaxContext');
+		$ajaxContext->addActionContext('getnotifications', 'html')->initContext();
+		$ajaxContext->addActionContext('pendingsubmissionsweeklyview', 'html')->initContext();
+		$ajaxContext->addActionContext('weeklymonthlyview', 'html')->initContext();
+	}
+
+	public function init()
+	{
+		$this->_options= $this->getInvokeArg('bootstrap')->getOptions();
+	}
+	public function indexAction()
+	{
+		$perPage = PERPAGE;
+		$auth = Zend_Auth::getInstance();
+		$loginUserId=0;
+		if($auth->hasIdentity()){
+			$loginUserId = $auth->getStorage()->read()->id;
+		}
+		$yet_to_submit_dates = array();
+		$notificationModel = new Timemanagement_Model_Notifications();
+		$usersModel = new Timemanagement_Model_Users();
+		$employeeDOJ = $usersModel->getEmployeeDoj($loginUserId);
+		$loginUserGroupId = $employeeDOJ['holiday_group'];
+		$department_id = $employeeDOJ['department_id'];
+		$weekend_date = date('Y-m-d', strtotime('last saturday'));
+		$notificationArray = array();
+		$submitted_notificationArray = array();
+		$final_notification_Arry = array();
+		$notificationArray = $notificationModel->getnotifications($loginUserId,$weekend_date);
+		$submitted_notificationArray = $notificationModel->getSubmittedNotifications($loginUserId,$weekend_date);
+		$employeeLeaves = array();
+		$getWeekends = array();
+		$employeeLeaves = $usersModel->getEmpLeaves($loginUserId,$employeeDOJ['date_of_joining'],$weekend_date);
+		$getWeekends = $usersModel->getWeekend($employeeDOJ['date_of_joining'],$weekend_date,$department_id);
+		$between_days = array();
+		$between_days = sapp_Global::createDateRangeArray($employeeDOJ['date_of_joining'],$weekend_date);
+		$holidayDatesArr =  array();
+		$holidayDateslistArr=array();
+		if( isset($loginUserId) && $loginUserId !=''){
+			$holidaydatesmodel = new Default_Model_Holidaydates();
+			if($loginUserGroupId>0)
+			{
+				$holidayDateslistArr = $holidaydatesmodel->getHolidayDatesListForGroup($loginUserGroupId);
+			}
+			if(!empty($holidayDateslistArr))
+			{
+				for($i=0;$i<sizeof($holidayDateslistArr);$i++)
+				{
+					$holidayDatesArr[$i] = $holidayDateslistArr[$i]['holidaydate'];
+				}
+			}
+		}
+
+		$emp_leave_days = array();
+		foreach($employeeLeaves as $empleave)
+		{
+			$emplev_start_date = $empleave['from_date'];
+			$emplev_endt_date = $empleave['to_date'];
+			$emp_leave_days[] = sapp_Global::createDateRangeArray($emplev_start_date,$emplev_endt_date);
+		}
+		$employee_leave_days = array();
+		foreach($emp_leave_days as $lev_days)
+		{
+			foreach($lev_days as $days)
+			{
+				$employee_leave_days[] = $days;
+			}
+		}
+		//merge all dates holidays,weekends,leaves
+		$hol_leav_weknd = array();
+		$hol_leav_weknd = array_merge($holidayDatesArr,$employee_leave_days,$getWeekends);
+		$working_days = array();
+		$dates_with_status = array();
+		$yet_to_submit_array = array();
+		$rejected_array=array();
+		$blocked_array=array();
+		$enabled_array=array();
+		$dates_without_status = array();
+		//remove holidays,weekend,leaves from between days
+		$working_days = array_diff($between_days, $hol_leav_weknd);
+		$tsEnteredDatesArray = array();
+		if(count($submitted_notificationArray)>0)
+		{
+			$submittes_ts_dates_with_status = '';
+			foreach($submitted_notificationArray as $sub_array)
+			{
+				$submittes_ts_dates_with_status.=$sub_array['ts_week_dates'];
+				$submittes_ts_dates_with_status.='$';
+			}
+			$ts_date_with_status_array = array_filter(explode('$',$submittes_ts_dates_with_status));
+			$tsEnteredDates = implode('#',$ts_date_with_status_array);
+			$tsEnteredDatesArray = explode('#',$tsEnteredDates);
+		}
+
+		if(count($notificationArray)>0 || count($submitted_notificationArray)>0)//if employee not saved timesheet
+		{
+			//get entered timesheet dates
+			$timesheet_dates_with_status = '';
+			foreach($notificationArray as $array)
+			{
+				$timesheet_dates_with_status.= $array['ts_week_dates'];
+				$timesheet_dates_with_status.='$';
+			}
+			$timesheet_date_with_status_array = array_filter(explode('$',$timesheet_dates_with_status));
+			//print_r($timesheet_date_with_status_array);
+			$timesheetEnteredDates = implode('#',$timesheet_date_with_status_array);
+			//echo $timesheetEnteredDates;
+			$timesheetEnteredDates_Array = explode('#',$timesheetEnteredDates);
+			$timesheetEnteredDatesArray = $timesheetEnteredDates_Array;
+			if(count($tsEnteredDatesArray)>0)
+			{
+				$timesheetEnteredDatesArray = array_merge($timesheetEnteredDates_Array,$tsEnteredDatesArray);
+			}
+			$enteredDatesArray = array();
+			$statusArray = array('saved','enabled','rejected','blocked','no_entry','submitted','approved');
+			$enteredDateStatusArr = array();
+			foreach($timesheetEnteredDatesArray as $date)
+			{
+				if(!empty($date))
+				{
+					if(!in_array($date,$statusArray))
+					{
+						$enteredDatesArray[] = $date;
+					}
+					else
+					{
+						$enteredDateStatusArr[] = $date;
+					}
+				}
+			}
+			$not_ts_weekend_ts = array();
+			foreach($enteredDatesArray as $key=>$value)
+			{
+				if(isset($key)){
+					if(in_array($value,$hol_leav_weknd) && $enteredDateStatusArr[$key]=='no_entry')
+					{
+						$not_ts_weekend_ts[] = $value;
+					}
+					$not_ts_weekend_ts[] = $value;
+					if($enteredDateStatusArr[$key]=='saved' || ($enteredDateStatusArr[$key]=='no_entry' && !in_array($value,$hol_leav_weknd)))
+					{
+						$yet_to_submit_array[$value] = $enteredDateStatusArr[$key];
+					}else if($enteredDateStatusArr[$key]=='rejected')
+					{
+						$rejected_array[$value] = $enteredDateStatusArr[$key];
+					}else if($enteredDateStatusArr[$key]=='blocked')
+					{
+						$blocked_array[$value] = $enteredDateStatusArr[$key];
+					}else if($enteredDateStatusArr[$key]=='enabled')
+					{
+						$enabled_array[$value] = $enteredDateStatusArr[$key];
+					}
+					$dates_with_status[$value] = $enteredDateStatusArr[$key];
+				}
+			}
+			$remainingDays = array_diff($working_days,$enteredDatesArray);
+
+			foreach($remainingDays as $dates)
+			{
+				$dates_without_status[$dates] = 'no_entry';
+			}
+			$display_dates = array_merge($dates_with_status,$dates_without_status);
+		}
+		else
+		{
+			$remainingDays = $working_days;
+			foreach($remainingDays as $dates)
+			{
+				$dates_without_status[$dates] = 'no_entry';
+			}
+			$display_dates = $dates_without_status;
+		}
+		$display_dates_array = array();
+		foreach($display_dates as $keydate => $statusarr)
+		{
+			if($keydate>=$employeeDOJ['date_of_joining'] && !($display_dates[$keydate]=='no_entry' && in_array($keydate,$hol_leav_weknd)))
+			{
+				if($display_dates[$keydate]!='submitted' && $display_dates[$keydate]!='approved') {
+					$display_dates_array[$keydate] = $statusarr;
+				}
+			}
+		}
+		$this->view->allCount = count($display_dates_array);
+		$this->view->enabledCount = count($enabled_array);
+		$this->view->rejectedCount = count($rejected_array);
+		$this->view->blockedCount = count($blocked_array);
+		$yet_to_submit_arr = array();
+		foreach($yet_to_submit_array as $key =>$valu)
+		{
+			if($key>=$employeeDOJ['date_of_joining'])
+			{
+				$yet_to_submit_arr[$key] = $valu;
+			}
+		}
+		$this->view->pageNo = 1;
+		$this->view->perPage = $perPage;
+		$yet_to_submit_dates = array_merge($yet_to_submit_arr,$dates_without_status);
+		$this->view->yet_to_submit_dates = $yet_to_submit_dates;
+		$this->view->totalJsonCount = count($yet_to_submit_dates);
+	}
+	//function by sravani for displaying notifications
+	public function getnotificationsAction()
+	{
+		$type = $this->_getParam('type');
+		$perPage = PERPAGE;
+		$auth = Zend_Auth::getInstance();
+		$loginUserId=0;
+		if($auth->hasIdentity()){
+			$loginUserId = $auth->getStorage()->read()->id;
+		}
+		$yet_to_submit_dates = array();
+		$notificationModel = new Timemanagement_Model_Notifications();
+		$usersModel = new Timemanagement_Model_Users();
+		$employeeDOJ = $usersModel->getEmployeeDoj($loginUserId);
+		$loginUserGroupId = $employeeDOJ['holiday_group'];
+		$department_id = $employeeDOJ['department_id'];
+		$weekend_date = date('Y-m-d', strtotime('last saturday'));
+		$notificationArray=array();
+		$submitted_notificationArray = array();
+		$notificationArray = $notificationModel->getnotifications($loginUserId,$weekend_date);
+		$submitted_notificationArray = $notificationModel->getSubmittedNotifications($loginUserId,$weekend_date);
+		$employeeLeaves = array();
+		$getWeekends=array();
+		$employeeLeaves = $usersModel->getEmpLeaves($loginUserId,$employeeDOJ['date_of_joining'],$weekend_date);
+		$getWeekends = $usersModel->getWeekend($employeeDOJ['date_of_joining'],$weekend_date,$department_id);
+		$between_days=array();
+		$between_days = sapp_Global::createDateRangeArray($employeeDOJ['date_of_joining'],$weekend_date);
+		$holidayDatesArr =  array();
+		if( isset($loginUserId) && $loginUserId !=''){
+			$holidaydatesmodel = new Default_Model_Holidaydates();
+			if($loginUserGroupId>0)
+			{
+				$holidayDateslistArr = $holidaydatesmodel->getHolidayDatesListForGroup($loginUserGroupId);
+			}
+			if(!empty($holidayDateslistArr))
+			{
+				for($i=0;$i<sizeof($holidayDateslistArr);$i++)
+				{
+					$holidayDatesArr[$i] = $holidayDateslistArr[$i]['holidaydate'];
+				}
+			}
+		}
+
+		$emp_leave_days = array();
+		foreach($employeeLeaves as $empleave)
+		{
+			$emplev_start_date = $empleave['from_date'];
+			$emplev_endt_date = $empleave['to_date'];
+			$emp_leave_days[] = sapp_Global::createDateRangeArray($emplev_start_date,$emplev_endt_date);
+		}
+		$employee_leave_days = array();
+		foreach($emp_leave_days as $lev_days)
+		{
+			foreach($lev_days as $days)
+			{
+				$employee_leave_days[] = $days;
+			}
+		}
+		//merge all dates holidays,weekends,leaves
+		$hol_leav_weknd = array();
+		$hol_leav_weknd = array_merge($holidayDatesArr,$employee_leave_days,$getWeekends);
+
+		$working_days = array();
+		$dates_with_status = array();
+		$yet_to_submit_array = array();
+		$enabled_array = array();
+		$rejected_array = array();
+		$blocked_array = array();
+		$dates_without_status = array();
+		//remove holidays,weekend,leaves from between days
+		$working_days = array_diff($between_days, $hol_leav_weknd);
+
+		$tsEnteredDatesArray = array();
+		if(count($submitted_notificationArray)>0)
+		{
+			$submittes_ts_dates_with_status = '';
+			foreach($submitted_notificationArray as $sub_array)
+			{
+				$submittes_ts_dates_with_status.=$sub_array['ts_week_dates'];
+				$submittes_ts_dates_with_status.='$';
+			}
+			$ts_date_with_status_array = array_filter(explode('$',$submittes_ts_dates_with_status));
+			$tsEnteredDates = implode('#',$ts_date_with_status_array);
+			$tsEnteredDatesArray = explode('#',$tsEnteredDates);
+		}
+
+		if(count($notificationArray)>0 || count($submitted_notificationArray)>0) {
+			//get entered timesheet dates
+			$timesheet_dates_with_status = '';
+			foreach($notificationArray as $array)
+			{
+				$timesheet_dates_with_status.= $array['ts_week_dates'];
+				$timesheet_dates_with_status.='$';
+			}
+			$timesheet_date_with_status_array = array_filter(explode('$',$timesheet_dates_with_status));
+			//print_r($timesheet_date_with_status_array);
+			$timesheetEnteredDates = implode('#',$timesheet_date_with_status_array);
+			//echo $timesheetEnteredDates;
+			$timesheetEnteredDates_Array = explode('#',$timesheetEnteredDates);
+			$timesheetEnteredDatesArray = $timesheetEnteredDates_Array;
+			if(count($tsEnteredDatesArray)>0)
+			{
+				$timesheetEnteredDatesArray = array_merge($timesheetEnteredDates_Array,$tsEnteredDatesArray);
+			}
+			$enteredDatesArray = array();
+			//$statusArray = array('saved','enabled','rejected','blocked','no_entry');
+			$statusArray = array('saved','enabled','rejected','blocked','no_entry','submitted','approved');
+			$enteredDateStatusArr = array();
+			foreach($timesheetEnteredDatesArray as $date)
+			{
+				if(!empty($date))
+				{
+					if(!in_array($date,$statusArray))
+					{
+						$enteredDatesArray[] = $date;
+					}
+					else
+					{
+						$enteredDateStatusArr[] = $date;
+					}
+				}
+			}
+			foreach($enteredDatesArray as $key=>$value)
+			{
+				if(isset($key)){
+					if($type == 'yet_to_submit')
+					{
+						if($enteredDateStatusArr[$key]=='saved' || ($enteredDateStatusArr[$key]=='no_entry' && !in_array($value,$hol_leav_weknd)))
+						{
+							$yet_to_submit_array[$value] = $enteredDateStatusArr[$key];
+						}
+					}else if($type == 'rejected')
+					{
+						if($enteredDateStatusArr[$key]=='rejected')
+						{
+							$rejected_array[$value] = $enteredDateStatusArr[$key];
+						}
+					}else if($type == 'blocked')
+					{
+						if($enteredDateStatusArr[$key]=='blocked')
+						{
+							$blocked_array[$value] = $enteredDateStatusArr[$key];
+						}
+					}else if($type == 'enabled')
+					{
+						if($enteredDateStatusArr[$key]=='enabled')
+						{
+							$enabled_array[$value] = $enteredDateStatusArr[$key];
+						}
+					}else if($type == 'all')
+					{
+						if(!($enteredDateStatusArr[$key]=='no_entry' && in_array($value,$hol_leav_weknd)))
+						{
+							if($enteredDateStatusArr[$key]!='submitted' && $enteredDateStatusArr[$key]!='approved') {
+								$dates_with_status[$value] = $enteredDateStatusArr[$key];
+							}
+						}
+					}
+				}
+			}
+			$remainingDays = array_diff($working_days,$enteredDatesArray);
+
+			foreach($remainingDays as $dates)
+			{
+				$dates_without_status[$dates] = 'no_entry';
+			}
+			$display_dates = array_merge($dates_with_status,$dates_without_status);
+		}
+		else
+		{
+			$remainingDays = $working_days;
+			foreach($remainingDays as $dates)
+			{
+				$dates_without_status[$dates] = 'no_entry';
+			}
+			$display_dates = $dates_without_status;
+		}
+
+		$display_dates_array = array();
+		foreach($display_dates as $keydate => $statusarr)
+		{
+			if($keydate>=$employeeDOJ['date_of_joining'] && !($display_dates[$keydate]=='no_entry' && in_array($keydate,$hol_leav_weknd)))
+			{
+				$display_dates_array[$keydate] = $statusarr;
+			}
+		}
+
+		$this->view->pageNo = 1;
+		$this->view->perPage = $perPage;
+		$yet_to_submit_dates_array = array_merge($yet_to_submit_array,$dates_without_status);
+		foreach($yet_to_submit_dates_array as $key =>$valu)
+		{
+			if($key>=$employeeDOJ['date_of_joining'])
+			{
+				$yet_to_submit_dates[$key] = $valu;
+			}
+		}
+
+		if($type == 'all')
+		{
+			$this->view->dataArray = $display_dates_array;
+			$this->view->totalJsonCount = count($display_dates_array);
+		}else if($type == 'enabled')
+		{
+			$this->view->dataArray = $enabled_array;
+			$this->view->totalJsonCount = count($enabled_array);
+		}else if($type == 'blocked')
+		{
+			$this->view->dataArray = $blocked_array;
+			$this->view->totalJsonCount = count($blocked_array);
+		}else if($type == 'rejected')
+		{
+			$this->view->dataArray = $rejected_array;
+			$this->view->totalJsonCount = count($rejected_array);
+		}else if($type == 'yet_to_submit')
+		{
+			$this->view->dataArray = $yet_to_submit_dates;
+			$this->view->totalJsonCount = count($yet_to_submit_dates);
+		}
+		$this->view->type=$type;
+	}
+	//function to get pending submissions
+	public function pendingsubmissionsAction()
+	{
+		$auth = Zend_Auth::getInstance();
+		$loginUserId=0;
+		if($auth->hasIdentity()){
+			$loginUserId = $auth->getStorage()->read()->id;
+		}
+		$weekend_date = date('Y-m-d', strtotime('last saturday'));
+		$notificationModel = new Timemanagement_Model_Notifications();
+		$getManagerEmployees = array();
+		$getManagerEmployees = $notificationModel->getManagerEmployees($loginUserId);
+		$concat_array = array();
+		if(count($getManagerEmployees)>0)
+		{
+			$is_current_week = 1;
+			$usersModel = new Timemanagement_Model_Users();
+			$projmodel = new Timemanagement_Model_Projects();
+			$prevweeks = $projmodel->getprevmonthweeks(date('Y-m') , date('d'));
+			$end_date = max($prevweeks[count($prevweeks)]);//get previous week end date
+			$start_date = min($prevweeks[count($prevweeks)]);//get previous week start date
+			if(!($end_date>=date('Y-m-01') && $end_date<=date('Y-m-t')))//check previous week end date is in current month or not
+			{	
+				$is_current_week = 0;
+				$sunday = strtotime("last sunday");
+				$sunday = date('w', $sunday)==date('w') ? $sunday+7*86400 : $sunday;
+				$satday = strtotime(date("Y-m-d",$sunday)." +6 days");
+				$this_week_sd = date("Y-m-d",$sunday);
+				$this_week_ed = date("Y-m-d",$satday);
+				
+				if($this_week_sd==date('Y-m-01'))//if month starts with sunday
+				{
+					$previous_week = strtotime("-1 week +1 day");
+
+					$start_week = strtotime("last sunday",$previous_week);
+					$end_week = strtotime("next saturday",$start_week);
+
+					$start_week = date("Y-m-d",$start_week);
+					$end_week = date("Y-m-d",$end_week);
+
+					//	echo $start_week.' '.$end_week ;
+					$this_week_sd = $start_week;
+					$this_week_ed = $end_week;
+				}	
+
+				//To get day in the week
+				$weekDatesArray = sapp_Global::createDateRangeArray($this_week_sd,$this_week_ed);
+				//End
+				
+				foreach($weekDatesArray as $this_date)
+				{
+					if(!($this_date>=date('Y-m-01') && $this_date<=date('Y-m-t')))
+					{
+						$concat_array[] = $this_date;
+					}
+				}
+			}
+			if(count($concat_array)>0)
+			{
+				$prevweeks[count($prevweeks)+1] = $concat_array;
+			}
+			$prev_week_status = array();
+			$emp_names = array();
+			foreach($getManagerEmployees as $emp)
+			{
+				$emp_names[$emp['user_id']] = $emp['userfullname'];
+				$empDoj = $usersModel->getEmployeeDoj($emp['user_id']);
+				$prev_week_status[$emp['user_id']]=$projmodel->getPreviousDaysTSStatus($prevweeks,$emp['user_id'],$empDoj);
+			}
+			$total_weeks=0;
+			$this->view->total_weeks = count($prevweeks);
+		}
+		$this->view->pending_submission = $prev_week_status;
+		$this->view->prevweeks = $prevweeks;
+		$this->view->emp_names = $emp_names;
+		$this->view->is_current_week = $is_current_week;
+	}
+	//function to show pending submission weekly view
+	public function pendingsubmissionsweeklyviewAction()
+	{
+		$post_array=$this->_getParam('display_array');
+		$weekly_preview=$this->_getParam('weekly_preview');
+		$emp_names=$this->_getParam('emp_names');
+		$selType=$this->_getParam('type');
+		$is_current_week=$this->_getParam('is_current_week');
+		$display_date = json_decode($post_array,true);
+		$week_dates = json_decode($weekly_preview,true);
+		$emp_names = json_decode($emp_names,true);
+		$this->view->pending_submission = $display_date;
+		$this->view->prevweeks = $week_dates;
+		$this->view->emp_names = $emp_names;
+		$this->view->is_current_week = $is_current_week;
+		$this->view->type = $selType;
+		$currentMonth = date('Y-m');
+		if($is_current_week==0)
+		{
+			$currentMonth = date('Y-m', strtotime(date('Y-m')." -1 month"));
+		}
+		$week = $selType;
+		$datesArray =  iterator_to_array(new DatePeriod(new DateTime("first sunday of $currentMonth"),
+    	DateInterval::createFromDateString('next sunday'),new DateTime("last day of $currentMonth")));
+		
+		$firstDay = DateTime::createFromFormat('Y-m-d', "$currentMonth".'-1');
+		$firstDayName =  $firstDay->format('D');
+		$wCounter = 1;
+		if($firstDayName != 'Sun')  $wCounter = 2;
+			
+		if($week == 1) {
+			$startDate = $currentMonth."-1";
+			$weekStartDay = date('F d, Y', strtotime('last sunday', strtotime($startDate)));
+			if($startDate==date('Y-m-1'))
+			{
+				$weekStartDay = date('F d, Y', strtotime($startDate));		
+			}
+		} else  {
+			$startDate = $datesArray[($week-$wCounter)]->format("Y-m-d");
+			$weekStartDay = date('F d, Y', strtotime($startDate));
+		}
+		$lastwkend_date_mnth = date('Y-m',strtotime('next saturday', strtotime($weekStartDay)));
+		$lastweek_start_mnth = date('Y-m', strtotime('last sunday', strtotime($startDate)));
+		$weekendDay = date('F d, Y', strtotime('next saturday', strtotime($weekStartDay)));
+		if($lastweek_start_mnth != $lastwkend_date_mnth && $is_current_week==0)
+		{
+			$weekendDay = date("F d, Y", strtotime("last day of previous month"));
+		}
+		
+		
+		$hidstartweek_date=min($week_dates[$week]);
+		$hidendweek_date=max($week_dates[$week]);
+		$weekStartDay = date('F d, Y', strtotime($hidstartweek_date));
+		$weekendDay = date("F d, Y", strtotime($hidendweek_date));
+		
+		$display_date = $weekStartDay.' - '.$weekendDay;
+		$this->view->weekStartDay =$weekStartDay;
+		$this->view->weekendDay =$weekendDay;
+		$this->view->display_date =$display_date;
+		
+	}
+	//function to get monthly,weely view
+	public function weeklymonthlyviewAction()
+	{
+		$post_array=$this->_getParam('display_array');
+		$weekly_preview=$this->_getParam('weekly_preview');
+		$emp_names=$this->_getParam('emp_names');
+		$input_type=$this->_getParam('input_type');
+		$total_weeks=$this->_getParam('total_weeks');
+		$div_name=$this->_getParam('div_name');
+		$is_current_week=$this->_getParam('is_current_week');
+		$display_date = json_decode($post_array,true);
+		$week_dates = json_decode($weekly_preview,true);
+		$emp_names = json_decode($emp_names,true);
+		$this->view->pending_submission = $display_date;
+		$this->view->prevweeks = $week_dates;
+		$this->view->emp_names = $emp_names;
+		$this->view->input_type = $input_type;
+		$this->view->total_weeks = $total_weeks;
+		$this->view->div_name = $div_name;
+		$this->view->is_current_week = $is_current_week;
+	}
+}
+?>
diff --git a/application/modules/timemanagement/controllers/ProjectresourcesController.php b/application/modules/timemanagement/controllers/ProjectresourcesController.php
index 665d396de..c69657100 100644
--- a/application/modules/timemanagement/controllers/ProjectresourcesController.php
+++ b/application/modules/timemanagement/controllers/ProjectresourcesController.php
@@ -32,6 +32,12 @@ public function init()
 	}
 	public function preDispatch()
 	{
+		/*$userModel = new Timemanagement_Model_Users();
+		$checkTmEnable = $userModel->checkTmEnable();
+
+		if(!$checkTmEnable){
+			$this->_redirect('error');
+		}*/
 		//check Time management module enable
 		if(!sapp_Helper::checkTmEnable())
 			$this->_redirect('error');
@@ -118,14 +124,28 @@ public function resourcesAction()
 		$resMessages = array();
 
 		if($this->getRequest()->getPost()){
+			//echo '<pre>'; print_r($this->getRequest()->getPost());exit;
 			$resourceprojectIds = $this->getRequest()->getParam('hid_resourceprojid');
 			$projectId = $this->getRequest()->getParam('project_id');
 			$empIds = $this->getRequest()->getParam('hid_resourceid');
 			$projectResourceData = array();
 			if(count($resourceprojectIds) > 0){
 				foreach($resourceprojectIds as $key=>$resourceProjectId){
+					if($this->getRequest()->getParam('txt_cost_rate'.$resourceProjectId) != ''){
+						$cost_rate =  $this->getRequest()->getParam('txt_cost_rate'.$resourceProjectId);
+					}else{
+						$cost_rate =  "";
+					}
+					if($this->getRequest()->getParam('txt_billable_rate'.$resourceProjectId) != ''){
+						$billable_rate =  $this->getRequest()->getParam('txt_billable_rate'.$resourceProjectId);
+					}else{
+						$billable_rate =  "";
+					}
+
 					$projectResourceData = array( 'project_id'=>trim($projectId),
 				               'emp_id'=>trim($empIds[$key]), 
+							   'cost_rate'=> $cost_rate,
+							   'billable_rate'=>$billable_rate, 
 			     	           'is_active' => 1,
 				   			   'modified_by'=>$loginUserId,
 							   'modified'=>gmdate("Y-m-d H:i:s")	
@@ -146,7 +166,7 @@ public function resourcesAction()
 				if(is_numeric($projectId) && $projectId>0){
 					$projectModel = new Timemanagement_Model_Projects();
 					$projectData = $projectModel->getSingleProjectData($projectId);
-					$projectResourcesData = $projectResourcesModel->getProjectResourcesData($projectId);
+					$projectResourcesData = $projectResourcesModel->getProjectResourcesData($projectId); //echo '<pre>';print_r($projectResourcesData); exit;
 
 					if($projectResourcesData == 'norows')
 					{
@@ -185,10 +205,13 @@ public function addresourcesprojectAction()
 	{
 		$type=$this->_getParam('type');
 		$projectId = $this->_getParam('projectId');
-		$projectResourcesModel = new Timemanagement_Model_Projectresources();	
+		$projectResourcesModel = new Timemanagement_Model_Projectresources();
+		//$userModel = new Timemanagement_Model_Users();
+		//print_r($userModel->getEmployees('manager'));exit;
 		$otherResources = 'norows';
 		if($type == 'manager'){
 			$added_mngr_emp_str = $this->_getParam('addedempstr');
+			//echo "<pre>";print_r($added_emp_str);exit;
 			$added_mgr_arr = array();
 			$added_mgr_data = '';
 			if(isset($added_mngr_emp_str) && $added_mngr_emp_str != '')
@@ -202,6 +225,8 @@ public function addresourcesprojectAction()
 		if($type == 'emp'){
 			$added_emp_str = $this->_getParam('addedempstr');
 			$added_mgr_str = $this->_getParam('mngrstr');
+				
+			//echo "<pre>";print_r($added_emp_str);exit;
 			$added_mgr_arr = array();
 			$added_mgr_data = $added_emp_data='';
 			if(isset($added_emp_str) && $added_emp_str != '')
@@ -226,7 +251,7 @@ public function addresourcesprojectAction()
 	}
 
 	public function addresourcesAction(){
-		$auth = Zend_Auth::getInstance(); 
+		$auth = Zend_Auth::getInstance();  //echo '<pre>';print_r($auth->getStorage()->read()); exit;
 		if($auth->hasIdentity()){
 			$loginUserId = $auth->getStorage()->read()->id;
 			$loginuserRole = $auth->getStorage()->read()->emprole;
@@ -256,12 +281,16 @@ public function addresourcesAction(){
 					);
 					$result = $projectResourcesModel->SaveorUpdateProjectResourceData($projectResourceData,'');
 				}
+
+				//$this->_helper->getHelper("FlashMessenger")->addMessage(array("success"=>"$type added successfully."));
+
+
 				$projectResourcesData = $projectData = array();
 				try{
 					if(is_numeric($projectId) && $projectId>0){
 						$projectModel = new Timemanagement_Model_Projects();
 						$projectData = $projectModel->getSingleProjectData($projectId);
-						$projectResourcesData = $projectResourcesModel->getProjectResourcesData($projectId); 
+						$projectResourcesData = $projectResourcesModel->getProjectResourcesData($projectId); //echo '<pre>';print_r($projectResourcesData); exit;
 
 						if($projectResourcesData == 'norows')
 						{
@@ -299,7 +328,7 @@ public function viewemptasksAction()
 
 	//delete resource from project
 	public function deleteprojectresourceAction(){
-		$auth = Zend_Auth::getInstance(); 
+		$auth = Zend_Auth::getInstance();  //echo '<pre>';print_r($auth->getStorage()->read()); exit;
 		if($auth->hasIdentity()){
 			$loginUserId = $auth->getStorage()->read()->id;
 			$projectId=$this->_getParam('projectId');
@@ -325,6 +354,8 @@ public function deleteprojectresourceAction(){
 						$where_cond = array('emp_id=?'=>$empId,'project_id=?'=>$projectId);
 							
 						$Id = $task_resource_model->SaveorUpdateProjectTaskResourceData($update_data, $where_cond);
+
+
 						//sapp_Global::send_configuration_mail("Default Task", $taskData[0]['task']);
 						$messages['message'] = 'Resource deleted successfully.';
 						$messages['msgtype'] = 'success';
diff --git a/application/modules/timemanagement/controllers/ProjectsController.php b/application/modules/timemanagement/controllers/ProjectsController.php
index 6aac36e56..623d95747 100644
--- a/application/modules/timemanagement/controllers/ProjectsController.php
+++ b/application/modules/timemanagement/controllers/ProjectsController.php
@@ -32,6 +32,13 @@ public function init()
 	}
 	public function preDispatch()
 	{
+		/*$userModel = new Timemanagement_Model_Users();
+		$checkTmEnable = $userModel->checkTmEnable();
+
+		if(!$checkTmEnable){
+			$this->_redirect('error');
+		}*/
+		
 		//check Time management module enable
 		if(!sapp_Helper::checkTmEnable())
 			$this->_redirect('error');
@@ -40,7 +47,7 @@ public function preDispatch()
 		$ajaxContext->addActionContext('addtasksproject', 'html')->initContext();
 		$ajaxContext->addActionContext('addtasks', 'html')->initContext();
 		$ajaxContext->addActionContext('checkempforprojects', 'json')->initContext();
-	
+		//echo Zend_Registry::get( 'tm_role' );
 	}
 
 	/**
@@ -108,7 +115,7 @@ public function viewAction()
 		{
 			if(is_numeric($id) && $id>0)
 			{
-				$auth = Zend_Auth::getInstance();  
+				$auth = Zend_Auth::getInstance();  //echo '<pre>';print_r($auth->getStorage()->read()); exit;
 				if($auth->hasIdentity()){
 					$loginUserId = $auth->getStorage()->read()->id;
 					$loginuserRole = $auth->getStorage()->read()->emprole;
@@ -273,6 +280,21 @@ public function editAction()
 			$msgarray['client_id'] = 'Clients are not configured yet.';
 			$emptyFlag++;
 		}
+
+		$currencyModel = new Default_Model_Currency();
+		$currencyData = $currencyModel->getCurrencyList();
+		if(sizeof($currencyData) > 0)
+		{
+			foreach ($currencyData as $currency){
+				$projectsForm->currency_id->addMultiOption($currency['id'],utf8_encode($currency['currency']));
+			}
+
+		}else
+		{
+			$msgarray['currency_id'] = 'Currency are not configured yet.';
+			$emptyFlag++;
+		}
+
 		$base_projectData = $projectModel->getProjectList();
 		if(sizeof($base_projectData) > 0)
 		{
@@ -286,12 +308,12 @@ public function editAction()
 		$this->view->emptyFlag = $emptyFlag;
 		try
 		{
+
 			if($id)
-			{	
-				//Edit Record...
+			{	//Edit Record...
 				if(is_numeric($id) && $id>0)
 				{
-					$auth = Zend_Auth::getInstance(); 
+					$auth = Zend_Auth::getInstance();  //echo '<pre>';print_r($auth->getStorage()->read()); exit;
 					if($auth->hasIdentity()){
 						$loginUserId = $auth->getStorage()->read()->id;
 						$loginuserRole = $auth->getStorage()->read()->emprole;
@@ -307,6 +329,17 @@ public function editAction()
 							
 							$projectsForm->populate($data[0]);
 							$projectsForm->submit->setLabel('Update');
+							if($data[0]['start_date'] !='' && $data[0]['start_date'] !='0000-00-00')
+							{
+								$estimated_start_date = sapp_Global::change_date($data[0]['start_date'],'view');
+								$projectsForm->start_date->setValue($estimated_start_date);
+							}
+
+							if($data[0]['end_date'] !='' && $data[0]['end_date'] !='0000-00-00')
+							{
+								$estimated_end_date = sapp_Global::change_date($data[0]['end_date'],'view');
+								$projectsForm->end_date->setValue($estimated_end_date);
+							}
 							$this->view->form = $projectsForm;
 							$this->view->controllername = $objName;
 							$this->view->data = $data;
@@ -355,23 +388,46 @@ public function editAction()
 		}
 		if($this->getRequest()->getPost()){
 			if($projectsForm->isValid($this->_request->getPost())){
+				//print_r($this->_request->getPost());exit;
 				$id = $this->_request->getParam('id');
 				$project_name = $this->_request->getParam('project_name');
 				$project_status = $this->_request->getParam('project_status');
 				$base_project = $this->_request->getParam('base_project');
 				$client_id = $this->_request->getParam('client_id');
+				$currency_id = $this->_request->getParam('currency_id');
+				$project_type = $this->_request->getParam('project_type');
+				$start_date = $this->_request->getParam('start_date');
+				$start_date = sapp_Global::change_date($start_date,'database');
+				$end_date = $this->_request->getParam('end_date');
+				$end_date = sapp_Global::change_date($end_date,'database');
+				$estimated_hrs = $this->_request->getParam('estimated_hrs');
 				$description = $this->_request->getParam('description');
 
 				$date = new Zend_Date();
 				$data = array('project_name'=>ucfirst(trim($project_name)),
 				              'project_status'=>trim($project_status),
 							  'base_project'=>(trim($base_project)!=''?$base_project:NUll),
+							  'start_date'=>(trim($start_date)!=''?$start_date:NUll),
+							  'end_date'=>(trim($end_date)!=''?$end_date:NUll),
+							  'estimated_hrs'=>(trim($estimated_hrs)!=''?$estimated_hrs:NUll),
 							  'description'=>trim($description),
 							  'client_id'=>trim($client_id),
+							  'currency_id'=>trim($currency_id),
+							  'project_type'=>trim($project_type),
 				              'modified_by'=>$loginUserId,
 							  'modified'=>gmdate("Y-m-d H:i:s")
 				);
 
+				if($project_status == 'initiated'){
+					$data['initiated_date'] = gmdate("Y-m-d H:i:s");
+				}
+				if($project_status == 'hold'){
+					$data['hold_date'] = gmdate("Y-m-d H:i:s");
+				}
+				if($project_status == 'completed'){
+					$data['completed_date'] = gmdate("Y-m-d H:i:s");
+				}
+
 				if($id!=''){
 					$where = array('id=?'=>$id);
 				}
@@ -382,6 +438,7 @@ public function editAction()
 					$data['is_active'] = 1;
 					$where = '';
 				}
+
 				$insertedId = $projectModel->SaveorUpdateProjectsData($data, $where);
 				if($insertedId == 'update')
 				{
@@ -404,6 +461,7 @@ public function editAction()
 					$id = $insertedId;
 					$this->_helper->getHelper("FlashMessenger")->addMessage(array("success"=>"Project added successfully."));
 				}
+
 				$this->_redirect('timemanagement/projects/tasks/projectid/'.$id);
 			}else
 			{
@@ -419,6 +477,8 @@ public function editAction()
 
 				if(sizeof($clientData) < 1)
 				$msgarray['client_id'] = 'Clients not configured yet.';
+				if(sizeof($currencyData) < 1)
+				$msgarray['currency_id'] = 'Currency not configured yet.';
 				$this->view->msgarray = $msgarray;
 			}
 		}
@@ -430,7 +490,7 @@ public function editAction()
 	 */
 	public function tasksAction()
 	{
-		$auth = Zend_Auth::getInstance();
+		$auth = Zend_Auth::getInstance();  //echo '<pre>';print_r($auth->getStorage()->read()); exit;
 		if($auth->hasIdentity()){
 			$loginUserId = $auth->getStorage()->read()->id;
 			$loginuserRole = $auth->getStorage()->read()->emprole;
@@ -438,7 +498,9 @@ public function tasksAction()
 		}
 		$projectTasksData = $projectData = array();
 		$projectId = $this->getRequest()->getParam('projectid',null);
+
 		if($this->getRequest()->getPost()){
+			//echo '<pre>'; print_r($this->getRequest()->getPost());exit;
 			$taskprojectIds = $this->getRequest()->getParam('hid_taskprojid');
 			$projectId = $this->getRequest()->getParam('project_id');
 			$taskIds = $this->getRequest()->getParam('hid_taskid');
@@ -446,8 +508,26 @@ public function tasksAction()
 			$projectTasksModel = new Timemanagement_Model_Projecttasks();
 			if(count($taskprojectIds) > 0){
 				foreach($taskprojectIds as $key=>$taskProjectId){
+					if($this->getRequest()->getParam('txt_taskhrs'.$taskProjectId) != ''){
+						$estimated_hrs =  $this->getRequest()->getParam('txt_taskhrs'.$taskProjectId);
+					}else{
+						$estimated_hrs =  "";
+					}
+					if($this->getRequest()->getParam('txt_taskbillable_rate'.$taskProjectId) != ''){
+						$billable_rate =  $this->getRequest()->getParam('txt_taskbillable_rate'.$taskProjectId);
+					}else{
+						$billable_rate =  "";
+					}
+					if($this->getRequest()->getParam('txt_taskbillable'.$taskProjectId,'') != ''){
+						$is_billable =  ($this->getRequest()->getParam('txt_taskbillable'.$taskProjectId) == 'on')?'1':'0';
+					}else{
+						$is_billable =  0;
+					}
 					$projectTaskData = array( 'project_id'=>trim($projectId),
 				               'task_id'=>trim($taskIds[$key]), 
+							   'estimated_hrs'=> $estimated_hrs,
+							   'billable_rate'=>$billable_rate, 
+			     	           'is_billable' => $is_billable, 
 							   'is_active' => 1,
 				   			   'modified_by'=>$loginUserId,
 							   'modified'=>gmdate("Y-m-d H:i:s")	
@@ -463,10 +543,11 @@ public function tasksAction()
 		$projectResourcesModel = new Timemanagement_Model_Projectresources();
 		$checkResourceExistsforProject = $projectResourcesModel->checkProjectResource($projectId,$loginUserId);
 		if($loginUserId == 1 || $checkResourceExistsforProject > 0){
+
 			try{
 				if(is_numeric($projectId) && $projectId>0){
 					$projectTasksModel = new Timemanagement_Model_Projecttasks();
-					$projectTasksData = $projectTasksModel->getProjectTasksData($projectId);
+					$projectTasksData = $projectTasksModel->getProjectTasksData($projectId); //echo '<pre>';print_r($projectTasksData); exit;
 					$projectModel = new Timemanagement_Model_Projects();
 					$projectData = $projectModel->getSingleProjectData($projectId);
 					if($projectTasksData == 'norows')
@@ -515,7 +596,7 @@ public function addtasksprojectAction()
 	}
 
 	public function addtasksAction(){
-		$auth = Zend_Auth::getInstance(); 
+		$auth = Zend_Auth::getInstance();  //echo '<pre>';print_r($auth->getStorage()->read()); exit;
 		if($auth->hasIdentity()){
 			$loginUserId = $auth->getStorage()->read()->id;
 			$loginuserRole = $auth->getStorage()->read()->emprole;
@@ -553,6 +634,7 @@ public function addtasksAction(){
 							   'modified'=>gmdate("Y-m-d H:i:s")	
 						);
 						$result = $projectTasksModel->SaveorUpdateProjectTaskData($projectTaskData,'');
+						//$this->_helper->getHelper("FlashMessenger")->addMessage(array("success"=>"Task added successfully."));
 					}
 
 				}
@@ -600,7 +682,7 @@ public function addtasksAction(){
 				}
 
 				$projectTasksData = array();
-				$projectTasksData = $projectTasksModel->getProjectTasksData($projectId); 
+				$projectTasksData = $projectTasksModel->getProjectTasksData($projectId); //echo '<pre>';print_r($projectTasksData); exit;
 				if($projectTasksData == 'norows')
 				{
 					$this->view->rowexist = "norows";
@@ -611,6 +693,7 @@ public function addtasksAction(){
 				}
 				$this->view->projectTasksData = $projectTasksData;
 				$this->view->projectId = $projectId;
+				$this->view->projectCurrencyCode = $projectData[0]['currencycode'];
 			}
 		}
 	}
diff --git a/application/modules/timemanagement/controllers/ProjecttasksController.php b/application/modules/timemanagement/controllers/ProjecttasksController.php
index acb9f1f15..26f3ade72 100644
--- a/application/modules/timemanagement/controllers/ProjecttasksController.php
+++ b/application/modules/timemanagement/controllers/ProjecttasksController.php
@@ -32,6 +32,13 @@ public function init()
 	}
 	public function preDispatch()
 	{
+		/*$userModel = new Timemanagement_Model_Users();
+		$checkTmEnable = $userModel->checkTmEnable();
+
+		if(!$checkTmEnable){
+			$this->_redirect('error');
+		}*/
+		
 		//check Time management module enable
 		if(!sapp_Helper::checkTmEnable())
 			$this->_redirect('error');
@@ -60,6 +67,7 @@ public function indexAction()
 		$refresh = $this->_getParam('refresh');
 		$dashboardcall = $this->_getParam('dashboardcall');
 		$projectId = $this->_getParam('projectId');
+
 		$data = array();
 		$searchQuery = '';
 		$searchArray = array();
@@ -118,6 +126,7 @@ public function deletetaskAction(){
 		if($auth->hasIdentity()){
 			$loginUserId = $auth->getStorage()->read()->id;
 		}
+
 		$projectId=$this->_getParam('projectId');
 		$projectTaskId=$this->_getParam('projectTaskId');
 		$taskId=$this->_getParam('taskId');
@@ -199,6 +208,8 @@ public function assignresourcestotaskAction(){
 			$this->view->assignedEmployees = $assignedEmployees;
 			$this->view->notAssignedEmployees = $notAssignedEmployees;
 			$this->view->existedEmpIdArray =$existedEmpArray;
+
+			//$this->view->projectEmployees = $projectEmployees;
 			$this->view->taskDetails = $taskDetails;
 			$this->view->projectTaskEmployees = $projectTaskEmployees;
 		}
@@ -231,7 +242,7 @@ function array_column(array $input, $columnKey, $indexKey = null) {
 	}
 
 	public function saveresourcesAction(){
-		$auth = Zend_Auth::getInstance(); 
+		$auth = Zend_Auth::getInstance();  //echo '<pre>';print_r($auth->getStorage()->read()); exit;
 		if($auth->hasIdentity()){
 			$loginUserId = $auth->getStorage()->read()->id;
 
@@ -242,12 +253,15 @@ public function saveresourcesAction(){
 				$newRes = $this->_getParam('newRes');
 				$taskId = $this->_getParam('taskId');
 				$projectTaskId = $this->_getParam('projectTaskId');
+					
 				$oldRes_arr = $newRes_arr = array();
+				//echo $oldRes.'</br>';
 				if(isset($oldRes) && $oldRes != '')
 				{
 					$projRes = trim($oldRes,",");
 					$oldRes_arr = explode(",",$oldRes);
 				}
+				//echo $newRes.'</br>';
 				if(isset($newRes) && $newRes != '')
 				{
 					$projRes = trim($newRes,",");
@@ -257,7 +271,7 @@ public function saveresourcesAction(){
 				if(!empty($newRes_arr)){
 				 foreach($newRes_arr as $newRess){
 				 	if(in_array($newRess, $oldRes_arr)){
-				 		$key = array_search($newRess, $oldRes_arr);
+				 		$key = array_search($newRess, $oldRes_arr); //echo $key;
 				 		unset($oldRes_arr[$key]); // check already exists or not
 				 		continue;
 				 	}else{
@@ -277,6 +291,7 @@ public function saveresourcesAction(){
 				 			 
 				 			$result = $projectTaskResourceModel->SaveorUpdateProjectTaskResourceData($projectTaskResourceData,'');
 				 		}
+				 		//echo $result;
 				 	}
 				 }
 				}
diff --git a/application/modules/timemanagement/controllers/ReportsController.php b/application/modules/timemanagement/controllers/ReportsController.php
index 0b2f1a3dc..ded0f5b4c 100644
--- a/application/modules/timemanagement/controllers/ReportsController.php
+++ b/application/modules/timemanagement/controllers/ReportsController.php
@@ -24,6 +24,16 @@ class Timemanagement_ReportsController extends Zend_Controller_Action
 	private $options;
 	public function preDispatch()
 	{
+		/*$userModel = new Timemanagement_Model_Users();
+		$checkTmEnable = $userModel->checkTmEnable();
+
+		if(!$checkTmEnable){
+			$this->_redirect('error');
+		}*/
+		
+		//check Time management module enable
+		// if(!sapp_Helper::checkTmEnable())
+			// $this->_redirect('error');
 		
 		$ajaxContext = $this->_helper->getHelper('AjaxContext');
 		$ajaxContext->addActionContext('employeereports', 'html')->initContext();
@@ -52,7 +62,10 @@ public function tmreportAction()
 		$start_date = ($this->_getParam('start_date')!='')? $this->_getParam('start_date'):$year_first_day;
 		$end_date = ($this->_getParam('end_date')!='')? $this->_getParam('end_date'):$today;
 
-		
+		// if($start_date != '')
+		// $start_date = $start_date.' 00:00:00';
+		// if($end_date != '')
+		// $end_date = $end_date.' 23:59:59';
 			
 		$this->view->start_date = ($this->_getParam('start_date')!='')? $this->_getParam('start_date'):$year_first_day;
 		$this->view->end_date = ($this->_getParam('end_date')!='')? $this->_getParam('end_date'):$today;
@@ -78,7 +91,10 @@ public function employeereportsAction(){
 		$org_start_date = $start_date;
 		$org_end_date = $end_date;
 
-		
+		// if($start_date != '')
+		// $start_date = $start_date;
+		// if($end_date != '')
+		// $end_date = $end_date;
 
 		$call = $this->_getParam('call');
 
@@ -127,7 +143,7 @@ public function employeereportsAction(){
 		$this->view->call = $call ;
 		$this->view->start_date = ($this->_getParam('start_date')!='')? $this->_getParam('start_date'):$year_first_day;
 		$this->view->end_date = ($this->_getParam('end_date')!='')? $this->_getParam('end_date'):$today;
-		
+		//$this->view->count=$paginator->getTotalItemCount();
 		$this->view->selcetedproj =$projid;
 		$this->view->selected_period_hidden = ($this->_getParam('selected_period_hidden')!='')? $this->_getParam('selected_period_hidden'):'';
 			
@@ -149,7 +165,11 @@ public function projectsreportsAction(){
 		$org_start_date = $start_date;
 		$org_end_date = $end_date;
 
-		
+		// if($start_date != '')
+		// $start_date = $start_date.' 00:00:00';
+		// if($end_date != '')
+		// $end_date = $end_date.' 23:59:59';
+
 		$call = $this->_getParam('call');
 
 		if($call == 'ajaxcall'){
@@ -192,12 +212,15 @@ public function projectsreportsAction(){
 		$param = $this->_getParam('selected_period_hidden');
 		$employeedata = $reportsmodel->getProjectReportsbyEmployeeId($sort, $by, $perPage, $pageNo, $searchData,
 		$call, $dashboardcall, $start_date, $end_date, $empid,$org_start_date,$org_end_date,$param);
+
+		//print_r($employeedata);
+		//exit();
 		array_push($data,$employeedata);
 		$this->view->dataArray = $data;
 		$this->view->call = $call ;
 		$this->view->start_date = ($this->_getParam('start_date')!='')? $this->_getParam('start_date'):$year_first_day;
 		$this->view->end_date = ($this->_getParam('end_date')!='')? $this->_getParam('end_date'):$today;
-	
+		//$this->view->count=$paginator->getTotalItemCount();
 		$this->view->selcetedemp =$empid;
 		$this->view->selected_period_hidden = ($this->_getParam('selected_period_hidden')!='')? $this->_getParam('selected_period_hidden'):'';
 
@@ -226,7 +249,10 @@ public function getempdurationAction()
 		}
 		$start_date = sapp_Global::change_date($start_date,'database');
 		$end_date = sapp_Global::change_date($end_date,'database');
-
+		// if($start_date != '')
+		// $start_date = $start_date.' 00:00:00';
+		// if($end_date != '')
+		// $end_date = $end_date.' 23:59:59';
 		$reportsmodel = new Timemanagement_Model_Reports();
 		$emp_id = $this->_getParam('empId');
 		$get_emp_proj_duration = $reportsmodel->getEmpProjDuration($emp_id,$start_date,$end_date,$projectId,$params);
@@ -258,6 +284,10 @@ public function getprojecttaskdurationAction()
 		$start_date = sapp_Global::change_date($start_date,'database');
 		$end_date = sapp_Global::change_date($end_date,'database');
 
+		// if($start_date != '')
+		// $start_date = $start_date.' 00:00:00';
+		// if($end_date != '')
+		// $end_date = $end_date.' 23:59:59';
 		$reportsmodel = new Timemanagement_Model_Reports();
 		$emp_id = $this->_getParam('empId');
 		$get_proj_task_duration = $reportsmodel->getProjTaskDuration($emp_id,$start_date,$end_date,$projectId,$params);
diff --git a/application/modules/timemanagement/forms/Configuration.php b/application/modules/timemanagement/forms/Configuration.php
new file mode 100644
index 000000000..dff1293cd
--- /dev/null
+++ b/application/modules/timemanagement/forms/Configuration.php
@@ -0,0 +1,79 @@
+<?php
+/********************************************************************************* 
+ *  This file is part of Sentrifugo.
+ *  Copyright (C) 2014 Sapplica
+ *   
+ *  Sentrifugo is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Sentrifugo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Sentrifugo.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  Sentrifugo Support <support@sentrifugo.com>
+ ********************************************************************************/
+
+class Timemanagement_Form_Configuration extends Zend_Form
+{
+	public function init()
+	{
+		$this->setMethod('post');
+		$this->setAttrib('id', 'formid');
+		$this->setAttrib('name', 'configuration');
+
+
+        $id = new Zend_Form_Element_Hidden('id');
+		/*$ts_block_reminder_day = new Zend_Form_Element_Select('ts_block_reminder_day');
+        $ts_block_reminder_day->setAttrib('class', 'selectoption');
+        $ts_block_reminder_day->setRegisterInArrayValidator(false);
+        $ts_block_reminder_day->setRequired(true);
+		$ts_block_reminder_day->addValidator('NotEmpty', false, array('messages' => 'Please select timesheet block reminder day.'));
+		
+		$ts_blocking_day = new Zend_Form_Element_Select('ts_blocking_day');
+        $ts_blocking_day->setAttrib('class', 'selectoption');
+        $ts_blocking_day->setRegisterInArrayValidator(false);
+        $ts_blocking_day->setRequired(true);
+        $ts_blocking_day->addValidator('NotEmpty', false, array('messages' => 'Please select timesheet block day.')); 
+        
+        $ts_block_start_day = new Zend_Form_Element_Select('ts_block_start_day');
+        $ts_block_start_day->setAttrib('class', 'selectoption');
+        $ts_block_start_day->setRegisterInArrayValidator(false);
+        $ts_block_start_day->setRequired(true);
+        $ts_block_start_day->addValidator('NotEmpty', false, array('messages' => 'Please select timesheet block start day.')); 
+        
+        $ts_block_end_day = new Zend_Form_Element_Select('ts_block_end_day');
+        $ts_block_end_day->setAttrib('class', 'selectoption');
+        $ts_block_end_day->setRegisterInArrayValidator(false);
+        $ts_block_end_day->setRequired(true);
+        $ts_block_end_day->addValidator('NotEmpty', false, array('messages' => 'Please select timesheet block end day.')); */
+        
+        $ts_weekly_reminder_day = new Zend_Form_Element_Select('ts_weekly_reminder_day');
+        $ts_weekly_reminder_day->setAttrib('class', 'selectoption');
+        $ts_weekly_reminder_day->setRegisterInArrayValidator(false);
+        $ts_weekly_reminder_day->setRequired(true);
+        $ts_weekly_reminder_day->addValidator('NotEmpty', false, array('messages' => 'Please select timesheet weekly submission reminder.')); 
+        
+        $ts_block_dates_range = new Zend_Form_Element_Select('ts_block_dates_range');
+        $ts_block_dates_range->setAttrib('class', 'selectoption');
+        $ts_block_dates_range->setRegisterInArrayValidator(false);
+        $ts_block_dates_range->addMultiOption('','Select Block dates range');
+		$ts_block_dates_range->addMultiOption('1-31','1st - End of month');
+		$ts_block_dates_range->addMultiOption('26-25','26th previous month - 25th current month');
+        $ts_block_dates_range->setRequired(true);
+        $ts_block_dates_range->addValidator('NotEmpty', false, array('messages' => 'Please select timesheet blocking range.'));
+
+        $submit = new Zend_Form_Element_Submit('submit');
+		$submit->setAttrib('id', 'submitbutton');
+		$submit->setLabel('Save');
+
+		// $this->addElements(array($id,$ts_block_reminder_day,$ts_blocking_day,$ts_block_start_day,$ts_block_end_day,$ts_weekly_reminder_day,$submit));
+		 $this->addElements(array($id,$ts_weekly_reminder_day,$ts_block_dates_range,$submit));
+         $this->setElementDecorators(array('ViewHelper')); 
+	}
+}
\ No newline at end of file
diff --git a/application/modules/timemanagement/forms/Projects.php b/application/modules/timemanagement/forms/Projects.php
index b0a48c67d..e80fadafe 100644
--- a/application/modules/timemanagement/forms/Projects.php
+++ b/application/modules/timemanagement/forms/Projects.php
@@ -80,7 +80,50 @@ public function init()
                                                 'exclude'=>'is_active = 1',
 										)));
 		$client->getValidator('Db_RecordExists')->setMessage('Selected client is inactivated.');
-			
+		
+		$currency = new Zend_Form_Element_Select('currency_id');
+		$currency->addMultiOption('','Select Currency');
+		$currency->setRegisterInArrayValidator(false);	
+        $currency->setRequired(true);
+        $currency->addValidator('NotEmpty', false, array('messages' => 'Please select currency.'));
+         
+		$currency->addValidator(new Zend_Validate_Db_RecordExists(
+										array('table' => 'main_currency',
+                                        		'field' => 'id',
+                                                'exclude'=>'isactive = 1',
+										)));
+		$currency->getValidator('Db_RecordExists')->setMessage('Selected currency is inactivated.');
+		
+		$project_type = new Zend_Form_Element_Radio('project_type');
+		$project_type->setLabel("Type");
+        $project_type->addMultiOptions(array(
+										   'billable' => 'Billable',
+										   'non_billable' => 'Non Billable',
+                                           'revenue' => 'Revenue generation',
+    									   ));
+		$project_type->setSeparator('');
+		$project_type->setValue('billable');    									   
+		$project_type->setRegisterInArrayValidator(false);
+		$project_type->setRequired(true);
+		$project_type->addValidator('NotEmpty', false, array('messages' => 'Please select type.'));
+		
+		$start_date = new ZendX_JQuery_Form_Element_DatePicker('start_date');
+		$start_date->setOptions(array('class' => 'brdr_none'));
+        //$date_of_leaving->setAttrib('onchange', 'validatejoiningdate(this)'); 		
+		$start_date->setAttrib('readonly', 'true');
+		$start_date->setAttrib('onfocus', 'this.blur()');
+		
+		$end_date = new ZendX_JQuery_Form_Element_DatePicker('end_date');
+		$end_date->setOptions(array('class' => 'brdr_none'));
+        //$date_of_leaving->setAttrib('onchange', 'validatejoiningdate(this)'); 		
+		$end_date->setAttrib('readonly', 'true');
+		$end_date->setAttrib('onfocus', 'this.blur()');
+		
+		$estimated_hrs = new Zend_Form_Element_Text("estimated_hrs");
+		$estimated_hrs->setAttrib('maxLength', 5);
+		$estimated_hrs->addFilter(new Zend_Filter_StringTrim());
+		$estimated_hrs->addValidator("regex", false, array("/^([0-9]*\:?[0-9]{1,2})$/","messages"=>"Please enter a valid hours."));
+		
 		$description = new Zend_Form_Element_Textarea('description');
         $description->setAttrib('rows', 10);
         $description->setAttrib('cols', 50);
@@ -89,7 +132,8 @@ public function init()
 		$submit = new Zend_Form_Element_Submit('submit');
 		$submit->setAttrib('id', 'submitbutton');
 		$submit->setLabel('Save');
-		$this->addElements(array($id,$invoice_method,$project_name,$projstatus,$base_project,$description,$client,$submit));
+		
+		 $this->addElements(array($id,$invoice_method,$project_name,$projstatus,$base_project,$description,$client,$currency,$project_type,$start_date,$end_date,$estimated_hrs,$submit));
          $this->setElementDecorators(array('ViewHelper')); 
           $this->setElementDecorators(array(
                     'UiWidgetElement',
diff --git a/application/modules/timemanagement/models/Clients.php b/application/modules/timemanagement/models/Clients.php
index 957887b5c..a69bb25a3 100644
--- a/application/modules/timemanagement/models/Clients.php
+++ b/application/modules/timemanagement/models/Clients.php
@@ -65,6 +65,7 @@ public function getGrid($sort,$by,$perPage,$pageNo,$searchData,$call,$dashboardc
 			
 		$objName = 'clients';
 
+		//email,phone_no,poc,address,country_id,state_id,created_by
 		$tableFields = array(
 					'action'=>'Action',
 					'client_name' => 'Client',
diff --git a/application/modules/timemanagement/models/Configuration.php b/application/modules/timemanagement/models/Configuration.php
new file mode 100644
index 000000000..376c93f5c
--- /dev/null
+++ b/application/modules/timemanagement/models/Configuration.php
@@ -0,0 +1,54 @@
+<?php
+/********************************************************************************* 
+ *  This file is part of Sentrifugo.
+ *  Copyright (C) 2014 Sapplica
+ *   
+ *  Sentrifugo is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Sentrifugo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Sentrifugo.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  Sentrifugo Support <support@sentrifugo.com>
+ ********************************************************************************/
+/**
+ *
+ * @model Configuration Model
+ * @author sagarsoft
+ *
+ */
+class Timemanagement_Model_Configuration extends Zend_Db_Table_Abstract
+{
+    protected $_name = 'tm_configuration';
+    protected $_primary = 'id';
+	
+	public function getActiveRecord()
+	{
+	   $select = $this->select()
+						->setIntegrityCheck(false)
+						->from(array('c'=>$this->_name),array('c.*'))
+					    ->where('c.is_active = 1');
+		return $this->fetchAll($select)->toArray();
+	
+	}
+	
+	public function SaveorUpdateConfigurationData($data, $where)
+	{	
+	    if($where != ''){
+		    $this->update($data, $where);
+			return 'update';
+		} else {
+			$this->insert($data);
+			$id=$this->getAdapter()->lastInsertId($this->_name);
+			return $id;
+		}
+	}	
+	
+}
\ No newline at end of file
diff --git a/application/modules/timemanagement/models/Cronjobstatus.php b/application/modules/timemanagement/models/Cronjobstatus.php
new file mode 100644
index 000000000..6ab4d0c5b
--- /dev/null
+++ b/application/modules/timemanagement/models/Cronjobstatus.php
@@ -0,0 +1,54 @@
+<?php
+/*********************************************************************************
+ *  This file is part of Sentrifugo.
+ *  Copyright (C) 2014 Sapplica
+ *
+ *  Sentrifugo is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Sentrifugo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Sentrifugo.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  Sentrifugo Support <support@sentrifugo.com>
+ ********************************************************************************/
+/**
+ *
+ * @model Configuration Model
+ * @author sagarsoft
+ *
+ */
+class Timemanagement_Model_Cronjobstatus extends Zend_Db_Table_Abstract
+{
+	protected $_name = 'tm_cronjob_status';
+	protected $_primary = 'id';
+
+	public function checkCronRunning()
+	{
+		$select = $this->select()
+		->setIntegrityCheck(false)
+		->from(array('c'=>$this->_name),array('c.*'))
+		->where("c.cronjob_status = 'running'");
+		return $this->fetchAll($select)->toArray();
+
+	}
+
+	public function saveorUpdateCronjobStatusData($data, $where)
+	{
+		if($where != ''){
+			$this->update($data, $where);
+			return 'update';
+		} else {
+			$this->insert($data);
+			$id=$this->getAdapter()->lastInsertId($this->_name);
+			return $id;
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/application/modules/timemanagement/models/Emptimesheets.php b/application/modules/timemanagement/models/Emptimesheets.php
index 3082d292b..8aac48106 100644
--- a/application/modules/timemanagement/models/Emptimesheets.php
+++ b/application/modules/timemanagement/models/Emptimesheets.php
@@ -68,7 +68,7 @@ public function monthly_master($selmn)
 	public function getEmployeesAsscociatedWithProject($manager_id = "",$year,$month,$search="",$clicked_status,$emp_list_flag="",$week="",$current_page){
 		
 		$search=urldecode($search);
-		$stat_arr=array('submitted'=>'For Approval','saved'=>'Saved');
+		$stat_arr=array('enabled'=>'Enabled','blocked'=>'Blocked','rejected'=>'Rejected','submitted'=>'For Approval','approved'=>'Approved','saved'=>'Saved');
 		$fin_arr=array();
 		$i=0;
 		$where = " WHERE (ms.isactive = 1 AND pe.is_active=1 ) ";
@@ -79,13 +79,20 @@ public function getEmployeesAsscociatedWithProject($manager_id = "",$year,$month
 		$duration = "IF(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.week_duration as time))))is null,'00:00',
 						time_format(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.week_duration as time)))),'%H:%i'))";
 
-		$time_status = "IF(FIND_IN_SET('submitted',GROUP_CONCAT(DISTINCT week_status))!=0,'For Approval',
-						IF(FIND_IN_SET('saved',GROUP_CONCAT(DISTINCT week_status))!=0,'Saved','No Entry'))";
+		$time_status = "IF(FIND_IN_SET('blocked',GROUP_CONCAT(DISTINCT week_status))!=0,'Blocked',
+						IF(FIND_IN_SET('submitted',GROUP_CONCAT(DISTINCT week_status))!=0,'For Approval',						
+						IF(FIND_IN_SET('rejected',GROUP_CONCAT(DISTINCT week_status))!=0,'Rejected',
+						IF(FIND_IN_SET('approved',GROUP_CONCAT(DISTINCT week_status))!=0,'Approved',
+						IF(FIND_IN_SET('saved',GROUP_CONCAT(DISTINCT week_status))!=0,'Saved',
+						IF(FIND_IN_SET('enabled',GROUP_CONCAT(DISTINCT week_status))!=0,'Enabled','No Entry'))))))";
 		if($emp_list_flag=="project")
 		{
-			$time_status = "IF(FIND_IN_SET('submitted',GROUP_CONCAT(sun_project_status,',',mon_project_status,',',tue_project_status,',',wed_project_status,',',thu_project_status,',',fri_project_status,',',sat_project_status))!=0,'For Approval',
-			IF(FIND_IN_SET('saved',GROUP_CONCAT(sun_project_status,',',mon_project_status,',',tue_project_status,',',wed_project_status,',',thu_project_status,',',fri_project_status,',',sat_project_status))!=0,'Saved','No Entry'
-			))";
+			$time_status = "IF(FIND_IN_SET('blocked',GROUP_CONCAT(sun_project_status,',',mon_project_status,',',tue_project_status,',',wed_project_status,',',thu_project_status,',',fri_project_status,',',sat_project_status))!=0,'Blocked',
+IF(FIND_IN_SET('rejected',GROUP_CONCAT(sun_project_status,',',mon_project_status,',',tue_project_status,',',wed_project_status,',',thu_project_status,',',fri_project_status,',',sat_project_status))!=0,'Rejected',
+IF(FIND_IN_SET('submitted',GROUP_CONCAT(sun_project_status,',',mon_project_status,',',tue_project_status,',',wed_project_status,',',thu_project_status,',',fri_project_status,',',sat_project_status))!=0,'For Approval',
+IF(FIND_IN_SET('approved',GROUP_CONCAT(sun_project_status,',',mon_project_status,',',tue_project_status,',',wed_project_status,',',thu_project_status,',',fri_project_status,',',sat_project_status))!=0,'Approved',
+IF(FIND_IN_SET('saved',GROUP_CONCAT(sun_project_status,',',mon_project_status,',',tue_project_status,',',wed_project_status,',',thu_project_status,',',fri_project_status,',',sat_project_status))!=0,'Saved',
+IF(FIND_IN_SET('enabled',GROUP_CONCAT(sun_project_status,',',mon_project_status,',',tue_project_status,',',wed_project_status,',',thu_project_status,',',fri_project_status,',',sat_project_status))!=0,'Enabled','No Entry'))))))";
 		}		
 
 		$selectEmpTimesheetsQuery = "SELECT GROUP_CONCAT( distinct pe.project_id) proj_ids, ms.user_id AS empid, ms.userfullname AS empname,
@@ -120,7 +127,7 @@ public function getEmployeesAsscociatedWithProject($manager_id = "",$year,$month
 			$selectEmpTimesheetsQuery.=" HAVING time_status=\"".$stat_arr[$clicked_status]."\" ";
 		}
 		$selectEmpTimesheetsQuery .= " LIMIT ".$current_index.",".$per_page;
-
+		//echo $selectEmpTimesheetsQuery;exit;
 		$res = $db->query($selectEmpTimesheetsQuery);
 		while ($row=$res->fetch())
 		{
@@ -143,7 +150,7 @@ public function getEmployeesAsscociatedWithProject($manager_id = "",$year,$month
 	public function getEmployeesForMonthly($manager_id = "",$year,$month,$search="",$clicked_status,$emp_list_flag="",$week="",$current_page)
 	{
 		$search=urldecode($search);
-		$stat_arr=array('submitted'=>'For Approval','saved'=>'Saved');
+		$stat_arr=array('enabled'=>'Enabled','blocked'=>'Blocked','rejected'=>'Rejected','submitted'=>'For Approval','approved'=>'Approved','saved'=>'Saved');
 		$fin_arr=array();
 		$i=0;
 		$where = " WHERE (ms.isactive = 1) ";
@@ -154,8 +161,13 @@ public function getEmployeesForMonthly($manager_id = "",$year,$month,$search="",
 		$duration = "IF(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.week_duration as time))))is null,'00:00',
 						time_format(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.week_duration as time)))),'%H:%i'))";
 		
-		$time_status = "IF(FIND_IN_SET('submitted',GROUP_CONCAT(DISTINCT week_status))!=0,'For Approval',
-						IF(FIND_IN_SET('saved',GROUP_CONCAT(DISTINCT week_status))!=0,'Saved','No Entry'))";
+		$time_status = "
+						IF(FIND_IN_SET('blocked',GROUP_CONCAT(DISTINCT week_status))!=0,'Blocked',
+						IF(FIND_IN_SET('submitted',GROUP_CONCAT(DISTINCT week_status))!=0,'For Approval',
+						IF(FIND_IN_SET('rejected',GROUP_CONCAT(DISTINCT week_status))!=0,'Rejected',						
+						IF(FIND_IN_SET('approved',GROUP_CONCAT(DISTINCT week_status))!=0,'Approved',
+						IF(FIND_IN_SET('saved',GROUP_CONCAT(DISTINCT week_status))!=0,'Saved',
+						IF(FIND_IN_SET('enabled',GROUP_CONCAT(DISTINCT week_status))!=0,'Enabled','No Entry'))))))";
 
 		$selectEmpTimesheetsQuery = "SELECT ms.user_id AS empid, ms.userfullname AS empname,
 									".$duration." AS duration, 
@@ -194,7 +206,7 @@ public function getEmployeesForMonthly($manager_id = "",$year,$month,$search="",
 			$selectEmpTimesheetsQuery.=" HAVING time_status=\"".$stat_arr[$clicked_status]."\" ";
 		}
 		$selectEmpTimesheetsQuery .= " LIMIT ".$current_index.",".$per_page;
-
+		//echo $selectEmpTimesheetsQuery;//exit;
 		$res = $db->query($selectEmpTimesheetsQuery);
 		while ($row=$res->fetch())
 		{
@@ -217,7 +229,7 @@ public function getEmployeesForMonthly($manager_id = "",$year,$month,$search="",
 	function getEmployeeTimsheetDetails($year,$month,$week="",$user_id,$project_ids="",$emplistflag=""){
 		
 
-		$stat_arr=array('submitted'=>'For Approval','saved'=>'Saved');
+		$stat_arr=array('enabled'=>'Enabled','blocked'=>'Blocked','rejected'=>'Rejected','submitted'=>'For Approval','approved'=>'Approved','saved'=>'Saved');
 		$fin_arr=array();
 		$i=0;
 		$where = "";
@@ -226,13 +238,20 @@ function getEmployeeTimsheetDetails($year,$month,$week="",$user_id,$project_ids=
 		$duration = "IF(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.week_duration as time))))is null,'00:00',
 						time_format(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.week_duration as time)))),'%H:%i'))";
 
-		$time_status = "IF(FIND_IN_SET('submitted',GROUP_CONCAT(DISTINCT week_status))!=0,'For Approval',
-						IF(FIND_IN_SET('saved',GROUP_CONCAT(DISTINCT week_status))!=0,'Saved','No Entry'))";
+		$time_status = "IF(FIND_IN_SET('blocked',GROUP_CONCAT(DISTINCT week_status))!=0,'Blocked',
+						IF(FIND_IN_SET('submitted',GROUP_CONCAT(DISTINCT week_status))!=0,'For Approval',						
+						IF(FIND_IN_SET('rejected',GROUP_CONCAT(DISTINCT week_status))!=0,'Rejected',
+						IF(FIND_IN_SET('approved',GROUP_CONCAT(DISTINCT week_status))!=0,'Approved',
+						IF(FIND_IN_SET('saved',GROUP_CONCAT(DISTINCT week_status))!=0,'Saved',
+						IF(FIND_IN_SET('enabled',GROUP_CONCAT(DISTINCT week_status))!=0,'Enabled','No Entry'))))))";
 		if($emplistflag=="project")
 		{
-			$time_status = "
+			$time_status = "IF(FIND_IN_SET('blocked',GROUP_CONCAT(sun_project_status,',',mon_project_status,',',tue_project_status,',',wed_project_status,',',thu_project_status,',',fri_project_status,',',sat_project_status))!=0,'Blocked',
+IF(FIND_IN_SET('rejected',GROUP_CONCAT(sun_project_status,',',mon_project_status,',',tue_project_status,',',wed_project_status,',',thu_project_status,',',fri_project_status,',',sat_project_status))!=0,'Rejected',
 IF(FIND_IN_SET('submitted',GROUP_CONCAT(sun_project_status,',',mon_project_status,',',tue_project_status,',',wed_project_status,',',thu_project_status,',',fri_project_status,',',sat_project_status))!=0,'For Approval',
-IF(FIND_IN_SET('saved',GROUP_CONCAT(sun_project_status,',',mon_project_status,',',tue_project_status,',',wed_project_status,',',thu_project_status,',',fri_project_status,',',sat_project_status))!=0,'Saved','No Entry'))";
+IF(FIND_IN_SET('approved',GROUP_CONCAT(sun_project_status,',',mon_project_status,',',tue_project_status,',',wed_project_status,',',thu_project_status,',',fri_project_status,',',sat_project_status))!=0,'Approved',
+IF(FIND_IN_SET('saved',GROUP_CONCAT(sun_project_status,',',mon_project_status,',',tue_project_status,',',wed_project_status,',',thu_project_status,',',fri_project_status,',',sat_project_status))!=0,'Saved',
+IF(FIND_IN_SET('enabled',GROUP_CONCAT(sun_project_status,',',mon_project_status,',',tue_project_status,',',wed_project_status,',',thu_project_status,',',fri_project_status,',',sat_project_status))!=0,'Enabled','No Entry'))))))";
 		}				
 
 		$selectEmpTimesheetsQuery = "SELECT ms.user_id AS empid,ms.reporting_manager_name, ms.userfullname AS empname,
@@ -257,7 +276,7 @@ function getEmployeeTimsheetDetails($year,$month,$week="",$user_id,$project_ids=
 		
 		$selectEmpTimesheetsQuery.=$where;
 		$selectEmpTimesheetsQuery.=" GROUP BY ms.user_id";
-
+		//echo $selectEmpTimesheetsQuery;//exit;
 		$res = $db->query($selectEmpTimesheetsQuery);
 		while ($row=$res->fetch())
 		{
@@ -282,6 +301,7 @@ public function getEachDayTsDateCron($empid,$cal_week,$startDateYear,$month="")
 		$select = $this->select()
 						->setIntegrityCheck(false)
 						->from(array('t' => $this->_ts_status),
+						//array('ts_week_dates' => "concat(concat(sun_date,'#',sun_status),'$',concat(mon_date,'#',mon_status),'$',concat(tue_date,'#',tue_status),'$',concat(wed_date,'#',wed_status),'$',concat(thu_date,'#',thu_status),'$',concat(fri_date,'#',fri_status),'$',concat(sat_date,'#',sat_status))"))
 						array('ts_week_dates' => "concat(concat(sun_date,'#',sun_status,'#','sun'),'$',
 												concat(mon_date,'#',mon_status,'#','mon'),'$',
 												concat(tue_date,'#',tue_status,'#','tue'),'$',
@@ -291,7 +311,7 @@ public function getEachDayTsDateCron($empid,$cal_week,$startDateYear,$month="")
 												concat(sat_date,'#',sat_status,'#','sat'))"))
 						->where("t.emp_id=".$empid." AND t.is_active=1 AND t.cal_week = '".$cal_week."' AND t.ts_month='".$month."' AND t.ts_year = '".$startDateYear."' ")
 						->group('t.emp_id');
-
+						//echo $select;exit();
 		return $this->fetchAll($select)->toArray();
 	}
 
@@ -308,11 +328,410 @@ public function getEachDayTsDateCronWithProject($empid,$cal_week,$startDateYear,
 													concat(fri_date,'#',fri_project_status,'#','fri'),'$',
 													concat(sat_date,'#',sat_project_status,'#','sat'))"))
 						->where("t.emp_id=".$empid." AND t.project_id IS NOT NULL AND t.is_active=1 AND t.cal_week = '".$cal_week."' AND t.ts_month='".$month."' AND t.ts_year = '".$startDateYear."' ");
-
+		//echo $select;exit();
 		return $this->fetchAll($select)->toArray();
 		
 	}
+	
+	function updateEmployeeTimesheet($emp_id="",$year="",$month="",$lastday="",$calenderWeekArray="",$flag="",$rejectNote="",$emplistflag){
+
+		$db = Zend_Db_Table::getDefaultAdapter();
+		$month_start_date = $year."-".$month."-"."01";
+		$month_end_date = $year."-".$month."-".$lastday;
+		try{
+			$db->beginTransaction();
+			$monthDatesArray = sapp_Global::createDateRangeArray($month_start_date,$month_end_date);
+			for($i=0; $i<sizeof($calenderWeekArray); $i++){
+				if($flag == "reject"){
+					$this->rejectEmployeeTimesheetStatus($emp_id,$calenderWeekArray[$i],$year,$monthDatesArray,$rejectNote,$month,$emplistflag);	
+				}else{
+					$this->updateEmployeeTimesheetStatus($emp_id,$calenderWeekArray[$i],$year,$flag,$monthDatesArray,$month,$emplistflag);	
+				}
+				
+			}
+			// If all succeed, commit the transaction and all changes
+			// are committed at once.
+			$db->commit();
+			return TRUE;
+		}catch(Exception $e){
+			// If any of the queries failed and threw an exception,
+			// we want to roll back the whole transaction, reversing
+			// changes made in the transaction, even those that succeeded.
+			// Thus all changes are committed together, or none are.
+			$db->rollBack();
+			echo $e->getMessage();
+			return FALSE;
+		}
+	}
 
+	function rejectEmployeeTimesheetStatus($emp_id="", $calweek="", $year="", $datesArr="",$rejectNote="",$month="",$emplistflag){
+		$resultData = array();
+		$ts_filled_dates = array();
+		$db = Zend_Db_Table::getDefaultAdapter();
+		$isprojectManager = false;
+		$conditionCheck = "submitted";
+		$statusUpdate = "rejected";
+		$storage = new Zend_Auth_Storage_Session();
+		$data = $storage->read();
+		
+		/*$getEmpDetails = $this->getEmp_from_summary($emp_id);
+		if($data->id !== $getEmpDetails['reporting_manager'] ){
+			$isprojectManager = true;
+		}*/
+			
+		if($emplistflag == "project"){
+			$isprojectManager = true;
+		}
+		
+		if($isprojectManager){
+			// for manager
+			$projects = $this->getEmpProjects($data->id);
+			$projects = explode(',',$projects);
+			if(sizeof($projects) > 0){
+				$resultData = $this->getEachDayTsDateCronWithProject($emp_id,$calweek,$year,$month);
+				if(sizeof($resultData) > 0){
+					foreach ($resultData as $tmpresultData){
+						$updateArray = array();
+						$updateRejProjStatus = array();
+						$updateStatus = array();
+						$ts_week_dates = $tmpresultData['ts_week_dates'];
+						$project_id = $tmpresultData['project_id'];
+						$ts_weekArray = explode('$',$ts_week_dates);
+						$curDate = gmdate("Y-m-d H:i:s");
+						if(count($ts_weekArray) > 0){
+							foreach($ts_weekArray as $ts_day){
+								$ts_day_Array = explode('#',$ts_day);
+								if(in_array($ts_day_Array[0],$datesArr)){
+									if($ts_day_Array[1] == $conditionCheck){
+										if(!empty($project_id) && $project_id != 'NULL' && in_array($project_id,$projects)){
+											$updateArray[$ts_day_Array[2].'_project_status'] = $statusUpdate;
+											$updateArray[$ts_day_Array[2].'_reject_note'] = $rejectNote;
+											$updateStatus[$ts_day_Array[2].'_status'] = $statusUpdate;
+											$updateArray[$ts_day_Array[2].'_status_date'] = $curDate;
+										}
+									}
+								}
+							}
+						}
+						if(!empty($project_id)){
+							/*$where = array();
+							$where['emp_id']=$emp_id;
+							$where['ts_year']=$year;
+							$where['cal_week']=$calweek;
+							$where['project_id']=$project_id;
+							$where['ts_month']=$month;*/
+							$whereStmt = " project_id = ".(int)$project_id." AND emp_id = $emp_id AND ts_year = $year AND ts_month =".(int)$month." AND cal_week = $calweek";
+							if(sizeof($updateArray) > 0){
+								//print_r($updateArray);
+								$result = $db->update($this->_ts_status, $updateArray ,$whereStmt);
+								
+								$updateStatusArray = array();
+								$getDayStatusForEmp = $this->getEmpDayStatusByProjectStatusForWeek($emp_id,$month, $calweek, $year);
+								foreach($getDayStatusForEmp as $key => $value){
+									if(isset($updateStatus[$key])){
+										$updateStatusArray[$key] = $value;	
+									}
+								}
+								/*$statusWhere = array();
+								$statusWhere['emp_id']=$emp_id;
+								$statusWhere['ts_year']=$year;
+								$statusWhere['cal_week']=$calweek;
+								$statusWhere['ts_month']=$month;*/
+								$statusWhere = " emp_id = $emp_id AND ts_year = $year AND ts_month =".(int)$month." AND cal_week = $calweek";
+								//echo $statusWhere;
+									
+								$db->update($this->_ts_status, $updateStatusArray ,$statusWhere);
+								
+								$weekStatus = $this->getEmpWeekStatus($emp_id,$calweek,$year,$month);
+								$week_status = $weekStatus['week_status'];
+								$db->update($this->_ts_status, array('week_status' => $week_status) ,$statusWhere);
+								
+							}	
+						}
+					}
+				}
+			}
+			
+		}else{
+			$updateArray = array();
+			$updateRejProjStatus = array();
+			$resultData = $this->getEachDayTsDateCron($emp_id,$calweek,$year,$month);
+			if(!empty($resultData[0])){
+				$ts_week_dates = $resultData[0]['ts_week_dates'];
+				$ts_weekArray = explode('$',$ts_week_dates);
+				if(count($ts_weekArray) > 0){
+					foreach($ts_weekArray as $ts_day){
+						$ts_day_Array = explode('#',$ts_day);
+						if(in_array($ts_day_Array[0],$datesArr)){
+							if($ts_day_Array[1] == $conditionCheck){
+								$updateArray[$ts_day_Array[2].'_status'] = $statusUpdate;
+								$updateArray[$ts_day_Array[2].'_project_status'] = $statusUpdate;
+								$updateArray[$ts_day_Array[2].'_status_date'] = gmdate("Y-m-d H:i:s");
+								$updateRejProjStatus[$ts_day_Array[2].'_reject_note'] = $rejectNote;
+							}
+						}
+					}
+					$whereStmt = "emp_id = $emp_id AND ts_year = $year AND ts_month =".(int)$month." AND cal_week = $calweek";
+					if(sizeof($updateArray) > 0){
+						$db->update($this->_ts_status, $updateArray ,$whereStmt);
+						$weekStatus = $this->getEmpWeekStatus($emp_id,$calweek,$year,$month);
+						$week_status = $weekStatus['week_status'];
+						$db->update($this->_ts_status, array('week_status' => $week_status) ,$whereStmt);
+						if(sizeof($updateRejProjStatus) > 0){
+							$db->update('tm_emp_ts_notes', $updateRejProjStatus ,$whereStmt);
+						}
+					}
+				}
+			}
+		}
+		
+	}
+	
+	function updateEmployeeTimesheetStatus($emp_id="", $calweek="", $year="", $flag="", $datesArr="",$month="",$emplistflag){
+
+		$resultData = array();
+		$ts_filled_dates = array();
+		$conditionCheck = "";
+		$statusUpdate = "";
+		$db = Zend_Db_Table::getDefaultAdapter();
+		$isprojectManager = false;
+		if($flag=="enable"){
+			$conditionCheck = "blocked";
+			$statusUpdate = "enabled";
+		}
+
+		if($flag=="approve"){
+			$conditionCheck = "submitted";
+			$statusUpdate = "approved";
+		}
+		
+		$storage = new Zend_Auth_Storage_Session();
+		$data = $storage->read();
+				
+		if($emplistflag == "project"){
+			$isprojectManager = true;
+		}
+			
+		if($isprojectManager){
+			// for manager
+			$projects = $this->getEmpProjects($data->id);
+			$projects = explode(',',$projects);
+			if(sizeof($projects) > 0){
+				$resultData = $this->getEachDayTsDateCronWithProject($emp_id,$calweek,$year,$month);
+				if(sizeof($resultData) > 0){
+					foreach ($resultData as $tmpresultData){
+						$updateArray = array();
+						$updateStatus = array();
+						$approvedDates = "";
+						$ts_week_dates = $tmpresultData['ts_week_dates'];
+						$project_id = $tmpresultData['project_id'];
+						$ts_weekArray = explode('$',$ts_week_dates);
+						if(count($ts_weekArray) > 0){
+							foreach($ts_weekArray as $ts_day){
+								$ts_day_Array = explode('#',$ts_day);
+								if(in_array($ts_day_Array[0],$datesArr)){
+									if($ts_day_Array[1] == $conditionCheck){
+										if($project_id != 'NULL' && in_array($project_id,$projects)){
+											$updateStatus[$ts_day_Array[2].'_status'] = $statusUpdate;
+											//$updateArray[$ts_day_Array[2].'_project_status'] = $statusUpdate;
+											$updateArray[$ts_day_Array[2].'_status_date'] = gmdate("Y-m-d H:i:s");
+											if($statusUpdate == "approved"){
+												$updateArray[$ts_day_Array[2].'_project_status'] = $statusUpdate;
+												$approvedDates.= $ts_day_Array[0].",";
+											}
+										}
+									}
+								}
+							}
+						}
+						
+						if(!empty($project_id) && in_array($project_id,$projects)){
+							$whereStmt = " project_id = ".(int)$project_id." AND emp_id = $emp_id AND ts_year = $year AND ts_month =".(int)$month." AND cal_week = $calweek";
+							if(sizeof($updateArray) > 0){
+								$result = $db->update($this->_ts_status, $updateArray ,$whereStmt);
+								if($result > 0){
+									$updateStatusArray = array();
+									$getDayStatusForEmp = $this->getEmpDayStatusByProjectStatusForWeek($emp_id,$month, $calweek, $year);
+									foreach($getDayStatusForEmp as $key => $value){
+										if(isset($updateStatus[$key])){
+											$updateStatusArray[$key] = $value;	
+										}
+									}
+									//print_r($updateStatusArray);
+									$statusWhere = " emp_id = $emp_id AND ts_year = $year AND ts_month =".(int)$month." AND cal_week = $calweek";
+									//echo $statusWhere;
+									$db->update($this->_ts_status, $updateStatusArray ,$statusWhere);
+																	
+									$weekStatus = $this->getEmpWeekStatus($emp_id,$calweek,$year,$month);
+									$week_status = $weekStatus['week_status'];
+									$db->update($this->_ts_status, array('week_status' => $week_status) ,$statusWhere);
+									
+									if($statusUpdate == "approved" && $approvedDates != ""){
+										$this->saveProcessNotes($emp_id,$approvedDates,$data->id);
+										/*$insertProcessUpdates = array(
+												'emp_id' => $emp_id,
+												'ts_dates' => $approvedDates,
+												'action_type' => 'approved',
+												'alert' => 1,
+												'action_by' => $data->id,
+												'created' => gmdate("Y-m-d H:i:s")
+										);
+										//print_r($insertProcessUpdates);
+										$db->insert('tm_process_updates',$insertProcessUpdates);*/
+									}
+								}
+							}	
+						}
+					}
+				}
+			}
+		}else{
+			$updateArray = array();
+			$approvedDates = "";
+			$resultData = $this->getEachDayTsDateCron($emp_id,$calweek,$year,$month);
+			if(!empty($resultData[0])){
+				$ts_week_dates = $resultData[0]['ts_week_dates'];
+				$ts_weekArray = explode('$',$ts_week_dates);
+				if(count($ts_weekArray) > 0){
+					foreach($ts_weekArray as $ts_day){
+						$ts_day_Array = explode('#',$ts_day);
+						if(in_array($ts_day_Array[0],$datesArr)){
+							if($ts_day_Array[1] == $conditionCheck){
+								$updateArray[$ts_day_Array[2].'_status'] = $statusUpdate;
+								//$updateArray[$ts_day_Array[2].'_project_status'] = $statusUpdate;
+								$updateArray[$ts_day_Array[2].'_status_date'] = gmdate("Y-m-d H:i:s");
+								if($statusUpdate == "approved"){
+									$updateArray[$ts_day_Array[2].'_project_status'] = $statusUpdate;
+									$approvedDates.= $ts_day_Array[0].",";
+								}
+							}
+						}
+					}
+					$whereStmt = "emp_id = $emp_id AND ts_year = $year AND ts_month =".(int)$month." AND cal_week = $calweek";
+					if(sizeof($updateArray) > 0){
+						$db->update($this->_ts_status, $updateArray ,$whereStmt);
+						$weekStatus = $this->getEmpWeekStatus($emp_id,$calweek,$year,$month);
+						$week_status = $weekStatus['week_status'];
+						$db->update($this->_ts_status, array('week_status' => $week_status) ,$whereStmt);
+						if($approvedDates != ""){
+							$this->saveProcessNotes($emp_id,$approvedDates,$data->id);
+							/*$insertProcessUpdates = array(
+									'emp_id' => $emp_id,
+									'ts_dates' => $approvedDates,
+									'action_type' => 'approved',
+									'alert' => 1,
+									'action_by' => $data->id,
+									'created' => gmdate("Y-m-d H:i:s")
+							);
+							$db->insert('tm_process_updates',$insertProcessUpdates);*/
+						}
+							
+					}
+				}
+			}
+		}
+	
+	}
+
+	function getEmpDayStatusByProjectStatus($emp_id="",$month="", $calweek="", $year="",$project_status="",$day_status="",$day_date_column ="", $day_date=""){
+		
+		$select = $this->select()
+						->setIntegrityCheck(false)
+						->from(array('t' => $this->_ts_status),
+						array("$day_status" => "IF(FIND_IN_SET('blocked',GROUP_CONCAT(DISTINCT ".$project_status."))!=0,'blocked',
+												IF(FIND_IN_SET('saved',GROUP_CONCAT(DISTINCT ".$project_status."))!=0,'saved',
+											    IF(FIND_IN_SET('rejected',GROUP_CONCAT(DISTINCT ".$project_status."))!=0,'rejected',
+												IF(FIND_IN_SET('submitted',GROUP_CONCAT(DISTINCT ".$project_status."))!=0,'submitted',
+											    IF(FIND_IN_SET('approved',GROUP_CONCAT(DISTINCT ".$project_status."))!=0,'approved',											    
+											    IF(FIND_IN_SET('enabled',GROUP_CONCAT(DISTINCT ".$project_status."))!=0,'enabled','No Entry'))))))
+												"))
+						->where("emp_id=".$emp_id." AND ts_month=".$month." AND project_id IS NOT NULL  
+								AND is_active=1 AND cal_week = '".$calweek."' AND ts_year = '".$year."' AND ".$day_date_column." = '".$day_date."'");
+		$result = $this->fetchAll($select)->toArray();
+		return $result[0];
+		
+	}
+	
+	function getEmpDayStatusByProjectStatusForWeek($emp_id="",$month="", $calweek="", $year=""){
+		$select = $this->select()
+						->setIntegrityCheck(false)
+						->from(array('t' => $this->_ts_status),
+							  array("mon_status" => " IF(FIND_IN_SET('blocked',GROUP_CONCAT(DISTINCT mon_project_status))!=0,'blocked',
+							  						IF(FIND_IN_SET('saved',GROUP_CONCAT(DISTINCT mon_project_status))!=0,'saved',
+												    IF(FIND_IN_SET('rejected',GROUP_CONCAT(DISTINCT mon_project_status))!=0,'rejected',
+												    IF(FIND_IN_SET('submitted',GROUP_CONCAT(DISTINCT mon_project_status))!=0,'submitted',
+												    IF(FIND_IN_SET('approved',GROUP_CONCAT(DISTINCT mon_project_status))!=0,'approved',												    
+												    IF(FIND_IN_SET('enabled',GROUP_CONCAT(DISTINCT mon_project_status))!=0,'enabled','no_entry'))))))",
+							  
+							  		"tue_status" => "IF(FIND_IN_SET('blocked',GROUP_CONCAT(DISTINCT tue_project_status))!=0,'blocked',
+							  						IF(FIND_IN_SET('saved',GROUP_CONCAT(DISTINCT tue_project_status))!=0,'saved',
+												    IF(FIND_IN_SET('rejected',GROUP_CONCAT(DISTINCT tue_project_status))!=0,'rejected',
+												    IF(FIND_IN_SET('submitted',GROUP_CONCAT(DISTINCT tue_project_status))!=0,'submitted',
+												    IF(FIND_IN_SET('approved',GROUP_CONCAT(DISTINCT tue_project_status))!=0,'approved',												    
+												    IF(FIND_IN_SET('enabled',GROUP_CONCAT(DISTINCT tue_project_status))!=0,'enabled','no_entry'))))))",
+							  
+									"wed_status" => "IF(FIND_IN_SET('blocked',GROUP_CONCAT(DISTINCT wed_project_status))!=0,'blocked',
+													IF(FIND_IN_SET('saved',GROUP_CONCAT(DISTINCT wed_project_status))!=0,'saved',
+												    IF(FIND_IN_SET('rejected',GROUP_CONCAT(DISTINCT wed_project_status))!=0,'rejected',
+												    IF(FIND_IN_SET('submitted',GROUP_CONCAT(DISTINCT wed_project_status))!=0,'submitted',
+												    IF(FIND_IN_SET('approved',GROUP_CONCAT(DISTINCT wed_project_status))!=0,'approved',												    
+												    IF(FIND_IN_SET('enabled',GROUP_CONCAT(DISTINCT wed_project_status))!=0,'enabled','no_entry'))))))",
+							  
+									"thu_status" => "IF(FIND_IN_SET('blocked',GROUP_CONCAT(DISTINCT thu_project_status))!=0,'blocked',
+													IF(FIND_IN_SET('saved',GROUP_CONCAT(DISTINCT thu_project_status))!=0,'saved',
+												    IF(FIND_IN_SET('rejected',GROUP_CONCAT(DISTINCT thu_project_status))!=0,'rejected',
+												    IF(FIND_IN_SET('submitted',GROUP_CONCAT(DISTINCT thu_project_status))!=0,'submitted',
+												    IF(FIND_IN_SET('approved',GROUP_CONCAT(DISTINCT thu_project_status))!=0,'approved',												    
+												    IF(FIND_IN_SET('enabled',GROUP_CONCAT(DISTINCT thu_project_status))!=0,'enabled','no_entry'))))))",
+							  
+									"fri_status" => "IF(FIND_IN_SET('blocked',GROUP_CONCAT(DISTINCT fri_project_status))!=0,'blocked',
+													IF(FIND_IN_SET('saved',GROUP_CONCAT(DISTINCT fri_project_status))!=0,'saved',
+												    IF(FIND_IN_SET('rejected',GROUP_CONCAT(DISTINCT fri_project_status))!=0,'rejected',
+												    IF(FIND_IN_SET('submitted',GROUP_CONCAT(DISTINCT fri_project_status))!=0,'submitted',
+												    IF(FIND_IN_SET('approved',GROUP_CONCAT(DISTINCT fri_project_status))!=0,'approved',												    
+												    IF(FIND_IN_SET('enabled',GROUP_CONCAT(DISTINCT fri_project_status))!=0,'enabled','no_entry'))))))",
+								    
+									"sat_status" => "IF(FIND_IN_SET('blocked',GROUP_CONCAT(DISTINCT sat_project_status))!=0,'blocked',
+													IF(FIND_IN_SET('saved',GROUP_CONCAT(DISTINCT sat_project_status))!=0,'saved',
+												    IF(FIND_IN_SET('rejected',GROUP_CONCAT(DISTINCT sat_project_status))!=0,'rejected',
+												    IF(FIND_IN_SET('submitted',GROUP_CONCAT(DISTINCT sat_project_status))!=0,'submitted',
+												    IF(FIND_IN_SET('approved',GROUP_CONCAT(DISTINCT sat_project_status))!=0,'approved',												    
+												    IF(FIND_IN_SET('enabled',GROUP_CONCAT(DISTINCT sat_project_status))!=0,'enabled','no_entry'))))))",
+									
+									"sun_status" => "IF(FIND_IN_SET('blocked',GROUP_CONCAT(DISTINCT sun_project_status))!=0,'blocked',
+													IF(FIND_IN_SET('saved',GROUP_CONCAT(DISTINCT sun_project_status))!=0,'saved',
+												    IF(FIND_IN_SET('rejected',GROUP_CONCAT(DISTINCT sun_project_status))!=0,'rejected',
+												    IF(FIND_IN_SET('submitted',GROUP_CONCAT(DISTINCT sun_project_status))!=0,'submitted',
+												    IF(FIND_IN_SET('approved',GROUP_CONCAT(DISTINCT sun_project_status))!=0,'approved',												    
+												    IF(FIND_IN_SET('enabled',GROUP_CONCAT(DISTINCT sun_project_status))!=0,'enabled','no_entry'))))))"
+							  )
+						)
+						->where("emp_id=".$emp_id." AND ts_month=".$month." AND project_id IS NOT NULL  
+								AND is_active=1 AND cal_week = '".$calweek."' AND ts_year =".$year);
+		$result = $this->fetchAll($select)->toArray();
+		return $result[0];
+	}
+	
+	
+	function getEmpWeekStatus($emp_id="", $calweek="", $year="", $month=""){
+
+		$select = $this->select()
+						->setIntegrityCheck(false)
+						->from(array('t' => $this->_ts_status),
+						array('week_status' => "IF(FIND_IN_SET('blocked',CONCAT(sun_status,',',mon_status,',',tue_status,',',wed_status,',',thu_status,',',fri_status,',',sat_status))!=0,'blocked',
+											   IF(FIND_IN_SET('submitted',CONCAT(sun_status,',',mon_status,',',tue_status,',',wed_status,',',thu_status,',',fri_status,',',sat_status))!=0,'submitted',
+											   IF(FIND_IN_SET('rejected',CONCAT(sun_status,',',mon_status,',',tue_status,',',wed_status,',',thu_status,',',fri_status,',',sat_status))!=0,'rejected',
+											   IF(FIND_IN_SET('saved',CONCAT(sun_status,',',mon_status,',',tue_status,',',wed_status,',',thu_status,',',fri_status,',',sat_status))!=0,'saved',											   
+											   IF(FIND_IN_SET('approved',CONCAT(sun_status,',',mon_status,',',tue_status,',',wed_status,',',thu_status,',',fri_status,',',sat_status))!=0,'approved',											   
+											   IF(FIND_IN_SET('enabled',CONCAT(sun_status,',',mon_status,',',tue_status,',',wed_status,',',thu_status,',',fri_status,',',sat_status))!=0,'enabled','no_entry'))))))
+												"))
+						->where("emp_id=".$emp_id." AND is_active=1 AND ts_month=".$month." AND cal_week = '".$calweek."' AND ts_year = '".$year."' ")
+						->group('emp_id');
+						//echo $select;
+		$result = $this->fetchAll($select)->toArray();
+		return $result[0];
+
+	}
 	
 	public function getEmp_from_summary($userid)
 	{
@@ -327,7 +746,7 @@ public function getEmpProjects($userid)
 		$db = Zend_Db_Table::getDefaultAdapter();
 		$qry = "select GROUP_CONCAT(project_id) as projects from tm_project_employees where is_active = 1 AND  emp_id = ".$userid." ";
 		$res = $db->query($qry)->fetch();
-
+		//print_r($res);
 		return $res['projects'];
 	}
 	
@@ -341,13 +760,153 @@ public function getEmpProjectByDate($userid,$calweek,$month,$year,$day,$date)
 		return $res['projects'];
 	}
 	
-
+	public function updateEmployeeDayTimesheet($emp_id, $calweek, $year, $month, $day, $date, $flag, $rejectNote,$emplistflag){
+	
+		$db = Zend_Db_Table::getDefaultAdapter();
+		$profiler = $db->getProfiler();
+		$resultData = array();
+		$ts_filled_dates = array();
+		$conditionCheck = "";
+		$statusUpdate = "";
+		$isprojectManager = false;
+		try{
+			$db->beginTransaction();
+		
+			if($flag=="reject"){
+				$conditionCheck = "submitted";
+				$statusUpdate = "rejected";
+			}
+	
+			if($flag=="approve"){
+				$conditionCheck = "submitted";
+				$statusUpdate = "approved";
+			}
+			
+			//echo "Calender Week : $calweek";
+			$storage = new Zend_Auth_Storage_Session();
+			$data = $storage->read();
+			
+			if($emplistflag == "project"){
+				$isprojectManager = true;
+			}
+			
+			if($isprojectManager){
+				// for manager
+				$projects = $this->getEmpProjects($data->id);
+				$projects = explode(',',$projects);
+				if(sizeof($projects) > 0){
+					$weekDay = $day.'_date';
+					//for employee
+					$project_ids = $this->getEmpProjectByDate($emp_id,$calweek,$month,$year,$weekDay,$date);
+					$project_ids = explode(',',$project_ids);
+					if(sizeof($project_ids)> 0){
+						for($i=0; $i<sizeof($project_ids); $i++){
+							if(in_array($project_ids[$i],$projects)){
+								$updateArray = array();
+								$updateRejProjStatus = array();
+								
+								$updateArray[$day.'_project_status'] = $statusUpdate;
+								$updateArray[$day.'_status_date'] = gmdate("Y-m-d H:i:s");
+								if($flag=="reject"){
+									$updateArray[$day.'_reject_note'] = $rejectNote;
+								}
+								
+								$whereStmt = " project_id = ".(int)$project_ids[$i]." AND emp_id = $emp_id AND ts_year = $year AND ts_month =".(int)$month." AND cal_week = $calweek AND ".$day."_date = '".$date."'";
+								//print_r($updateArray);
+								//echo $whereStmt;
+								if(sizeof($updateArray) > 0){
+									$result = $db->update($this->_ts_status, $updateArray ,$whereStmt);
+									$day_status = $this->getEmpDayStatusByProjectStatus($emp_id,$month,$calweek,$year,$day.'_project_status',$day.'_status',$day.'_date', $date);
+									$update_day_status_Array = array(
+										$day.'_status'	=>$day_status[$day.'_status']
+									);
+									$where_day_status = " emp_id = $emp_id AND ts_year = $year AND ts_month =".(int)$month." AND cal_week = $calweek AND ".$day."_date = '".$date."'";
+									//print_r($update_day_status_Array);
+									//echo $where_day_status;
+									$db->update($this->_ts_status, $update_day_status_Array ,$where_day_status);
+									
+									$where_week_status_Array = " emp_id = $emp_id AND ts_year = $year AND ts_month =".(int)$month." AND cal_week = $calweek";
+									$weekStatus = $this->getEmpWeekStatus($emp_id,$calweek,$year,$month);
+									$week_status = $weekStatus['week_status'];
+									$db->update($this->_ts_status, array('week_status' => $week_status) ,$where_week_status_Array);
+									
+									if($flag=="approve"){
+										
+										$this->saveProcessNotes($emp_id,$date,$data->id);
+										/*$insertProcessUpdates = array(
+												'emp_id' => $emp_id,
+												'ts_dates' => $date,
+												'action_type' => 'approved',
+												'alert' => 1,
+												'action_by' => $data->id,
+												'created' => gmdate("Y-m-d H:i:s")
+										);
+										$db->insert('tm_process_updates',$insertProcessUpdates);*/
+									}
+								}
+					
+							}
+						}
+					}
+				}
+			}else{
+				$updateArray = array();
+				$updateRejProjStatus = array();
+				$updateArray[$day.'_status'] = $statusUpdate;
+				$updateArray[$day.'_project_status'] = $statusUpdate;
+				$updateArray[$day.'_status_date'] = gmdate("Y-m-d H:i:s");
+				if($flag=="reject"){
+					$updateRejProjStatus[$day.'_reject_note'] = $rejectNote;
+				}
+				$whereStmt = "emp_id = $emp_id AND ts_year = $year AND ts_month =".(int)$month." AND cal_week = $calweek AND ".$day."_date = '".$date."'";
+				if(sizeof($updateArray) > 0){
+					$db->update($this->_ts_status, $updateArray ,$whereStmt);
+					$weekStatus = $this->getEmpWeekStatus($emp_id,$calweek,$year,$month);
+					$week_status = $weekStatus['week_status'];
+					$db->update($this->_ts_status, array('week_status' => $week_status) ,$whereStmt);
+				}
+				if($flag=="approve"){
+					
+					$this->saveProcessNotes($emp_id,$date,$data->id);
+					/*$insertProcessUpdates = array(
+							'emp_id' => $emp_id,
+							'ts_dates' => $date,
+							'action_type' => 'approved',
+							'alert' => 1,
+							'action_by' => $data->id,
+							'created' => gmdate("Y-m-d H:i:s")
+					);
+					$db->insert('tm_process_updates',$insertProcessUpdates);*/
+				}
+				if(sizeof($updateRejProjStatus) > 0){
+					$db->update('tm_emp_ts_notes', $updateRejProjStatus ,$whereStmt);
+				}
+			}
+			
+			// If all succeed, commit the transaction and all changes
+			// are committed at once.
+			$db->commit();
+			return TRUE;
+		}catch(Exception $e){
+			// If any of the queries failed and threw an exception,
+			// we want to roll back the whole transaction, reversing
+			// changes made in the transaction, even those that succeeded.
+			// Thus all changes are committed together, or none are.
+			$db->rollBack();
+			echo $e->getMessage();
+			return FALSE;
+		}
+		
+	}
 	
 	public function getMonthTimesheetData($empId,$year,$month,$project_ids="",$emplistflag='') {
 		$status = '_status';
 		if($emplistflag == "project"){
 			$status = '_project_status';
 		}
+	
+		$select_list = ",CONCAT(IFNULL(ts.sun_reject_note,''),IFNULL(en.sun_reject_note,'')) as sun_reject_note ,CONCAT(IFNULL(ts.mon_reject_note,''),IFNULL(en.mon_reject_note,'')) as mon_reject_note,CONCAT(IFNULL(ts.tue_reject_note,''),IFNULL(en.tue_reject_note,'')) as tue_reject_note ,CONCAT(IFNULL(ts.wed_reject_note,''),IFNULL(en.wed_reject_note,'')) as wed_reject_note,CONCAT(IFNULL(ts.thu_reject_note,''),IFNULL(en.thu_reject_note,'')) as thu_reject_note,CONCAT(IFNULL(ts.fri_reject_note,''),IFNULL(en.fri_reject_note,'')) as fri_reject_note,CONCAT(IFNULL(ts.sat_reject_note,''),IFNULL(en.sat_reject_note,'')) as sat_reject_note";
+		
 		 $select = $this->select()
 				  ->setIntegrityCheck(false)
 				  ->from(array('et'=>$this->_name),array(
@@ -359,17 +918,18 @@ public function getMonthTimesheetData($empId,$year,$month,$project_ids="",$empli
 					if(et.thu_duration is null,"00:00",time_format(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.thu_duration as time)))),"%H:%i"))thu_duration,ifnull(ts.thu'.$status.',"no_entry")thu_status,
 					if(et.fri_duration is null,"00:00",time_format(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.fri_duration as time)))),"%H:%i"))fri_duration,ifnull(ts.fri'.$status.',"no_entry")fri_status,
 					if(et.sat_duration is null,"00:00",time_format(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.sat_duration as time)))),"%H:%i"))sat_duration,ifnull(ts.sat'.$status.',"no_entry")sat_status,
-				  	if(et.week_duration is null,"00:00",time_format(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.week_duration as time)))),"%H:%i"))week_duration'
+				  	if(et.week_duration is null,"00:00",time_format(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.week_duration as time)))),"%H:%i"))week_duration'.$select_list
 					));
 			  if($project_ids != ""){
 			  	$select->joinInner(array('ts'=> $this->_ts_status),'ts.emp_id = et.emp_id and et.ts_year= ts.ts_year and et.ts_month= ts.ts_month and et.ts_week = ts.ts_week and et.project_id = ts.project_id and et.project_id IN ('.$project_ids.')',array());
 			  }else{
+			  //	$select->joinInner(array('ts'=> $this->_ts_status),'ts.emp_id = et.emp_id and et.ts_year= ts.ts_year and et.ts_month= ts.ts_month and et.ts_week = ts.ts_week and et.project_id = ts.project_id',array());
 			 	 	$select->joinInner(array('ts'=> $this->_ts_status),'ts.emp_id = et.emp_id and et.ts_year= ts.ts_year and et.ts_month= ts.ts_month and et.ts_week = ts.ts_week and (et.project_id = ts.project_id OR ts.project_id IS NULL)',array());
 			  }
 			  $select->joinInner(array('en'=> 'tm_emp_ts_notes'),'en.emp_id = et.emp_id and et.ts_year= en.ts_year and et.ts_month= en.ts_month and et.ts_week = en.ts_week ',array());
 	  	  	  $select->where("et.is_active=1 and ts.is_active=1 and et.ts_year = $year and  et.ts_month = $month and et.emp_id = $empId");
 			  $select->group('ts.ts_week');
-
+			// echo $select;//exit;
 		return $this->fetchAll($select)->toArray();
 	}
 	
@@ -388,7 +948,7 @@ public function getWeeklyTimesheetData($empId,$year,$month,$week,$project_ids=""
 		  	$select->where("p.id IN (".$project_ids.")");
 		  }
 		  $select->order('p.project_name');
-
+		//echo $select;exit;		  	         
 		return $this->fetchAll($select)->toArray();
 	}
 
diff --git a/application/modules/timemanagement/models/MyTimesheet.php b/application/modules/timemanagement/models/MyTimesheet.php
index a8b4e80b2..6996b6888 100644
--- a/application/modules/timemanagement/models/MyTimesheet.php
+++ b/application/modules/timemanagement/models/MyTimesheet.php
@@ -29,11 +29,19 @@ public function SaveOrUpdateTimesheet($arrayData)
 		$query = 'INSERT INTO '. $this->_name.'('.implode(',',array_keys($arrayData)).') VALUES ('.
 			implode(',',array_fill(1, count($arrayData), '?')).') ON DUPLICATE KEY UPDATE '.implode(' = ?,',
 			array_keys($arrayDataForUpdate)).' = ?';
-
+		//	echo $query; exit;      
         $result = $db->query($query,array_merge(array_values($arrayData),array_values($arrayDataForUpdate)));
         
         return $result;
         
+//		if($where != ''){
+//			$this->update($data, $where);
+//			return 'update';
+//		} else {
+//			$this->insert($data);
+//			$id=$this->getAdapter()->lastInsertId($this->_name);
+//			return $id;
+//		}
 	}
 	public function updateTimesheetRecord($data, $where) {
 		
@@ -45,7 +53,7 @@ public function updateStatusRecord($data, $where) {
 		$db = Zend_Db_Table::getDefaultAdapter();	
 		$query = 'UPDATE  tm_ts_status SET '.implode(' = ?,',array_keys($data)).' = ?'.
 				 ' where '.$where;
-
+		//echo $query; exit;      
         $result = $db->query($query,array_values($data));
 		
 	}
@@ -56,7 +64,7 @@ public function getProjNullRecordCountInTimeSheet($empId,$year,$month,$week){
 				->from(array('t' => 'tm_emp_timesheets'),
 				array('count(*) rec_count'))			
 				->where(" project_id is null and t.emp_id =".$empId." and t.ts_year = '".$year."' and t.ts_month='".$month."' and t.ts_week = '".$week."'");
-
+			//echo $select;exit;					
      	 $result = $this->fetchAll($select)->toArray();		  	
 		 
        	 return $result[0]['rec_count'];
@@ -68,7 +76,7 @@ public function getProjNullRecordCountInStatus($empId,$year,$month,$week){
 				->from(array('s' => 'tm_ts_status'),
 				array('count(*) rec_count'))			
 				->where(" project_id is null and s.emp_id =".$empId." and s.ts_year = '".$year."' and s.ts_month='".$month."' and s.ts_week = '".$week."'");
-
+			//echo $select;exit;	
 		 $result = $this->fetchAll($select)->toArray();		  	
 		 
        return $result[0]['rec_count'];
@@ -78,7 +86,7 @@ public function deleteTimesheetTask($empId,$arrayData,$projTaskId,$year,$month,$
 		$db = Zend_Db_Table::getDefaultAdapter();	
 		$query = 'UPDATE '. $this->_name.' SET '.implode(' = ?,',array_keys($arrayData)).' = ?'.
 			' where project_task_id = '. $projTaskId.' and ts_year = '.$year.' and  ts_month = '.$month .' and ts_week = '.$week.' and emp_id ='. $empId;
-
+		//echo $query; exit;      
         $result = $db->query($query,array_values($arrayData));
         
         return $result;
@@ -88,7 +96,7 @@ public function deleteWeekProjectStatus($empId,$arrayData,$projId,$year,$month,$
 		$db = Zend_Db_Table::getDefaultAdapter();	
 		$query = 'UPDATE tm_ts_status  SET '.implode(' = ?,',array_keys($arrayData)).' = ?'.
 			' where project_id = '. $projId.' and ts_year = '.$year.' and  ts_month = '.$month .' and ts_week = '.$week.' and emp_id ='. $empId;
-
+		//echo $query; exit;      
         $result = $db->query($query,array_values($arrayData));
         
         return $result;
@@ -172,6 +180,9 @@ public function SaveOrUpdateTimesheetStatus($arrayData)
 		$query = 'INSERT INTO tm_ts_status ('.implode(',',array_keys($arrayData)).') VALUES ('.
 			implode(',',array_fill(1, count($arrayData), '?')).') ON DUPLICATE KEY UPDATE '.implode(' = ?,',
 			array_keys($arrayDataForUpdate)).' = ?';
+		//echo $query; //exit;
+
+       // return $db->query($query,array_merge(array_values($arrayData),array_values($arrayDataForUpdate)))->fetch();
         $result =  $db->query($query,array_merge(array_values($arrayData),array_values($arrayDataForUpdate)));
         
         return $result;
@@ -191,7 +202,7 @@ public function SaveOrUpdateTimesheetNotes($arrayData)
 		$query = 'INSERT INTO tm_emp_ts_notes ('.implode(',',array_keys($arrayData)).') VALUES ('.
 			implode(',',array_fill(1, count($arrayData), '?')).') ON DUPLICATE KEY UPDATE '.implode(' = ?,',
 			array_keys($arrayDataForUpdate)).' = ?';
-
+	////	echo $query; exit;      
         $result = $db->query($query,array_merge(array_values($arrayData),array_values($arrayDataForUpdate)));
         return $result;
         
@@ -222,21 +233,32 @@ public function empployeeDeletedTasks($empId,$year,$mon,$week,$calWeek,$projTask
 		
 		$db = Zend_Db_Table::getDefaultAdapter();
 		$taskIds = "".implode(',',array_values($projTasks)); 
-
+		//echo " tasks --> ".implode(',',array_values($projTasks)); exit;
 		$query = 'SELECT project_task_id FROM tm_emp_timesheets WHERE is_active = 1 and emp_id ='.$empId.' AND ts_year='.$year.' AND ts_month="'.$mon.
 				 '" AND ts_week ='.$week.' AND cal_week ='.$calWeek.' AND project_task_id NOT IN ('.$taskIds.')';
-
+		//echo " SQL  ".$query; exit; 
 		$result =$db->query($query)->fetch();
 		return $result;
 	}
+//	public function getEmployeeWeekTasks($empId,$year,$mon,$week) {
+//		
+//		$db = Zend_Db_Table::getDefaultAdapter();
+//		$taskIds = "".implode(',',array_values($projTasks)); 
+//		//echo " tasks --> ".implode(',',array_values($projTasks)); exit;
+//		$query = 'SELECT project_task_id FROM tm_emp_timesheets WHERE is_active = 1 and emp_id ='.$empId.' AND ts_year='.$year.' AND ts_month="'.$mon.
+//				 '" AND ts_week ='.$week.')';
+//		//echo " SQL  ".$query; exit; 
+//		$result =$db->query($query)->fetch();
+//		return $result;
+//	}
 	public function empployeeDeletedProjects($empId,$year,$mon,$week,$calWeek,$projectIds) {
 		
 		$db = Zend_Db_Table::getDefaultAdapter();
 		$projIds = "".implode(',',array_values($projectIds)); 
-
+		//echo " tasks --> ".implode(',',array_values($projTasks)); exit;
 		$query = 'SELECT project_id FROM tm_ts_status WHERE is_active = 1 and emp_id ='.$empId.' AND ts_year='.$year.' AND ts_month="'.$mon.
 				 '" AND ts_week ='.$week.' AND cal_week ='.$calWeek.' AND project_id NOT IN ('.$projIds.')';
-
+		//echo " SQL  ".$query; exit; 
 		$result =$db->query($query)->fetch();
 		return $result;
 	}
@@ -248,7 +270,7 @@ public function getWeekDaysDailyStatus($empId,$year,$mon,$week) {
 				's.fri_status','s.sat_status'))
 				->where("s.emp_id =".$empId." and s.ts_year = '".$year."' and s.ts_month = '".$mon."' and s.ts_week = '".$week."' ")
 				->group('s.emp_id');
-
+			//echo $select;exit;					
        return $this->fetchAll($select)->toArray();
 		
 	}
@@ -260,7 +282,7 @@ public function getWeekDaysProjStatus($empId,$year,$mon,$week) {
 				's.fri_project_status','s.sat_project_status'))
 				->where("s.emp_id =".$empId." and s.ts_year = '".$year."' and s.ts_month = '".$mon."' and s.ts_week = '".$week."' and s.is_active = 1 ");
 			
-
+			//echo $select;exit;					
        return $this->fetchAll($select)->toArray();
 		
 	}
@@ -272,13 +294,13 @@ public function getWeekDaysProjStatusForProject($empId,$year,$mon,$week,$projId)
 				's.fri_project_status','s.sat_project_status'))
 				->where("s.project_id =".$projId." and s.emp_id =".$empId." and s.ts_year = '".$year."' and s.ts_month = '".$mon."' and s.ts_week = '".$week."' ");
 			
-
+			//echo $select;exit;					
        return $this->fetchAll($select)->toArray();
 		
 	}
 	
-	public function getMonthTimesheetData($empId,$year,$month) { 
-
+	public function getMonthTimesheetData($empId,$year,$month) { //,$project_ids="" 
+		//echo $project_ids;
 		$select = $this->select()
 				  ->setIntegrityCheck(false)
 				  ->from(array('et'=>$this->_name),array(
@@ -290,44 +312,57 @@ public function getMonthTimesheetData($empId,$year,$month) {
 					if(et.thu_duration is null,"00:00",time_format(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.thu_duration as time)))),"%H:%i"))thu_duration,ifnull(ts.thu_status,"no_entry")thu_status,
 					if(et.fri_duration is null,"00:00",time_format(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.fri_duration as time)))),"%H:%i"))fri_duration,ifnull(ts.fri_status,"no_entry")fri_status,
 					if(et.sat_duration is null,"00:00",time_format(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.sat_duration as time)))),"%H:%i"))sat_duration,ifnull(ts.sat_status,"no_entry")sat_status,
-				  	if(et.week_duration is null,"00:00",time_format(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.week_duration as time)))),"%H:%i"))week_duration'
+				  	if(et.week_duration is null,"00:00",time_format(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.week_duration as time)))),"%H:%i"))week_duration,
+				  	GROUP_CONCAT(distinct ifnull(tn.sun_reject_note,""), if(ts.sun_reject_note != "", CONCAT(p.project_name,":",ifnull(ts.sun_reject_note,"")),"")) sun_reject_note,
+				  	GROUP_CONCAT(distinct ifnull(tn.mon_reject_note,""), if(ts.mon_reject_note != "", CONCAT(p.project_name,":",ifnull(ts.mon_reject_note,"")),"")) mon_reject_note,
+				  	GROUP_CONCAT(distinct ifnull(tn.tue_reject_note,""), if(ts.tue_reject_note != "", CONCAT(p.project_name,":",ifnull(ts.tue_reject_note,"")),"")) tue_reject_note,
+				  	GROUP_CONCAT(distinct ifnull(tn.wed_reject_note,""), if(ts.wed_reject_note != "", CONCAT(p.project_name,":",ifnull(ts.wed_reject_note,"")),"")) wed_reject_note,
+				  	GROUP_CONCAT(distinct ifnull(tn.thu_reject_note,""), if(ts.thu_reject_note != "", CONCAT(p.project_name,":",ifnull(ts.thu_reject_note,"")),"")) thu_reject_note,
+				  	GROUP_CONCAT(distinct ifnull(tn.fri_reject_note,""), if(ts.fri_reject_note != "", CONCAT(p.project_name,":",ifnull(ts.fri_reject_note,"")),"")) fri_reject_note,
+				  	GROUP_CONCAT(distinct ifnull(tn.sat_reject_note,""), if(ts.sat_reject_note != "", CONCAT(p.project_name,":",ifnull(ts.sat_reject_note,"")),"")) sat_reject_note'
 					));
-			
+			//	  ->joinInner(array('ts'=>'tm_ts_status'),'ts.emp_id = et.emp_id and ts.project_id = et.project_id',array())
+//			  if($project_ids != ""){
+//			  	$select->joinInner(array('ts'=>'tm_ts_status'),'ts.emp_id = et.emp_id and et.ts_year= ts.ts_year and et.ts_month= ts.ts_month and et.ts_week = ts.ts_week and et.project_id = ts.project_id and et.project_id IN ('.$project_ids.')',array());
+//			  }else{
 			  	$select->joinInner(array('ts'=>'tm_ts_status'),'ts.emp_id = et.emp_id and et.ts_year= ts.ts_year and et.ts_month= ts.ts_month and et.ts_week = ts.ts_week and (et.project_id = ts.project_id OR ts.project_id IS NULL)',array());
 			  	$select->joinInner(array('tn'=>'tm_emp_ts_notes'),'tn.emp_id = ts.emp_id and tn.ts_year= ts.ts_year and tn.ts_month= ts.ts_month and tn.ts_week = ts.ts_week',array());
 			  	$select->joinLeft(array('p'=>'tm_projects'),'p.id = ts.project_id and p.id = et.project_id',array());
 			  	
 			  	
-			
+			//  }
 	  	  	  $select->where("et.is_active=1 and ts.is_active=1 and et.ts_year = $year and  et.ts_month = $month and et.emp_id = $empId");
 			  $select->group('ts.ts_week');
-			
+			//echo $select; exit;	  	         
 		return $this->fetchAll($select)->toArray();
 	}
 	//public function getWeeklyTimesheetData($empId,$year,$calWeek,$week) {
-	public function getWeeklyTimesheetData($empId,$year,$month,$week,$flag='') { 
-		
+	public function getWeeklyTimesheetData($empId,$year,$month,$week,$flag='') { //,$project_ids="" 
+		//$calWeek = 26;
 		$where = '';
 		if($flag != 'view'){
-			$where .= " and  p.project_status NOT IN ('draft','hold','completed')";
+			$where .= " and  p.project_status NOT IN ('draft')";
 		}
 		$select = $this->select()
 				  ->setIntegrityCheck(false)
 				  ->from(array('pte'=>'tm_project_task_employees'),array(
-				  	'pte.project_id','p.project_name','pte.project_task_id','t.task','sun_duration'=>'ifnull(et.sun_duration,0)','mon_duration'=>'ifnull(et.mon_duration,0)',
+				  	'pte.project_id','p.project_name','p.project_status','pte.project_task_id','t.task','sun_duration'=>'ifnull(et.sun_duration,0)','mon_duration'=>'ifnull(et.mon_duration,0)',
 				  	'tue_duration'=>'ifnull(et.tue_duration,0)','wed_duration'=>'ifnull(et.wed_duration,0)','thu_duration'=>'ifnull(et.thu_duration,0)','fri_duration'=>'ifnull(et.fri_duration,0)','sat_duration'=>'ifnull(et.sat_duration,0)','week_duration'=>'ifnull(et.week_duration,0)'))
 				  ->joinInner(array('pt'=>'tm_project_tasks'),'pt.id = pte.project_task_id',array())
 				  ->joinInner(array('p'=>'tm_projects'),'p.id = pt.project_id and p.id = pte.project_id',array())
 				  ->joinInner(array('t'=>'tm_tasks'),'t.id = pt.task_id',array());
-		
+				 // ->joinLeft(array('et'=>'tm_emp_timesheets'),'et.project_task_id = pte.project_task_id and ts_year='.$year.' and et.ts_month='.$month.' and et.ts_week = '.$week.' and et.emp_id= '.$empId,array());
 				 
 				if($flag == 'view')  
 		 		 	$select->joinInner(array('et'=>'tm_emp_timesheets'),'et.project_task_id = pte.project_task_id and et.ts_year='.$year.' and et.ts_month='.$month.' and et.ts_week = '.$week.' and et.emp_id= '.$empId,array());
 		 		else  
 		 			$select->joinLeft(array('et'=>'tm_emp_timesheets'),'et.project_task_id = pte.project_task_id and ts_year='.$year.' and et.ts_month='.$month.' and et.ts_week = '.$week.' and et.emp_id= '.$empId,array());	
 		  $select->where("pte.emp_id =".$empId." and pte.is_active = 1 and p.is_active = 1 $where ");
-
-		  $select->order('p.project_name'); 
+//		  if($project_ids != ""){
+//		  	$select->where("p.id IN (".$project_ids.")");
+//		  }
+		  $select->order('p.project_name');
+		//echo $select;exit;		  	         
 		return $this->fetchAll($select)->toArray();
 	}
 	public function getWeekNotes($empId,$year,$month,$week){
@@ -336,9 +371,9 @@ public function getWeekNotes($empId,$year,$month,$week){
 				->setIntegrityCheck(false)
 				->from(array('n' => 'tm_emp_ts_notes'),array('n.sun_note','n.mon_note','n.tue_note','n.wed_note','n.thu_note',
 				'n.fri_note','n.sat_note','n.week_note'))
-
+			//	->where("n.emp_id =".$empId." and n.ts_year = '".$year."' and n.cal_week = '".$calWeek."' ");
 				->where("n.emp_id =".$empId." and n.ts_year = '".$year."' and n.ts_month='".$month."' and n.ts_week = '".$week."'");
-
+			//echo $select;exit;					
        return $this->fetchAll($select)->toArray();
 	}
 //	public function getWeekDaysStatus($empId,$year,$calWeek){
@@ -352,10 +387,18 @@ public function getWeekDaysStatus($empId,$year,$month,$week,$emplistflag='',$pro
 				$where = " AND s.project_id IN (".$project_ids.")";
 			}
 		}
+		$sun_reject_note = 'CONCAT(IFNULL(s.sun_reject_note,""),IFNULL(en.sun_reject_note,""))';
+		$mon_reject_note = 'CONCAT(IFNULL(s.mon_reject_note,""),IFNULL(en.mon_reject_note,""))';
+		$tue_reject_note = 'CONCAT(IFNULL(s.tue_reject_note,""),IFNULL(en.tue_reject_note,""))';
+		$wed_reject_note = 'CONCAT(IFNULL(s.wed_reject_note,""),IFNULL(en.wed_reject_note,""))';
+		$thu_reject_note = 'CONCAT(IFNULL(s.thu_reject_note,""),IFNULL(en.thu_reject_note,""))';
+		$fri_reject_note = 'CONCAT(IFNULL(s.fri_reject_note,""),IFNULL(en.fri_reject_note,""))';
+		$sat_reject_note = 'CONCAT(IFNULL(s.sat_reject_note,""),IFNULL(en.sat_reject_note,""))';
+		
 		
 		 $select = $this->select()
 				->setIntegrityCheck(false)
-				->from(array('s' => 'tm_ts_status'),array(
+				->from(array('s' => 'tm_ts_status'),array('sun_reject_note'=>$sun_reject_note,'mon_reject_note'=>$mon_reject_note,'tue_reject_note'=>$tue_reject_note,'wed_reject_note'=>$wed_reject_note,'thu_reject_note'=>$thu_reject_note,'fri_reject_note'=>$fri_reject_note,'sat_reject_note'=>$sat_reject_note,
 				'sun_status'=>'case when s.sun'.$status.' ="submitted" then "For Approval" when s.sun'.$status.' ="saved" 
 				then "Yet to submit" when s.sun'.$status.' ="no_entry" then "No Entry" 
 				else CONCAT(UCASE(LEFT(s.sun'.$status.', 1)),SUBSTRING(s.sun'.$status.', 2)) end',
@@ -389,9 +432,11 @@ public function getWeekDaysStatus($empId,$year,$month,$week,$emplistflag='',$pro
 				
 				->joinInner(array('en'=> 'tm_emp_ts_notes'),'en.emp_id = s.emp_id and s.ts_year= en.ts_year and s.ts_month= en.ts_month and s.ts_week = en.ts_week ',array())
 				
-
+		//		->where("s.emp_id =".$empId." and s.ts_year = '".$year."' and s.cal_week = '".$calWeek."' ");
 				->where("s.emp_id =".$empId." and s.ts_year = '".$year."' and s.ts_month='".$month."' and s.ts_week = '".$week."'  ".$where)
-				->group('s.emp_id');		
+				->group('s.emp_id');
+				
+		//echo $select;//exit;					
        return $this->fetchAll($select)->toArray();
 	}
 	public function updateDayStatus($empId,$year,$month,$week){
@@ -399,27 +444,55 @@ public function updateDayStatus($empId,$year,$month,$week){
 		$select = $this->select()
 				->setIntegrityCheck(false)
 				->from(array('s' => 'tm_ts_status'),array(
-				 'sun_status' => 'IF(FIND_IN_SET("saved",GROUP_CONCAT(DISTINCT s.sun_project_status))!=0,"saved",
-    			IF(FIND_IN_SET("submitted",GROUP_CONCAT(DISTINCT s.sun_project_status))!=0,"submitted","no_entry"))',
-				 'mon_status' => 'IF(FIND_IN_SET("saved",GROUP_CONCAT(DISTINCT s.mon_project_status))!=0,"saved",
-			    IF(FIND_IN_SET("submitted",GROUP_CONCAT(DISTINCT s.mon_project_status))!=0,"submitted", "no_entry"))',
-				 'tue_status' => 'IF(FIND_IN_SET("saved",GROUP_CONCAT(DISTINCT s.tue_project_status))!=0,"saved",
-			    IF(FIND_IN_SET("submitted",GROUP_CONCAT(DISTINCT s.tue_project_status))!=0,"submitted","no_entry"))',
-				 'wed_status' => 'IF(FIND_IN_SET("saved",GROUP_CONCAT(DISTINCT s.wed_project_status))!=0,"saved",
-			    IF(FIND_IN_SET("submitted",GROUP_CONCAT(DISTINCT s.wed_project_status))!=0,"submitted","no_entry"))',
-				 'thu_status' => 'IF(FIND_IN_SET("saved",GROUP_CONCAT(DISTINCT s.thu_project_status))!=0,"saved",
-			    IF(FIND_IN_SET("submitted",GROUP_CONCAT(DISTINCT s.thu_project_status))!=0,"submitted","no_entry"))',
-				 'fri_status' => 'IF(FIND_IN_SET("saved",GROUP_CONCAT(DISTINCT s.fri_project_status))!=0,"saved",
-			    IF(FIND_IN_SET("submitted",GROUP_CONCAT(DISTINCT s.fri_project_status))!=0,"submitted","no_entry"))',
-				 'sat_status' => 'IF(FIND_IN_SET("saved",GROUP_CONCAT(DISTINCT s.sat_project_status))!=0,"saved", 
-			    IF(FIND_IN_SET("submitted",GROUP_CONCAT(DISTINCT s.sat_project_status))!=0,"submitted","no_entry"))' 
+				 'sun_status' => 'IF(FIND_IN_SET("blocked",GROUP_CONCAT(DISTINCT s.sun_project_status))!=0,"blocked",
+				 IF(FIND_IN_SET("saved",GROUP_CONCAT(DISTINCT s.sun_project_status))!=0,"saved",
+    			IF(FIND_IN_SET("rejected",GROUP_CONCAT(DISTINCT s.sun_project_status))!=0,"rejected",
+    			IF(FIND_IN_SET("submitted",GROUP_CONCAT(DISTINCT s.sun_project_status))!=0,"submitted",
+    			IF(FIND_IN_SET("approved",GROUP_CONCAT(DISTINCT s.sun_project_status))!=0,"approved",    			
+    			IF(FIND_IN_SET("enabled",GROUP_CONCAT(DISTINCT s.sun_project_status))!=0,"enabled","no_entry"))))))',
+				 'mon_status' => 'IF(FIND_IN_SET("blocked",GROUP_CONCAT(DISTINCT s.mon_project_status))!=0,"blocked",
+				IF(FIND_IN_SET("saved",GROUP_CONCAT(DISTINCT s.mon_project_status))!=0,"saved",
+			    IF(FIND_IN_SET("rejected",GROUP_CONCAT(DISTINCT s.mon_project_status))!=0,"rejected",
+			    IF(FIND_IN_SET("submitted",GROUP_CONCAT(DISTINCT s.mon_project_status))!=0,"submitted",
+			    IF(FIND_IN_SET("approved",GROUP_CONCAT(DISTINCT s.mon_project_status))!=0,"approved",			    
+			    IF(FIND_IN_SET("enabled",GROUP_CONCAT(DISTINCT s.mon_project_status))!=0,"enabled","no_entry"))))))',
+				 'tue_status' => 'IF(FIND_IN_SET("blocked",GROUP_CONCAT(DISTINCT s.tue_project_status))!=0,"blocked",
+				IF(FIND_IN_SET("saved",GROUP_CONCAT(DISTINCT s.tue_project_status))!=0,"saved",
+			    IF(FIND_IN_SET("rejected",GROUP_CONCAT(DISTINCT s.tue_project_status))!=0,"rejected",
+			    IF(FIND_IN_SET("submitted",GROUP_CONCAT(DISTINCT s.tue_project_status))!=0,"submitted",
+			    IF(FIND_IN_SET("approved",GROUP_CONCAT(DISTINCT s.tue_project_status))!=0,"approved",			    
+			    IF(FIND_IN_SET("enabled",GROUP_CONCAT(DISTINCT s.tue_project_status))!=0,"enabled","no_entry"))))))',
+				 'wed_status' => 'IF(FIND_IN_SET("blocked",GROUP_CONCAT(DISTINCT s.wed_project_status))!=0,"blocked",
+				IF(FIND_IN_SET("saved",GROUP_CONCAT(DISTINCT s.wed_project_status))!=0,"saved",
+			    IF(FIND_IN_SET("rejected",GROUP_CONCAT(DISTINCT s.wed_project_status))!=0,"rejected",
+			    IF(FIND_IN_SET("submitted",GROUP_CONCAT(DISTINCT s.wed_project_status))!=0,"submitted",
+			    IF(FIND_IN_SET("approved",GROUP_CONCAT(DISTINCT s.wed_project_status))!=0,"approved",			 
+			    IF(FIND_IN_SET("enabled",GROUP_CONCAT(DISTINCT s.wed_project_status))!=0,"enabled","no_entry"))))))',
+				 'thu_status' => 'IF(FIND_IN_SET("blocked",GROUP_CONCAT(DISTINCT s.thu_project_status))!=0,"blocked",
+				IF(FIND_IN_SET("saved",GROUP_CONCAT(DISTINCT s.thu_project_status))!=0,"saved",
+			    IF(FIND_IN_SET("rejected",GROUP_CONCAT(DISTINCT s.thu_project_status))!=0,"rejected",
+			    IF(FIND_IN_SET("submitted",GROUP_CONCAT(DISTINCT s.thu_project_status))!=0,"submitted",
+			    IF(FIND_IN_SET("approved",GROUP_CONCAT(DISTINCT s.thu_project_status))!=0,"approved",			    
+			    IF(FIND_IN_SET("enabled",GROUP_CONCAT(DISTINCT s.thu_project_status))!=0,"enabled","no_entry"))))))',
+				 'fri_status' => 'IF(FIND_IN_SET("blocked",GROUP_CONCAT(DISTINCT s.fri_project_status))!=0,"blocked",
+				IF(FIND_IN_SET("saved",GROUP_CONCAT(DISTINCT s.fri_project_status))!=0,"saved",
+			    IF(FIND_IN_SET("rejected",GROUP_CONCAT(DISTINCT s.fri_project_status))!=0,"rejected",
+			    IF(FIND_IN_SET("submitted",GROUP_CONCAT(DISTINCT s.fri_project_status))!=0,"submitted",
+			    IF(FIND_IN_SET("approved",GROUP_CONCAT(DISTINCT s.fri_project_status))!=0,"approved",			   
+			    IF(FIND_IN_SET("enabled",GROUP_CONCAT(DISTINCT s.fri_project_status))!=0,"enabled","no_entry"))))))',
+				 'sat_status' => 'IF(FIND_IN_SET("blocked",GROUP_CONCAT(DISTINCT s.sat_project_status))!=0,"blocked",
+				IF(FIND_IN_SET("saved",GROUP_CONCAT(DISTINCT s.sat_project_status))!=0,"saved", 
+			    IF(FIND_IN_SET("rejected",GROUP_CONCAT(DISTINCT s.sat_project_status))!=0,"rejected",
+			    IF(FIND_IN_SET("submitted",GROUP_CONCAT(DISTINCT s.sat_project_status))!=0,"submitted",
+			    IF(FIND_IN_SET("approved",GROUP_CONCAT(DISTINCT s.sat_project_status))!=0,"approved",			    
+			    IF(FIND_IN_SET("enabled",GROUP_CONCAT(DISTINCT s.sat_project_status))!=0,"enabled","no_entry"))))))' 
 				))
 				->where(" s.project_id is not null and s.is_active = 1 and s.emp_id =".$empId." and s.ts_year = '".$year."' and s.ts_month = '".$month."' and s.ts_week = '".$week."' ")
 				->group('s.emp_id');
 
 		$result = $this->fetchAll($select)->toArray();
 		$db = Zend_Db_Table::getDefaultAdapter();	
-
+		//print_r($result);
 		$where = " emp_id =".$empId." and ts_year = '".$year."' and ts_month = '".$month."' and ts_week = '".$week."' ";
 		$db->update('tm_ts_status',$result[0], $where);		
 	}
@@ -428,29 +501,33 @@ public function updateWeekStatus($empId,$year,$month,$week){
 		$select = $this->select()
 		->setIntegrityCheck(false)
 		->from(array('t' => 'tm_ts_status'),
-		array('week_status' => 						
-		"IF(FIND_IN_SET('submitted',CONCAT(sun_status,',',mon_status,',',tue_status,',',wed_status,',',thu_status,',',fri_status,',',sat_status))!=0,'submitted',
-		IF(FIND_IN_SET('saved',CONCAT(sun_status,',',mon_status,',',tue_status,',',wed_status,',',thu_status,',',fri_status,',',sat_status))!=0,'saved', 'no_entry'))"))
+		array('week_status' => "IF(FIND_IN_SET('blocked',CONCAT(sun_status,',',mon_status,',',tue_status,',',wed_status,',',thu_status,',',fri_status,',',sat_status))!=0,'blocked',
+					   		   IF(FIND_IN_SET('submitted',CONCAT(sun_status,',',mon_status,',',tue_status,',',wed_status,',',thu_status,',',fri_status,',',sat_status))!=0,'submitted',
+							   IF(FIND_IN_SET('rejected',CONCAT(sun_status,',',mon_status,',',tue_status,',',wed_status,',',thu_status,',',fri_status,',',sat_status))!=0,'rejected',				
+							   IF(FIND_IN_SET('approved',CONCAT(sun_status,',',mon_status,',',tue_status,',',wed_status,',',thu_status,',',fri_status,',',sat_status))!=0,'approved',
+							   IF(FIND_IN_SET('saved',CONCAT(sun_status,',',mon_status,',',tue_status,',',wed_status,',',thu_status,',',fri_status,',',sat_status))!=0,'saved',
+							   IF(FIND_IN_SET('enabled',CONCAT(sun_status,',',mon_status,',',tue_status,',',wed_status,',',thu_status,',',fri_status,',',sat_status))!=0,'enabled','no_entry'))))))
+							"))
 		->where("emp_id=".$empId." and is_active=1 and ts_week = '".$week."' and ts_year = '".$year."' and ts_month = '".$month."' ")
 		->group('emp_id');
-
+	//	echo $select;
 		$result = $this->fetchAll($select)->toArray();
 		$db = Zend_Db_Table::getDefaultAdapter();	
-
+		//print_r($result);
 		$where = " emp_id =".$empId." and ts_year = '".$year."' and ts_month = '".$month."' and ts_week = '".$week."' ";
 		$db->update('tm_ts_status',$result[0], $where);		
 	}
 	public function updateSubmitStatus($empId,$year,$month,$week,$dataArray) {
 		
 		$db = Zend_Db_Table::getDefaultAdapter();	
-
+		//print_r($result);
 		$where = " emp_id =".$empId." and ts_year = '".$year."' and ts_month = '".$month."' and ts_week = '".$week."' ";
 		$db->update('tm_ts_status',$dataArray, $where);		
 	}
 	public function updateProjectSubmitStatus($empId,$year,$month,$week,$dataArray,$projId) {
 		
 		$db = Zend_Db_Table::getDefaultAdapter();	
-
+		//print_r($result);
 		$where = " is_active = 1 and emp_id =".$empId." and ts_year = '".$year."' and ts_month = '".$month."' and ts_week = '".$week."' and project_id = ".$projId;
 		$db->update('tm_ts_status',$dataArray, $where);		
 	}
@@ -491,6 +568,15 @@ public function updateWeekDuration($empId,$year,$month,$week) {
 		$stmt->execute(); 	
 	}
 	
-	
+	public function getCronDetailsForMonth($year,$month) {
+		
+		$select = $this->select()
+				->setIntegrityCheck(false)
+				->from(array('c' => 'tm_mailing_list'),array('ts_start_date','ts_end_date'))
+				->where("mail_type = 'block' and YEAR(ts_end_date) = '".$year."' and MONTH(ts_end_date) = '".$month."'");
+			
+			//echo $select;exit;					
+       return $this->fetchAll($select)->toArray();
+	}
 	
 }
diff --git a/application/modules/timemanagement/models/Notifications.php b/application/modules/timemanagement/models/Notifications.php
new file mode 100644
index 000000000..a4d5ff7ae
--- /dev/null
+++ b/application/modules/timemanagement/models/Notifications.php
@@ -0,0 +1,215 @@
+<?php
+
+/**
+ * Timemanagement_Model_Notifications
+ *
+ * @author l.sravani
+ * @version
+ */
+
+
+class Timemanagement_Model_Notifications extends Zend_Db_Table_Abstract
+{
+	/**
+	 * The default table name
+	 */
+	public function getnotifications($loginId,$weekend)
+	{
+        $db = Zend_Db_Table::getDefaultAdapter();
+		  /*$query = "select ts.ts_year,ts.cal_week,
+				concat(if(sun_status not in('submitted','approved'),concat(sun_date,'#',sun_status),''),'$',
+				if(mon_status not in('submitted','approved'),concat(mon_date,'#',mon_status),''),'$',
+				if(tue_status not in('submitted','approved'),concat(tue_date,'#',tue_status),''),'$',
+				if(wed_status not in('submitted','approved'),concat(wed_date,'#',wed_status),''),'$',
+				if(thu_status not in('submitted','approved'),concat(thu_date,'#',thu_status),''),'$',
+				if(fri_status not in('submitted','approved'),concat(fri_date,'#',fri_status),''),'$',
+				if(sat_status not in('submitted','approved'),concat(sat_date,'#',sat_status),'')) ts_week_dates
+				from tm_ts_status ts 
+				inner join main_employees_summary es on es.user_id = ts.emp_id
+				where ts.emp_id=".$loginId." and (ts.ts_year >= year(es.date_of_joining) and cal_week >= week(es.date_of_joining))
+				and (ts.ts_year <= year(now()) and cal_week <= week('".$weekend."'))
+				and week_status != 'approved'
+				group by ts.ts_year,ts.cal_week";*/
+			 $query = "select ts_year,
+				concat(if(sun_status not in('submitted','approved'),concat(sun_date,'#',if(sun_status!='',sun_status,'no_entry')),''),'$', 
+				if(mon_status not in('submitted','approved'),concat(mon_date,'#',if(mon_status!='',mon_status,'no_entry')),''),'$', 
+				if(tue_status not in('submitted','approved'),concat(tue_date,'#',if(tue_status!='',tue_status,'no_entry')),''),'$',
+				if(wed_status not in('submitted','approved'),concat(wed_date,'#',if(wed_status!='',wed_status,'no_entry')),''),'$', 
+				if(thu_status not in('submitted','approved'),concat(thu_date,'#',if(thu_status!='',thu_status,'no_entry')),''),'$', 
+				if(fri_status not in('submitted','approved'),concat(fri_date,'#',if(fri_status!='',fri_status,'no_entry')),''),'$',
+				if(sat_status not in('submitted','approved'),concat(sat_date,'#',if(sat_status!='',sat_status,'no_entry')),'')) ts_week_dates  
+				from (
+				select ts.ts_year,ts.ts_month,ts.cal_week, sun_date,TRIM( BOTH ',' FROM GROUP_CONCAT(DISTINCT if(sun_status = 'no_entry','',sun_status))) sun_status,
+				mon_date,TRIM( BOTH ',' FROM GROUP_CONCAT(DISTINCT if(mon_status = 'no_entry','',mon_status))) mon_status,
+				tue_date,TRIM( BOTH ',' FROM GROUP_CONCAT(DISTINCT if(tue_status = 'no_entry','',tue_status))) tue_status,
+				wed_date,TRIM( BOTH ',' FROM GROUP_CONCAT(DISTINCT if(wed_status = 'no_entry','',wed_status))) wed_status,
+				thu_date,TRIM( BOTH ',' FROM GROUP_CONCAT(DISTINCT if(thu_status = 'no_entry','',thu_status))) thu_status,
+				fri_date,TRIM( BOTH ',' FROM GROUP_CONCAT(DISTINCT if(fri_status = 'no_entry','',fri_status))) fri_status,
+				sat_date,TRIM( BOTH ',' FROM GROUP_CONCAT(DISTINCT if(sat_status = 'no_entry','',sat_status))) sat_status
+				from tm_ts_status ts
+				inner join main_employees_summary es on es.user_id = ts.emp_id
+				where ts.emp_id=".$loginId." AND ts.ts_year >= year(es.date_of_joining)
+				and cal_week <= week('".$weekend."') and week_status != 'approved'
+				group by ts.ts_year,ts.cal_week
+				)k";
+				
+		$result = $db->query($query)->fetchAll();
+		return $result;
+	}
+	public function getSubmittedNotifications($loginId,$weekend)
+	{
+		$db = Zend_Db_Table::getDefaultAdapter();
+		  /*$query = "select ts.ts_year,ts.cal_week,
+				concat(if(sun_status in('submitted','approved'),concat(sun_date,'#',sun_status),''),'$',
+				if(mon_status in('submitted','approved'),concat(mon_date,'#',mon_status),''),'$',
+				if(tue_status in('submitted','approved'),concat(tue_date,'#',tue_status),''),'$',
+				if(wed_status in('submitted','approved'),concat(wed_date,'#',wed_status),''),'$',
+				if(thu_status in('submitted','approved'),concat(thu_date,'#',thu_status),''),'$',
+				if(fri_status in('submitted','approved'),concat(fri_date,'#',fri_status),''),'$',
+				if(sat_status in('submitted','approved'),concat(sat_date,'#',sat_status),'')) ts_week_dates
+				from tm_ts_status ts 
+				inner join main_employees_summary es on es.user_id = ts.emp_id
+				where ts.emp_id=".$loginId." and (ts.ts_year >= year(es.date_of_joining) and cal_week >= week(es.date_of_joining))
+				and (ts.ts_year <= year(now()) and cal_week <= week('".$weekend."'))
+				and week_status != 'approved'
+				group by ts.ts_year,ts.cal_week";*/
+				
+				 $query = "select ts_year,
+				concat(if(sun_status in('submitted','approved'),concat(sun_date,'#',if(sun_status!='',sun_status,'no_entry')),''),'$', 
+				if(mon_status in('submitted','approved'),concat(mon_date,'#',if(mon_status!='',mon_status,'no_entry')),''),'$', 
+				if(tue_status in('submitted','approved'),concat(tue_date,'#',if(tue_status!='',tue_status,'no_entry')),''),'$',
+				if(wed_status in('submitted','approved'),concat(wed_date,'#',if(wed_status!='',wed_status,'no_entry')),''),'$', 
+				if(thu_status in('submitted','approved'),concat(thu_date,'#',if(thu_status!='',thu_status,'no_entry')),''),'$', 
+				if(fri_status in('submitted','approved'),concat(fri_date,'#',if(fri_status!='',fri_status,'no_entry')),''),'$',
+				if(sat_status in('submitted','approved'),concat(sat_date,'#',if(sat_status!='',sat_status,'no_entry')),'')) ts_week_dates  
+				from (
+				select ts.ts_year,ts.ts_month,ts.cal_week, sun_date,TRIM( BOTH ',' FROM GROUP_CONCAT(DISTINCT if(sun_status = 'no_entry','',sun_status))) sun_status,
+				mon_date,TRIM( BOTH ',' FROM GROUP_CONCAT(DISTINCT if(mon_status = 'no_entry','',mon_status))) mon_status,
+				tue_date,TRIM( BOTH ',' FROM GROUP_CONCAT(DISTINCT if(tue_status = 'no_entry','',tue_status))) tue_status,
+				wed_date,TRIM( BOTH ',' FROM GROUP_CONCAT(DISTINCT if(wed_status = 'no_entry','',wed_status))) wed_status,
+				thu_date,TRIM( BOTH ',' FROM GROUP_CONCAT(DISTINCT if(thu_status = 'no_entry','',thu_status))) thu_status,
+				fri_date,TRIM( BOTH ',' FROM GROUP_CONCAT(DISTINCT if(fri_status = 'no_entry','',fri_status))) fri_status,
+				sat_date,TRIM( BOTH ',' FROM GROUP_CONCAT(DISTINCT if(sat_status = 'no_entry','',sat_status))) sat_status
+				from tm_ts_status ts
+				inner join main_employees_summary es on es.user_id = ts.emp_id
+				where ts.emp_id=".$loginId." AND ts.ts_year >= year(es.date_of_joining)
+				and cal_week <= week('".$weekend."')
+				group by ts.ts_year,ts.cal_week
+				)k";
+		$result = $db->query($query)->fetchAll();
+		return $result;
+	}
+	//get time sheet status for employee in between days
+	public function getTimesheetStatus($emp_id,$weekend)
+	{
+		$mnth = date('m');
+		//and (ts.ts_year = year(now()) and ts.ts_month = month(now()) and cal_week <= week('".$weekend."'))
+		$db = Zend_Db_Table::getDefaultAdapter();
+		 $query = "select ts.ts_year,ts.cal_week,
+				concat(if(sun_status not in('no_entry','saved'),if(month(sun_date)='".$mnth."',concat(sun_date,'#',sun_status),''),''),'$',
+				if(mon_status not in('no_entry','saved'),if(month(mon_date)='".$mnth."',concat(mon_date,'#',mon_status),''),''),'$', 
+				if(tue_status not in('no_entry','saved'),if(month(tue_date)='".$mnth."',concat(tue_date,'#',tue_status),''),''),'$', 
+				if(wed_status not in('no_entry','saved'),if(month(wed_date)='".$mnth."',concat(wed_date,'#',wed_status),''),''),'$',
+				if(thu_status not in('no_entry','saved'),if(month(thu_date)='".$mnth."',concat(thu_date,'#',thu_status),''),''),'$', 
+				if(fri_status not in('no_entry','saved'),if(month(fri_date)='".$mnth."',concat(fri_date,'#',fri_status),''),''),'$',
+				if(sat_status not in('no_entry','saved'),if(month(sat_date)='".$mnth."',concat(sat_date,'#',sat_status),''),'')) ts_week_dates
+				from tm_ts_status ts 
+				inner join main_employees_summary es on es.user_id = ts.emp_id
+				where ts.emp_id=".$emp_id." and (ts.ts_year >= year(es.date_of_joining))
+				and (ts.ts_year = year(now()) and ts.ts_month = month(now()) and cal_week = week('".$weekend."'))
+				group by ts.ts_year,ts.ts_month,ts.cal_week";
+		$result = $db->query($query)->fetchAll();
+		return $result;
+	}
+	//get saved time sheets
+	public function getSavedTimesheets($emp_id,$weekend)
+	{
+		$mnth = date('m');
+		$db = Zend_Db_Table::getDefaultAdapter();
+		 $query = "select ts.ts_year,ts.cal_week,
+				concat(if(sun_status in('no_entry','saved'),if(month(sun_date)='".$mnth."',concat(sun_date,'#',sun_status),''),''),'$',
+				if(mon_status in('no_entry','saved'),if(month(mon_date)='".$mnth."',concat(mon_date,'#',mon_status),''),''),'$', 
+				if(tue_status in('no_entry','saved'),if(month(tue_date)='".$mnth."',concat(tue_date,'#',tue_status),''),''),'$', 
+				if(wed_status in('no_entry','saved'),if(month(wed_date)='".$mnth."',concat(wed_date,'#',wed_status),''),''),'$',
+				if(thu_status in('no_entry','saved'),if(month(thu_date)='".$mnth."',concat(thu_date,'#',thu_status),''),''),'$', 
+				if(fri_status in('no_entry','saved'),if(month(fri_date)='".$mnth."',concat(fri_date,'#',fri_status),''),''),'$',
+				if(sat_status in('no_entry','saved'),if(month(sat_date)='".$mnth."',concat(sat_date,'#',sat_status),''),'')) ts_week_dates
+				from tm_ts_status ts 
+				inner join main_employees_summary es on es.user_id = ts.emp_id
+				where ts.emp_id=".$emp_id." and (ts.ts_year >= year(es.date_of_joining))
+				and (ts.ts_year = year(now()) and ts.ts_month = month(now()) and cal_week = week('".$weekend."'))
+				group by ts.ts_year,ts.ts_month,ts.cal_week";
+		$result = $db->query($query)->fetchAll();
+		return $result;
+	}
+
+	//function to get employees under reporting manager
+	public function getManagerEmployees($managerId)
+	{
+		$db = Zend_Db_Table::getDefaultAdapter();
+		$query = "select es.user_id,es.userfullname from main_employees_summary es where es.isactive=1 and es.reporting_manager = ".$managerId;
+		$result = $db->query($query)->fetchAll();
+		return $result;
+
+	}
+	//function to get previous days time sheet status less than current week
+	public function getpreviousTimesheetStatus($loginId,$weekend,$mnth,$year)
+	{
+        $db = Zend_Db_Table::getDefaultAdapter();
+		  $query = "select ts.ts_year,ts.cal_week,
+			concat(if(sun_status not in('rejected','blocked'), if(month(sun_date)='".$mnth."',concat(sun_date,'#',sun_status),''),''),'$',
+			if(mon_status not in('rejected','blocked'),if(month(mon_date)='".$mnth."',concat(mon_date,'#',mon_status),''),''),'$', 
+			if(tue_status not in('rejected','blocked'),if(month(tue_date)='".$mnth."',concat(tue_date,'#',tue_status),''),''),'$', 
+			if(wed_status not in('rejected','blocked'),if(month(wed_date)='".$mnth."',concat(wed_date,'#',wed_status),''),''),'$', 
+			if(thu_status not in('rejected','blocked'),if(month(thu_date)='".$mnth."',concat(thu_date,'#',thu_status),''),''),'$', 
+			if(fri_status not in('rejected','blocked'),if(month(fri_date)='".$mnth."',concat(fri_date,'#',fri_status),''),''),'$', 
+			if(sat_status not in('rejected','blocked'),if(month(sat_date)='".$mnth."',concat(sat_date,'#',sat_status),''),'')) ts_week_dates 
+			from tm_ts_status ts 
+			inner join main_employees_summary es on es.user_id = ts.emp_id
+			where ts.emp_id=".$loginId." and (ts.ts_year >= year(es.date_of_joining))
+				and (ts.ts_year <= '".$year."' and ts.ts_month = '".$mnth."' and cal_week = week('".$weekend."'))
+				group by ts.ts_year,ts.cal_week";
+		$result = $db->query($query)->fetchAll();
+		return $result;
+	}
+	//get time sheet status for employee in between days
+	public function getpreviousSavedTimesheets($emp_id,$weekend,$mnth,$year)
+	{
+		//and (ts.ts_year = year(now()) and ts.ts_month = month(now()) and cal_week <= week('".$weekend."'))
+		$db = Zend_Db_Table::getDefaultAdapter();
+		 $query = "select ts.ts_year,ts.cal_week,
+				concat(if(sun_status in('rejected','blocked'), if(month(sun_date)='".$mnth."',concat(sun_date,'#',sun_status),''),''),'$',
+			if(mon_status in('rejected','blocked'),if(month(mon_date)='".$mnth."',concat(mon_date,'#',mon_status),''),''),'$', 
+			if(tue_status in('rejected','blocked'),if(month(tue_date)='".$mnth."',concat(tue_date,'#',tue_status),''),''),'$', 
+			if(wed_status in('rejected','blocked'),if(month(wed_date)='".$mnth."',concat(wed_date,'#',wed_status),''),''),'$', 
+			if(thu_status in('rejected','blocked'),if(month(thu_date)='".$mnth."',concat(thu_date,'#',thu_status),''),''),'$', 
+			if(fri_status in('rejected','blocked'),if(month(fri_date)='".$mnth."',concat(fri_date,'#',fri_status),''),''),'$', 
+			if(sat_status in('rejected','blocked'),if(month(sat_date)='".$mnth."',concat(sat_date,'#',sat_status),''),'')) ts_week_dates 
+				from tm_ts_status ts 
+				inner join main_employees_summary es on es.user_id = ts.emp_id
+				where ts.emp_id=".$emp_id." and (ts.ts_year >= year(es.date_of_joining))
+				and (ts.ts_year = '".$year."' and ts.ts_month = '".$mnth."' and cal_week = week('".$weekend."'))
+				group by ts.ts_year,ts.ts_month,ts.cal_week";
+		$result = $db->query($query)->fetchAll();
+		//echo $query.'<br/>';
+		return $result;
+	}
+	//get number of weeks in current given month
+	function weeks_in_month($year, $month, $start_day_of_week)
+	{
+		// Total number of days in the given month.
+		$num_of_days = date("t", mktime(0,0,0,$month,1,$year));
+	 
+		// Count the number of times it hits $start_day_of_week.
+		$num_of_weeks = 0;
+		for($i=1; $i<=$num_of_days; $i++)
+		{
+		  $day_of_week = date('w', mktime(0,0,0,$month,$i,$year));
+		  if($day_of_week==$start_day_of_week)
+			$num_of_weeks++;
+		}
+	 
+		return $num_of_weeks;
+	}
+
+}
diff --git a/application/modules/timemanagement/models/Projectresources.php b/application/modules/timemanagement/models/Projectresources.php
index c0f7952b9..dfd2904dd 100644
--- a/application/modules/timemanagement/models/Projectresources.php
+++ b/application/modules/timemanagement/models/Projectresources.php
@@ -42,7 +42,8 @@ public function getProjectResourcesData($projectId){
 		->joinInner(array('r'=>'main_roles'),"r.id = e.emprole",array())
 		->joinInner(array('g'=>'main_groups'),"g.id = r.group_id",array())
 		->where('pr.is_active = 1 AND e.isactive = 1 AND pr.project_id = '.$projectId.'')
-		->order("pr.modified DESC");
+		->order("pr.modified DESC");;
+		//echo $select;exit;
 		$res = $this->fetchAll($select)->toArray();
 		if (isset($res) && !empty($res))
 		{
@@ -98,7 +99,9 @@ public function getGrid($sort,$by,$perPage,$pageNo,$searchData,$call,$dashboardc
 
 		$projectModel = new Timemanagement_Model_Projects();
 		$projectData = $projectModel->getSingleProjectData($a);
-		$tableFields = array('empname' => 'Name','tm_role' => 'Role','viewtasks' => '');
+		$currencyCode = (isset($projectData[0]['currencycode']))?$projectData[0]['currencycode']:'';
+
+		$tableFields = array('empname' => 'Name','tm_role' => 'Role','billable_rate' => 'Billable Rate ('.$currencyCode.')','cost_rate'=>'Cost Rate ('.$currencyCode.')','viewtasks' => '');
 
 		$tablecontent = $this->getProjectResourcesGridData($sort, $by, $pageNo, $perPage,$searchQuery,$a,$loginUserId,$having);
 
@@ -124,6 +127,10 @@ public function getGrid($sort,$by,$perPage,$pageNo,$searchData,$call,$dashboardc
 		),
 		)
 		);
+
+		/* if($tm_role == 'Lead'){
+		 $dataTmp['otheraction'] = 'leadresourcegrid';
+		 }*/
 		return $dataTmp;
 	}
 	public function getProjectResourcesGridData($sort, $by, $pageNo, $perPage,$searchQuery,$project_id,$loginUserId,$having = '')
@@ -147,10 +154,11 @@ public function getProjectResourcesGridData($sort, $by, $pageNo, $perPage,$searc
 		if($having != ''){
 			$select->having("$having")
 			->order("$by $sort");
+			//->limitPage($pageNo, $perPage);
 		}else{
 			$select->order("$by $sort")
 			->limitPage($pageNo, $perPage);
-		}
+		}//echo $select;exit;
 		return $select;
 	}
 
@@ -199,6 +207,7 @@ public function getProjectNotAddedResource($projectId,$added_empIdStrind,$empTyp
 		->where("1=1 AND u.date_of_joining <= CURDATE() AND u.isactive = 1 ".$orWhere."")
 		->group("u.user_id")
 		->having("tm_role = '".$empType."'");
+		//echo $select;exit;
 		$res = $this->fetchAll($select)->toArray();
 		if (isset($res) && !empty($res))
 		{
@@ -237,7 +246,8 @@ public function getOtherEmployees($projectId,$added_empIdStrind,$empType,$addedM
 		->joinLeft(array('j'=>'main_jobtitles'),"u.jobtitle_id = j.id",array())
 		->where("1=1 AND u.isactive =1 AND u.date_of_joining <= CURDATE() ".$orWhere."")
 		->group("u.user_id")
-		->having("tm_role = '".$empType."'");
+		->having("tm_role = '".$empType."'");;
+		//echo $select;exit;
 		$res = $this->fetchAll($select)->toArray();
 		if (isset($res) && !empty($res))
 		{
@@ -286,10 +296,11 @@ public function getEmpTasks($project_id,$resource_id)
 		->setIntegrityCheck(false)
 		->from(array('pr'=>'tm_project_task_employees'),array('pr.*'))
 		->joinInner(array('tt'=>'tm_tasks'),"tt.id = pr.task_id",array('tt.task'))
-		->joinInner(array('ept'=>'tm_project_tasks'),"ept.task_id = pr.task_id AND ept.project_id = pr.project_id",array('actual_hrs'=>new Zend_Db_Expr("IF(et.week_duration is null,'',time_format(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.week_duration as time)))),'%H:%i' ))")))
+		->joinInner(array('ept'=>'tm_project_tasks'),"ept.task_id = pr.task_id AND ept.project_id = pr.project_id",array('ept.estimated_hrs','actual_hrs'=>new Zend_Db_Expr("IF(et.week_duration is null,'',time_format(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.week_duration as time)))),'%H:%i' ))")))
 		->joinLeft(array('et'=>'tm_emp_timesheets'),'et.project_task_id = ept.id and pr.emp_id = et.emp_id AND et.is_active = 1',array())
 		->where('pr.emp_id='.$resource_id.' AND pr.project_id = '.$project_id.' AND pr.is_active = 1 AND ept.is_active=1')
 		->group(array('ept.id'));
+		//echo $select;
 		return $this->fetchAll($select)->toArray();
 	}
 	//FUNCTION TO GET EMPLOYEE DETAILS
@@ -322,7 +333,7 @@ public function getAllTasks($projectId,$task_ids='')
 		$db = Zend_Db_Table::getDefaultAdapter();
 		$select = $this->select()
 		->setIntegrityCheck(false)
-		->from(array('pt'=>'tm_project_tasks'))
+		->from(array('pt'=>'tm_project_tasks'),array('pt.task_id','pt.estimated_hrs','pt.id'))
 		->joinInner(array('t'=>'tm_tasks'),"t.id = pt.task_id ",array('t.task'))
 		->where('pt.is_active = 1 AND pt.project_id = '.$projectId.$cond.'');
 		return $this->fetchAll($select)->toArray();
@@ -331,9 +342,9 @@ public function getAllTasks($projectId,$task_ids='')
 	public function getassignedTasks($project_id,$employee_id)
 	{
 		$db = Zend_Db_Table::getDefaultAdapter();
-    	$select = $this->select()
+		$select = $this->select()
 		->setIntegrityCheck(false)
-		->from(array('pt'=>'tm_project_tasks'),array('pt.task_id'))
+		->from(array('pt'=>'tm_project_tasks'),array('pt.task_id','pt.estimated_hrs'))
 		->joinInner(array('pte'=>'tm_project_task_employees'),"pt.task_id = pte.task_id and pte.project_id = ".$project_id." ",array('pte.id','pte.project_task_id','projectTaskCount'=>'(SELECT count(*) FROM tm_emp_timesheets et WHERE et.project_task_id = pte.project_task_id AND et.is_active = 1 AND et.emp_id ='. $employee_id.')'))
 		->joinInner(array('t'=>'tm_tasks'),"t.id = pt.task_id ",array('t.task'))
 		->where('pt.is_active = 1 AND pt.project_id = '.$project_id.' and pte.is_active = 1 and pte.emp_id = '.$employee_id);
diff --git a/application/modules/timemanagement/models/Projects.php b/application/modules/timemanagement/models/Projects.php
index 87d7242d2..a2f4e8874 100644
--- a/application/modules/timemanagement/models/Projects.php
+++ b/application/modules/timemanagement/models/Projects.php
@@ -60,15 +60,18 @@ public function getProjectsData($sort, $by, $pageNo, $perPage,$searchQuery)
 
 		$projectsData = $this->select()->distinct()
 		->setIntegrityCheck(false)
-		->from(array('p' => $this->_name),array('id'=>'p.id','project_name'=>'p.project_name','project_status'=>'if(p.project_status = "initiated", "Initiated",if(p.project_status = "draft" , "Draft",if (p.project_status = "in-progress","In Progress",if(p.project_status = "hold","Hold",if(p.project_status = "completed","Completed","")))))','parent_project'=>'p2.project_name'))
+		->from(array('p' => $this->_name),array('id'=>'p.id','project_name'=>'p.project_name','project_status'=>'if(p.project_status = "initiated", "Initiated",if(p.project_status = "draft" , "Draft",if (p.project_status = "in-progress","In Progress",if(p.project_status = "hold","Hold",if(p.project_status = "completed","Completed","")))))','start_date'=>'p.start_date','end_date'=>'p.end_date','parent_project'=>'p2.project_name','project_type'=>'IF(p.project_type="billable","Billable",IF(p.project_type="non_billable","Non billable","Revenue generation"))'))
 		->joinLeft(array('p2' => $this->_name),'p.base_project = p2.id',array())
-		->joinLeft(array('c'=>'tm_clients'),'p.client_id=c.id',array('client_name'=>'c.client_name'));
+		->joinLeft(array('c'=>'tm_clients'),'p.client_id=c.id',array('client_name'=>'c.client_name'))
+		->joinLeft(array('cur'=>'main_currency'),'p.currency_id = cur.id',array('currencyname'=>'cur.currencyname'));
 		if(Zend_Registry::get( 'tm_role' ) == 'Manager'){
 			$projectsData->joinLeft(array('pe'=>'tm_project_employees'),'pe.project_id = p.id',array());
 		}
 		$projectsData->where($where)
 		->order("$by $sort")
 		->limitPage($pageNo, $perPage);
+		//echo $projectsData;exit;
+
 		return $projectsData;
 	}
 
@@ -97,10 +100,13 @@ public function getGrid($sort,$by,$perPage,$pageNo,$searchData,$call,$dashboardc
 			foreach($searchValues as $key => $val)
 			{
 				if($key == 'client') $key = 'client_id';
+				if($key == 'currency') $key = 'currency_id';
 				if($key == 'parent_project'){
 					$searchQuery .= " p.base_project = '".$val."' AND ";
 				}else if($key == 'client_name'){
 					$searchQuery .= " c.id = '".$val."' AND ";
+				}else if($key == 'currencyname'){
+					$searchQuery .= " cur.id = '".$val."' AND ";
 				}else{
 					$searchQuery .= " p.".$key." like '%".$val."%' AND ";
 				}
@@ -111,7 +117,7 @@ public function getGrid($sort,$by,$perPage,$pageNo,$searchData,$call,$dashboardc
 
 		$objName = 'projects';
 
-		$tableFields = array('action'=>'Action','project_name' => 'Project','project_status'=>'Status','parent_project'=>'Base Project','client_name' => 'Client');
+		$tableFields = array('action'=>'Action','project_name' => 'Project','project_status'=>'Status','parent_project'=>'Base Project','client_name' => 'Client','currencyname'=>'Currency','project_type'=>'Project Type');
 
 		$tablecontent = $this->getProjectsData($sort, $by, $pageNo, $perPage,$searchQuery);
 
@@ -135,6 +141,16 @@ public function getGrid($sort,$by,$perPage,$pageNo,$searchData,$call,$dashboardc
 			}
 		}
 
+		$currencyModel = new Default_Model_Currency();
+		$currencyData = $currencyModel->getCurrencyList();
+		$currencyArray = array(''=>'All');
+		if(sizeof($currencyData) > 0)
+		{
+			foreach ($currencyData as $currency){
+				$currencyArray[$currency['id']] = $currency['currency'];
+			}
+		}
+
 		$dataTmp = array(
 			'sort' => $sort,
 			'by' => $by,
@@ -155,15 +171,27 @@ public function getGrid($sort,$by,$perPage,$pageNo,$searchData,$call,$dashboardc
                         'type' => 'select',
                         'filter_data' => $clientArray,
 		),
-    		'parent_project' => array(
+                    'currencyname' => array(
+                        'type' => 'select',
+                        'filter_data' => $currencyArray,
+		),
+					'parent_project' => array(
 			                        'type' => 'select',
 			                        'filter_data' => $base_projectArray,
 		),
-			'project_status' => array(
+                    'category' => array(
+                        'type' => 'select',
+                        'filter_data' => array(''=>'All','billable' => 'Billable','non_billable' => 'Non Billable','revenue' => 'Revenue generation'),
+		),
+					 'project_status' => array(
 			                        'type' => 'select',
 			                        'filter_data' => array(''=>'All','initiated' => 'Initiated','draft' => 'Draft','in-progress' => 'In Progress','hold'=>'Hold','completed'=>'Completed'),
 		),
-				
+					'project_type' => array('type' => 'select',
+						                      'filter_data' => array(''=>'All','billable' => 'Billable','non_billable' => 'Non Billable','revenue' => 'Revenue generation'),
+		),
+		//'start_date'=>array('type'=>'datepicker'),
+		//	  'end_date'=>array('type'=>'datepicker')
 		),
 		);
 		return $dataTmp;
@@ -174,6 +202,7 @@ public function getSingleProjectData($id){
 		->setIntegrityCheck(false)
 		->from(array('p'=>$this->_name),array('p.*'))
 		->joinLeft(array('c'=>'tm_clients'),'p.client_id=c.id',array('client_name'=>'c.client_name'))
+		->joinLeft(array('cur'=>'main_currency'),'p.currency_id=cur.id',array('currencyname'=>'cur.currencyname','currencycode'=>'cur.currencycode'))
 		->where('p.is_active = 1 AND p.id='.$id.' ');
 		$res = $this->fetchAll($select)->toArray();
 		if (isset($res) && !empty($res))
@@ -245,7 +274,12 @@ public function getEmpGrid($sort,$by,$perPage,$pageNo,$searchData,$call,$dashboa
 			foreach($searchValues as $key => $val)
 			{
 				if($key == 'client') $key = 'client_id';
-				else{
+				if($key == 'currency') $key = 'currency_id';
+				if($key == 'start_date'){ 
+					$searchQuery .= " ".$key." like '%".  sapp_Global::change_date($val,'database')."%' AND ";
+				}else if($key == 'end_date'){ 
+					$searchQuery .= " ".$key." like '%".  sapp_Global::change_date($val,'database')."%' AND ";
+				}else{
 					$searchQuery .= " ".$key." like '%".$val."%' AND ";
 				}
 				$searchArray[$key] = $val;
@@ -258,7 +292,7 @@ public function getEmpGrid($sort,$by,$perPage,$pageNo,$searchData,$call,$dashboa
 		 $objName = 'leadprojects';
 		}
 
-		$tableFields = array('action'=>'Action','project_name' => 'Project','client_name' => 'Client');
+		$tableFields = array('action'=>'Action','project_name' => 'Project','start_date' => 'Start Date','end_date' => 'End Date','client_name' => 'Client');
 
 		$tablecontent = $this->getEmpProjectsData($sort, $by, $pageNo, $perPage,$searchQuery,$employee_id);
 
@@ -282,6 +316,16 @@ public function getEmpGrid($sort,$by,$perPage,$pageNo,$searchData,$call,$dashboa
 			}
 		}
 
+		$currencyModel = new Default_Model_Currency();
+		$currencyData = $currencyModel->getCurrencyList();
+		$currencyArray = array(''=>'All');
+		if(sizeof($currencyData) > 0)
+		{
+			foreach ($currencyData as $currency){
+				$currencyArray[$currency['currency']] = $currency['currency'];
+			}
+		}
+
 		$dataTmp = array(
 			'sort' => $sort,
 			'by' => $by,
@@ -301,18 +345,26 @@ public function getEmpGrid($sort,$by,$perPage,$pageNo,$searchData,$call,$dashboa
                     'client_name' => array(
                         'type' => 'select',
                         'filter_data' => $clientArray,
+		),
+                    'currencyname' => array(
+                        'type' => 'select',
+                        'filter_data' => $currencyArray,
 		),
 					'base_project' => array(
 			                        'type' => 'select',
 			                        'filter_data' => $base_projectArray,
 		),
-                    
+                    'category' => array(
+                        'type' => 'select',
+                        'filter_data' => array(''=>'All','billable' => 'Billable','non_billable' => 'Non Billable','revenue' => 'Revenue generation'),
+		),
 					 'project_status' => array(
 			                        'type' => 'select',
 			                        'filter_data' => array(''=>'All','initiated' => 'Initiated','draft' => 'Draft','in-progress' => 'In Progress','hold'=>'Hold','completed'=>'Completed'),
-		)
-		 
-		)
+		),
+		 'start_date'=>array('type'=>'datepicker'),
+						  'end_date'=>array('type'=>'datepicker')
+		),
 		);
 		return $dataTmp;
 	}
@@ -327,11 +379,13 @@ public function getEmpProjectsData($sort, $by, $pageNo, $perPage,$searchQuery,$e
 		$projectsData = $this->select()
 		->setIntegrityCheck(false)
 		->from(array('tpe' => 'tm_project_employees'),array('tpe.*'))
-		->joinLeft(array('p' => $this->_name),'tpe.project_id=p.id',array('id'=>'p.id','project_name'=>'p.project_name','project_status'=>'p.project_status','base_project'=>'p.base_project'))
+		->joinLeft(array('p' => $this->_name),'tpe.project_id=p.id',array('id'=>'p.id','project_name'=>'p.project_name','project_status'=>'p.project_status','start_date'=>'p.start_date','end_date'=>'p.end_date','base_project'=>'p.base_project','project_type'=>'IF(p.project_type="billable","Billable",IF(p.project_type="non_billable","Non billable","Revenue generation"))'))
 		->joinLeft(array('c'=>'tm_clients'),'p.client_id=c.id',array('client_name'=>'c.client_name'))
+		->joinLeft(array('cur'=>'main_currency'),'p.currency_id = cur.id',array('currencyname'=>'cur.currencyname'))
 		->where($where)
 		->order("$by $sort")
 		->limitPage($pageNo, $perPage);
+		// echo $projectsData; //exit;
 		return $projectsData;
 	}
 
@@ -418,8 +472,446 @@ public function getprevmonthweeks($selmn,$day)
 			  return $this->getprevmonthweeks($new_selmn, $lsday_new);
 		  } 
 	}
+	//previous weeks submit status.
+	public function prev_weeksubmit_status($prevweeks,$emp_id,$emp_details)
+	{
+	   $fin_str=array();
+	   $month_name='';
+	   $prev_str='';
+		if(sizeof($prevweeks) >0)
+		{
+			//To get dates of timesheet filled by user of the given duration
+			
+			$notificationModel = new Timemanagement_Model_Notifications();
+			$weekend_date = date('Y-m-d', strtotime('last saturday'));
+
+			for($i=1;$i<=count($prevweeks);$i++)
+			{
+				$timesheet_date_array = array();
+				$weekno=$i;
+				$hidstartweek_date=min($prevweeks[$i]);
+				$for_month=new DateTime($hidstartweek_date);
+				$yr_mnth=$for_month->format('Y-m');
+				$month_name=$for_month->format('F');
+				$hidendweek_date=max($prevweeks[$i]);
+				$hidemp=$emp_id;
+				$emp_dept_id = $emp_details['department_id'];
+				$join_date=new DateTime($emp_details['date_of_joining']);
+				$join_date=$join_date->format('Y-m-d');
+				
+				$resultData = array();
+				$savedTimeSheets = array();
+				$resultData = $notificationModel->getTimesheetStatus($emp_id,$hidendweek_date);
+				$savedTimeSheets = $notificationModel->getSavedTimesheets($emp_id,$hidendweek_date);
+
+				//End
+				if(count($resultData)>0)
+				{
+					$timesheet_dates_with_status = '';
+					foreach($resultData as $array)
+					{
+						$timesheet_dates_with_status.= $array['ts_week_dates'];
+						$timesheet_dates_with_status.='$';
+					}
+					$ts_date_array = array();
+					$ts_date_array = array_filter(explode('$',$timesheet_dates_with_status));
+					$timesheetEnteredDates = implode('#',$ts_date_array);
+					//echo $timesheetEnteredDates;
+					$timesheetEnteredDatesArray = explode('#',$timesheetEnteredDates);
+					$statusArray = array('saved','enabled','rejected','blocked','no_entry','submitted','approved');
+					$enteredDateStatusArr = array();
+					$timesheet_date_arr=array();
+					if(count($timesheetEnteredDatesArray)>0)
+					{
+						foreach($timesheetEnteredDatesArray as $date)
+						{
+							if(!in_array($date,$statusArray))
+							{
+								$timesheet_date_arr[] = $date;
+							}
+							else
+							{
+								$enteredDateStatusArr[] = $date;
+							}
+						}
+					}
+					foreach($timesheet_date_arr as $key => $ts_date)
+					{
+						//echo 'date'.$ts_date.'-----'.$enteredDateStatusArr[$key].'<br/>';
+						if($ts_date>=date('Y-m-01') && $ts_date<=date('Y-m-t') && isset($enteredDateStatusArr[$key]) && ($enteredDateStatusArr[$key]=='approved' || $enteredDateStatusArr[$key]=='submitted'))
+						{
+							$timesheet_date_array[] = $ts_date;
+						}
+					}
+				}
+				$saved_timesheet_date_array = array();
+				$timesheet_date_arry=array();
+				$enteredDateStatusArray = array();
+				if(count($savedTimeSheets)>0)
+				{
+					$saved_timesheet_dates = '';
+					foreach($savedTimeSheets as $arrayy)
+					{
+						$saved_timesheet_dates.= $arrayy['ts_week_dates'];
+						$saved_timesheet_dates.='$';
+					}
+					$saved_ts_date_arra = array();
+					$saved_ts_date_arra = array_filter(explode('$',$saved_timesheet_dates));
+					$timesheetEnteredDatesArr = array();
+					$timesheetEnteredDate='';
+					$timesheetEnteredDate = implode('#',$saved_ts_date_arra);
+					//echo $timesheetEnteredDates;
+					$timesheetEnteredDatesArr = explode('#',$timesheetEnteredDate);
+					$statusArray = array('saved','enabled','rejected','blocked','no_entry','submitted','approved');
+					$timesheet_date_arry=array();
+					$enteredDateStatusArray = array();
+					if(count($timesheetEnteredDatesArr)>0)
+					{
+						foreach($timesheetEnteredDatesArr as $dates)
+						{
+							if(!in_array($dates,$statusArray))
+							{
+								$timesheet_date_arry[] = $dates;
+							}
+							else
+							{
+								$enteredDateStatusArray[] = $dates;
+							}
+						}
+					}
+					foreach($timesheet_date_arry as $key => $saved_date)
+					{
+						if($saved_date>=date('Y-m-01') && $saved_date<=date('Y-m-t') && isset($enteredDateStatusArray[$key]) && ($enteredDateStatusArray[$key]=='approved' || $enteredDateStatusArray[$key]=='submitted'))
+						if($saved_date>=date('Y-m-01') && $saved_date<=date('Y-m-t') && isset($enteredDateStatusArray[$key]) && ($enteredDateStatusArray[$key]=='approved' || $enteredDateStatusArray[$key]=='submitted'))
+						{
+							$saved_timesheet_date_array[] = $saved_date;
+						}
+					}
+				}
+				$weekDatesArray = array();
+				//To get day in the week
+				$weekDatesArray = sapp_Global::createDateRangeArray($hidstartweek_date,$hidendweek_date);
+				//End
+				
+
+				//To get Holidays for the given duration
+				
+				$holidays = array();
+				$holidayDateslistArr = array();
+				$loginUserGroupId = $emp_details['holiday_group'];
+				if( isset($hidemp) && $hidemp !=''){
+					$holidaydatesmodel = new Default_Model_Holidaydates();
+					if($loginUserGroupId>0)
+					{
+						$holidayDateslistArr = $holidaydatesmodel->getHolidayDatesListForGroup($loginUserGroupId);
+					}
+					if(!empty($holidayDateslistArr))
+					{
+						for($j=0;$j<sizeof($holidayDateslistArr);$j++)
+						{
+							$holidays[$j] = $holidayDateslistArr[$j]['holidaydate'];
+						}
+					}
+				}
+				//End
+
+				//To get Leaves applied by user for the given duration
+				
+				$employeeLeaves = array();
+				$usersModel = new Timemanagement_Model_Users();
+				$employeeLeaves = $usersModel->getEmpLeaves($hidemp,$hidstartweek_date,$hidendweek_date);
+				$emp_leave_days = array();
+				foreach($employeeLeaves as $empleave)
+				{
+					$emplev_start_date = $empleave['from_date'];
+					$emplev_endt_date = $empleave['to_date'];
+					$emp_leave_days[] = sapp_Global::createDateRangeArray($emplev_start_date,$emplev_endt_date);
+				}
+				$employee_leave_days = array();
+				foreach($emp_leave_days as $lev_days)
+				{
+					foreach($lev_days as $days)
+					{
+						$employee_leave_days[] = $days;
+					}
+				}	
+				//End
+				$empWeekends = array();
+				//To get default not working days(saturday and sunday)
+				$empWeekends = $usersModel->getWeekend($hidstartweek_date,$hidendweek_date,$emp_dept_id);
+				//End
+				
+				//combine all holidays , leaves, weekends
+				$hol_leav_weknd = array();
+				$hol_leav_weknd = array_merge($holidays,$employee_leave_days,$empWeekends);
+				
+				$no_entry_weekennds = array();
+				if(count($timesheet_date_arry)>0)
+				{
+					//if employee work on holiday , weekend
+					foreach($timesheet_date_arry as $key =>$val)
+					{
+						if(in_array($val,$hol_leav_weknd) && $enteredDateStatusArray[$key]=='no_entry')
+						{
+							$no_entry_weekennds[] = $val;
+						}
+					}
+				}
+				//remove holidays,weekend,leaves from between days
+				$working_days = array();
+				$working_days = array_diff($weekDatesArray, $hol_leav_weknd);
+				$emptyDataDatesArry=array();
+				$emptyDataDatesArray = array();
+				$holiday_timesheets = array();
+				$holiday_timesheets = array_diff($working_days,$timesheet_date_array);
+				$emptyDataDatesArry = array_merge($holiday_timesheets,$saved_timesheet_date_array);
+				$emptyDataDatesArray = array_diff($emptyDataDatesArry,$no_entry_weekennds);
+				if(count($emptyDataDatesArray)>0)
+				{
+					$newemptyDataDatesArray=array();
+					foreach($emptyDataDatesArray as $edate)
+					{
+						if($edate>=$join_date)
+							$newemptyDataDatesArray[]=$edate;
+					}
+					$emptyDataDatesArray=$newemptyDataDatesArray;
+				}
+				if(count($emptyDataDatesArray) >0)
+				{
+					$fin_str[]= $weekno;
+				}
+			}
+		}
+		if(count($fin_str)>0)
+		{
+		   $prev_str=  " Week- ".implode(',', $fin_str).' timesheet(s) of '.$month_name."@@@".$yr_mnth;
+		}
+		return $prev_str;
+	}
+	//function to get previous pending submissions
+	public function getPreviousDaysTSStatus($prevweeks,$emp_id,$emp_details)
+	{
+		$fin_str=array();
+	   $month_name='';
+	   $prev_str='';
+	   $final_display_array = array();
+	  
+		if(sizeof($prevweeks) >0)
+		{
+			//To get dates of timesheet filled by user of the given duration
+			$resultData = array();
+			$timesheet_date_array = array();
+			$enteredDateStatusArr = array();
+			$notificationModel = new Timemanagement_Model_Notifications();
+			$weekend_date = date('Y-m-d', strtotime('last saturday'));
+			for($i=1;$i<=count($prevweeks);$i++)
+			{
+				 
+				$savedTimeSheetArray = array();
+				$savedTimeSheetblckedArray = array();
+				$weekno=$i;
+				$hidstartweek_date=min($prevweeks[$i]);
+				$for_month=new DateTime($hidstartweek_date);
+				$yr_mnth=$for_month->format('Y-m');
+				$month_name=$for_month->format('F');
+				$hidendweek_date=max($prevweeks[$i]);
+				 $mnth = date('m',strtotime($hidendweek_date));
+				 $year = date('Y',strtotime($hidendweek_date));
+				$hidemp=$emp_id;
+				$emp_dept_id = $emp_details['department_id'];
+				$join_date=new DateTime($emp_details['date_of_joining']);
+				$join_date=$join_date->format('Y-m-d');
+			$resultData = $notificationModel->getpreviousTimesheetStatus($emp_id,$hidendweek_date,$mnth,$year);
+			$savedTimeSheets = $notificationModel->getpreviousSavedTimesheets($emp_id,$hidendweek_date,$mnth,$year);
+			//End
+			if(count($resultData)>0)
+			{
+				$timesheet_dates_with_status = '';
+				foreach($resultData as $array)
+				{
+					$timesheet_dates_with_status.= $array['ts_week_dates'];
+					$timesheet_dates_with_status.='$';
+				}
+				$timesheet_date_with_status_array = array_filter(explode('$',$timesheet_dates_with_status));
+				$timesheetEnteredDatesArray = array();
+				if(count($timesheet_date_with_status_array)>0)
+				{
+					$timesheetEnteredDates = implode('#',$timesheet_date_with_status_array);
+					$timesheetEnteredDatesArray = explode('#',$timesheetEnteredDates);
+				}
+				$enteredDatesArray = array();
+				$statusArray = array('saved','enabled','rejected','blocked','no_entry','submitted','approved');
+				$enteredDateStatusArr = array();
+				$timesheet_date_array = array();
+				if(count($timesheetEnteredDatesArray)>0)
+				{
+					foreach($timesheetEnteredDatesArray as $date)
+					{
+						if(!in_array($date,$statusArray))
+						{
+							$timesheet_date_array[] = $date;
+						}
+						else
+						{
+							$enteredDateStatusArr[] = $date;
+						}
+					}
+				}
+				
+			}
+			if(count($timesheet_date_array) > 0 && (count($timesheet_date_array) == count($enteredDateStatusArr)))
+			{
+				foreach($timesheet_date_array as $key=>$value)
+				{
+					$status = 'No Entry';
+					if(isset($key))
+					{
+						$status = $key;
+					}
+					$savedTimeSheetArray[$value] = ($enteredDateStatusArr[$status]=='no_entry')?'No Entry':$enteredDateStatusArr[$status];
+				}
+			}
 
+			$saved_timesheet_date_array = array();
+			if(count($savedTimeSheets)>0)
+			{
+				$saved_timesheet_dates = '';
+				foreach($savedTimeSheets as $arrayy)
+				{
+					$saved_timesheet_dates.= $arrayy['ts_week_dates'];
+					$saved_timesheet_dates.='$';
+				}
+				$timesheet_date_with_status_array = array_filter(explode('$',$saved_timesheet_dates));
+				$timesheetEnteredDatesArr = array();
+				if(count($timesheet_date_with_status_array)>0)
+				{
+					$timesheetSavedEnteredDates = implode('#',$timesheet_date_with_status_array);
+					$timesheetEnteredDatesArr = explode('#',$timesheetSavedEnteredDates);
+				}
+				$enteredDatesArray = array();
+				$statusArr = array('saved','enabled','rejected','blocked','no_entry','submitted','approved');
+				$enteredDateStatusArry = array();
+				foreach($timesheetEnteredDatesArr as $dates)
+				{
+					if(!in_array($dates,$statusArr))
+					{
+						$saved_timesheet_date_array[] = $dates;
+					}
+					else
+					{
+						$enteredDateStatusArry[] = $dates;
+					}
+				}
+			}
+			if(count($saved_timesheet_date_array)>0 && count($enteredDateStatusArry)>0)
+			{
+				foreach($saved_timesheet_date_array as $keyy=>$valuee)
+				{
+					$savedTimeSheetblckedArray[$valuee] = $enteredDateStatusArry[$keyy];
+				}
+			}
+				//To get day in the week
+				$weekDatesArray = sapp_Global::createDateRangeArray($hidstartweek_date,$hidendweek_date);
+				//End
+				//To get Holidays for the given duration
+				
+				$holidays = array();
+				$holidayDateslistArr = array();
+				$loginUserGroupId = $emp_details['holiday_group'];
+				if( isset($hidemp) && $hidemp !=''){
+					$holidaydatesmodel = new Default_Model_Holidaydates();
+					if($loginUserGroupId>0)
+					{
+						$holidayDateslistArr = $holidaydatesmodel->getHolidayDatesListForGroup($loginUserGroupId);
+					}
+					if(!empty($holidayDateslistArr))
+					{
+						for($j=0;$j<sizeof($holidayDateslistArr);$j++)
+						{
+							$holidays[$j] = $holidayDateslistArr[$j]['holidaydate'];
+						}
+					}
+				}
+				$holidaysStatusArray = array();
+				if(count($holidays)>0)
+				{
+					foreach($holidays as $holidayDate){
+						//if(!in_array($holidayDate,$timesheet_date_array) && !in_array($holidayDate,$saved_timesheet_date_array) && ($holidayDate>=$hidstartweek_date && $holidayDate<=$hidendweek_date))
+						if(!(isset($savedTimeSheetArray[$holidayDate]) && $savedTimeSheetArray[$holidayDate]!='No Entry') && !(isset($savedTimeSheetblckedArray[$holidayDate]) && $savedTimeSheetblckedArray[$holidayDate]!='No Entry') && ($holidayDate>=$hidstartweek_date && $holidayDate<=$hidendweek_date))	
+						{
+							$holidaysStatusArray[$holidayDate] = 'Holiday';
+						}
+					}
+				}
+				//End
+
+				//To get Leaves applied by user for the given duration
+				
+				$employeeLeaves = array();
+				$usersModel = new Timemanagement_Model_Users();
+				$employeeLeaves = $usersModel->getEmpLeaves($hidemp,$hidstartweek_date,$hidendweek_date);
+				$emp_leave_days = array();
+				foreach($employeeLeaves as $empleave)
+				{
+					$emplev_start_date = $empleave['from_date'];
+					$emplev_endt_date = $empleave['to_date'];
+					$emp_leave_days[] = sapp_Global::createDateRangeArray($emplev_start_date,$emplev_endt_date);
+				}
+				$employee_leave_days = array();
+				$employee_leave_ts_array = array();
+				foreach($emp_leave_days as $lev_days)
+				{
+					foreach($lev_days as $days)
+					{
+						$employee_leave_days[] = $days;
+						$employee_leave_ts_array[$days]='Leave';
+					}
+				}	
+				//End
 
+				//To get default not working days(saturday and sunday)
+				$empWeekends = $usersModel->getWeekend($hidstartweek_date,$hidendweek_date,$emp_dept_id);
+				//End	
+				$weekend_array = array();
+				foreach($empWeekends as $weekend)
+				{
+					if(!(isset($savedTimeSheetArray[$weekend]) && $savedTimeSheetArray[$weekend]!='No Entry') && !in_array($weekend,$saved_timesheet_date_array))
+					{
+						$weekend_array[$weekend] = 'Weekend';
+					}
+				}
+				
+				//combine all holidays , leaves, weekends
+				$hol_leav_weknd = array();
+				$hol_leav_weknd = array_merge($holidays,$employee_leave_days,$empWeekends);
+				
+				//remove holidays,weekend,leaves from between days
+				$working_days = array_diff($weekDatesArray, $hol_leav_weknd);
+				$emptyDataDatesArray = array();
+				$holiday_timesheets = array_diff($working_days,$timesheet_date_array);
+				$emptyDataDatesArray = array_merge($holiday_timesheets,$saved_timesheet_date_array);
+				$holiday_ts_array = array();
+				foreach($holiday_timesheets as $holidayts)
+				{
+					$holiday_ts_array[$holidayts] = 'No Entry';
+				}
+				$final_array = array_merge($savedTimeSheetArray,$holiday_ts_array,$savedTimeSheetblckedArray,$holidaysStatusArray,$employee_leave_ts_array,$weekend_array);
+		
+				
+				$final_holadys_removed_array = array();
+				foreach($final_array as $finalkey => $finalstatus)
+				{
+					if(!(in_array($finalkey,$hol_leav_weknd) && $final_array[$finalkey] == 'No Entry'))
+					{
+						$final_holadys_removed_array[$finalkey] = $finalstatus;
+					}
+				}
+				$final_display_array[$weekno] = $final_holadys_removed_array;
+			}
+		}
+		return $final_display_array;
+	}
+	
 	/**
 	 * This method returns all projects under client
 	 *
diff --git a/application/modules/timemanagement/models/Projecttasks.php b/application/modules/timemanagement/models/Projecttasks.php
index ec56ce132..32e04f9c9 100644
--- a/application/modules/timemanagement/models/Projecttasks.php
+++ b/application/modules/timemanagement/models/Projecttasks.php
@@ -41,6 +41,7 @@ public function getProjectTasksData($projectId){
 		->joinLeft(array('et'=>'tm_emp_timesheets'),'et.project_task_id = pt.id AND et.is_active = 1',array())
 		->where('pt.is_active = 1 AND pt.project_id = '.$projectId.'')
 		->order("pt.modified DESC");
+		//echo $select; //exit;
 		$res = $this->fetchAll($select)->toArray();
 		if (isset($res) && !empty($res))
 		{
@@ -88,10 +89,15 @@ public function getGrid($sort,$by,$perPage,$pageNo,$searchData,$call,$dashboardc
 		}
 			
 		$objName = 'projecttasks';
-        $projectModel = new Timemanagement_Model_Projects();
+
+		$projectModel = new Timemanagement_Model_Projects();
 		$projectData = $projectModel->getSingleProjectData($a);
-		$tableFields = array('task' => 'Name','actual_hrs' => 'Actual Hours','viewresources'=>'');
+		$currencyCode = (isset($projectData[0]['currencycode']))?$projectData[0]['currencycode']:'';
+					
+		$tableFields = array('task' => 'Name','estimated_hrs' => 'Estimated Hours','billable_rate' => 'Billable Rate ('.$currencyCode.')','actual_hrs' => 'Actual Hours','viewresources'=>'');
+
 		$tablecontent = $this->getProjectTaskData($sort, $by, $pageNo, $perPage,$searchQuery,$a,$having);
+
 		$dataTmp = array(
 			'sort' => $sort,
 			'by' => $by,
@@ -128,7 +134,7 @@ public function getProjectTaskData($sort, $by, $pageNo, $perPage,$searchQuery,$a
 		->where($where)
 		->order("$by $sort")
 		->limitPage($pageNo, $perPage)
-		->group(array('tpt.id')); 
+		->group(array('tpt.id')); //echo $projectTaskData;exit;
 
 		if($having != ''){
 			$projectTaskData->having("$having");
@@ -154,9 +160,9 @@ public function getTasks($projectId,$projectTaskId)
 		$db = Zend_Db_Table::getDefaultAdapter();
 		$select = $this->select()
 		->setIntegrityCheck(false)
-		->from(array('tpte'=>'tm_project_tasks'))
+		->from(array('tpte'=>'tm_project_tasks'),array('tpte.is_billable','tpte.estimated_hrs'))
 		->joinInner(array('tt'=>'tm_tasks'),"tt.id = tpte.task_id",array('tt.task'))
-		->where( 'tpte.project_id='.$projectId.' and tpte.task_id='.$projectTaskId.'');
+		->where('tpte.is_active=1 and tpte.project_id='.$projectId.' and tpte.task_id='.$projectTaskId.'');
 		return $this->fetchAll($select)->toArray();
 	}
 	//function to get tasks resources
@@ -255,6 +261,8 @@ public function getEmpTaskGrid($sort,$by,$perPage,$pageNo,$searchData,$call,$das
 			{
 				if($key == 'task'){
 					$searchQuery .= " tt.".$key." like '%".$val."%' AND ";
+				}else if($key == 'estimated_hrs'){
+					$searchQuery .= " tpt.".$key." like '%".$val."%' AND ";
 				}else if($key == 'actual_hrs'){
 					$having = " ".$key." like '%".$val."%' ";
 				}else{
@@ -270,8 +278,10 @@ public function getEmpTaskGrid($sort,$by,$perPage,$pageNo,$searchData,$call,$das
 		 $objName = 'leadprojects';
 		}
 
-		$tableFields = array('task' => 'Name','actual_hrs' => 'Actual Hours');
+		$tableFields = array('task' => 'Name','estimated_hrs' => 'Estimated Hours','actual_hrs' => 'Actual Hours');
+
 		$tablecontent = $this->getProjectEmpTaskData($sort, $by, $pageNo, $perPage,$searchQuery,$a,$loginUserId,$having);
+
 		$dataTmp = array(
 			'sort' => $sort,
 			'by' => $by,
@@ -298,9 +308,10 @@ public function getProjectEmpTaskData($sort, $by, $pageNo, $perPage,$searchQuery
 		if($searchQuery)
 		$where .= " AND ".$searchQuery;
 		$db = Zend_Db_Table::getDefaultAdapter();
+		
 		$empTaskData = $this->select()
 		->setIntegrityCheck(false)
-		->from(array('tpe'=>'tm_project_task_employees'),array('tt.task','actual_hrs'=>new Zend_Db_Expr("IF(et.week_duration is null,'',time_format(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.week_duration as time)))),'%H:%i' ))")))
+		->from(array('tpe'=>'tm_project_task_employees'),array('tt.task','tpt.estimated_hrs','actual_hrs'=>new Zend_Db_Expr("IF(et.week_duration is null,'',time_format(SEC_TO_TIME(sum(TIME_TO_SEC(cast(et.week_duration as time)))),'%H:%i' ))")))
 		->joinINNER(array('tt'=>'tm_tasks'),'tpe.task_id=tt.id',array())
 		->joinINNER(array('tpt'=>'tm_project_tasks'),'tpe.project_task_id = tpt.id',array())
 		->joinLeft(array('et'=>'tm_emp_timesheets'),'et.project_task_id = tpt.id AND et.is_active = 1',array())
@@ -312,6 +323,7 @@ public function getProjectEmpTaskData($sort, $by, $pageNo, $perPage,$searchQuery
 		if($having != ''){
 			$empTaskData->having("$having");
 		}
+		//echo $empTaskData;exit;
 		return $empTaskData;
 
 	}
diff --git a/application/modules/timemanagement/models/Reports.php b/application/modules/timemanagement/models/Reports.php
index f53075a41..d0b5b3bc5 100644
--- a/application/modules/timemanagement/models/Reports.php
+++ b/application/modules/timemanagement/models/Reports.php
@@ -93,11 +93,11 @@ public function getEmployeeReportsbyProjectId($sort, $by, $perPage, $pageNo, $se
 			
 		$objName = 'reports';
 
-		
+		//email,phone_no,poc,address,country_id,state_id,created_by
 		$tableFields = array(
-		
+					//'action'=>'Action',
 					'userfullname' => 'Employee',
-		
+					//'project_type' => 'Project Type',
 					'duration' => 'Hours',
 		);
 
@@ -145,7 +145,7 @@ public function getEmployeeReportsData($sort, $by, $pageNo, $perPage, $searchQue
 		{
 			if($end_date == "")
 			{
-		
+				//$end_date = date('%Y-%m-%d %H:%i:%s');
 				$end_date = date('%Y-%m-%d');
 			}
 			$start_dates=strtotime($start_date);
@@ -221,7 +221,11 @@ public function getEmployeeReportsData($sort, $by, $pageNo, $perPage, $searchQue
 				$duration_sort = "SUM(TIME_TO_SEC(et.week_duration))";
 			}
 			
-		
+			// if($param!="" && $param!="undefined" && $param!="Today" && $param!="Last 7 days")
+			// {
+				// $andwhere = " AND et.ts_year = ".$sd_year." AND et.ts_month >= ".$sd_month." AND et.ts_month <= ".$sd_month;
+			// }
+			//	$andwhere = " AND et.created BETWEEN STR_TO_DATE('".$start_date."','%Y-%m-%d %H:%i:%s') AND STR_TO_DATE('".$end_date."','%Y-%m-%d %H:%i:%s')";
 		}
 		
 		if($searchQuery){
@@ -235,7 +239,7 @@ public function getEmployeeReportsData($sort, $by, $pageNo, $perPage, $searchQue
 		$db = Zend_Db_Table::getDefaultAdapter();
 		$select = $this->select()
 			   		   ->setIntegrityCheck(false)
-					   ->from(array('et' => 'tm_emp_timesheets'),array('e.userfullname','userId'=>'et.emp_id',
+					   ->from(array('et' => 'tm_emp_timesheets'),array('e.userfullname','p.project_type','userId'=>'et.emp_id',
 				                                'duration'=>$duration,'duration_sort'=>$duration_sort))  
 					   ->joinInner(array('pt'=>'tm_project_tasks'), 'pt.id = et.project_task_id',array())
 					   ->joinInner(array('p'=>'tm_projects'), 'p.id = pt.project_id',array())
@@ -244,7 +248,7 @@ public function getEmployeeReportsData($sort, $by, $pageNo, $perPage, $searchQue
 					   ->order("$by $sort")
 					   ->group('et.emp_id')
 					   ->limitPage($pageNo, $perPage);
-		
+					   //echo $select;
 		return $select;
 	}
 	
@@ -268,10 +272,11 @@ function getProjectReportsbyEmployeeId($sort, $by, $perPage, $pageNo, $searchDat
 
 		$objName = 'reports';
 
-		
+		//email,phone_no,poc,address,country_id,state_id,created_by
 		$tableFields = array(
-		
+		//'action'=>'Action',
 					'project_name' => 'Project',
+					'project_type' => 'Project Type',
 					'duration' => 'Hours',
 		);
 
@@ -308,7 +313,7 @@ function getProjectReportsData($sort, $by, $pageNo, $perPage, $searchQuery, $sta
 		{
 			if($end_date == "")
 			{
-
+				//$end_date = date('%Y-%m-%d %H:%i:%s');
 				$end_date = date('%Y-%m-%d');
 			}
 			$start_dates=strtotime($start_date);
@@ -322,7 +327,7 @@ function getProjectReportsData($sort, $by, $pageNo, $perPage, $searchQuery, $sta
 			
 			$duration="";
 			$duration_sort ="";
-
+			//$andwhere = " AND et.created BETWEEN STR_TO_DATE('".$start_date."','%Y-%m-%d %H:%i:%s') AND STR_TO_DATE('".$end_date."','%Y-%m-%d %H:%i:%s')";
 			if($param=="" || $param=="undefined" || $param=="Last 7 days")
 			{
 				$duration = "CONCAT(FLOOR(SUM( TIME_TO_SEC( IF(sun_date BETWEEN '".$start_date."' AND '".$end_date."',sun_duration,'00:00')) +
@@ -394,22 +399,24 @@ function getProjectReportsData($sort, $by, $pageNo, $perPage, $searchQuery, $sta
 		{
 			$andwhere .= ' AND et.emp_id = '.$empid;
 		}
-
-
+		//'duration'=>'concat(floor(SUM( TIME_TO_SEC( et.week_duration ))/3600),":",lpad(floor(SUM( TIME_TO_SEC( et.week_duration ))/60)%60,2,"0"))'
+		//'SUM(TIME_TO_SEC(et.week_duration))'
 		$select = $this->select()
 		->setIntegrityCheck(false)
-		->from(array('et' => 'tm_emp_timesheets'),array('p.project_name','p.id',
+		->from(array('et' => 'tm_emp_timesheets'),array('p.project_name','proj_category'=>'p.project_type','p.id','project_type'=>'IF(p.project_type="billable","Billable",IF(p.project_type="non_billable","Non billable","Revenue generation"))',
                                 'duration'=>$duration,'duration_sort'=>$duration_sort))  
 		->joinInner(array('pt'=>'tm_project_tasks'), 'pt.id = et.project_task_id',array())
 		->joinInner(array('p'=>'tm_projects'), 'p.id = pt.project_id and p.id = et.project_id',array())
 		->joinInner(array('e'=>'main_employees_summary'), 'e.user_id = et.emp_id',array())
 		->joinLeft(array('pm'=>'tm_project_employees'), 'p.id = pm.project_id and pm.emp_id = et.emp_id ',array())
-
+		//->joinLeft(array('pm'=>new Zend_Db_Expr('(SELECT project_id,GROUP_CONCAT(emp_id) as manager_ids FROM tm_project_employees 
+		//WHERE is_active=1 and emp_type = \'manager\' GROUP BY project_id)')), 'pm.project_id = pt.project_id',array())
 		->where('et.is_active=1 '.$andwhere)
 		->order("$by $sort")
 		->group('p.id')
 		->limitPage($pageNo, $perPage);
 
+		//echo $select;//exit;
 		return $select;
 	}
 	public function getEmpProjDuration($empId,$start_date,$end_date,$project_id,$param)
@@ -419,7 +426,7 @@ public function getEmpProjDuration($empId,$start_date,$end_date,$project_id,$par
 		{
 			if($end_date == "")
 			{
-
+				//$end_date = date('%Y-%m-%d %H:%i:%s');
 				$end_date = date('%Y-%m-%d');
 			}
 			$start_dates=strtotime($start_date);
@@ -432,7 +439,7 @@ public function getEmpProjDuration($empId,$start_date,$end_date,$project_id,$par
 			
 			$duration="";
 			$andwhere = " AND et.ts_year >= ".$sd_year." AND et.ts_year <=".$ed_year." AND et.ts_month >= ".$sd_month." AND et.ts_month <= ".$ed_month;
-
+			//$andwhere = " AND et.created BETWEEN STR_TO_DATE('".$start_date."','%Y-%m-%d %H:%i:%s') AND STR_TO_DATE('".$end_date."','%Y-%m-%d %H:%i:%s')";
 			
 			if($param=="" || $param=="undefined" || $param=="Last 7 days")
 			{
@@ -492,7 +499,7 @@ public function getEmpProjDuration($empId,$start_date,$end_date,$project_id,$par
 					   ->joinInner(array('p'=>'tm_projects'), 'p.id = et.project_id',array())
 					   ->where('et.is_active=1  and p.is_active = 1 '.$andwhere.' and et.emp_id = '.$empId)
 					   ->group('et.project_id');
-
+					  // echo $select;
 		return $this->fetchAll($select)->toArray();
 	}
 	public function getProjTaskDuration($empId,$start_date,$end_date,$project_id,$param)
@@ -502,7 +509,7 @@ public function getProjTaskDuration($empId,$start_date,$end_date,$project_id,$pa
 		{
 			if($end_date == "")
 			{
-
+				//$end_date = date('%Y-%m-%d %H:%i:%s');
 				$end_date = date('%Y-%m-%d');
 			}
 			$start_dates=strtotime($start_date);
@@ -515,7 +522,7 @@ public function getProjTaskDuration($empId,$start_date,$end_date,$project_id,$pa
 			
 			
 			$andwhere = " AND et.ts_year >= ".$sd_year." AND et.ts_year <=".$ed_year." AND et.ts_month >= ".$sd_month." AND et.ts_month <= ".$ed_month;
-
+			//$andwhere = " AND et.created BETWEEN STR_TO_DATE('".$start_date."','%Y-%m-%d %H:%i:%s') AND STR_TO_DATE('".$end_date."','%Y-%m-%d %H:%i:%s')";
 			$duration="";
 			if($param=="" || $param=="undefined" || $param=="Last 7 days")
 			{
@@ -584,7 +591,7 @@ public function getProjTaskDuration($empId,$start_date,$end_date,$project_id,$pa
 		->joinLeft(array('pm'=>'tm_project_employees'), 'p.id = pm.project_id and pm.emp_id = et.emp_id ',array())
 		->where('et.is_active=1 and p.id='.$project_id.' '.$andwhere)
 		->group('t.id');
-
+		//echo $select;//exit;
 		return $this->fetchAll($select)->toArray();
 	}
 }
\ No newline at end of file
diff --git a/application/modules/timemanagement/models/Timesheetstatus.php b/application/modules/timemanagement/models/Timesheetstatus.php
index 5204885d1..c0dd01bb9 100644
--- a/application/modules/timemanagement/models/Timesheetstatus.php
+++ b/application/modules/timemanagement/models/Timesheetstatus.php
@@ -31,11 +31,11 @@ public function getEachDayTsDateCron($empid,$cal_weekArray,$yearArray)
 		}
 		$select = $this->select()
 		->setIntegrityCheck(false)
-		->from(array('t' => 'tm_ts_status'), array('ts_week_dates'=>"concat(concat(sun_date,'#',IFNULL(sun_status,'NULL')),'$',concat(mon_date,'#',IFNULL(mon_status,'NULL')),'$',concat(tue_date,'#',IFNULL(tue_status,'NULL')),'$',concat(wed_date,'#',IFNULL(wed_status,'NULL')),'$',concat(thu_date,'#',IFNULL(thu_status,'NULL')),'$',concat(fri_date,'#',IFNULL(fri_status,'NULL')),'$',concat(sat_date,'#',IFNULL(sat_status,'NULL')))"))
+		->from(array('t' => 'tm_ts_status'), array('ts_week_dates'=>"group_concat(concat(sun_date,'#',IFNULL(sun_status,'NULL')),'$',concat(mon_date,'#',IFNULL(mon_status,'NULL')),'$',concat(tue_date,'#',IFNULL(tue_status,'NULL')),'$',concat(wed_date,'#',IFNULL(wed_status,'NULL')),'$',concat(thu_date,'#',IFNULL(thu_status,'NULL')),'$',concat(fri_date,'#',IFNULL(fri_status,'NULL')),'$',concat(sat_date,'#',IFNULL(sat_status,'NULL')))"))
 		->where("t.emp_id=".$empid." AND t.is_active=1 AND (".$where.")")
 		->group('t.ts_month');
 
-		
+		//echo $select;exit;
 		return $this->fetchAll($select)->toArray();
 	}
 
@@ -47,7 +47,7 @@ public function getTsRecordExists($empid,$ts_year,$ts_month,$ts_week,$cal_week)
 		->where("t.emp_id=".$empid." AND t.is_active=1 AND t.ts_year=".$ts_year." AND t.ts_month=".$ts_month." AND t.ts_week=".$ts_week." AND t.cal_week=".$cal_week." ")
 		->group('t.emp_id');
 
-		
+		//echo $select;exit;
 		return $this->fetchAll($select)->toArray();
 	}
 
diff --git a/application/modules/timemanagement/models/Users.php b/application/modules/timemanagement/models/Users.php
index f5e7d2e9c..13344a0cb 100644
--- a/application/modules/timemanagement/models/Users.php
+++ b/application/modules/timemanagement/models/Users.php
@@ -33,13 +33,8 @@ public function getUserTimemanagementRole($userId){
 		}else{
 			$tmRole[0]['tm_role'] = 'Admin';
 		}
-		if(isset($tmRole))
-		{
-			return	$tmRole[0]['tm_role'];
-		}else{
-			return array();
-		}
-		
+
+		return	$tmRole[0]['tm_role'];
 	}
 	public function getEmployees($empType) {
 
@@ -50,7 +45,7 @@ public function getEmployees($empType) {
 		->joinInner(array('p'=>'main_privileges'),"p.role = u.emprole",array())
 		->joinInner(array('m'=>'main_menu'),"m.id = p.object",array())
 		->where(" m.menuName = '".$empType."' and m.parent=(select id from main_menu where menuName ='Time Management' and isactive = 1)");
-		
+		//echo $select;exit;
 		$employees = $this->fetchAll($select)->toArray();
 
 		return	$employees;
@@ -75,7 +70,7 @@ public function getEmployeeHolidaysNWeekends($empId,$year,$month,$calWeek="") {
 		->from(array('s'=>'main_employees_summary'),
 		array('date_of_joining','m.weekend_startday','m.weekend_endday','holiday_names'=>'GROUP_CONCAT(h.holidayname)' ,
 					 'holiday_dates'=>'GROUP_CONCAT(h.holidaydate)'))				
-		->joinInner(array('m'=>'main_leavemanagement'),"m.department_id = s.department_id",array())
+		->joinInner(array('m'=>'main_leavemanagement'),"m.department_id = s.department_id and m.isactive=1",array())
 		->joinLeft(array('h'=>'main_holidaydates'),"h.groupid = s.holiday_group and h.isactive=1 and YEAR(holidaydate) = '".$year."' ".$where." ",array())
 		->where(" s.user_id = '".$empId."'");
 		//echo $select; 
@@ -84,6 +79,22 @@ public function getEmployeeHolidaysNWeekends($empId,$year,$month,$calWeek="") {
 		return $result;
 	}
 
+	//function to get approval details
+	public function getEmpApprovalStatusDteails($emp_id)
+	{
+		$select = $this->select()
+		->setIntegrityCheck(false)
+		->from(array('t' => 'tm_process_updates'),array('ts_date'=>'t.ts_dates','approved_date'=>'date_format(t.created,"%Y-%m-%d")'))
+		->where("t.action_type = 'approved' AND t.alert = 'open' AND t.emp_id = '".$emp_id."' ")
+		->order("t.ts_dates DESC");
+		return $this->fetchAll($select)->toArray();
+	}
+	//function to update notification alert as closed
+	public function addOrUpdateTstatusData($employee_id)
+	{
+		$db = Zend_Db_Table::getDefaultAdapter();
+		$db->query("UPDATE tm_process_updates SET alert='closed' , modified=NOW() WHERE action_type='approved' AND emp_id = ".$employee_id);
+	}
 
 
 	//function to fetch all employees who reports
@@ -99,8 +110,9 @@ public function getEmployeesReportingTo($reportingToId,$cron_run_day) {
 		->joinInner(array('g'=>'main_groups'),"g.id = r.group_id",array())
 		->joinInner(array('d'=>'main_departments'),"d.id = u.department_id",array())
 		->joinInner(array('tz'=>'main_timezone'),"tz.id = d.timezone",array())
-		->where("u.reporting_manager = '".$reportingToId."'");
-	
+		->where("u.isactive=1 and u.reporting_manager = '".$reportingToId."'");
+		//->having('emp_cur_day = "'.$cron_run_day.'"');
+		//echo $select;exit;
 		$employeesReported = $this->fetchAll($select)->toArray();
 
 		return	$employeesReported;
@@ -115,7 +127,7 @@ public function checkweekdaysdatacron($hidstartweek_date,$hidendweek_date,$hidem
 		if($hidemp != '' && $hidstartweek_date != '' && $hidendweek_date != '')
 		{
 			//To get days in the week/month
-			$weekDatesArray = sapp_Global::createDateRangeArray($hidstartweek_date,$hidendweek_date); //echo 
+			$weekDatesArray = sapp_Global::createDateRangeArray($hidstartweek_date,$hidendweek_date); //echo '<pre>';print_r($weekDatesArray);
 			//End
 
 			$submittedtsdates = $holDates = $weekendDates = $leaveDates = array();
@@ -139,14 +151,14 @@ public function checkweekdaysdatacron($hidstartweek_date,$hidendweek_date,$hidem
 				}
 				$loopDate = date ("Y-m-d", strtotime("+1 day", strtotime($loopDate)));
 			}
-			
+			//$cal_week = strftime('%U',strtotime($hidstartweek_date));
 
 			$startDateYear = $startdateObj->format("Y");
 
 			/*submitted and approved status dates in a date range*/
 			//To get dates of timesheet filled by user of the given duration
 			$tsStatus_model = new Timemanagement_Model_Timesheetstatus();
-			$resultData = $tsStatus_model->getEachDayTsDateCron($hidemp,$cal_weekArray,$yearCalWeekArray); 
+			$resultData = $tsStatus_model->getEachDayTsDateCron($hidemp,$cal_weekArray,$yearCalWeekArray); //echo '<pre>'; print_r($resultData);exit;
 			$ts_filled_dates = array();
 			if(!empty($resultData)){
 				foreach($resultData as $resData){
@@ -157,9 +169,13 @@ public function checkweekdaysdatacron($hidstartweek_date,$hidendweek_date,$hidem
 							$ts_day_Array = explode('#',$ts_day);
 							if(in_array($ts_day_Array[0],$weekDatesArray)){
 								if($ts_day_Array[1] == 'submitted' || $ts_day_Array[1] == 'approved'){
-									
+									/*if(!empty($submittedtsdates)){
+										if(in_array($ts_day_Array[0],$submittedtsdates)){
+											continue;
+										}
+									}else{*/
 										$submittedtsdates[] = $ts_day_Array[0]; //$ts_day_Array[0] is ts status date
-									
+									//}
 								}
 							}
 						}
@@ -183,7 +199,7 @@ public function checkweekdaysdatacron($hidstartweek_date,$hidendweek_date,$hidem
 				}
 			}
 			//End
-			
+			//echo '$emp_dept_id---'.$emp_dept_id.'<br>';
 			//To get Leaves applied by user for the given duration
 			$empLeaves = $this->getEmpLeaves($hidemp,$hidstartweek_date,$hidendweek_date);
 			if(!empty($empLeaves)){
@@ -201,7 +217,7 @@ public function checkweekdaysdatacron($hidstartweek_date,$hidendweek_date,$hidem
 			if($emp_dept_id !='' && $emp_dept_id != NULL){
 				$weekendDetailsArr = $this->getWeekend($hidstartweek_date, $hidendweek_date, $emp_dept_id);
 			}
-			
+			//print_r($weekendDetailsArr);exit;
 			//End
 
 
@@ -235,11 +251,11 @@ public function checkweekdaysdatacron($hidstartweek_date,$hidendweek_date,$hidem
 
 			$totalDaysArray = array();
 			$totalDaysArray = array_merge($submittedtsdates,$holDates,$leaveDates,$weekendDates);
-			
+			//print_r($totalDaysArray);
 
 			$emptyDataDatesArray = array();
 			$emptyDataDatesArray = array_diff($weekDatesArray,$totalDaysArray);
-			
+			//echo '<pre>';print_r($emptyDataDatesArray);exit;
 			if(count($emptyDataDatesArray)>0)
 			{
 				$newemptyDataDatesArray=array();
@@ -247,12 +263,12 @@ public function checkweekdaysdatacron($hidstartweek_date,$hidendweek_date,$hidem
 				{
 					if($edate>=$empJoiningDate)
 					$newemptyDataDatesArray[]=$edate;
-				} 
+				} //print_r($newemptyDataDatesArray);exit;
 				return $newemptyDataDatesArray;
 			}
 			else
 			return array();
-			
+			// echo "<pre>";print_r($emptyDataDatesArray);exit;
 		}
 	}
 
@@ -288,9 +304,9 @@ public function getEmpLeaves($empid,$startday,$endday,$flag='')
 		->setIntegrityCheck(false)
 		->from(array('el' => 'main_leaverequest'),
 		array('from_date'=>'date_format(el.from_date,"%Y-%m-%d")','to_date'=>'date_format(el.to_date,"%Y-%m-%d")','leavetypeid'=>'el.leavetypeid','leavestatus'=>'el.leavestatus','leaveday'=>'el.leaveday','leave_req_id'=>'el.id'))
-	
+	//	->where("el.isactive=1 AND el.user_id=".$empid." AND el.leavestatus IN ('Approved','Pending for approval') AND  ((el.from_date >= '".$startday."' AND el.from_date <= '".$endday."') OR (el.to_date >= '".$startday."' AND el.to_date <= '".$endday."')) ");
 		->where("$where  el.isactive=1 AND el.user_id=".$empid." AND el.leavestatus IN ('Approved','Pending for approval') AND  ((el.from_date >= '".$startday."' AND el.from_date <= '".$endday."') OR (el.to_date >= '".$startday."' AND el.to_date <= '".$endday."')) ");
-	
+		//echo $select;	
 		return $this->fetchAll($select)->toArray();
 	}
 
@@ -305,13 +321,28 @@ public function getManagers()
       ELSE 'Employee' END END)"),'u.userfullname','u.emailaddress','u.employeeId'))
 		->joinInner(array('r'=>'main_roles'),"r.id = u.emprole",array())
 		->joinInner(array('g'=>'main_groups'),"g.id = r.group_id",array())
+		->where("u.isactive=1")
 		->group("u.user_id")
 		->having("tm_role = 'Manager'");;
 
 		return $this->fetchAll($select)->toArray();
 	}
 
-	
+	/*public function checkTmEnable()
+	{
+		$select = $this->select()
+		->setIntegrityCheck(false)
+		->from(array('m' => 'main_menu'),array())
+		->where("m.isactive=1 AND m.url='/timemanagement'");
+
+		$result = $this->fetchAll($select)->toArray();
+
+		if(count($result) > 0){
+			return true;
+		}else{
+			return false;
+		}
+	}*/
 	public function checkTmEnable()
 	{
 		$select = "select * from main_menu where isactive=1 AND url='/timemanagement'";
diff --git a/application/modules/timemanagement/views/scripts/configuration/add.phtml b/application/modules/timemanagement/views/scripts/configuration/add.phtml
new file mode 100644
index 000000000..9dc0d0a83
--- /dev/null
+++ b/application/modules/timemanagement/views/scripts/configuration/add.phtml
@@ -0,0 +1,137 @@
+<?php 
+/********************************************************************************* 
+ *  This file is part of Sentrifugo.
+ *  Copyright (C) 2014 Sapplica
+ *   
+ *  Sentrifugo is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Sentrifugo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Sentrifugo.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  Sentrifugo Support <support@sentrifugo.com>
+ ********************************************************************************/
+?>
+
+<?php
+if($this->nodata != '')
+{
+?>
+<div class="ml-alert-1-info m1-info-set-2">
+    <div class="style-1-icon info"></div>
+       Configuration already configured.
+</div>
+<?php 
+}
+else 
+{
+sapp_Global::generateClientValidations($this->form);?>
+<div id="error_message" style="display:none;"></div>
+
+<form name="<?php echo $this->form->getName(); ?>" id="<?php echo $this->form->getId(); ?>" action="<?php echo $this->form->getAction();?>" method="<?php echo $this->form->getMethod(); ?>">
+		<?php echo $this->form->id; ?>
+        <div class="total-form-controller">
+			
+			<div class="new-form-ui clearb">
+			  <label class="required">Weekly Submission Reminder</label>
+			      <div class="division"><?php //echo $this->form->timeformatid; ?>
+                        <select name="ts_weekly_reminder_day" id="ts_weekly_reminder_day">
+                                <option value="" example="">Select Weekly Reminder Day</option>
+                        <?php 
+                         $weekArray = array('sun'=>'Every Sunday','mon'=>'Every Monday','tue'=>'Every Tuesday','wed'=>'Every Wednesday','thu'=>'Every Thursday','fri'=>'Every Friday','sat'=>'Every Saturday');
+	                            foreach($weekArray as $key => $val)
+	                            {
+	                                $selected = ($key == $this->form->ts_weekly_reminder_day->getValue())?"selected":"";
+	                            	
+	                        ?>
+	                                <option value="<?php echo $key;?>" <?php echo $selected;?> example="<?php echo $val;?>" ><?php echo $val;?></option>
+	                        <?php
+	                            }
+	                        ?>
+                            </select>
+                        
+					<?php if(isset($this->msgarray['ts_weekly_reminder_day'])){?>
+					   <span class="errors" id="errors-ts_weekly_reminder_day"><?php echo $this->msgarray['ts_weekly_reminder_day'];?></span>
+					<?php }?>
+					</div>
+   			</div>
+   			
+   			<div class="new-form-ui clearb">
+			    <label class="required">Timesheet Blocking Range </label>
+				<div class="division"><?php echo $this->form->ts_block_dates_range; ?>
+				<?php if(isset($this->msgarray['ts_block_dates_range'])){?>
+				   <span class="errors" id="errors-<?php echo $this->form->ts_block_dates_range->getId(); ?>"><?php echo $this->msgarray['ts_block_dates_range'];?></span>
+				<?php }?>
+				</div>
+			</div>
+			
+			<div class='config_help'>
+			        <div class="h_txt">Weekly Submission Reminder: <span>Set a day in a week for mailing weekly reminders to notify your employees about sending their timesheets for approval. </span></div>
+					<div class="h_txt">Timesheet Blocking Range: <span>Set monthly timesheet blocking range<br/><br/>
+
+<span class="config_help_span_h">1st - End of month </span>
+<ol>
+<li>By the end of every month, all employees must submit their timesheets</li>
+<li>Two days of grace period i.e. 1st and 2nd of the next month, is provided to the employees to submit their timesheets. On 2nd of every month, a notification will be sent as a reminder about blocking the timesheet.</li>
+<li>On 3rd of every month, if the employees have not submitted their timesheets, their previous month's timesheet will be blocked.</li>
+</ol>
+<span class="config_help_span_h">26th previous month - 25th next month </span>
+<ol>
+<li>By 25th of every month, all employees must submit their timesheets.</li>
+<li>Two days of grace period i.e. 27th and 28th of the next month, is provided to the employees to submit their timesheets. On 27th of every month, a notification will be sent as a reminder about blocking the timesheet.</li>
+<li>On 28th of every month, if the employees have not submitted their timesheets, their previous month's timesheet will be blocked.</li>
+</ol>
+</span></div>
+			</div>
+
+    	<div class="new-form-ui-submit"  style="float: left; position: absolute; top: 95px; width: auto;">
+		<?php echo $this->form->submit; ?>
+		<button onclick="window.location.href='<?php echo BASE_URL; ?>timemanagement/configuration';" type="button" id="Cancel" name="Cancel">Cancel</button>
+		</div>
+</div>
+
+
+<script type="text/javascript" language="javascript">
+$(document).ready(function(){
+	<?php
+			if($this->nodata != '')
+			{
+			?>
+	// $('.breadcrumbs').append("<span class='arrows'>&rsaquo;</span><a href='http://localhost/hrmstm/index.php/timemanagement/configuration'>Configuration</a><span class='arrows'>&rsaquo;</span><span>Edit</span>");
+	 $('.breadcrumbs').append("<span class='arrows'>&rsaquo;</span><a href='<?php echo BASE_URL; ?>timemanagement/configuration'>Configuration</a><span class='arrows'>&rsaquo;</span><span>Edit</span>");
+	 
+	 <?php }else{?>
+	 //$('.breadcrumbs').append("<span class='arrows'>&rsaquo;</span><a href='http://localhost/hrmstm/index.php/timemanagement/configuration'>Configuration</a><span class='arrows'>&rsaquo;</span><span>Add</span>");
+	 $('.breadcrumbs').append("<span class='arrows'>&rsaquo;</span><a href='<?php echo BASE_URL; ?>timemanagement/configuration'>Configuration</a><span class='arrows'>&rsaquo;</span><span>Add</span>");
+	 
+	 <?php }?>
+    /*$('#ts_block_reminder_day').change(function(){
+        var val = $(this).val();
+        $('#errors-ts_block_reminder_day').html("");
+        if(($('#ts_blocking_day').val() != '') && val < $('#ts_blocking_day').val()){ 
+        	 $('#ts_block_reminder_day').after("<span class='errors' id='errors-ts_block_reminder_day'>Block Reminder Day should be less than Blocking day</span>");
+        }
+    });
+    
+    $('#ts_blocking_day').change(function(){
+    	var val = $(this).val();
+        $('#errors-ts_blocking_day').html("");
+        if(($('#ts_block_reminder_day').val() != '') && val < $('#ts_block_reminder_day').val()){ 
+        	 $('#ts_blocking_day').after("<span class='errors' id='errors-ts_blocking_day'>Blocking day should be greater than Block Reminder Day</span>");
+        }
+    });*/
+
+    
+});
+</script>    
+</form>
+<?php 
+}
+?>
diff --git a/application/modules/timemanagement/views/scripts/configuration/index.phtml b/application/modules/timemanagement/views/scripts/configuration/index.phtml
new file mode 100644
index 000000000..d4a2a9ed9
--- /dev/null
+++ b/application/modules/timemanagement/views/scripts/configuration/index.phtml
@@ -0,0 +1,113 @@
+<?php 
+/********************************************************************************* 
+ *  This file is part of Sentrifugo.
+ *  Copyright (C) 2014 Sapplica
+ *   
+ *  Sentrifugo is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Sentrifugo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Sentrifugo.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  Sentrifugo Support <support@sentrifugo.com>
+ ********************************************************************************/
+?>
+
+<?php 
+$sess_values = $this->sess_values;
+
+if (count($this->messages)) {?>
+    <div id="dispsyspref" class="settingssuccess">
+<?php 
+        foreach ($this->messages as $message)
+        {
+            $flag = array();				
+            $flag = array_keys($message);
+            echo "<div id='messageData' class='ml-alert-1-$flag[0]'><div style='display:block;'><span class='style-1-icon $flag[0]'></span>";
+            echo $message[$flag[0]];
+            echo "</div></div>";
+        } 
+?>
+    </div>	
+	
+<?php } ?>
+<span id="error_message"></span>
+<?php if(empty($this->dataArray)){?>
+      
+	  <div class="ml-alert-1-info m1-info-set" style="margin-top: 22px;">
+		  <div class="style-1-icon info">
+		  </div>Configuration is not yet set. 
+		<a href='<?php echo BASE_URL;?>timemanagement/configuration/add'>Click here</a>  to add the Configuration
+	  </div>
+	  
+<?php }else{?>
+<div class="total-form-controller project_view_page">
+<?php 
+if($this->admin == 'Yes')
+{
+  $weekArray = array('sun'=>'Sunday','mon'=>'Monday','tue'=>'Tuesday','wed'=>'Wednesday','thu'=>'Thursday','fri'=>'Friday','sat'=>'Saturday');
+?>
+    
+	<div style="margin-left: 0px; padding-top: 0px; padding-bottom: 20px;  float: none;" class="cofig_title">Configuration
+			<div style="margin-top: 0px; float: right; width: auto;" class="new-form-ui-submit ">
+				
+				
+				<input type="button" class="fltright" style="margin-right: 0px;" value="Edit" name="Back" onclick="window.location.href='<?php echo BASE_URL; ?>timemanagement/configuration/add';">
+			</div>
+	</div>
+<?php 
+}
+?>
+		<div class="config_table_div">
+			<table  cellspacing="0"  cellpadding="0" border="0" class="requisition-table view-table-data"  style="float: left; clear:none; ">
+				<tbody>
+				<tr class="req-no-form">
+					<td width="50%"><span class="head_txt">Weekly Submission Reminder</span></td>
+					<td width="50%"><?php echo 'Every '.$weekArray[htmlspecialchars($this->dataArray[0]['ts_weekly_reminder_day'])]; ?></td>
+				</tr>
+				<tr class="req-bg-form">
+					<td width="50%"><span class="head_txt">Timesheet Blocking Range</span></td>
+					<td width="50%"><?php echo (htmlspecialchars($this->dataArray[0]['ts_block_dates_range']) == '26-25')?'26th previous month - 25th next month':'1st - End of month'; ?></td>
+				</tr>
+				</tbody>
+			</table>
+		</div>			
+			<div class='config_help'>
+			        <div class="h_txt">Weekly Submission Reminder: <span>Set a day in a week for mailing weekly reminders to notify your employees about sending their timesheets for approval. </span></div>
+					<div class="h_txt">Timesheet Blocking Range: <span>Set monthly timesheet blocking range<br/><br/>
+						<span class="config_help_span_h">1st - End of month </span>
+						<ol>
+						<li>By the end of every month, all employees must submit their timesheets</li>
+						<li>Two days of grace period i.e. 1st and 2nd of the next month, is provided to the employees to submit their 
+						timesheets. On 2nd of every month, a notification will be sent as a reminder about blocking the timesheet.</li>
+						<li>On 3rd of every month, if the employees have not submitted their timesheets, their previous month's timesheet will be blocked.</li>
+						</ol>
+						<span class="config_help_span_h">26th previous month - 25th next month </span>
+						<ol>
+						<li>By 25th of every month, all employees must submit their timesheets.</li>
+						<li>Two days of grace period i.e. 27th and 28th of the next month, is provided to the employees to submit their timesheets. On 27th of every month, a notification will be sent as a reminder about blocking the timesheet.</li>
+						<li>On 28th of every month, if the employees have not submitted their timesheets, their previous month's timesheet will be blocked.</li>
+						</ol>
+						</span>
+                   </div>
+			</div>
+<?php } ?>
+</div>
+<script type='text/javascript'>
+$(document).ready(function(){
+	 $('.breadcrumbs').append("<span class='arrows'>&rsaquo;</span><span>Configuration</span>");
+<?php if (count($this->messages)) {?>
+      setTimeout(function(){
+			$('#dispsyspref').fadeOut('slow');
+		},3000);
+
+<?php } ?>
+});
+</script>
\ No newline at end of file
diff --git a/application/modules/timemanagement/views/scripts/employeeprojects/view.phtml b/application/modules/timemanagement/views/scripts/employeeprojects/view.phtml
index e93a3d421..f78de2485 100644
--- a/application/modules/timemanagement/views/scripts/employeeprojects/view.phtml
+++ b/application/modules/timemanagement/views/scripts/employeeprojects/view.phtml
@@ -35,14 +35,19 @@ else
 {
 $data = $this->data;
 $projectStatusArray = array('initiated'=>'Initiated','draft'=>'Draft','in-progress'=>'In Progress','hold'=>'Hold','completed'=>'Completed');
-?>
+
+	?>
+					
+
 <div class="total-form-controller project_view_page"> 
 	<div id="error_message" style="display:none;"></div>
+	
     <div style="margin-left: 0px; padding-top: 0px; padding-bottom: 20px;  float: none;" class="cofig_title">Project Details
 		<div style="margin-top: 0px; float: right; width: auto;" class="new-form-ui-submit ">
 			<div style="position: relative; float: right; top: 0px;" class="back-to-page">
 				<input type="button" style="margin-right: 0px;" value="Back" name="Back" onclick="window.location.href='<?php echo BASE_URL; ?>timemanagement/employeeprojects';">
-			</div>																
+			</div>								
+										
          </div>
 	 </div>
 		<table width="100%" cellspacing="0" cellpadding="0" border="0" class="requisition-table view-table-data">
@@ -56,9 +61,21 @@ $projectStatusArray = array('initiated'=>'Initiated','draft'=>'Draft','in-progre
 				<tr class="req-no-form">
 					<td><span class="head_txt">Description</span></td>
 					<td><?php echo $data[0]['description']; ?></td>
-				  <td><span class="head_txt">Project status</span></td>
+					<td><span class="head_txt">Project status</span></td>
 					<td><?php echo isset($projectStatusArray[$data[0]['project_status']])?$projectStatusArray[$data[0]['project_status']]:$data[0]['project_status']; ?></td>
 				</tr>
+				<tr class="req-bg-form">
+					<td><span class="head_txt">Start Date</span></td>
+					<td><?php echo $data[0]['start_date']; ?></td>
+					<td><span class="head_txt">End Date</span></td>
+					<td><?php echo $data[0]['end_date']; ?></td>
+				</tr>
+				<tr class="req-no-form">
+					<td><span class="head_txt">Estimated Hours </span></td>
+					<td><?php echo $data[0]['estimated_hrs']; ?></td>
+					<td></td>
+					<td></td>
+				</tr>
 				
 			</tbody>
 		</table>
diff --git a/application/modules/timemanagement/views/scripts/emptimesheets/accordion.ajax.phtml b/application/modules/timemanagement/views/scripts/emptimesheets/accordion.ajax.phtml
index 9ecf8f471..9c64b60f7 100644
--- a/application/modules/timemanagement/views/scripts/emptimesheets/accordion.ajax.phtml
+++ b/application/modules/timemanagement/views/scripts/emptimesheets/accordion.ajax.phtml
@@ -36,6 +36,7 @@ if('<?php echo $this->page;?>'==1 && '<?php echo sizeof($emplist); ?>' == '0')
 		$('#idhidweek_ac').val('<?php echo $hidweek;?>');
 	});
 	</script>
+	<!-- div class="emp_list" -->
 	<?php foreach ($emplist as $tmpEmp) { ?>
 			<div class="emp_approve_box">
 				<div class="emp_approve_box_left single_text_left">
@@ -43,13 +44,10 @@ if('<?php echo $this->page;?>'==1 && '<?php echo sizeof($emplist); ?>' == '0')
 				</div>
 				<div class="row_info">
 					<label>Status</label>
-					<span class="<?php if($tmpEmp['time_status'] == "For Approval"){?>for_approval<?php }?><?php if($tmpEmp['time_status'] == "Saved"){?>yet_to_submit<?php }?><?php if($tmpEmp['time_status'] == "No Entry"){?>no_entry<?php }?>">
+					<span class="<?php if($tmpEmp['time_status'] == "For Approval"){?>for_approval<?php }?><?php if($tmpEmp['time_status'] == "Rejected"){?>rejected<?php }?><?php if($tmpEmp['time_status'] == "Approved"){?>approved<?php }?><?php if($tmpEmp['time_status'] == "Blocked"){?>blocked<?php }?><?php if($tmpEmp['time_status'] == "Saved"){?>yet_to_submit<?php }?><?php if($tmpEmp['time_status'] == "No Entry"){?>no_entry<?php }?>">
 					<?php if($tmpEmp['time_status']=="Saved")
 					{
 						echo 'Yet to submit';
-					}else if($tmpEmp['time_status']=="For Approval"){
-						echo 'Submitted';
-						
 					}else {
 					echo $tmpEmp['time_status'];}?>
 					</span>
@@ -67,11 +65,24 @@ if('<?php echo $this->page;?>'==1 && '<?php echo sizeof($emplist); ?>' == '0')
 					</span>
 				</div>
 				<div class="left-btn-block">
-
+					<?php if($tmpEmp['time_status'] == "For Approval"){?>
+						<a class="approve-btn action_btn" href="javascript:void(0)" 
+							onclick="approveEmpTimesheet('<?php echo $selmn;?>','<?php echo $tmpEmp['emp_id'];?>','<?php echo $type;?>','<?php echo $hidweek;?>','<?php echo $manager_id;?>','grid','<?php echo $emp_list_flag; ?>');">
+							<i class="fa fa-check"></i> Approve</a>
+						<a class="reject-btn action_btn" href="javascript:void(0)" 
+							onclick="rejectEmpTimesheet('<?php echo $selmn;?>','<?php echo $tmpEmp['emp_id'];?>','<?php echo $type;?>','<?php echo $hidweek;?>','<?php echo $manager_id;?>','grid','<?php echo $emp_list_flag; ?>');">
+							<i class="fa fa-ban"></i> Reject</a>
+					<?php } else if($tmpEmp['time_status'] == "Blocked"){?>
+						<a class="approve-btn action_btn" href="javascript:void(0)" 
+							onclick="enableEmpTimesheet('<?php echo $selmn;?>','<?php echo $tmpEmp['emp_id'];?>','<?php echo $type;?>','<?php echo $hidweek;?>','<?php echo $manager_id;?>','grid','<?php echo $emp_list_flag; ?>');">
+							<i class="fa fa-check"></i> Enable</a>
+					<?php } else { ?>
 						<a href="javascript:void(0);"><i class="fa"></i></a>
+					<?php } ?>
 				</div>
 			 </div>
 	<?php } ?>
+	<!--  /div-->
 <?php  } else { ?>
 		<div id="emp_list"></div>
 <?php } ?>
diff --git a/application/modules/timemanagement/views/scripts/emptimesheets/displayweeks.ajax.phtml b/application/modules/timemanagement/views/scripts/emptimesheets/displayweeks.ajax.phtml
index 5478e8535..659d0b68d 100644
--- a/application/modules/timemanagement/views/scripts/emptimesheets/displayweeks.ajax.phtml
+++ b/application/modules/timemanagement/views/scripts/emptimesheets/displayweeks.ajax.phtml
@@ -19,17 +19,19 @@ $(document).ready(function(){
 </script>
 
 						<?php $currentMonth = date($selmn);
+	//$datesArray =  iterator_to_array(new DatePeriod(new DateTime("first sunday of $currentMonth"),
+    	 	//DateInterval::createFromDateString('next sunday'),new DateTime("last day of $currentMonth")));
 			
 			
 			$selectedYrMon = explode('-', $currentMonth);
-    
+      	//$selMonName = date('F', mktime(0, 0, 0, $selectedYrMon[1], 10)); 
       	$firstday = date("w", mktime(0, 0, 0, $selectedYrMon[1], 1, $selectedYrMon[0])); 
         $lastday = date("t", mktime(0, 0, 0, $selectedYrMon[1], 1, $selectedYrMon[0])); 
 		$noOfweeks = 1 + ceil(($lastday-7+$firstday)/7);
 		 
 		
 		$selWeek = $this->selWeek;
-	
+		//$nextMonth = $selectedYrMon[1]+1;
 		if($selectedYrMon[1] < 12) 
 			$nextMonth = $selectedYrMon[1]+1;
 		else 
@@ -38,6 +40,9 @@ $(document).ready(function(){
     	 	DateInterval::createFromDateString('next sunday'),new DateTime("first day of $selectedYrMon[0]-$nextMonth")));
 			
         
+//    	foreach($datesArray as $sunday) {
+//    			//echo $sunday->format("Y-m-d\n");
+//		}
 
 		$firstDay = DateTime::createFromFormat('Y-m-d', "$currentMonth".'-1');
 		$firstDayName =  $firstDay->format('D');
@@ -46,7 +51,7 @@ $(document).ready(function(){
 			
 		if($hidweek == 1) {
 			$startDate = $currentMonth."-1";
-			
+			//$weekStartDay = date('F d, Y', strtotime('last sunday', strtotime($startDate)));
 			$startDateName = date('D', strtotime($startDate));
 			if($startDateName != "Sun") {
 				$weekStartDay = date('F d, Y', strtotime('last sunday', strtotime($startDate)));
@@ -74,7 +79,7 @@ $(document).ready(function(){
 </ul>
 <?php if($cnt>1) { ?>
             <ul class="scroll_change week_select_list" style="display:none;">
-			
+			<!--<li class="prev_click"><i class="fa fa-arrow-left fa-2"></i></li>-->
 <?php       for($i=1;$i<=$cnt;$i++)           
             {
                 $starday_w=min($weeks[$i]);
@@ -82,19 +87,19 @@ $(document).ready(function(){
                 if($i!=$hidweek)
                 {    
 ?>                      <li><a href="javascript:void(0)" onclick="display_weeks_monthly('<?php echo $selmn;?>','<?php echo $manager_id;?>','<?php echo $search;?>','<?php echo $clicked_status;?>','<?php echo $i;?>' );"><span class="main_txt"> Week-<?php echo $i;?></span>
-
+<!--<span class="sub_txt"> <?php //echo $weekStartDay." - ".$weekendDay; ?></span>-->
 </a></li>
 <?php           }
                 else 
                 {
 ?>                      <li class="active"><div id="week_selected"><span class="main_txt">Week-<?php echo $i;?></span>
-						
+						<!--<span class="sub_txt"> <?php //echo $weekStartDay." - ".$weekendDay; ?></span>-->
 						</div></li>
 <?php                        
                 }
             }   
 ?>
-
+<!--<li class="next_click"><i class="fa fa-arrow-right fa-2"></i></li>-->
             </ul>
 			<?php } ?>
 </div>
diff --git a/application/modules/timemanagement/views/scripts/emptimesheets/empdisplayweeks.ajax.phtml b/application/modules/timemanagement/views/scripts/emptimesheets/empdisplayweeks.ajax.phtml
index 4501cb27d..589eafbc9 100644
--- a/application/modules/timemanagement/views/scripts/emptimesheets/empdisplayweeks.ajax.phtml
+++ b/application/modules/timemanagement/views/scripts/emptimesheets/empdisplayweeks.ajax.phtml
@@ -31,14 +31,14 @@ $(document).ready(function(){
 
 
 $selectedYrMon = explode('-', $currentMonth);
-      	
+      	//$selMonName = date('F', mktime(0, 0, 0, $selectedYrMon[1], 10)); 
       	$firstday = date("w", mktime(0, 0, 0, $selectedYrMon[1], 1, $selectedYrMon[0])); 
         $lastday = date("t", mktime(0, 0, 0, $selectedYrMon[1], 1, $selectedYrMon[0])); 
 		$noOfweeks = 1 + ceil(($lastday-7+$firstday)/7);
 		 
 		
 		$selWeek = $this->selWeek;
-		
+		//$nextMonth = $selectedYrMon[1]+1;
 		if($selectedYrMon[1] < 12) 
 			$nextMonth = $selectedYrMon[1]+1;
 		else 
@@ -46,7 +46,13 @@ $selectedYrMon = explode('-', $currentMonth);
 		$datesArray =  iterator_to_array(new DatePeriod(new DateTime("first sunday of $currentMonth"),
     	 	DateInterval::createFromDateString('next sunday'),new DateTime("first day of $selectedYrMon[0]-$nextMonth")));
 
-	
+	//$datesArray =  iterator_to_array(new DatePeriod(new DateTime("first sunday of $currentMonth"),
+    	 	//DateInterval::createFromDateString('next sunday'),new DateTime("last day of $currentMonth")));
+        
+//    	foreach($datesArray as $sunday) {
+//    			//echo $sunday->format("Y-m-d\n");
+//		}
+
 		$firstDay = DateTime::createFromFormat('Y-m-d', "$currentMonth".'-1');
 		$firstDayName =  $firstDay->format('D');
 		$wCounter = 1;
@@ -54,7 +60,7 @@ $selectedYrMon = explode('-', $currentMonth);
 			
 		if($hidweek == 1) {
 			$startDate = $currentMonth."-1";
-			
+			//$weekStartDay = date('F d, Y', strtotime('last sunday', strtotime($startDate)));
 			$startDateName = date('D', strtotime($startDate));
 			if($startDateName != "Sun") {
 				$weekStartDay = date('F d, Y', strtotime('last sunday', strtotime($startDate)));
@@ -85,7 +91,7 @@ $selectedYrMon = explode('-', $currentMonth);
 
 <?php if($cnt>1) { ?>
 		<ul class="scroll_change week_select_list" style="display:none;">
-			
+			<!--<li class="prev_click"><i class="fa fa-arrow-left fa-2"></i></li>-->
 <?php       for($i=1;$i<=$cnt;$i++)           
             {
                 $starday_w=min($weeks[$i]);
@@ -101,7 +107,7 @@ $selectedYrMon = explode('-', $currentMonth);
                 }
             }   
 ?>
-
+<!--<li class="next_click"><i class="fa fa-arrow-right fa-2"></i></li>-->
             </ul>
 			<?php } ?>
 			
diff --git a/application/modules/timemanagement/views/scripts/emptimesheets/employeetimesheet.phtml b/application/modules/timemanagement/views/scripts/emptimesheets/employeetimesheet.phtml
index fd1d43fdd..dfbb5ffc9 100644
--- a/application/modules/timemanagement/views/scripts/emptimesheets/employeetimesheet.phtml
+++ b/application/modules/timemanagement/views/scripts/emptimesheets/employeetimesheet.phtml
@@ -72,10 +72,13 @@ $(document).ready(function(){
 	<div class="left_container">
     	<div class="emp_approve_box">
         	<div class="emp_approve_box_left">
-            	
+            	<!-- label>Employee</label -->
                 <span id="emp_name"></span>
             </div>
-            
+            <!-- div class="emp_approve_box_right">
+           		 <label>Total Hours</label>
+                <span id="emp_total_hours">00:00</span>
+            </div -->
             <div class="row_info">
             	<label>Status</label>
                 <span class="no_entry" id="emp_timesheet_status"></span>
@@ -92,8 +95,8 @@ $(document).ready(function(){
 		<div class="control_option cal_single_view flt_lft">
 		
 			<ul id="monthweek" class="month_view_link">
-				 <li class="link_txt" <?php if($type == "month") { ?> class="dis_none" <?php } ?> id="month" title="Month">Month View</li>
-		         <li class="link_txt" <?php if($type == "week") { ?> class="dis_none" <?php } ?>id="week" title="Week">Week View</li>
+				 <li class="link_txt" <?php if($type == "month") { ?> class="dis_none" <?php } ?> id="month" title="Month">Monthly View</li>
+		         <li class="link_txt" <?php if($type == "week") { ?> class="dis_none" <?php } ?>id="week" title="Week">Weekly View</li>
 			</ul>
 		
 			<div class="new-form-ui month_picker" id="show_cal" style='display:none;'>
@@ -129,6 +132,7 @@ if(str_type=='month')
 }
 	options = {
 	    pattern: 'yyyy-mm', // Default is 'mm/yyyy' and separator char is not mandatory
+	   // selectedYear: <?php echo date('Y');?>,
 	    selectedYear: <?php echo (isset($selectedYrMon[0]))?$selectedYrMon[0]:date('Y');?>,
 	    startYear: <?php echo $min_year;?>,
 	    finalYear: <?php echo date('Y');?>,
diff --git a/application/modules/timemanagement/views/scripts/emptimesheets/emptimesheetmonthly.ajax.phtml b/application/modules/timemanagement/views/scripts/emptimesheets/emptimesheetmonthly.ajax.phtml
index e4f941dd0..1f998dbfc 100644
--- a/application/modules/timemanagement/views/scripts/emptimesheets/emptimesheetmonthly.ajax.phtml
+++ b/application/modules/timemanagement/views/scripts/emptimesheets/emptimesheetmonthly.ajax.phtml
@@ -65,8 +65,37 @@ $(document).ready(function () {
   	var empDojYr = dt.getFullYear();
   	var empDojMon = dt.getMonth();
 
+  	function contextMenuItems(dayStatus) {
+  	  	var menUItems = {
+  	    	  	"approve": {name: "Approve Timesheet"},
+  	    	  	"reject": {name: "Reject Timesheet"}
+  	    		};	        
+ 	    return menUItems;
+	} 
 
-
+    $('.month_view td').each(function(index){
+        var td_id=$(this).attr('id');      		
+		var inativeClass = $(this).hasClass('inactive_td');
+		var dayStatus = $(this).find('.sheet_status').text();			
+		var emplistflag = $('#emplistflag').val();
+		if(td_id != undefined && !inativeClass){
+			var day = $(this).children('.date').text();			   
+			if(dayStatus == "For Approval" ){
+				$.contextMenu({
+					selector: "#"+td_id,
+					items:  contextMenuItems (dayStatus),
+					callback: function(key, options) {
+						if(key == 'approve') {
+							approveEmpDayTimesheet('<?php echo $selmn;?>','<?php echo $emp_id;?>',day,'month',emplistflag);
+						}
+						if(key == 'reject') {
+							rejectEmpDayTimesheet('<?php echo $selmn;?>','<?php echo $emp_id;?>',day,'month',emplistflag);
+						}
+	            	}
+	    	     });
+			   }
+			}
+    });
 });
 
 function emp_display_weeks_for_day(weekNo,day)
@@ -75,7 +104,7 @@ function emp_display_weeks_for_day(weekNo,day)
 	var manager_id=$('#manager_id').val();
 	var emp_list_flag = '<?php echo $emplistflag; ?>';
 	var selmn = '<?php echo $selmn;?>';
-
+	//$("#month").css("display", "block");
 	$("#week").addClass("dis_none");
 	$( "#month" ).removeClass( "dis_none" );
 	$("#show_cal").css("display", "block");
@@ -110,12 +139,14 @@ if(strlen($empMinsPart.'') == 1) $empMinsPart = '0'.$empMinsPart;?>
 <input	type="hidden" name="empid" id="empid"	value="<?php  echo $this->empid;?>" />
  <input type="hidden" name="calSelYrMonth" id="calSelYrMonth" />
  <div class="calender_view_div"> 
+	<!-- div class="project_time"><i class="fa fa-clock-o fa-1"></i>Project Time</div>
+	<div class="export_time"><i class="fa fa-share fa-1"></i>Export Time Sheet</div -->
 <table class="month_view" width="100%" border="0" cellspacing="0" cellpadding="0">
         <tbody>
           <tr>          
             <th class="month_name_dsp" colspan="7">
 			
-
+			<!--<span class="month_name_disp"><?php //echo $selMonName." ".$selectedYrMon[0]?></span>-->
 			<span class="month_name_disp">
 		   <span class="control_option cal_single_view flt_lft">
 		   <div class="new-form-ui month_picker">
@@ -125,11 +156,11 @@ if(strlen($empMinsPart.'') == 1) $empMinsPart = '0'.$empMinsPart;?>
 			</div> 
 	    </div>
 		</span>
-</span>
+		<?php //echo $selMonName." ".$selectedYrMon[0]?></span>
 			
 			<div class="total_hrs_display total_hrs-50">
 	Total Hours -
-
+	<?php  //echo $this->empTotalHrs;?>
 	<?php  echo $empHrsPart.':'.$empMinsPart;?>
 </div></th>
           </tr>
@@ -147,7 +178,7 @@ if(strlen($empMinsPart.'') == 1) $empMinsPart = '0'.$empMinsPart;?>
           	$empHolidaysWeekends = $this->empHolidaysWeekends;
           	$weekend_start =  $empHolidaysWeekends['weekend_startday'];
           	$weekend_end =  $empHolidaysWeekends['weekend_endday'];
-
+          	//$weekendsArray = array($weekend_start,$weekend_end);
           	$weekendsArray = array();
           	if($weekend_start != '') {
           		$weekendsArray[]= $weekend_start;
@@ -197,12 +228,12 @@ if(strlen($empMinsPart.'') == 1) $empMinsPart = '0'.$empMinsPart;?>
         			 	   		
         		}        	
         	}
-
+        	//print_r($leavesArray);
           	$weekdays = array( 'Sun','Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');
           	$statusClasses = array('no_entry'=>'no_entry','saved'=>'yet_to_submit','approved'=>'approved',
-          		'submitted'=>'for_approval');
+          		'submitted'=>'for_approval','enabled'=>'enabled','rejected'=>'rejected','blocked'=>'blocked');
           	$statusText = array('no_entry'=>'No Entry','saved'=>'Yet to submit','approved'=>'Approved',
-          		'submitted'=>'Submitted');
+          		'submitted'=>'For Approval','enabled'=>'Enabled','rejected'=>'Rejected','blocked'=>'Blocked');
 
           	$dayCounter = 1;
           	for($i = 1; $i <= $noOfweeks; $i++) { 
@@ -241,6 +272,7 @@ if(strlen($empMinsPart.'') == 1) $empMinsPart = '0'.$empMinsPart;?>
           				
           				$duration = ($weekData != "")?$weekData[strtolower($dayName).'_duration']:"00:00";
           				$status = ($weekData != "")?$weekData[strtolower($dayName).'_status']:'no_entry'; 
+						$rejected_note = ($weekData != "")?$weekData[strtolower($dayName).'_reject_note']:''; 
           				$calDate = $selectedYrMon[0].'-'.$selectedYrMon[1].'-'.$dayCounter;
           				$holiday = (in_array($calDate,$holidayDates))?"H":"";
           				if((in_array($calDate,$holidayDates))){
@@ -250,7 +282,7 @@ if(strlen($empMinsPart.'') == 1) $empMinsPart = '0'.$empMinsPart;?>
           					
           				} 
           				$keys = array_keys($weekdays, $day);
-
+          				//$weekendClass = (in_array($keys[0],$weekendsArray))?" weekend_td":"";
           				if(!empty($weekendsArray))       				
           					$weekendClass = (in_array($keys[0],$weekendsArray))?" weekend_td":"";
           				else 
@@ -279,10 +311,10 @@ if(strlen($empMinsPart.'') == 1) $empMinsPart = '0'.$empMinsPart;?>
           		 	<td  style="cursor: pointer; cursor: hand;" onclick="emp_display_weeks_for_day(<?php  echo $i;?>,<?php echo $dayCounter;?>);" id="id_day_<?php echo  $dayCounter; ?>" <?php echo $tdClass; ?> ><span class="date"><?php echo  $dayCounter; ?></span><div class="hrs_displ"><span class="hrs_txt">Hours</span><span class="time_disp"><?php echo $duration;?></span></div>
 					<?php } ?>
           		 	<?php  
-
+          		 	//$leave = (in_array($dayCounter, $leavesArray))?"L":"";
           		 	$leave = "";
           			$leaveType = ""; 
-
+          			//print_r($leavesArray);        			
 					foreach($leavesArray as $k=>$v) {
 									
 					    if(preg_match("/\b$dayCounter\b/i", $v)) {					       
@@ -321,8 +353,16 @@ if(strlen($empMinsPart.'') == 1) $empMinsPart = '0'.$empMinsPart;?>
 
           		 		if(!strpos($tdClass, "inactive_td")) {	
           		 	?>
-	
-          		 	<div class="sheet_status <?php echo $statusClasses[$status];?>"><?php echo ($statusText[$status] == "Blocked")?"Not Submitted":$statusText[$status];?></div></td>
+					<?php $class = '';
+					$tdata='';
+					$span='';
+					if($status == 'rejected') { 
+					$class = 'rejected_note';
+					$span = "<span class = 'note_tool_date'>".(isset($rejected_note) && $rejected_note!='')?$rejected_note:''."</span>";
+					$tdata='data-powertip="'.$span.'"';
+					}?>
+					<!--<input type="hidden" name="txt_rej_note" id="txt_rej_note" value="<?php //echo (isset($rejected_note) && $rejected_note!='')?$rejected_note:'';?>">-->
+          		 	<div class="sheet_status <?php echo $statusClasses[$status];?> <?php echo $class;?>" <?php echo $tdata;?>><?php echo ($statusText[$status] == "Blocked")?"Not Submitted":$statusText[$status];?></div></td>
           		<?php 
           		 		} else {
           		?>
@@ -346,12 +386,15 @@ if(strlen($empMinsPart.'') == 1) $empMinsPart = '0'.$empMinsPart;?>
       </table>
  </div>
 <script type="text/javascript">
-
+//$(".rejected_note").mouseover(function(){
+//var id = $('.rejected_note').attr('rej_text');
+//alert(id);
+//});
 
 $(document).ready(function(){
 options = {
 	    pattern: 'yyyy-mm', // Default is 'mm/yyyy' and separator char is not mandatory
-
+	    //selectedYear: <?php echo date('Y');?>,
 	    selectedYear: <?php echo (isset($selectedYrMon[0]))?$selectedYrMon[0]:date('Y');?>,
 	    startYear: <?php echo $min_year;?>,
 	    finalYear: <?php echo date('Y');?>,
@@ -361,7 +404,7 @@ options = {
 	    var year_month=$('#start_dates').val();
 	    var selmn_split=year_month.split('-');
 	    var month_names=new Array('','January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December');
-
+	  //  $('#start_dates').val(month_names[parseFloat(selmn_split[1])]+'-'+selmn_split[0])
 	    $('#start_dates').val(month_names[parseFloat(selmn_split[1])]+' '+selmn_split[0])
 	    $('#idhidselmn').val(year_month); 
 	    var act=$( "#idempaccordion" ).accordion( "option", "active");
@@ -379,11 +422,11 @@ options = {
             dmonth='0'+dmonth;
         }
         var dselmn=dyear+'-'+dmonth;  
-
+       // console.log(" selected yr mon "+year_month); 
         $("#calSelYrMonth").val(year_month);
-
+       // monthlyView();
 	   var emplistflag = $('#emplistflag').val();
-
+	   //displayEmpTimesheetMonthly('<?php echo $selYrMon;?>',emplistflag);
 	   displayEmpTimesheetMonthly(year_month,emplistflag);
      
 	
@@ -427,7 +470,24 @@ options = {
     $('#start_dates').val(month_names[parseFloat(selmn_split[1])]+' '+selmn_split[0]);
 	$('#start_date').val($('#start_dates').val());
 	
+	//alert($('#start_dates').val());
+    // var emplistflag = $('#emplistflag').val();
+	// if('<?php echo $type;?>' == "month"){
+		// displayEmpTimesheetMonthly('<?php echo $selYrMon;?>',emplistflag);
+	// }else{
+		// emp_display_weeks_monthly('<?php echo $selYrMon;?>','<?php echo $data->id;?>','<?php echo $hidweek;?>',emplistflag);
+	// }
+
+	        $('.rejected_note').powerTip({
+	                placement: 'e',
+	                mouseOnToPopup: true,
+	                smartPlacement: true
+	        });
+	
+
+	// $('[data-toggle="tooltip"]').tooltip();
 	 var emp_timesheet_status = '<?php  echo (isset($empData[0]['time_status']) && $empData[0]['time_status']!='')?$empData[0]['time_status']:'' ;?>';
+	 /*$('#emp_total_hours').html('<?php  echo $this->empTotalHrs;?>');*/
 	 $('#emp_manager_name').html('<?php  echo (isset($empData[0]['reporting_manager']) && $empData[0]['reporting_manager']!='')?$empData[0]['reporting_manager']:'' ;?>');
 	 $('#emp_name').html('<?php  echo (isset($empData[0]['emp_name']) && $empData[0]['emp_name']!='')?$empData[0]['emp_name']:'' ; ?>');
 
@@ -436,24 +496,37 @@ options = {
 	 if(emp_timesheet_status == "For Approval"){
 		 status_class = "for_approval";
 	 }
+
+	 if(emp_timesheet_status == "Approved"){
+		 status_class = "approved";
+	 }
+	 
 	 if(emp_timesheet_status == "Saved"){
 		 status_class = "yet_to_submit";
 	 }
 
+	 if(emp_timesheet_status == "Rejected"){
+		 status_class = "rejected";
+	 }
+
+	 if(emp_timesheet_status == "Blocked"){
+		 status_class = "blocked";
+	 }
 	var emp_status = emp_timesheet_status;
 	 if(emp_timesheet_status=='Saved')
 	 {
 		emp_status='Yet to submit';
 	 }
-	 if(emp_timesheet_status=='For Approval')
-	 {
-		emp_status='Submitted';
-	 } 
-	
 	 $( "#emp_timesheet_status" ).attr('class','').addClass(status_class);
 	 $('#emp_timesheet_status').html(emp_status);
-
+	 
+	 if(emp_timesheet_status=="For Approval"){
+		 $('#emp_buttons_display').html('<span class="emp_tme_pre_dis">Monthly</span><a class="approve-btn action_btn" href="javascript:void(0);" onclick="approveEmpTimesheet(\'<?php echo $selmn;?>\',\'<?php echo $emp_id;?>\',\'<?php echo $type;?>\',\'<?php echo $hidweek;?>\',\'<?php echo $manager_id;?>\',\'monthly\',\'<?php echo $emplistflag;?>\');"><i class="fa fa-check" style=""></i> Approve</a><a class="reject-btn action_btn" href="javascript:void(0);" onclick="rejectEmpTimesheet(\'<?php echo $selmn;?>\',\'<?php echo $emp_id;?>\',\'<?php echo $type;?>\',\'<?php echo $hidweek;?>\',\'<?php echo $manager_id;?>\',\'monthly\',\'<?php echo $emplistflag;?>\');"><i class="fa fa-ban" style=""></i> Reject</a>');
+	 }else if(emp_timesheet_status=="Blocked"){
+		 $('#emp_buttons_display').html('<span class="emp_tme_pre_dis">Monthly</span><a class="approve-btn action_btn" href="javascript:void(0);" onclick="enableEmpTimesheet(\'<?php echo $selmn;?>\',\'<?php echo $emp_id;?>\',\'<?php echo $type;?>\',\'<?php echo $hidweek;?>\',\'<?php echo $manager_id;?>\',\'monthly\',\'<?php echo $emplistflag;?>\');"><i class="fa fa-check" style=""></i> Enable</a>');
+	 }else{
 		 $('#emp_buttons_display').html("");
+	 }
 	 
 	 $('#idweek_status_display').html("");
 });
diff --git a/application/modules/timemanagement/views/scripts/emptimesheets/emptimesheetweekly.ajax.phtml b/application/modules/timemanagement/views/scripts/emptimesheets/emptimesheetweekly.ajax.phtml
index f2014e14a..d8baed3d1 100644
--- a/application/modules/timemanagement/views/scripts/emptimesheets/emptimesheetweekly.ajax.phtml
+++ b/application/modules/timemanagement/views/scripts/emptimesheets/emptimesheetweekly.ajax.phtml
@@ -45,8 +45,11 @@
 	  var selDay = "<?php echo strtolower($this->selDay);?>";	 
 	  
 	  function  showNote(day) {	
+		  //jAlert(note, day+' Note');
 		  var day = day.substring(0,3).toLowerCase();
-
+			
+//		  $('.daily_note').hide();
+//		  $('#'+day+'_note').show();
 		  var isNoteOpen = $('#'+day+'_note').is(':visible');
 		  if(!isNoteOpen) {
 			  $('.enter_note').hide();		 
@@ -155,12 +158,13 @@
 		$noOfweeks = 1 + ceil(($lastday-7+$firstday)/7);
 
 		$selWeek = $this->selWeek;
-		
+		//$nextMonth = $selectedYrMon[1]+1;
 		if($selectedYrMon[1] < 12) 
 			$nextMonth = $selectedYrMon[1]+1;
 		else 
 			$nextMonth = $selectedYrMon[1];
-		
+		//$datesArray =  iterator_to_array(new DatePeriod(new DateTime("first sunday of $currentMonth"),
+    	 	//DateInterval::createFromDateString('next sunday'),new DateTime("last day of $currentMonth")));
 			
 			$datesArray =  iterator_to_array(new DatePeriod(new DateTime("first sunday of $currentMonth"),
     	 	DateInterval::createFromDateString('next sunday'),new DateTime("first day of $selectedYrMon[0]-$nextMonth")));
@@ -172,7 +176,7 @@
 			
 		if($selWeek == 1) {
 			$startDate = $currentMonth."-1";
-			
+			//$weekStartDay = date('F d, Y', strtotime('last sunday', strtotime($startDate)));
 			$startDateName = date('D', strtotime($startDate));
 			if($startDateName != "Sun") {
 				$weekStartDay = date('F d, Y', strtotime('last sunday', strtotime($startDate)));
@@ -188,8 +192,8 @@
         $calWeekNo = strftime('%U',strtotime($weekStartDay));
                
       	$weekDaysStatus = $this->weekDaysStatus;
-      	$statusClasses = array('No Entry'=>'no_entry','Yet to submit'=>'yet_to_submit',
-          		'For Approval'=>'for_approval');     
+      	$statusClasses = array('No Entry'=>'no_entry','Yet to submit'=>'yet_to_submit','Approved'=>'approved',
+          		'For Approval'=>'for_approval','Enabled'=>'enabled','Rejected'=>'rejected','Blocked'=>'blocked');     
 
 ?>
      
@@ -202,6 +206,12 @@
         <?php
         	$selDay = $this->selDay;
 			$sunDay = date('d M, Y', strtotime($weekStartDay));
+//			$monDay = date('d M, Y', strtotime('next day', strtotime($sunDay)));
+//			$tueDay = date('d M, Y', strtotime('next day', strtotime($monDay)));
+//			$wedDay = date('d M, Y', strtotime('next day', strtotime($tueDay)));
+//			$thuDay = date('d M, Y', strtotime('next day', strtotime($wedDay)));
+//			$friDay = date('d M, Y', strtotime('next day', strtotime($thuDay)));
+//			$satDay = date('d M, Y', strtotime('next day', strtotime($friDay)));
 			$monDay = date('d M, Y', strtotime("$weekStartDay +1 day"));
 			$tueDay = date('d M, Y', strtotime("$weekStartDay +2 day"));
 			$wedDay = date('d M, Y', strtotime("$weekStartDay +3 day"));
@@ -308,6 +318,7 @@
 				}
         		$leaveOrHol = (in_array($d, $leavesArray))?$leaveType:"";
         	}
+        	//$leaveOrHol = (in_array($d, $leavesArray))?"L":(in_array($d, $holidaysArray))?"H":"";
         	if($leaveOrHol != "") {
         	    if($leaveOrHol == 'H'){
         			$tooltip = $holName; 
@@ -704,7 +715,86 @@
         
         <th class="total_pro_hrs_txt">Hours</th>
       </tr>
-
+     <?php 
+     	if(sizeof($weekDaysStatus)>0 && (($weekDaysStatus[0]['sun_status'] == "For Approval") || ($weekDaysStatus[0]['mon_status'] == "For Approval") ||
+     		($weekDaysStatus[0]['tue_status'] == "For Approval") || ($weekDaysStatus[0]['wed_status'] == "For Approval") ||
+     		($weekDaysStatus[0]['thu_status'] == "For Approval") || ($weekDaysStatus[0]['fri_status'] == "For Approval") ||
+     		($weekDaysStatus[0]['sat_status'] == "For Approval")) ){?>
+	 <tr class="mark_leave_col">
+        <td>&nbsp;</td>
+        <td id="td_sun_0" class="<?php echo $weekendSunClass; ?>">
+        	<?php if($weekDaysStatus[0]['sun_status'] == "For Approval" ) { ?>
+      			<a class="approve-btn action_btn" title="Approve" href="javascript:void(0);" 
+      				onclick="approveEmpDayTimesheet('<?php echo $selmn;?>','<?php echo $emp_id;?>','<?php echo date('d', strtotime($sunDay))?>','week','<?php echo $emplistflag;?>');"><i class="fa fa-check"></i></a>
+      			<a class="reject-btn action_btn"  title="Reject" href="javascript:void(0);" 
+      				onclick="rejectEmpDayTimesheet('<?php echo $selmn;?>','<?php echo $emp_id;?>','<?php echo date('d', strtotime($sunDay))?>','week','<?php echo $emplistflag;?>');"><i class="fa fa-ban"></i></a>
+      		<?php }else{?>
+      		&nbsp;
+      		<?php }?>
+        </td>
+        <td id="td_mon_0" class="<?php echo $weekendMonClass; ?>">
+        	<?php if($weekDaysStatus[0]['mon_status'] == "For Approval" ) { ?>
+      			<a class="approve-btn action_btn" title="Approve" href="javascript:void(0);" 
+      				onclick="approveEmpDayTimesheet('<?php echo $selmn;?>','<?php echo $emp_id;?>','<?php echo date('d', strtotime($monDay))?>','week','<?php echo $emplistflag;?>');"><i class="fa fa-check"></i></a>
+      			<a class="reject-btn action_btn"  title="Reject" href="javascript:void(0);" 
+      				onclick="rejectEmpDayTimesheet('<?php echo $selmn;?>','<?php echo $emp_id;?>','<?php echo date('d', strtotime($monDay))?>','week','<?php echo $emplistflag;?>');"><i class="fa fa-ban"></i></a>
+      		<?php }else{?>
+      		&nbsp;
+      		<?php }?>
+      	</td>
+        <td id="td_tue_0" class="<?php echo $weekendTueClass; ?>">
+        	<?php if($weekDaysStatus[0]['tue_status'] == "For Approval" ) { ?>
+      			<a class="approve-btn action_btn" title="Approve" href="javascript:void(0);" 
+      				onclick="approveEmpDayTimesheet('<?php echo $selmn;?>','<?php echo $emp_id;?>','<?php echo date('d', strtotime($tueDay))?>','week','<?php echo $emplistflag;?>');"><i class="fa fa-check"></i></a>
+      			<a class="reject-btn action_btn"  title="Reject" href="javascript:void(0);" 
+      				onclick="rejectEmpDayTimesheet('<?php echo $selmn;?>','<?php echo $emp_id;?>','<?php echo date('d', strtotime($tueDay))?>','week','<?php echo $emplistflag;?>');"><i class="fa fa-ban"></i></a>
+      		<?php }else{?>
+      		&nbsp;
+      		<?php }?>
+        </td>
+        <td id="td_wed_0" class="<?php echo $weekendWedClass; ?>">
+        	<?php if($weekDaysStatus[0]['wed_status'] == "For Approval" ) { ?>
+      			<a class="approve-btn action_btn" title="Approve" href="javascript:void(0);" 
+      				onclick="approveEmpDayTimesheet('<?php echo $selmn;?>','<?php echo $emp_id;?>','<?php echo date('d', strtotime($wedDay))?>','week','<?php echo $emplistflag;?>');"><i class="fa fa-check"></i></a>
+      			<a class="reject-btn action_btn"  title="Reject" href="javascript:void(0);" 
+      				onclick="rejectEmpDayTimesheet('<?php echo $selmn;?>','<?php echo $emp_id;?>','<?php echo date('d', strtotime($wedDay))?>','week','<?php echo $emplistflag;?>');"><i class="fa fa-ban"></i></a>
+      		<?php }else{?>
+      		&nbsp;
+      		<?php }?>
+        </td>
+        <td id="td_thu_0" class="<?php echo $weekendThuClass; ?>">
+        	<?php if($weekDaysStatus[0]['thu_status'] == "For Approval" ) { ?>
+      			<a class="approve-btn action_btn" title="Approve" href="javascript:void(0);" 
+      				onclick="approveEmpDayTimesheet('<?php echo $selmn;?>','<?php echo $emp_id;?>','<?php echo date('d', strtotime($thuDay))?>','week','<?php echo $emplistflag;?>');"><i class="fa fa-check"></i></a>
+      			<a class="reject-btn action_btn"  title="Reject" href="javascript:void(0);" 
+      				onclick="rejectEmpDayTimesheet('<?php echo $selmn;?>','<?php echo $emp_id;?>','<?php echo date('d', strtotime($thuDay))?>','week','<?php echo $emplistflag;?>');"><i class="fa fa-ban"></i></a>
+      		<?php }else{?>
+      		&nbsp;
+      		<?php }?>
+        </td>
+        <td id="td_fri_0" class="<?php echo $weekendFriClass; ?>">
+        	<?php if($weekDaysStatus[0]['fri_status'] == "For Approval" ) { ?>
+      			<a class="approve-btn action_btn" title="Approve" href="javascript:void(0);" 
+      				onclick="approveEmpDayTimesheet('<?php echo $selmn;?>','<?php echo $emp_id;?>','<?php echo date('d', strtotime($friDay))?>','week','<?php echo $emplistflag;?>');"><i class="fa fa-check"></i></a>
+      			<a class="reject-btn action_btn"  title="Reject" href="javascript:void(0);" 
+      				onclick="rejectEmpDayTimesheet('<?php echo $selmn;?>','<?php echo $emp_id;?>','<?php echo date('d', strtotime($friDay))?>','week','<?php echo $emplistflag;?>');"><i class="fa fa-ban"></i></a>
+      		<?php }else{?>
+      		&nbsp;
+      		<?php }?>
+        </td>
+        <td id="td_sat_0" class="<?php echo $weekendSatClass; ?>">
+        	<?php if($weekDaysStatus[0]['sat_status'] == "For Approval" ) { ?>
+      			<a class="approve-btn action_btn" title="Approve" href="javascript:void(0);" 
+      				onclick="approveEmpDayTimesheet('<?php echo $selmn;?>','<?php echo $emp_id;?>','<?php echo date('d', strtotime($satDay))?>','week','<?php echo $emplistflag;?>');"><i class="fa fa-check"></i></a>
+      			<a class="reject-btn action_btn"  title="Reject" href="javascript:void(0);" 
+      				onclick="rejectEmpDayTimesheet('<?php echo $selmn;?>','<?php echo $emp_id;?>','<?php echo date('d', strtotime($satDay))?>','week','<?php echo $emplistflag;?>');"><i class="fa fa-ban"></i></a>
+      		<?php }else{?>
+      		&nbsp;
+      		<?php }?>
+        </td>
+        <td>&nbsp;</td>
+      </tr>
+      <?php } ?>
 	   <?php 
       		$i = 1;
       		$j = 1;
@@ -862,90 +952,115 @@
       
       <tr class="week_status_tr">
         <td></td>
-
-        <td class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sun_status']:"No Entry"];?>">
         <?php 
-        	//$sunDate = date('Y-m-d', strtotime($sunDay));   
-        	$sunStatus  = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sun_status']:"No Entry"; 
-			if($sunStatus=='For Approval')
-			{
-				$sunStatus = 'Submitted';
+            $tdata='';
+			$span='';
+	        if((sizeof($weekDaysStatus) != 0) && $weekDaysStatus[0]['sun_status'] && $weekDaysStatus[0]['sun_status'] == 'Rejected'){	 
+					$span = "<span class = 'note_tool_date'>".(isset($weekDaysStatus[0]['sun_reject_note']) && $weekDaysStatus[0]['sun_reject_note']!='')?$weekDaysStatus[0]['sun_reject_note']:''."</span>";
+					$tdata='data-powertip="'.$span.'"';
 			}
+		?>
+        <td class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sun_status']:"No Entry"];?>"  <?php echo $tdata;?>>
+        <?php 
+        	//$sunDate = date('Y-m-d', strtotime($sunDay));   
+        	$sunStatus  = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sun_status']:"No Entry";       	
            	if($sunDate <= $today   && $sunDisClass == '' && $sunDate >= $empDojDate )	
            			echo ($sunStatus == "Blocked")?"Not Submitted":	$sunStatus; 
         		//echo (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sun_status']:"No Entry"; 
         ?>
         </td>
-        
-        <td class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['mon_status']:"No Entry"];?>" >
+         <?php 
+            $tdata='';
+			$span='';
+	        if((sizeof($weekDaysStatus) != 0) && $weekDaysStatus[0]['mon_status'] && $weekDaysStatus[0]['mon_status'] == 'Rejected'){	 
+					$span = "<span class = 'note_tool_date'>".(isset($weekDaysStatus[0]['mon_reject_note']) && $weekDaysStatus[0]['mon_reject_note']!='')?$weekDaysStatus[0]['mon_reject_note']:''."</span>";
+					$tdata='data-powertip="'.$span.'"';
+			}
+		?>
+        <td class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['mon_status']:"No Entry"];?>"   <?php echo $tdata;?>>
         <?php
         	//$monDate = date('Y-m-d', strtotime($monDay));  
         	$monStatus =  (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['mon_status']:"No Entry"; 
-			if($monStatus=='For Approval')
-			{
-				$monStatus = 'Submitted';
-			}
         	if($monDate <= $today   && $monDisClass == '' && $monDate >= $empDojDate )
         		echo ($monStatus == "Blocked")?"Not Submitted":	$monStatus;   	 
         		// echo (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['mon_status']:"No Entry"; ?>
         </td>
-
-        <td class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['tue_status']:"No Entry"];?>">
+         <?php 
+            $tdata='';
+			$span='';
+	        if((sizeof($weekDaysStatus) != 0) && $weekDaysStatus[0]['tue_status'] && $weekDaysStatus[0]['tue_status'] == 'Rejected'){	 
+					$span = "<span class = 'note_tool_date'>".(isset($weekDaysStatus[0]['tue_reject_note']) && $weekDaysStatus[0]['tue_reject_note']!='')?$weekDaysStatus[0]['tue_reject_note']:''."</span>";
+					$tdata='data-powertip="'.$span.'"';
+			}
+		?>
+        <td class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['tue_status']:"No Entry"];?>"  <?php echo $tdata;?>>
         <?php 
         	//$tueDate = date('Y-m-d', strtotime($tueDay));  
         	$tueStatus =  (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['tue_status']:"No Entry"; 
-			if($tueStatus=='For Approval')
-			{
-				$tueStatus = 'Submitted';
-			}
         	if($tueDate <= $today   && $tueDisClass == '' && $tueDate >= $empDojDate )
         		echo ($tueStatus == "Blocked")?"Not Submitted":	$tueStatus;   	 
         		//echo (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['tue_status']:"No Entry"; 
         ?>
         </td>
-
-        <td class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['wed_status']:"No Entry"];?>" >
+         <?php 
+            $tdata='';
+			$span='';
+	        if((sizeof($weekDaysStatus) != 0) && $weekDaysStatus[0]['wed_status'] && $weekDaysStatus[0]['wed_status'] == 'Rejected'){	 
+					$span = "<span class = 'note_tool_date'>".(isset($weekDaysStatus[0]['wed_reject_note']) && $weekDaysStatus[0]['wed_reject_note']!='')?$weekDaysStatus[0]['wed_reject_note']:''."</span>";
+					$tdata='data-powertip="'.$span.'"';
+			}
+		?>
+        <td class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['wed_status']:"No Entry"];?>"  <?php echo $tdata;?>>
         <?php
         	//$wedDate = date('Y-m-d', strtotime($wedDay));
-        	$wedStatus = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['wed_status']:"No Entry"; 
-			if($wedStatus=='For Approval')
-			{
-				$wedStatus = 'Submitted';
-			}			
+        	$wedStatus = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['wed_status']:"No Entry";   
         	if($wedDate <= $today   && $wedDisClass == ''&& $wedDate >= $empDojDate)
         		echo ($wedStatus == "Blocked")?"Not Submitted":	$wedStatus;    	 
         		// echo (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['wed_status']:"No Entry"; 
          ?>
         </td>
-      
-        <td class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['thu_status']:"No Entry"];?>">
+        <?php 
+            $tdata='';
+			$span='';
+	        if((sizeof($weekDaysStatus) != 0) && $weekDaysStatus[0]['thu_status'] && $weekDaysStatus[0]['thu_status'] == 'Rejected'){	 
+					$span = "<span class = 'note_tool_date'>".(isset($weekDaysStatus[0]['thu_reject_note']) && $weekDaysStatus[0]['thu_reject_note']!='')?$weekDaysStatus[0]['thu_reject_note']:''."</span>";
+					$tdata='data-powertip="'.$span.'"';
+			}
+		?>
+        <td class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['thu_status']:"No Entry"];?>" <?php echo $tdata;?>>
         <?php
          	//$thuDate = date('Y-m-d', strtotime($thuDay));  
-         	$thuStatus = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['thu_status']:"No Entry";
-			if($thuStatus=='For Approval')
-			{
-				$thuStatus = 'Submitted';
-			}				
+         	$thuStatus = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['thu_status']:"No Entry"; 
         	if($thuDate <= $today   && $thuDisClass == ''&& $thuDate >= $empDojDate )
         		echo ($thuStatus == "Blocked")?"Not Submitted":	$thuStatus;   	   
         		//echo (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['thu_status']:"No Entry";
          ?>
         </td>
-       
-        <td class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['fri_status']:"No Entry"];?>" >
+        <?php 
+            $tdata='';
+			$span='';
+	        if((sizeof($weekDaysStatus) != 0) && $weekDaysStatus[0]['fri_status'] && $weekDaysStatus[0]['fri_status'] == 'Rejected'){	 
+					$span = "<span class = 'note_tool_date'>".(isset($weekDaysStatus[0]['fri_reject_note']) && $weekDaysStatus[0]['fri_reject_note']!='')?$weekDaysStatus[0]['fri_reject_note']:''."</span>";
+					$tdata='data-powertip="'.$span.'"';
+			}
+		?>
+        <td class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['fri_status']:"No Entry"];?>" <?php echo $tdata;?>>
         <?php
         	//$friDate = date('Y-m-d', strtotime($friDay)); 
         	$friStatus = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['fri_status']:"No Entry";  
-			if($friStatus=='For Approval')
-			{
-				$friStatus = 'Submitted';
-			}	
         	if($friDate <= $today   && $friDisClass == ''&& $friDate >= $empDojDate )
         		echo ($friStatus == "Blocked")?"Not Submitted":	$friStatus;   	 
         		// echo (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['fri_status']:"No Entry"; 
         ?>
         </td>
-      
+        <?php 
+            $tdata='';
+			$span='';
+	        if((sizeof($weekDaysStatus) != 0) && $weekDaysStatus[0]['sat_status'] && $weekDaysStatus[0]['sat_status'] == 'Rejected'){	 
+					$span = "<span class = 'note_tool_date'>".(isset($weekDaysStatus[0]['sat_reject_note']) && $weekDaysStatus[0]['sat_reject_note']!='')?$weekDaysStatus[0]['sat_reject_note']:''."</span>";
+					$tdata='data-powertip="'.$span.'"';
+			}
+		?>
 		<?php 
 			$weekHrsPart = floor($week_tot / 60);
 			$weekMinsPart = $week_tot % 60;
@@ -954,14 +1069,10 @@
 		
 		//($week_tot != 0)?floor($week_tot / 60).':'.$week_tot % 60 :'00:00';
 		?>
-        <td class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sat_status']:"No Entry"];?>" >
+        <td class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sat_status']:"No Entry"];?>" <?php echo $tdata;?>>
         <?php
         	//$satDate = date('Y-m-d', strtotime($satDay));  
         	$satStatus =  (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sat_status']:"No Entry"; 
-			if($satStatus=='For Approval')
-			{
-				$satStatus = 'Submitted';
-			}
         	if($satDate <= $today   && $satDisClass == '' && $satDate >= $empDojDate )
         		echo ($satStatus == "Blocked")?"Not Submitted":	$satStatus; 
         	 	//echo (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sat_status']:"No Entry"; 
@@ -1049,28 +1160,48 @@ $('#weekview').accordion({header: '.proj',collapsible : true});
 	 $('#emp_name').html('<?php  echo (isset($empData[0]['emp_name']) && $empData[0]['emp_name']!='')?$empData[0]['emp_name']:'' ; ?>');
  	var status_class = 'no_entry';
 	 
-	if(emp_timesheet_status == "For Approval"){
+	 if(emp_timesheet_status == "For Approval"){
 		 status_class = "for_approval";
-	}
+	 }
 
+	 if(emp_timesheet_status == "Approved"){
+		 status_class = "approved";
+	 }
+	 
 	 if(emp_timesheet_status == "Saved"){
 		 status_class = "yet_to_submit";
 	 }
 
+	 if(emp_timesheet_status == "Rejected"){
+		 status_class = "rejected";
+	 }
+
+	 if(emp_timesheet_status == "Blocked"){
+		 status_class = "blocked";
+	 }
+		
 	 $( "#emp_timesheet_status" ).attr('class','').addClass(status_class);
 	 var emp_status = emp_timesheet_status;
 	 if(emp_timesheet_status=='Saved')
 	 {
 		emp_status='Yet to submit';
-	 }else if(emp_timesheet_status=='For Approval')
-	 {
-		emp_status='Submitted';
 	 }
 	 $('#emp_timesheet_status').html(emp_status);
-	
-	$('#emp_buttons_display').html("");
+	 if(emp_timesheet_status=="For Approval"){
+		 $('#emp_buttons_display').html('<span class="emp_tme_pre_dis">Weekly</span><a class="approve-btn action_btn" href="javascript:void(0);" onclick="approveEmpTimesheet(\'<?php echo $selmn;?>\',\'<?php echo $emp_id;?>\',\'<?php echo $type;?>\',\'<?php echo $hidweek;?>\',\'<?php echo $manager_id;?>\',\'monthly\',\'<?php echo $emplistflag;?>\');"><i class="fa fa-check" style=""></i> Approve</a><a class="reject-btn action_btn" href="javascript:void(0);" onclick="rejectEmpTimesheet(\'<?php echo $selmn;?>\',\'<?php echo $emp_id;?>\',\'<?php echo $type;?>\',\'<?php echo $hidweek;?>\',\'<?php echo $manager_id;?>\',\'monthly\',\'<?php echo $emplistflag;?>\');"><i class="fa fa-ban" style=""></i> Reject</a>');
+	 }else if(emp_timesheet_status=="Blocked"){
+		 $('#emp_buttons_display').html('<span class="emp_tme_pre_dis">Weekly</span><a class="approve-btn action_btn" href="javascript:void(0);" onclick="enableEmpTimesheet(\'<?php echo $selmn;?>\',\'<?php echo $emp_id;?>\',\'<?php echo $type;?>\',\'<?php echo $hidweek;?>\',\'<?php echo $manager_id;?>\',\'monthly\',\'<?php echo $emplistflag;?>\');"><i class="fa fa-check" style=""></i> Enable</a>');
+	 }else{
+		 $('#emp_buttons_display').html("");
+	 }
 	 $('#idweek_status_display').html( $('#week_status').html());
 
+
+	 $('.rejected').powerTip({
+         placement: 'e',
+         mouseOnToPopup: true,
+         smartPlacement: true
+    });
 	 
 });
 </script>
diff --git a/application/modules/timemanagement/views/scripts/emptimesheets/index.phtml b/application/modules/timemanagement/views/scripts/emptimesheets/index.phtml
index c1e87efde..65211be02 100644
--- a/application/modules/timemanagement/views/scripts/emptimesheets/index.phtml
+++ b/application/modules/timemanagement/views/scripts/emptimesheets/index.phtml
@@ -51,6 +51,25 @@ $(document).ready(function(){
 	    	 display_monthly(selmn,'<?php echo $data->id;?>',search,click,'','month','');
 	    }
 	});
+	
+	$("#mainmenuTabs li").click(function() {
+		var status=$(this).attr('id');
+		$('#mainmenuTabs li').removeClass('menu_filter_clicked');
+	    $(this).addClass('menu_filter_clicked');  
+	    $('#idhidmenuitem').val(status);
+	    var search=$('#empstring').val();
+	    var selmn=$('#idhidselmn').val();
+	    var type=$('#timesheetView').val();
+	    var hidweek=$('#idhidweek_ac').val();
+	    if(type=='month')
+	    {
+	    	display_monthly(selmn,'<?php echo $data->id;?>',search,status,'',type,hidweek);
+	    }
+	    else
+	    {        
+	    	display_weeks_monthly(selmn,'<?php echo $data->id;?>',search,status,hidweek);
+	    }
+	});
 
 	$('#sel_emp_list').change(function(){    
 	    var status= $('#idhidmenuitem').val();
@@ -134,8 +153,8 @@ $(function() {
 	
 		    <ul id="monthweek" class="month_view_link">
 			 <!--<li class="active" id="month" title="Month">M</li>-->
-	         <li id="week" class="link_txt"  title="Week">Week View</li>
-	         <li id="month" class="link_txt dis_none"  title="Month">Month View</li>
+	         <li id="week" class="link_txt"  title="Week">Weekly View</li>
+	         <li id="month" class="link_txt dis_none"  title="Month">Monthly View</li>
 		</ul>
 		
 		<div class="new-form-ui month_picker">
@@ -167,7 +186,14 @@ $(function() {
         		<?php } ?>
         	</select>
          </div>
-
+	     <ul id="mainmenuTabs" class="tabs_ul_all">
+            <li id="all" class="menu_filter_clicked">All</li>
+            <li id="submitted">For Approval</li>            
+            <li id="rejected">Rejected</li>
+            <li id="blocked">Blocked</li>
+            <li id="enabled">Enabled</li>
+            <li id="approved">Approved</li>
+        </ul>
 	</div>
 	<div id="idweeks_display"></div>
 	
@@ -185,7 +211,7 @@ $(function() {
 </div>  
 <script type="text/javascript" language="javascript" >
 $(document).ready(function(){
-	$('.breadcrumbs').append("<span class='arrows'>&rsaquo;</span><span>Employee Time Sheets</span>");
+	$('.breadcrumbs').append("<span class='arrows'>&rsaquo;</span><span>Employee TimeSheets</span>");
 $('#idclear_view_task').hide();
 	options = {
 	    pattern: 'yyyy-mm', // Default is 'mm/yyyy' and separator char is not mandatory
diff --git a/application/modules/timemanagement/views/scripts/index/entertime.phtml b/application/modules/timemanagement/views/scripts/index/entertime.phtml
index 9c4346ca4..04ec7df56 100644
--- a/application/modules/timemanagement/views/scripts/index/entertime.phtml
+++ b/application/modules/timemanagement/views/scripts/index/entertime.phtml
@@ -40,11 +40,33 @@
 	
 	$cronStartDay = $this->cronStartDay;
 	$cronEndDay = $this->cronEndDay;
+	
+	
+	$empHolidaysWeekends = $this->empHolidaysWeekends;
+      		$weekendStart = $empHolidaysWeekends['weekend_startday'];
+      		$weekendEnd = $empHolidaysWeekends['weekend_endday'];
+      		
+      		
+      		$weekendSunClass = ($weekendStart == 0 || $weekendEnd == 0)? 'weekend': "";
+      		$weekendMonClass = ($weekendStart == 1 || $weekendEnd == 1)? 'weekend': "";
+      		$weekendTueClass = ($weekendStart == 2 || $weekendEnd == 2)? 'weekend': "";
+      		$weekendWedClass = ($weekendStart == 3 || $weekendEnd == 3)? 'weekend': "";
+      		$weekendThuClass = ($weekendStart == 4 || $weekendEnd == 4)? 'weekend': "";
+      		$weekendFriClass = ($weekendStart == 5 || $weekendEnd == 5)? 'weekend': "";
+      		$weekendSatClass = ($weekendStart == 6 || $weekendEnd == 6)? 'weekend': "";
+	
 ?>
+<input type="hidden" id="sundayweekend" value="<?php echo $weekendSunClass;?>">
+<input type="hidden" id="mondayweekend" value="<?php echo $weekendMonClass;?>">
+<input type="hidden" id="tuedayweekend" value="<?php echo $weekendTueClass;?>">
+<input type="hidden" id="weddayweekend" value="<?php echo $weekendWedClass;?>">
+<input type="hidden" id="thudayweekend" value="<?php echo $weekendThuClass;?>">
+<input type="hidden" id="fridayweekend" value="<?php echo $weekendFriClass;?>">
+<input type="hidden" id="satdayweekend" value="<?php echo $weekendSatClass;?>">
 <script type="text/javascript">
 
 
-	  var currMonth = "<?php echo $currentMonth; ?>";	
+	  var currMonth = "<?php echo $currentMonth; ?>";
 	  var empDoj = $('#empDoj').val();
 	  var selDay = "<?php echo $this->selDay; ?>";
 	  var currentDay = "<?php echo $now->format('D'); ?>";
@@ -170,7 +192,11 @@
     	$("#show_hide").mouseover(function() {
     		$('.week_select_list').css('display','block');
     	});
-
+    	$('.rejected_note').powerTip({
+            placement: 'e',
+            mouseOnToPopup: true,
+            smartPlacement: true
+    	});
     	$('.hol_leave').powerTip({
             placement: 'e',
             mouseOnToPopup: true,
@@ -219,15 +245,14 @@
             return false;
         });
     	$('.time_enter_field').timeEntry({show24Hours: true,initialField:0,spinnerImage:'', defaultTime:"00:00"}).
-    	change(function() {        	
+    	change(function() { 
 			//console.log("change");
     		var time = $(this).val();
     		var taskTdId = $(this).attr('id');
        		var tdId = $(this).attr('id');
     		var taskId = tdId.substring(10, tdId.length);        		
     		var taskTimeArray = time.split(':');
-    		var dayName = tdId.substring(6, 9);	
-	  		   
+    		var dayName = tdId.substring(6, 9);
 	  		     
 			var sunTaskTime = $("#input_sun_"+taskId).val();
 			var monTaskTime = $("#input_mon_"+taskId).val();
@@ -333,7 +358,17 @@
 			
       		//var totDay  = Math.floor(totDayTime / 60) +':' + (totDayTime % 60);
 			var totDay  = dayHrsPart +':' + dayMinsPart;
-      		$('#'+dayName+'_tot_hrs').html(totDay+'<span onclick="eraseTime(\''+dayName+'\')" style="display:none;" class="erase_icon" id="th_erase_'+dayName+'">Erase Time</span>');        	
+			
+			//if day is weekend dont check validation
+			if($('#'+dayName+'dayweekend').val()=='weekend')
+			{
+				$('#'+dayName+'_tot_hrs').html(totDay+'<span onclick="eraseTime(\''+dayName+'\')" style="display:block;" class="erase_icon" id="th_erase_'+dayName+'">Erase Time</span>');
+			}
+			else
+			{
+				$('#'+dayName+'_tot_hrs').html(totDay+'<span onclick="eraseTime(\''+dayName+'\')" style="display:none;" class="erase_icon" id="th_erase_'+dayName+'">Erase Time</span>');
+			}
+        	
 //    		if(time == '' || time == '00:00')
 //    			$(this).val('');    			
     		
@@ -471,8 +506,8 @@
         $weekDaysProjStatus = $this->weekDaysProjStatus;  
         //print_r($weekDaysProjStatus);
         //print_r($weekDaysStatus);
-        $statusClasses = array('No Entry'=>'no_entry','Yet to submit'=>'yet_to_submit',
-          		'For Approval'=>'for_approval');       
+        $statusClasses = array('No Entry'=>'no_entry','Yet to submit'=>'yet_to_submit','Approved'=>'approved',
+          		'For Approval'=>'for_approval','Enabled'=>'enabled','Rejected'=>'rejected','Blocked'=>'blocked');       
       
 //		$weekStartDay = $weekendDay + 1;
 //      	$dayName = date('D',mktime(0, 0, 0, $selectedYrMon[1], $weekStartDay));
@@ -489,7 +524,14 @@
 //		echo " week start : ".$weekStartDay." week end : ".$weekendDay;
 
 	?>
-
+				
+			<?php if($this->prev_str!=''){ 
+              $prev_str_split=preg_split('/@@@/',$this->prev_str);
+            ?>
+			
+			<div class="ml-alert-1-error" id="close_div"  style="cursor: pointer;width: 90%;" onclick="javascript:window.location.href='<?php echo $this->baseUrl("index.php/timemanagement/index/index");?>'"><div class="style-1-icon error"></div><?php echo $prev_str_split[0];?> has not been submitted.</div>
+		
+            <?php }?>
            <span id="error_message"></span>     
 	<div  class="control_option cal_single_view flt_lft" style="margin-top: 8px;">
 		
@@ -744,7 +786,6 @@
           			$satFreezedClass = "freezed";          					
           		}
           	} 
-        	
          //	 print_r($leavesArray);
 //     			$weekendDay = 0;
        	//		$weekdays = array( 'Sun','Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');    			
@@ -1334,8 +1375,7 @@
 	        		$totalHrs = $hrs.':'.$mins;
       				$proArray[$weekData['project_id']]= $totalHrs;    
       			}  
-      		}      	 	
-        	        		
+      		}      	 	 		
       		foreach ($myTsWeekData as $weekData) {
       			
       			if(!in_array($weekData['sun_duration'],array('00:00','0:0','0'))) {
@@ -1404,19 +1444,20 @@
 	      </tbody>
 	      <?php  
       			$projName = $weekData['project_name'];
+				$projectStatus = $weekData['project_status'];
       			$j++;
       			} 	         	  	 	      
       			
       			//print_r($weekDaysProjStatus);
       			      			
       			foreach ($weekDaysProjStatus as $projStatus) {
-      				     				
+      				     		
       				$projId = $projStatus['project_id']; 
       				
       				if($weekData['project_id'] == $projId) {	
       					//echo " thu status for proj  ".$projId." ".$projStatus['thu_project_status'];						
       					 $sunEntryFlag = in_array($projStatus['sun_project_status'], array('submitted','approved'));
-      					 $monEntryFlag = in_array($projStatus['mon_project_status'], array('submitted','approved'));
+      					$monEntryFlag = in_array($projStatus['mon_project_status'], array('submitted','approved'));
       					 $tueEntryFlag = in_array($projStatus['tue_project_status'], array('submitted','approved'));
       					 $wedEntryFlag = in_array($projStatus['wed_project_status'], array('submitted','approved'));
       					 $thuEntryFlag = in_array($projStatus['thu_project_status'], array('submitted','approved'));
@@ -1426,34 +1467,54 @@
       					 if(in_array($sunStatus, array('For Approval','Approved'))) {
       						if($projStatus['sun_project_status'] == 'no_entry')
       					 		$sunEntryFlag = true; 
-      					 }
+      					 }else if(in_array($sunStatus, array('Blocked')))
+						 {
+      					 		$sunEntryFlag = true;
+						 }
       					 if(in_array($monStatus, array('For Approval','Approved'))) {
       						if($projStatus['mon_project_status'] == 'no_entry')
       					 		$monEntryFlag = true; 
-      					 }
+      					 }else if(in_array($monStatus, array('Blocked')))
+						 {
+      					 		$monEntryFlag = true; 
+						 }
       					 if(in_array($tueStatus, array('For Approval','Approved'))) {
       						if($projStatus['tue_project_status'] == 'no_entry')
       					 		$tueEntryFlag = true; 
-      					 }
+      					 }else if(in_array($tueStatus, array('Blocked')))
+						 {
+      					 		$tueEntryFlag = true; 
+						 }
+							 
       				 	if(in_array($wedStatus, array('For Approval','Approved'))) {
       						if($projStatus['wed_project_status'] == 'no_entry')
       					 		$wedEntryFlag = true; 
-      					 }
+      					 }else if(in_array($wedStatus, array('Blocked')))
+						 {
+      					 		$wedEntryFlag = true; 
+						 }
       				 	if(in_array($thuStatus, array('For Approval','Approved'))) {
-      						if($projStatus['thu_project_status'] == 'no_entry')
       					 		$thuEntryFlag = true; 
-      					 }
+      					 }else if(in_array($thuStatus, array('Blocked')))
+						 {
+      					 		$thuEntryFlag = true; 
+						 }
       				 	if(in_array($friStatus, array('For Approval','Approved'))) {
       						if($projStatus['fri_project_status'] == 'no_entry')
       					 		$friEntryFlag = true; 
-      					 }
+      					 }else if(in_array($friStatus, array('Blocked')))
+						 {
+      					 		$friEntryFlag = true; 
+						 }
       					if(in_array($satStatus, array('For Approval','Approved'))) {
       						if($projStatus['sat_project_status'] == 'no_entry')
       					 		$satEntryFlag = true; 
-      					 }
+      					 }else if(in_array($satStatus, array('Blocked')))
+						 {
+      					 		$satEntryFlag = true; 
+						 }
       				}      						
       			}
-      			
       			?>
       		
 	        <tr id="proj_task_col_<?php echo $weekData['project_id']; ?>_<?php echo $weekData['project_task_id']; ?>" class="proj_task_col">
@@ -1461,9 +1522,15 @@
 	        <td id="td_sun_<?php echo $weekData['project_task_id']; ?>" class="<?php echo $weekendSunClass; ?> <?php echo $sunDisClass; ?>">
 	       		<input	       		
 	       		 <?php 	       			       		 
-	       		 if($sunDate <= $today  && $sunDisClass == '' && !$sunEntryFlag && $sunFreezedClass == ''){?> 
+	       		 if($sunDate <= $today  && $sunDisClass == '' && !$sunEntryFlag && $sunFreezedClass == ''){
+					if($projectStatus=='hold' || $projectStatus=='completed')
+					{ 
+				?>
+						disabled="disabled";
+				<?php	} else {
+				 ?> 
 	       		 onfocus="activeDay('sun')"
-		       		<?php } else {?>
+				 <?php } }else {?>
 		       		disabled="disabled"
 		       		<?php }?> 
 		          type="text" class="time_enter_field <?php echo ($sunEntryFlag)?"time_enter_field_view":"";?>"  id="input_sun_<?php echo $weekData['project_task_id'];?>"
@@ -1473,9 +1540,12 @@
 	        <td id="td_mon_<?php echo $weekData['project_task_id']; ?>" class="<?php echo $weekendMonClass; ?> <?php echo $monDisClass; ?>">
 	      	   <input
 	      	    <?php 
-	      	    if($monDate <= $today  && $monDisClass == ''  && !$monEntryFlag && $monFreezedClass == '') {?> 
+	      	    if($monDate <= $today  && $monDisClass == ''  && !$monEntryFlag && $monFreezedClass == '') { 
+				if($projectStatus=='hold' || $projectStatus=='completed'){ ?> 
+				 disabled="disabled"
+				<?php } else {?>
 	      	    onfocus="activeDay('mon')"
-		      	<?php }else {?>
+		      	<?php } }else {?>
 		       disabled="disabled"
 		       	<?php }?> 
         	     type="text" class="time_enter_field <?php echo ($monEntryFlag)?"time_enter_field_view":"";?>"  id="input_mon_<?php echo $weekData['project_task_id'];?>" 
@@ -1485,9 +1555,12 @@
 	        <td id="td_tue_<?php echo $weekData['project_task_id']; ?>" class="activeleft <?php echo $weekendTueClass; ?> <?php echo $tueDisClass; ?>" >
 	       		<input 
 	       		 <?php
-	       		 if($tueDate <= $today  && $tueDisClass == ''  && !$tueEntryFlag && $tueFreezedClass == '') {?> 
+	       		 if($tueDate <= $today  && $tueDisClass == ''  && !$tueEntryFlag && $tueFreezedClass == '') {
+					if($projectStatus=='hold' || $projectStatus=='completed'){  ?> 
+				 disabled="disabled"
+					<?php } else {?>
 	       		onfocus="activeDay('tue')"
-		       	<?php }else {?>
+				 <?php } }else {?>
 		       		disabled="disabled"
 		       		<?php }?>  	 
 	       		type="text" class="time_enter_field <?php echo ($tueEntryFlag)?"time_enter_field_view":"";?>"  id="input_tue_<?php echo $weekData['project_task_id'];?>"
@@ -1497,9 +1570,12 @@
 	        <td id="td_wed_<?php echo $weekData['project_task_id']; ?>" class="active <?php echo $weekendWedClass; ?> <?php echo $wedDisClass; ?>">
 	        	<input
 	        	 <?php 
-	        	 if($wedDate <= $today  && $wedDisClass == ''  && !$wedEntryFlag && $wedFreezedClass == '') {?> 
+	        	 if($wedDate <= $today  && $wedDisClass == ''  && !$wedEntryFlag && $wedFreezedClass == '') {
+					 if($projectStatus=='hold' || $projectStatus=='completed'){ ?> 
+					 disabled="disabled"
+					 <?php } else {?>
 	        	 onfocus="activeDay('wed')"
-		       	 <?php }else {?>
+		       	 <?php } }else {?>
 		       		disabled="disabled"
 		       		<?php }?>  
 	        	 type="text" class="time_enter_field <?php echo ($wedEntryFlag)?"time_enter_field_view":"";?>"  id="input_wed_<?php echo $weekData['project_task_id'];?>" 
@@ -1509,9 +1585,12 @@
 	        <td id="td_thu_<?php echo $weekData['project_task_id']; ?>" class="activeright <?php echo $weekendThuClass; ?> <?php echo $thuDisClass; ?>">
 	       		 <input
 	       		 <?php 
-	       		 if($thuDate <= $today  && $thuDisClass == '' && !$thuEntryFlag && $thuFreezedClass == '') {?>  
+	       		 if($thuDate <= $today  && $thuDisClass == '' && !$thuEntryFlag && $thuFreezedClass == '') { 
+				 if($projectStatus=='hold' || $projectStatus=='completed'){ ?> 
+				disabled="disabled"				 
+				 <?php } else {?>
 	       		 onfocus="activeDay('thu')"
-		       	 <?php }else {?>
+		       	 <?php } }else {?>
 		       		disabled="disabled"
 		       		<?php }?>  
 		         type="text" class="time_enter_field <?php echo ($thuEntryFlag)?"time_enter_field_view":"";?>"  id="input_thu_<?php echo $weekData['project_task_id'];?>" 
@@ -1521,9 +1600,12 @@
 	        <td id="td_fri_<?php echo $weekData['project_task_id']; ?>" class="<?php echo $weekendFriClass; ?> <?php echo $friDisClass; ?>">
 	       		<input
 	       		 <?php 
-	       		 if($friDate <= $today  && $friDisClass == '' && !$friEntryFlag && $friFreezedClass == '') {?> 
+	       		 if($friDate <= $today  && $friDisClass == '' && !$friEntryFlag && $friFreezedClass == '') {
+					 if($projectStatus=='hold' || $projectStatus=='completed'){ ?> 
+				disabled="disabled"
+					 <?php } else {?>
 	       		 onfocus="activeDay('fri')" 
-	       		 <?php }else {?>
+	       		 <?php } }else {?>
 		       		disabled="disabled"
 		       		<?php }?>  
 	       		 type="text" class="time_enter_field <?php echo ($friEntryFlag)?"time_enter_field_view":"";?>"  id="input_fri_<?php echo $weekData['project_task_id'];?>" 
@@ -1533,9 +1615,12 @@
 	        <td id="td_sat_<?php echo $weekData['project_task_id']; ?>" class="<?php echo $weekendSatClass; ?> <?php echo $satDisClass; ?>">
 	        	<input
 	        	 <?php 
-	        	 if($satDate <= $today  && $satDisClass == '' && !$satEntryFlag && $satFreezedClass == '') {?>  
+	        	 if($satDate <= $today  && $satDisClass == '' && !$satEntryFlag && $satFreezedClass == '') {  
+				 if($projectStatus=='hold' || $projectStatus=='completed'){ ?>  
+				 disabled="disabled"
+				 <?php } else {?>
 	        	onfocus="activeDay('sat')"
-		        <?php } else {?>
+				 <?php } } else {?>
 		       		disabled="disabled"
 		       		<?php }?>  
 		         type="text" class="time_enter_field <?php echo ($satEntryFlag)?"time_enter_field_view":"";?>"  id="input_sat_<?php echo $weekData['project_task_id'];?>"
@@ -1568,82 +1653,105 @@
        <tr><td class="no-data-td" colspan="10"><p class="no-data">No project was assigned</p></td></tr>
       <?php } ?>
       <tbody> 
-
+      <?php 
+      		$sunRejNoteAttr  = "";
+      		$sunRejectNoteClass = "";
+          	if($sunStatus == 'Rejected'){
+          		$sunRejectNote = $weekDaysStatus[0]['sun_reject_note'];
+          		$sunRejectNoteClass = 'rejected_note';
+          		$sunRejNoteAttr = 'data-powertip="'.$sunRejectNote.'"';
+          	} 
+          	$monRejNoteAttr  = "";
+      		$monRejectNoteClass = "";
+          	if($monStatus == 'Rejected'){
+          		$monRejectNote = $weekDaysStatus[0]['mon_reject_note'];
+          		$monRejectNoteClass = 'rejected_note';
+          		$monRejNoteAttr = 'data-powertip="'.$monRejectNote.'"';
+          	}  
+          	$tueRejNoteAttr  = "";
+      		$tueRejectNoteClass = "";
+          	if($tueStatus == 'Rejected'){
+          		$tueRejectNote = $weekDaysStatus[0]['tue_reject_note'];
+          		$tueRejectNoteClass = 'rejected_note';
+          		$tueRejNoteAttr = 'data-powertip="'.$tueRejectNote.'"';
+          	}  
+          	$wedRejNoteAttr  = "";
+      		$wedRejectNoteClass = "";
+          	if($wedStatus == 'Rejected'){
+          		$wedRejectNote = $weekDaysStatus[0]['wed_reject_note'];
+          		$wedRejectNoteClass = 'rejected_note';
+          		$wedRejNoteAttr = 'data-powertip="'.$wedRejectNote.'"';
+          	}  
+          	$thuRejNoteAttr  = "";
+      		$thuRejectNoteClass = "";
+          	if($thuStatus == 'Rejected'){
+          		$thuRejectNote = $weekDaysStatus[0]['thu_reject_note'];
+          		$thuRejectNoteClass = 'rejected_note';
+          		$thuRejNoteAttr = 'data-powertip="'.$thuRejectNote.'"';
+          	}  
+          	$friRejNoteAttr  = "";
+      		$friRejectNoteClass = "";
+          	if($friStatus == 'Rejected'){
+          		$friRejectNote = $weekDaysStatus[0]['fri_reject_note'];
+          		$friRejectNoteClass = 'rejected_note';
+          		$friRejNoteAttr = 'data-powertip="'.$friRejectNote.'"';
+          	} 
+          	$satRejNoteAttr  = "";
+      		$satRejectNoteClass = "";
+          	if($satStatus == 'Rejected'){
+          		$satRejectNote = $weekDaysStatus[0]['sat_reject_note'];
+          		$satRejectNoteClass = 'rejected_note';
+          		$satRejNoteAttr = 'data-powertip="'.$satRejectNote.'"';
+          	}      
+      
+      ?>
       <tr class="week_status_tr">
         <td></td>
-        <td class="<?php echo $statusClasses[$sunStatus];?> ">
+        <td class="<?php echo $statusClasses[$sunStatus];?> <?php echo $sunRejectNoteClass?>" <?php echo $sunRejNoteAttr;?> >
         <?php 
-        	//$sunDate = date('Y-m-d', strtotime($sunDay)); 
-			if($sunStatus=='For Approval')
-			{	
-				$sunStatus='Submitted';
-			}
+        	//$sunDate = date('Y-m-d', strtotime($sunDay));        	
            	if($sunDate <= $today   && $sunDisClass == ''&& $sunDate >= $empDojDate )	
         		echo ($sunStatus == "Blocked")?"Not Submitted":$sunStatus; 
         ?>        
         </td>
-        <td class="<?php echo $statusClasses[$monStatus];?>" >
+        <td class="<?php echo $statusClasses[$monStatus];?> <?php echo $monRejectNoteClass?>" <?php echo $monRejNoteAttr;?>>
         <?php 
         	//$monDate = date('Y-m-d', strtotime($monDay));  
-			if($monStatus=='For Approval')
-			{	
-				$monStatus='Submitted';
-			}
         	if($monDate <= $today   && $monDisClass == '' && $monDate >= $empDojDate )	 
         		echo ($monStatus == "Blocked")?"Not Submitted":$monStatus; 
         ?>        
         </td>
-        <td class="<?php echo $statusClasses[$tueStatus];?> " >
+        <td class="<?php echo $statusClasses[$tueStatus];?> <?php echo $tueRejectNoteClass?>" <?php echo $tueRejNoteAttr;?>>
         <?php 
         	//$tueDate = date('Y-m-d', strtotime($tueDay));  
-			if($tueStatus=='For Approval')
-			{	
-				$tueStatus='Submitted';
-			}
         	if($tueDate <= $today   && $tueDisClass == '' && $tueDate >= $empDojDate)	
         		echo ($tueStatus == "Blocked")?"Not Submitted":$tueStatus; 
         ?>        
         </td>
-        <td class="<?php echo $statusClasses[$wedStatus];?> " >
+        <td class="<?php echo $statusClasses[$wedStatus];?> <?php echo $wedRejectNoteClass?>" <?php echo $wedRejNoteAttr;?>>
         <?php 
         	//$wedDate = date('Y-m-d', strtotime($wedDay));  
-			if($wedStatus=='For Approval')
-			{	
-				$wedStatus='Submitted';
-			}
         	if($wedDate <= $today   && $wedDisClass == '' && $wedDate >= $empDojDate )	  
         		echo ($wedStatus == "Blocked")?"Not Submitted":$wedStatus; 
         ?>       
         </td>
-        <td class="<?php echo $statusClasses[$thuStatus];?>" >
+        <td class="<?php echo $statusClasses[$thuStatus];?> <?php echo $thuRejectNoteClass?>" <?php echo $thuRejNoteAttr;?>>
         <?php 
         	//$thuDate = date('Y-m-d', strtotime($thuDay));  
-			if($thuStatus=='For Approval')
-			{	
-				$thuStatus='Submitted';
-			}
         	if($thuDate <= $today   && $thuDisClass == ''&& $thuDate >= $empDojDate )	  
         		echo ($thuStatus == "Blocked")?"Not Submitted":$thuStatus; 
         ?>        
         </td>
-        <td class="<?php echo $statusClasses[$friStatus];?>" >
+        <td class="<?php echo $statusClasses[$friStatus];?> <?php echo $friRejectNoteClass?>" <?php echo $friRejNoteAttr;?>>
         <?php 
         	//$friDate = date('Y-m-d', strtotime($friDay));  
-			if($friStatus=='For Approval')
-			{	
-				$friStatus='Submitted';
-			}
         	if($friDate <= $today   && $friDisClass == '' && $friDate >= $empDojDate )	
         		echo ($friStatus == "Blocked")?"Not Submitted":$friStatus; 
         ?>        
         </td>
-        <td class="<?php echo $statusClasses[$satStatus];?>" >
+        <td class="<?php echo $statusClasses[$satStatus];?> <?php echo $satRejectNoteClass?>" <?php echo $satRejNoteAttr;?>>
         <?php
         	//$satDate = date('Y-m-d', strtotime($satDay));  
-			if($satStatus=='For Approval')
-			{	
-				$satStatus='Submitted';
-			}
          	if($satDate <= $today   && $satDisClass == '' && $satDate >= $empDojDate )
         		echo ($satStatus == "Blocked")?"Not Submitted":$satStatus; 
         ?>        
@@ -1787,7 +1895,7 @@
 	$timeEntryCheck = 0; 
 	foreach($weekdays as $day) {
 		$dayStatus = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0][$day.'_status']:"No Entry"; 		
-		if($dayStatus == 'No Entry' || $dayStatus == 'Yet to submit') {
+		if($dayStatus == 'No Entry' || $dayStatus == 'Yet to submit' || $dayStatus == 'Rejected' || $dayStatus == 'Enabled') {
 			
 			if($day == 'sun') {
 				if($sunFreezedClass == '' && $sunDisClass == '') $timeEntryCheck ++;	
diff --git a/application/modules/timemanagement/views/scripts/index/getapprovedtimesheet.ajax.phtml b/application/modules/timemanagement/views/scripts/index/getapprovedtimesheet.ajax.phtml
new file mode 100644
index 000000000..a0089bd1d
--- /dev/null
+++ b/application/modules/timemanagement/views/scripts/index/getapprovedtimesheet.ajax.phtml
@@ -0,0 +1,73 @@
+<?php 
+$approvalAlertData = $this->approvalAlertData;
+if(count($approvalAlertData)>0)
+{
+?>
+
+<table class='tm_grid tablesorter tm_body_content' id="idapprovedtbl" width="100%" cellspacing="0" cellpadding="0" border="0" align="center" >
+<thead>
+    <tr>
+        <th style="text-align: left;">Timesheet Date</th>
+        <th style="text-align: center;">Approved on</th>
+    </tr>
+</thead>	
+<tbody>
+<?php 
+
+foreach($approvalAlertData as $data)
+{
+
+?> 
+		<?php //$newDate = date("d-m-Y", strtotime($data['ts_date']));
+		$newDate = explode(',',$data['ts_date']);
+		$display_date = array();
+		$final_array = array();
+		foreach($newDate as $date)
+		{
+			if($date!='')
+			{
+				//$display_date[] =  date("d-m-Y", strtotime($date));
+				$display_date[] =  sapp_Global::change_date($date,'view');
+
+			}
+			$final_array[$data['approved_date']] = $display_date;
+		}
+		//$display_dates = implode(',',$display_date);
+		//$app_date = date('Y-m-d',strtotime($data['approved_date']));
+		?>
+		<?php foreach($final_array as $key => $value) {
+		//echo $key;
+		?>
+		
+		<?php foreach($value as $date){
+		?>
+		<tr>
+        <td><?php echo $date;?></td>
+		<?php //} ?>
+        <td style="text-align: center;"><?php echo sapp_Global::change_date($key,'view');?></td>
+		</tr>
+		<?php }
+		}		?>
+
+<?php 	
+}    
+?>	
+</tbody>
+</table>
+<?php 
+}
+else 
+{
+?>
+<div class="err_viewproj"><span class="no_record">No record exists.</span></div>
+<?php 
+}
+?>
+<script type='text/javascript'>
+	$('#idapprovedtbl').tablesorter({
+	    scrollHeight: 500,
+	    widgets: ['zebra','scroller']
+	});
+	
+	$('.scroller_tbl').alternateScroll({ 'horizontal-bar-class': 'styled-h-bar'});
+</script>
\ No newline at end of file
diff --git a/application/modules/timemanagement/views/scripts/index/index.phtml b/application/modules/timemanagement/views/scripts/index/index.phtml
index 1e5674ab3..3b62acde6 100644
--- a/application/modules/timemanagement/views/scripts/index/index.phtml
+++ b/application/modules/timemanagement/views/scripts/index/index.phtml
@@ -21,9 +21,11 @@
 ?>
 
 <?php
+
 	$now = new DateTime();	
 	$today = $now->format('Y-m-d');
-
+	//$currentMonth = $now->format('Y-m');	
+	//echo " DOJ ".$this->empDoj;
 	$empDoj = $this->empDoj;
 	$dateEmpDoj = date('Y-m',strtotime($empDoj));
 	$empDojDay = intval(date('d',strtotime($empDoj)));
@@ -31,6 +33,7 @@
 	$selYrMon = $this->selYrMon;
 	
 	$currentMonth  = $selYrMon;
+	$approvedAlert  = $this->approvedAlert;
 	
 	$cronStartDay = $this->cronStartDay;
 	$cronEndDay = $this->cronEndDay;
@@ -44,16 +47,21 @@
  
 	  var currMonth = "<?php echo $currentMonth; ?>";
 	  var empId = "<?php echo $empId; ?>";
-
+	 // console.log(" currMonth "+currMonth);  
+	  //console.log($("#calSelYrMonth").val());
       $(document).ready(function () {	
         
-		$('.breadcrumbs').append("<span class='arrows'>&rsaquo;</span><span>Time Sheet</span>");
+		$('.breadcrumbs').append("<span class='arrows'>&rsaquo;</span><span>Timesheet</span>");
     	$('.hol_leave').powerTip({
               placement: 'e',
               mouseOnToPopup: true,
               smartPlacement: true
        });
-
+    	$('.rejected_note').powerTip({
+            placement: 'e',
+            mouseOnToPopup: true,
+            smartPlacement: true
+    	});
         $("#calSelYrMonth").val(currMonth);	   
     		
     	var empDoj = $('#empDoj').val();
@@ -65,9 +73,9 @@
    	 	function contextMenuItems(dayStatus,inactiveClass,weekendClass,leaveDataId) {
    	   	 	
    	   	   	var menUItems = {
-   	  	           "submit": {name: "Submit Time Sheet"},                
-   	 	           "new": {name: "New Time Sheet"},
-   	   	  	       "edit": {name: "Edit Time Sheet"},
+   	  	           "submit": {name: "Submit Timesheet"},                
+   	 	           "new": {name: "New Timesheet"},
+   	   	  	       "edit": {name: "Edit Timesheet"},
    	   	  	       "leave": {name: "Mark as Leave"},
    	   	  	       "cancelleave": {name: "Cancel Leave"},
    	 	         };	
@@ -86,7 +94,12 @@
 	   	   	   	}	   	 	
    	   	 	}
    	   	 	
-
+   	   	   	if(dayStatus == 'Rejected' || dayStatus == 'Enabled' ) {
+     	   	   	 	delete menUItems["submit"];	 
+         	   	   	delete menUItems["new"];
+         	   	    delete menUItems["leave"];
+         	        delete menUItems["cancelleave"];
+     	   	}
    	   	   	if(dayStatus == 'Yet to submit') {	   	   	 
 	   	   	    delete menUItems["new"];	   	   	    
 	   	     
@@ -99,7 +112,11 @@
 	   	   	        delete menUItems["cancelleave"];
 	   	   	   	}
 	   	 	}
-
+//	   	   	if(dayStatus == 'For Approval') {
+//		   	   	delete menUItems["submit"];	 
+//	 	   	   	delete menUItems["new"];	
+//	 	   	    delete menUItems["edit"];       	 	
+//		   	}
 	   	 	if(inactiveClass){
 	   	 	    delete menUItems["submit"];	  
 	   	   	    delete menUItems["edit"];	
@@ -138,7 +155,7 @@
 			if(td_id != undefined){
 
 			   var day = $(this).children('.date').text();			   
-			   if(dayStatus != "Approved" && dayStatus != "Submitted" && dayStatus != "Not Submitted" )	{ 
+			   if(dayStatus != "Approved" && dayStatus != "For Approval" && dayStatus != "Not Submitted" )	{ 
 				   
 				   if(inativeClass && leaveDataId == 'L'){
 					   freezedClass = true;
@@ -173,7 +190,36 @@
 			}
       	}); 
 	     	    	    	    
-                        
+    	//var mainDivHeight = $(".reports-block-area").height();    	
+    	//$('.right_container').height(eval(mainDivHeight-51));
+    	  
+     /*   $(".responsive-calendar").responsiveCalendar({
+          time: currMonth,
+          startFromSunday: true,
+          allRows: false,
+          events: {
+        	  "<?php //echo $today; ?>":{}
+            },
+            onInit: function() {
+          	 
+           	  var currYrMon = (this.currentYear)+'-'+(this.currentMonth+1);            
+          	  $("#calSelYrMonth").val(currYrMon);	
+           },  
+          onMonthChange: function() {
+            
+              var selYrMon = (this.currentYear)+'-'+(this.currentMonth+1);            
+        	  $("#calSelYrMonth").val(selYrMon);
+        	  var selYrMonArray = selYrMon.split("-");
+        	 	
+        	  var currDt = new Date();
+        	  var currMon =  currDt.getMonth();
+        	  if(selYrMonArray[1]< empDojMon+1 || selYrMonArray[1] > currMon+1 ) {            	         	  
+        	  	 $("#res_div_link").hide();
+        	 } else {
+        		 $("#res_div_link").show(); 
+            }
+          }
+        });  */                         
       });
       
          
@@ -196,31 +242,118 @@
 
    
 <div class="container">
-
+<?php 
+		//$YrMonths = $this->YrMonths;
+		//$this->empDoj;
+?>
 	<div class="full_container">
 	 <input type="hidden" name="empDoj" id="empDoj" value="<?php  echo $this->empDoj;?>"/>
 	 <input type="hidden" name="empid" id="empid" value="<?php  echo $this->empid;?>"/>
 	 <input type="hidden" name="calSelYrMonth" id="calSelYrMonth" />
-
-
+	<!--  <input type="hidden" name="startYrMon" id="startYrMon"  value="<?php //echo $YrMonths[0];?>" />  -->
+	 
+	 <!-- input type="hidden" name="start_m_y" id="start_m_y" value = "<?php //echo date('m',strtotime($this->empDoj)).'_'.date('Y',strtotime($this->empDoj));?>"/> 
+	 <input type="hidden" name="end_m_y" id="end_m_y" value = "<?php //echo date('m',strtotime($this->empDoj)).'_'.date('Y',strtotime($this->empDoj));?>"/-->  
+	 
+	 	 			<?php 
+			if(isset($approvedAlert) && (count($approvedAlert))>0){ 
+			?>
+				<!--<div id="first_task_add" class="ml-alert-1-info m1-info-set">Your time sheet has been approved.<div class="approve_alert_close"><a href="javascript:void(0);" onclick="javascript:closeApproveAlert();">Close</a></div>
+				<span class="add-coloum click-text"><a href="javascript:void(0);" onclick="javascript:viewApproveAlert();">View Details</a></span>
+				</div>-->
+				
+ <div class="ml-alert-1-info" id="close_div"><div class="style-1-icon info"></div>Your timesheet has been approved.&nbsp;<a href="javascript:void(0);" onclick="javascript:viewApproveAlert();">View Details</a><a href="javascript:void(0);" onclick="javascript:closeApproveAlert();" class="close_icon style-1-close info"></a></div>
+			<?php
+			}?>	
+			
+			<?php if($this->prev_str!=''){ 
+              $prev_str_split=preg_split('/@@@/',$this->prev_str);
+            ?>
+			<!--style="cursor: pointer;width: 90%;" onclick="javascript:window.location.href='<?php //echo $this->baseUrl("index.php/timemanagement/index/index");?>'"-->
+			<div class="ml-alert-1-error" id="close_div" style="width: 90%;"><div class="style-1-icon error"></div><?php echo $prev_str_split[0];?> has not been submitted.</div>
+		
+            <?php }?>
     
      <div id="months_div"class="control_option cal_single_view flt_lft" style="margin-top: 8px; margin-bottom: 0px;">
-	
+    
+		<!-- <div class="new-form-ui month_picker">
+			<div class="division">
+				<input id="start_date" class="brdr_none hasDatepicker" type="text" onfocus="this.blur()" readonly="readonly" value="" name="start_date">		
+				<img class="ui-datepicker-trigger" src="<?php //echo $this->baseUrl().'/public/media/timemanagement/';?>images/cal_new.png" alt="" title="">	 				
+			</div> 
+	    </div>		  
+      <ul id="monthweek" class="toggle_btn mont_week right_week_toggle"  style="margin-top: 0px;">
+			 <li class="active" id="month" onclick="monthlyView();">Month</li>
+	         <li id="week" onclick="weeklyView();">Week</li>
+		</ul>
+	 -->	
 
 	  <?php 
    		  if(Zend_Registry::get( 'tm_role' ) !='Admin') {     
  	    ?>
 	   <ul id="monthweek" class="month_view_link">
-			 <li class="link_txt" id="week" onclick="weeklyView();">Week View</li>
+			 <li class="link_txt" id="week" onclick="weeklyView();">Weekly View</li>
 		</ul>
 	    <?php }?>
       </div>      
       <span id="error_message" style="position: relative; top: -37px;"></span>    
 	  <ul class="scroll_change marg_top_0 ul_option_top-62">      
-
+      <?php 
+      	 	//$empDojYr = date('Y',strtotime($this->empDoj));
+      		//$empDojMonth = date('m',strtotime($this->empDoj)); 
+     
+			//$YrMonths = $this->YrMonths;
+		//	$startYrMon = date_create($YrMonths[0].' last month')->format('Y-m');
+		//	$endYrMon = date_create($YrMonths[3].' next month')->format('Y-m');
+			
+			//echo " selYrMon ".$selYrMon." dateEmpDoj ".$dateEmpDoj;
+			//if($selYrMon > $dateEmpDoj) {	
+		?>
+		<!-- 	<a onclick="getPrevMonthData(<?php // echo  "'".$startYrMon."'"; ?>, <?php  //echo "'".$selYrMon."'";?>)" href="javascript:void(0)" ><li class="prev_click"><i class="fa fa-arrow-left fa-2"></i></li></a>  -->
+		<?php 
+			//} else {
+		?>
+		<!-- 	<li class="prev_click disable_click"><i class="fa fa-arrow-left fa-2"></i></li>  -->
+		<?php 		
+		//	}			
+//				foreach ($YrMonths as $val) {
+//			
+//					$yrMon = explode('-', $val);
+//					$monthName = date('F', mktime(0, 0, 0, $yrMon[1], 10));
+//							
+//					if($val == $selYrMon) {						
+		?>			
+		<!-- 	<a onclick ="getMonthData(<?php //echo "'".$YrMonths[0]."'"; ?>,<?php //echo "'".$yrMon[0].'-'.$yrMon[1]."'"; ?>)" href="javascript:void(0)"><li id="id_<?php //echo $yrMon[1].'_'.$yrMon[0]; ?>" class="active"><span class="main_txt"><?php //echo $monthName; ?></span><span class="sub_txt"><?php //echo  $yrMon[0]; ?></span></li></a>  -->		 		 				
+		<?php         
+//					} else {
+//						if($val > $now->format('Y-m') ||$val < $dateEmpDoj ) { 
+		?>
+		<!-- 	<li class="disable_click" id="id_<?php //echo $yrMon[1].'_'.$yrMon[0]; ?>" ><span class="main_txt" ><?php //echo $monthName; ?></span><span  class="sub_txt"><?php //echo $yrMon[0]; ?></span></li>  -->
+		<?php 
+			//			} else {
+		?>		
+			<!-- <a onclick ="getMonthData(<?php //echo "'".$YrMonths[0]."'"; ?>,<?php //echo "'".$yrMon[0].'-'.$yrMon[1]."'"; ?>)" href="javascript:void(0)" ><li id="id_<?php //echo $yrMon[1].'_'.$yrMon[0]; ?>" ><span class="main_txt" ><?php //echo $monthName; ?></span><span  class="sub_txt"><?php //echo $yrMon[0]; ?></span></li></a>  -->		
+		<?php
+//						}
+//					}
+//				}
+//			if($selYrMon < $now->format('Y-m')) {	
+		?>
+		 <!-- <a onclick="getNextMonthData(<?php //echo "'".$endYrMon."'" ?>, <?php // echo "'".$selYrMon."'";?>)"  href="javascript:void(0)" > <li class="next_click"><i class="fa fa-arrow-right fa-2"></i></li></a>  -->
+		 <?php 
+		//	} else {
+		 ?>
+		 	<!-- <li class="next_click disable_click"><i class="fa fa-arrow-right fa-2"></i></li>  -->
+		 <?php 
+		//	}
+		 ?>
       </ul>
 	  
-
+ <div id="idviewapprovedsheets" style="display:none">
+    <div id="idapprovedaheetcontent">
+        
+    </div>
+</div>
       <?php 
       	$selectedYrMon = explode('-', $currentMonth);
       	$selMonName = date('F', mktime(0, 0, 0, $selectedYrMon[1], 1,$selectedYrMon[0]));      	
@@ -354,10 +487,10 @@
         	}
         	//print_r($holidayDates);
           	$weekdays = array( 'Sun','Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');
-          	$statusClasses = array('no_entry'=>'no_entry','saved'=>'yet_to_submit',
-          		'submitted'=>'for_approval');
-          	$statusText = array('no_entry'=>'No Entry','saved'=>'Yet to submit',
-          		'submitted'=>'Submitted');
+          	$statusClasses = array('no_entry'=>'no_entry','saved'=>'yet_to_submit','approved'=>'approved',
+          		'submitted'=>'for_approval','enabled'=>'enabled','rejected'=>'rejected','blocked'=>'blocked');
+          	$statusText = array('no_entry'=>'No Entry','saved'=>'Yet to submit','approved'=>'Approved',
+          		'submitted'=>'For Approval','enabled'=>'Enabled','rejected'=>'Rejected','blocked'=>'Blocked');
           	
           	$dayCounter = 1;
           
@@ -380,6 +513,7 @@
           			$currentDayClass = ""; 
           			$inactiveDayClass = ""; 
           			$blockedDayClass = ""; 
+          			$rejectNoteClass = ""; 
           			$holName = "";
           			$holLeaveClass = "";
           			$curDate = date('Y-m-d',strtotime($cDate));
@@ -397,7 +531,8 @@
           			if($dayName == $day)  {
           				
           				$duration = ($weekData != "")?$weekData[strtolower($dayName).'_duration']:"00:00";
-          				$status = ($weekData != "")?$weekData[strtolower($dayName).'_status']:'no_entry';           				
+          				$status = ($weekData != "")?$weekData[strtolower($dayName).'_status']:'no_entry'; 
+          				$rejectNote = ($weekData != "")?$weekData[strtolower($dayName).'_reject_note']:"";            				
           				$calDate = $selectedYrMon[0].'-'.$selectedYrMon[1].'-'.$dayCounter;
           				//$holiday = (in_array($calDate,$holidayDates))?"H":"";
           				$holiday = (in_array($dayCounter,$holidayDates))?"H":""; 
@@ -503,10 +638,16 @@
           		 		<div class="hol_leave  <?php echo $holLeaveClass; ?>" title="<?php echo $tooltip;?>"><?php echo $holiday.$leave; ?> </div>
           		 	<?php  }
 
-          		 		if(!strpos($tdClass, "inactive_td")) {
+          		 		if(!strpos($tdClass, "inactive_td")) {	
+          		 			
+          		 			$rejNoteAttr  = "";
+          		 			if($status == 'rejected'){
+          		 				$rejectNoteClass = 'rejected_note';
+          		 				$rejNoteAttr = 'data-powertip="'.$rejectNote.'"';
+          		 			}
           		 			
           		 	?>
-          		 	<div class="sheet_status <?php echo $statusClasses[$status];?> "    leaveData = "leave_<?php echo $leaveId;?>"><?php echo ($statusText[$status] == "Blocked")?"Not Submitted":$statusText[$status];?></div></td>
+          		 	<div class="sheet_status <?php echo $statusClasses[$status];?> <?php echo  $rejectNoteClass?>"  <?php echo $rejNoteAttr;?>  leaveData = "leave_<?php echo $leaveId;?>"><?php echo ($statusText[$status] == "Blocked")?"Not Submitted":$statusText[$status];?></div></td>
           		<?php 
           		 		} else {
           		?>
@@ -529,7 +670,33 @@
         </tbody>
       </table>
     </div>
-   
+    <!-- 
+    <div class="right_container" >
+    	<div class="responsive-calendar">
+        <div class="controls">
+            <a class="pull-left" data-go="prev"><i class="fa fa-arrow-left fa-1"></i></a>
+            <h4><span data-head-year></span> <span data-head-month></span></h4>
+            <a class="pull-right" data-go="next"><i class="fa fa-arrow-right fa-1"></i></a>
+        </div>
+        <div class="day-headers">
+          <div class="day header">Sun</div>
+          <div class="day header">Mon</div>
+          <div class="day header">Tue</div>
+          <div class="day header">Wed</div>
+          <div class="day header">Thu</div>
+          <div class="day header">Fri</div>
+          <div class="day header">Sat</div>          
+        </div>
+        <div class="days" data-group="days">
+          
+        </div>
+      </div>  
+      <div id="res_div_link" >    
+      
+      <a  onclick="weeklyView();" href="javascript:void(0);" class="weekly_view_butt">Weekly View</a>
+      </div>
+    </div>    
+     -->
 </div>
 <!-- a class="weekly_view_butt" href="<?php //echo $this->baseUrl("/index.php/timemanagement/index/week");?>">Weekly View</a-->
 
@@ -820,31 +987,24 @@ $(document).ready(function(){
 	function markasleave(day){
 	    var selYyrMon = "<?php echo $currentMonth; ?>";
 	    var selYYrMonArray =  selYyrMon.split("-"); 	
-		if(day.length == 1){
+	
+	    if(day.length == 1){
 	       day = '0'+day;
 	    } 
-		
 	    var selectedStartDates = day+"-"+selYYrMonArray[1]+"-"+selYYrMonArray[0];
-		
-		//changed to convert date as gloabal
+
+	      //changed to convert date as gloabal
 		
 		 $.ajax({
-        type:"post",	
-        data:"day="+day+"&yearmonth="+selectedStartDates,	
-        url:base_url+"/timemanagement/index/converdate/format/json",
-        dataType:'json',
-        success: function(response)
-        {
+       type:"post",	
+       data:"day="+day+"&yearmonth="+selectedStartDates,	
+       url:base_url+"/timemanagement/index/converdate/format/json",
+       dataType:'json',
+       success: function(response)
+       {
 			validatefullcalenderdate(response.conerteddate,response.conerteddate);
-        }
+       }
 		});
-	
-	    
-		
-		
-		
-		
-		
 	}
 
 	function validate_todate()
diff --git a/application/modules/timemanagement/views/scripts/index/week.phtml b/application/modules/timemanagement/views/scripts/index/week.phtml
index aa86671cb..a3942248f 100644
--- a/application/modules/timemanagement/views/scripts/index/week.phtml
+++ b/application/modules/timemanagement/views/scripts/index/week.phtml
@@ -23,6 +23,7 @@
 <?php	
 	//$storage = new Zend_Auth_Storage_Session();
 	//$data = $storage->read();
+ 	  	
 	$now = new DateTime();	
 	$today = $now->format('Y-m-d');	
 	$empDoj = $this->empDoj;
@@ -162,8 +163,8 @@
  	   	 	
  	   	   	var menUItems = {
  	  	        //   "submit": {name: "Submit Time Sheet"},                
- 	 	            "new": {name: "New Time Sheet"},
- 	   	  	        "edit": {name: "Edit Time Sheet"},
+ 	 	            "new": {name: "New Timesheet"},
+ 	   	  	        "edit": {name: "Edit Timesheet"},
  	   	  	        "leave": {name: "Mark as Leave"},
  	   	  	        "cancelleave": {name: "Cancel Leave"},
  	 	         };   
@@ -183,7 +184,13 @@
 	   	   	   	}
    	   	   	   	 	
  	   	 	}
-
+ 	   	   	if(dayStatus == 'Rejected' || dayStatus == 'Enabled' ) {
+   	   	   	 //	delete menUItems["submit"];	 
+       	   	   	delete menUItems["new"];
+       	   	    delete menUItems["leave"];
+       	        delete menUItems["cancelleave"];
+      	 	
+   	   		}
  	   	   	if(dayStatus == 'Yet to submit') {	   	   	 
  	   	   	    delete menUItems["new"];
 
@@ -196,7 +203,10 @@
 	   	   	        delete menUItems["cancelleave"];
 	   	   	   	}	   	 	
  	   	 	}
-
+// 	   	    if(dayStatus == 'For Approval') {	   	   	 
+//	   	   	    delete menUItems["new"];
+//	   	   	    delete menUItems["edit"];	   	 	
+//	   	 	}
  	     	if(weekendClass) {	   	   	 
 	   	   	    delete menUItems["leave"];	   	 	
 	   	 	}
@@ -356,7 +366,47 @@
      			} 
      		 }  		
     	}) ; 
-   
+    	  	
+    //	console.log(" opened "+opened);
+  	  //  $weekview.find("tr").not('.accordion').hide();
+  	   // $weekview.find("tr").eq(0).show();
+  	    
+//  		 $weekview.find(".accordion").click(function(id){
+//  			 $(id).not(this).siblings().fadeOut(1000);
+//           	 $(this).siblings().fadeToggle(1000);
+//  	    });
+    	
+  	    
+    	//var mainDivHeight = $(".reports-block-area").height();    	
+       // $('.right_container').height(eval(mainDivHeight-51));
+        	  
+       /* $(".responsive-calendar").responsiveCalendar({
+          time: currMonth,
+          startFromSunday: true,
+          allRows: false,
+          events: {
+        	  "<?php // echo $today; ?>": {}
+            },
+           onInit: function() {
+            	 
+           	  var currYrMon = (this.currentYear)+'-'+(this.currentMonth+1);            
+          	  $("#calSelYrMonth").val(currYrMon);	
+           },  
+          onMonthChange: function() {
+            
+              var selYrMon = (this.currentYear)+'-'+(this.currentMonth+1);            
+        	  $("#calSelYrMonth").val(selYrMon);
+        	  var selYrMonArray = selYrMon.split("-");
+        	 	
+        	  var currDt = new Date();
+        	  var currMon =  currDt.getMonth();
+        	  if(selYrMonArray[1]< empDojMon+1 || selYrMonArray[1] > currMon+1 ) {            	         	  
+        	 	 	 $("#res_div_link").hide();
+        	  } else {
+        			 $("#res_div_link").show(); 
+          	  }
+          	}
+         }); */
       });     
       
    </script>
@@ -366,6 +416,8 @@
  	 <input type="hidden" name="calSelYrMonth" id="calSelYrMonth" /> 	
 	<div class="full_container">	
 	<?php 
+		//echo date("W", strtotime('2015-12-30'));
+		//echo "\n".gmstrftime('%U',mktime(0,0,0,06,29,2015));
 		
 		
 		$selectedYrMon = explode('-', $currentMonth);
@@ -383,7 +435,9 @@
 		$datesArray =  iterator_to_array(new DatePeriod(new DateTime("first sunday of $currentMonth"),
     	 	DateInterval::createFromDateString('next sunday'),new DateTime("first day of $selectedYrMon[0]-$nextMonth")));
         
-
+//    	foreach($datesArray as $sunday) {
+//    			echo $sunday->format("Y-m-d\n");
+//		}
 
 		$firstDay = DateTime::createFromFormat('Y-m-d', "$currentMonth".'-1');
 		$firstDayName =  $firstDay->format('D');
@@ -407,9 +461,22 @@
         $calWeekNo = strftime('%U',strtotime($weekStartDay));
                
       	$weekDaysStatus = $this->weekDaysStatus;
-      	$statusClasses = array('No Entry'=>'no_entry','Yet to submit'=>'yet_to_submit',
-          		'For Approval'=>'for_approval');     
-
+      	$statusClasses = array('No Entry'=>'no_entry','Yet to submit'=>'yet_to_submit','Approved'=>'approved',
+          		'For Approval'=>'for_approval','Enabled'=>'enabled','Rejected'=>'rejected','Blocked'=>'blocked');     
+      
+//		$weekStartDay = $weekendDay + 1;
+//      	$dayName = date('D',mktime(0, 0, 0, $selectedYrMon[1], $weekStartDay));
+//       	$key = array_keys($weekdays, $dayName);
+//       	if($selWeek == $noOfweeks) {
+//       				
+//       		$dayName = date('D',mktime(0, 0, 0, $selectedYrMon[1], $lastday));
+//       		$key = array_keys($weekdays, $dayName);
+//       		$weekCounter = $key[0];
+//       	} else {
+//       			$weekCounter = 7 - ($key[0]+ 1);	
+//       	}					
+//		$weekendDay =  $weekStartDay + $weekCounter;  
+//		echo " week start : ".$weekStartDay." week end : ".$weekendDay;
 	?>	
 	
 	<?php  
@@ -442,7 +509,7 @@
 				</div>
 			</div>	
 			<ul id="monthweek" class="month_view_link">
-				 <li  class="link_txt"  id="month" onclick="monthlyView();">Month View</li>
+				 <li  class="link_txt"  id="month" onclick="monthlyView();">Monthly View</li>
 	</ul>
 	 <?php 
     	$firstCalWeek = strftime('%U',strtotime($currentMonth.'-1'));
@@ -490,7 +557,60 @@
        </ul>
   	</div>
      	</div>	
-  </div>	
+     <!--   
+       	<ul class="scroll_change scroll_change_single marg_top_0 flt_lft">
+       	<?php //if($selWeek != 1){?>
+       	<li class="prev_click"><a href="javascript:void(0);" onclick="getWeekData('',<?php //echo ($selWeek-1); ?>,<?php //echo ($calWeekNo-1);?>,'');" ><i class="fa fa-arrow-left fa-2"></i></a></li>
+       	<?php // } else {?>      
+       	<li class="prev_click disable_click"><i class="fa fa-arrow-left fa-2"></i></li>
+       <?php //}?>		    	
+        	<li>        	         	
+        	<span class="main_txt">Week <?php //echo $selWeek; ?></span><span class="sub_txt"> <?php //echo $weekStartDay." - ".$weekendDay; ?></span>        	        	
+        	</li>        	
+       
+       <?php //if($selWeek != $noOfweeks){?>
+        <li class="next_click"><a href="javascript:void(0);" onclick="getWeekData('',<?php //echo ($selWeek+1);?>,<?php //echo ($calWeekNo+1);?>,'');" ><i class="fa fa-arrow-right fa-2"></i></a></li>
+        <?php //} else {?>      
+       	<li class="next_click disable_click"><i class="fa fa-arrow-right fa-2"></i></li>
+       <?php //}?>        
+    </ul>
+     -->
+    <!-- <span>
+		 <input type="button" onclick="viewEnterTime (<?php //echo $selWeek; ?>,<?php //echo $calWeekNo; ?>);" value="Enter Time" class="save_but"/>
+	 -->	 
+	
+	
+	<!-- <span class="enter_time_div">
+		 <button type="button" onclick="viewEnterTime (<?php //echo $selWeek; ?>,<?php //echo $calWeekNo; ?>);"  class="enter_time_butt"><i class="fa fa-clock-o"></i>
+ Enter Time</button>
+    <?php 
+  
+    //if(!empty($weekDaysStatus)) {
+    	
+    	//$submitText = in_array('For Approval',$weekDaysStatus[0])?"Re-Submit":"Submit";
+    	
+    //	if(in_array('Yet to submit',$weekDaysStatus[0])) {
+
+    		?>
+    		<input type="button" class="save_but submit_time_sheet" value="<?php //echo $submitText;?> Time Sheet" onclick="submitWeekTimesheet
+			(<?php //echo $selWeek; ?>,<?php //echo$calWeekNo;?>);">
+    		<?php  	
+/*     	}
+    } */
+    
+    ?>
+    </span>-->
+	<!-- <ul id="monthweek" class="toggle_btn mont_week right_week_toggle">
+				 <li  id="month" onclick="monthlyView();">Month</li>
+				 <li  class="active" id="week" onclick="weeklyView();">Week</li>
+	</ul>
+	 
+	 <ul id="monthweek" class="toggle_btn mont_week right_week_toggle">
+				 <li  class="active"  id="month" onclick="monthlyView();">Month View</li>
+	</ul>
+	-->
+	<!-- <div class="week_status_total">Weekly Status :<span class="<?php //echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['week_status']:"No Entry"];?>"> -->
+	 <?php //echo (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['week_status']:"No Entry"; ?> </div>	
 		  
 	
      
@@ -514,7 +634,14 @@
 			$thuDate = date('Y-m-d', strtotime("$weekStartDay +4 day"));
 			$friDate = date('Y-m-d', strtotime("$weekStartDay +5 day"));
 			$satDate = date('Y-m-d', strtotime("$weekStartDay +6 day"));
-
+			
+//			$sunDisClass = ($selYrMon != date('Y-m',strtotime($sunDay)))? 'dis_pre_mon':"";
+//			$monDisClass = ($selYrMon != date('Y-m',strtotime($monDay)))? 'dis_pre_mon':"";
+//			$tueDisClass = ($selYrMon != date('Y-m',strtotime($tueDay)))? 'dis_pre_mon':"";
+//			$wedDisClass = ($selYrMon != date('Y-m',strtotime($wedDay)))? 'dis_pre_mon':"";
+//			$thuDisClass = ($selYrMon != date('Y-m',strtotime($thuDay)))? 'dis_pre_mon':"";
+//			$friDisClass = ($selYrMon != date('Y-m',strtotime($friDay)))? 'dis_pre_mon':"";
+//			$satDisClass = ($selYrMon != date('Y-m',strtotime($satDay)))? 'dis_pre_mon':"";
 			
 			$sunDisClass = ($selMon != date('m',strtotime($sunDate)))? 'dis_pre_mon':"";
 			$monDisClass = ($selMon != date('m',strtotime($monDate)))? 'dis_pre_mon':"";
@@ -658,7 +785,25 @@
           			$satFreezedClass = "freezed";          					
           		}
           	} 
-
+         	 //print_r($leavesArray);
+//     			$weekendDay = 0;
+       	//		$weekdays = array( 'Sun','Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');    			
+       		//	for($i = 1; $i <= $noOfweeks; $i++) {					
+        
+//       			$weekStartDay = $weekendDay + 1;
+//      			$dayName = date('D',mktime(0, 0, 0, $selectedYrMon[1], $weekStartDay));
+//       			$key = array_keys($weekdays, $dayName);
+//       			if($i == $noOfweeks) {
+//       				
+//       				$dayName = date('D',mktime(0, 0, 0, $selectedYrMon[1], $lastday));
+//       				$key = array_keys($weekdays, $dayName);
+//       				$weekCounter = $key[0];
+//       			} else {
+//       				$weekCounter = 7 - ($key[0]+ 1);	
+//       			}					
+//				$weekendDay =  $weekStartDay + $weekCounter;  
+//				echo " week start : ".$weekStartDay." week end : ".$weekendDay;
+				//$selWeekClass = ($i == $selWeek)? "class='active'":"";
        				
        	?>  
         <th id="th_sun"  class="week_th  <?php echo $sunDisClass; ?> <?php echo $weekendSunClass; ?> <?php echo $sunFreezedClass;?>">
@@ -1094,7 +1239,19 @@
         
         <th class="total_pro_hrs_txt">Hours</th>
       </tr>
-
+    <!--
+      <tr class="mark_leave_col">
+        <td>&nbsp;</td>
+        <td id="td_sun_0" class="<?php //echo $weekendSunClass; ?>">&nbsp;</td>
+        <td id="td_mon_0" class="<?php //echo $weekendMonClass; ?>">&nbsp;</td>
+        <td id="td_tue_0" class="<?php //echo $weekendTueClass; ?>">&nbsp;</td>
+        <td id="td_wed_0" class="active <?php //echo $weekendWedClass; ?>">&nbsp;</td>
+        <td id="td_thu_0" class="<?php //echo $weekendThuClass; ?>">&nbsp;</td>
+        <td id="td_fri_0" class="<?php //echo $weekendFriClass; ?>">&nbsp;</td>
+        <td id="td_sat_0" class="<?php //echo $weekendSatClass; ?>">&nbsp;</td>
+        <td>&nbsp;</td>
+      </tr>
+       -->
       <?php 
       		$i = 1;
       		$j = 1;
@@ -1265,118 +1422,167 @@
       <tr class="week_status_tr">
         <td></td>
         <?php  
-         
-		 $is_sun_rej = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sun_status']:"No Entry";
-
-		$is_mon_rej = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['mon_status']:"No Entry";
-		 
+      /*   $sunDayNo = date('d', strtotime($sunDay));
+           $monDayNo = date('d', strtotime($monDay));
+           $tueDayNo = date('d', strtotime($tueDay));
+           $wedDayNo = date('d', strtotime($wedDay));
+           $thuDayNo = date('d', strtotime($thuDay));
+           $friDayNo = date('d', strtotime($friDay));
+           $satDayNo = date('d', strtotime($satDay));
+        */           
+		  $is_sun_rej = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sun_status']:"No Entry";
+		  $sun_rej_note='';
+		  $sun_reject_note='';
+		  $sun_span='';
+		  $sun_tdata='';
+		  if($is_sun_rej=='Rejected')
+		  {
+			$sun_reject_note = $weekDaysStatus[0]['sun_reject_note'];
+			$sun_rej_note = 'rejected_note';
+			$sun_span = "<span class = 'note_tool_date'>".(isset($sun_reject_note) && $sun_reject_note!='')?$sun_reject_note:''."</span>";
+			$sun_tdata='data-powertip="'.$sun_span.'"';
+		  }
+			$is_mon_rej = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['mon_status']:"No Entry";
+		  $mon_rej_note='';
+		  $mon_reject_note='';
+		  $mon_span='';
+		  $mon_tdata='';
+		  if($is_mon_rej=='Rejected')
+		  {
+			$mon_reject_note = $weekDaysStatus[0]['mon_reject_note'];
+			$mon_rej_note = 'rejected_note';
+			$mon_span = "<span class = 'note_tool_date'>".(isset($mon_reject_note) && $mon_reject_note!='')?$mon_reject_note:''."</span>";
+			$mon_tdata='data-powertip="'.$mon_span.'"';
+		  }
 		  $is_tue_rej = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['tue_status']:"No Entry";
-		  
+		  $tue_rej_note='';
+		  $tue_reject_note='';
+		  $tue_span='';
+		  $tue_tdata='';
+		  if($is_tue_rej=='Rejected')
+		  {
+			$tue_reject_note = $weekDaysStatus[0]['tue_reject_note'];
+			$tue_rej_note = 'rejected_note';
+			$tue_span = "<span class = 'note_tool_date'>".(isset($tue_reject_note) && $tue_reject_note!='')?$tue_reject_note:''."</span>";
+			$tue_tdata='data-powertip="'.$tue_span.'"';
+		  }
 		  
 		  $is_wed_rej = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['wed_status']:"No Entry";
-		 
+		  $wed_rej_note='';
+		  $wed_reject_note='';
+		  $wed_span='';
+		  $wed_tdata='';
+		  if($is_wed_rej=='Rejected')
+		  {
+			$wed_reject_note = $weekDaysStatus[0]['wed_reject_note'];
+			$wed_rej_note = 'rejected_note';
+			$wed_span = "<span class = 'note_tool_date'>".(isset($wed_reject_note) && $wed_reject_note!='')?$wed_reject_note:''."</span>";
+			$wed_tdata='data-powertip="'.$wed_span.'"';
+		  }
 		  $is_thu_rej = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['thu_status']:"No Entry";
-		  
+		  $thu_rej_note='';
+		  $thu_reject_note='';
+		  $thu_span='';
+		  $thu_tdata='';
+		  if($is_thu_rej=='Rejected')
+		  {
+			$thu_reject_note = $weekDaysStatus[0]['thu_reject_note'];
+			$thu_rej_note = 'rejected_note';
+			$thu_span = "<span class = 'note_tool_date'>".(isset($thu_reject_note) && $thu_reject_note!='')?$thu_reject_note:''."</span>";
+			$thu_tdata='data-powertip="'.$thu_span.'"';
+		  }
 		  
 		  $is_fri_rej = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['fri_status']:"No Entry";
-		 
+		  $fri_rej_note='';
+			$fri_reject_note='';
+			$fri_span='';
+			$fri_tdata='';
+		  if($is_fri_rej=='Rejected')
+		  {
+			$fri_reject_note = $weekDaysStatus[0]['fri_reject_note'];
+			$fri_rej_note = 'rejected_note';
+			$fri_span = "<span class = 'note_tool_date'>".(isset($fri_reject_note) && $fri_reject_note!='')?$fri_reject_note:''."</span>";
+			$fri_tdata='data-powertip="'.$fri_span.'"';
+		  }
 		  
 		  $is_sat_rej = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sat_status']:"No Entry";
-		  
+		  $sat_rej_note='';
+		  $sat_reject_note='';
+		  $sat_span='';
+		  $sat_tdata='';
+		  if($is_sat_rej=='Rejected')
+		  {
+			$sat_reject_note = $weekDaysStatus[0]['sat_reject_note'];
+			$sat_rej_note = 'rejected_note';
+			$sat_span = "<span class = 'note_tool_date'>".(isset($sat_reject_note) && $sat_reject_note!='')?$sat_reject_note:''."</span>";
+			$sat_tdata='data-powertip="'.$sat_span.'"';
+		  }
 		
         ?>
-        <td id="td_sun_status" class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sun_status']:"No Entry"];?> <?php echo $weekendSunClass; ?> <?php echo $sunDisClass; ?> <?php echo $sunFreezedClass; ?> "  >
+        <td id="td_sun_status" class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sun_status']:"No Entry"];?> <?php echo $weekendSunClass; ?> <?php echo $sunDisClass; ?> <?php echo $sunFreezedClass; ?> <?php echo $sun_rej_note;?>"  <?php echo $sun_tdata;?>>
         <?php
         	//$sunDate = date('Y-m-d', strtotime($sunDay));   
-        	$sunStatus  = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sun_status']:"No Entry";   
-			if($sunStatus=='For Approval')
-			{
-				$sunStatus = 'Submitted';
-			}
+        	$sunStatus  = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sun_status']:"No Entry";     	
            	if($sunDate <= $today   && $sunDisClass == '' && $sunDate >= $empDojDate )
            			echo ($sunStatus == "Blocked")?"Not Submitted":	$sunStatus; 
         		//	echo (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sun_status']:"No Entry";        	 
         ?>
         <input id="sun_dayNumber" type="hidden" value="<?php echo $sunDayNo;?>" />
         </td>
-        <td id="td_mon_status" class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['mon_status']:"No Entry"];?> <?php echo $weekendMonClass; ?> <?php echo $monDisClass; ?> <?php echo $monFreezedClass; ?> " >
+        <td id="td_mon_status" class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['mon_status']:"No Entry"];?> <?php echo $weekendMonClass; ?> <?php echo $monDisClass; ?> <?php echo $monFreezedClass; ?> <?php echo $mon_rej_note;?>" <?php echo $mon_tdata;?>>
         <?php
         	//$monDate = date('Y-m-d', strtotime($monDay)); 
         	$monStatus =  (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['mon_status']:"No Entry"; 
-			if($monStatus=='For Approval')
-			{
-				$monStatus = 'Submitted';
-			}
         	if($monDate <= $today   && $monDisClass == '' && $monDate >= $empDojDate )	
         			echo ($monStatus == "Blocked")?"Not Submitted":	$monStatus;   
         	//	echo (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['mon_status']:"No Entry"; 
         ?>
         <input id="mon_dayNumber" type="hidden" value="<?php echo $monDayNo;?>" />
         </td>
-        <td id="td_tue_status" class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['tue_status']:"No Entry"];?> <?php echo $weekendTueClass; ?> <?php echo $tueDisClass; ?> <?php echo $tueFreezedClass; ?> " >
+        <td id="td_tue_status" class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['tue_status']:"No Entry"];?> <?php echo $weekendTueClass; ?> <?php echo $tueDisClass; ?> <?php echo $tueFreezedClass; ?> <?php echo $tue_rej_note;?>" <?php echo $tue_tdata;?>>
         <?php
         	//$tueDate = date('Y-m-d', strtotime($tueDay)); 
         	$tueStatus =  (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['tue_status']:"No Entry"; 
-			if($tueStatus=='For Approval')
-			{
-				$tueStatus = 'Submitted';
-			}
         	if($tueDate <= $today   && $tueDisClass == '' && $tueDate >= $empDojDate )	 
         		echo ($tueStatus == "Blocked")?"Not Submitted":	$tueStatus;     
         		//echo (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['tue_status']:"No Entry"; 
         ?>
         <input id="tue_dayNumber" type="hidden" value="<?php echo $tueDayNo;?>" />
         </td>
-        <td id="td_wed_status" class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['wed_status']:"No Entry"];?> <?php echo $weekendWedClass; ?> <?php echo $wedDisClass; ?> <?php echo $wedFreezedClass; ?> " >
+        <td id="td_wed_status" class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['wed_status']:"No Entry"];?> <?php echo $weekendWedClass; ?> <?php echo $wedDisClass; ?> <?php echo $wedFreezedClass; ?> <?php echo $wed_rej_note;?>" <?php echo $wed_tdata;?>>
         <?php
         	//$wedDate = date('Y-m-d', strtotime($wedDay));  
         	$wedStatus = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['wed_status']:"No Entry"; 
-			if($wedStatus=='For Approval')
-			{
-				$wedStatus = 'Submitted';
-			}
         	if($wedDate <= $today   && $wedDisClass == '' && $wedDate >= $empDojDate )	 
         		echo ($wedStatus == "Blocked")?"Not Submitted":	$wedStatus;    
         	 //	echo (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['wed_status']:"No Entry"; 
         ?>
         <input id="wed_dayNumber" type="hidden" value="<?php echo $wedDayNo;?>" />
         </td>
-        <td id="td_thu_status" class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['thu_status']:"No Entry"];?> <?php echo $weekendThuClass; ?> <?php echo $thuDisClass; ?> <?php echo $thuFreezedClass; ?>" >
+        <td id="td_thu_status" class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['thu_status']:"No Entry"];?> <?php echo $weekendThuClass; ?> <?php echo $thuDisClass; ?> <?php echo $thuFreezedClass; ?> <?php echo $thu_rej_note;?>" <?php echo $thu_tdata;?>>
         <?php
         	//$thuDate = date('Y-m-d', strtotime($thuDay));  
         	$thuStatus = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['thu_status']:"No Entry"; 
-			if($thuStatus=='For Approval')
-			{
-				$thuStatus = 'Submitted';
-			}
         	if($thuDate <= $today   && $thuDisClass == ''&& $thuDate >= $empDojDate )	
         		echo ($thuStatus == "Blocked")?"Not Submitted":	$thuStatus;            
         		//echo (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['thu_status']:"No Entry"; 
         ?>
         <input id="thu_dayNumber" type="hidden" value="<?php echo $thuDayNo;?>" />
         </td>
-        <td id="td_fri_status" class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['fri_status']:"No Entry"];?> <?php echo $weekendFriClass; ?> <?php echo $friDisClass; ?> <?php echo $friFreezedClass; ?> " >
+        <td id="td_fri_status" class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['fri_status']:"No Entry"];?> <?php echo $weekendFriClass; ?> <?php echo $friDisClass; ?> <?php echo $friFreezedClass; ?> <?php echo $fri_rej_note;?>" <?php echo $fri_tdata;?>>
         <?php
         	//$friDate = date('Y-m-d', strtotime($friDay));  
         	$friStatus = (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['fri_status']:"No Entry"; 
-			if($friStatus=='For Approval')
-			{
-				$friStatus = 'Submitted';
-			}
         	if($friDate <= $today   && $friDisClass == '' && $friDate >= $empDojDate )	 
         		echo ($friStatus == "Blocked")?"Not Submitted":	$friStatus;   
         		// echo (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['fri_status']:"No Entry"; 
         ?>
         <input id="fri_dayNumber" type="hidden" value="<?php echo $friDayNo;?>" />
         </td>
-        <td id="td_sat_status" class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sat_status']:"No Entry"];?> <?php echo $weekendSatClass; ?> <?php echo $satDisClass; ?> <?php echo $satFreezedClass; ?> " >
+        <td id="td_sat_status" class="<?php echo $statusClasses[(sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sat_status']:"No Entry"];?> <?php echo $weekendSatClass; ?> <?php echo $satDisClass; ?> <?php echo $satFreezedClass; ?> <?php echo $sat_rej_note;?>" <?php echo $sat_tdata;?>>
         <?php
         	//$satDate = date('Y-m-d', strtotime($satDay)); 
         	$satStatus =  (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sat_status']:"No Entry"; 
-			if($satStatus=='For Approval')
-			{
-				$satStatus = 'Submitted';
-			}
         	if($satDate <= $today   && $satDisClass == '' && $satDate >= $empDojDate )
         		echo ($satStatus == "Blocked")?"Not Submitted":	$satStatus;  
         	//	echo (sizeof($weekDaysStatus) != 0)?$weekDaysStatus[0]['sat_status']:"No Entry"; 
@@ -1479,7 +1685,7 @@
 	  <?php } else {?>
 	  	<span> : Nothing entered</span>
 	  <?php }?>
-	  
+	  <!-- <textarea cols="" rows="">Enter note</textarea>-->
 	  </div>	  
 	  
 	  <?php 
@@ -1488,7 +1694,13 @@
 		$disDays = array($sunDisClass,$monDisClass,$tueDisClass,$wedDisClass,$thuDisClass,$friDisClass,$satDisClass);
 		
 	  	if(!(empty($weekDaysStatus))) {
-
+	  		unset($weekDaysStatus[0]['sun_reject_note']);
+	  		unset($weekDaysStatus[0]['mon_reject_note']);
+	  		unset($weekDaysStatus[0]['tue_reject_note']);
+	  		unset($weekDaysStatus[0]['wed_reject_note']);
+	  		unset($weekDaysStatus[0]['thu_reject_note']);
+	  		unset($weekDaysStatus[0]['fri_reject_note']);
+	  		unset($weekDaysStatus[0]['sat_reject_note']);
 	  		unset($weekDaysStatus[0]['week_status']);
 	  		
 		  	foreach($weekDaysStatus[0] as $dayStatus) {	
@@ -1517,19 +1729,124 @@
     		$submitText = in_array('For Approval',$weekDaysStatus[0])?"Re-Submit":"Submit";    	
     		if(in_array('Yet to submit',$weekDaysStatus[0])) {
     	?>
-    	<input type="button" class="save_but submit_time_sheet" value="<?php echo $submitText;?> Time Sheet"
+    	<input type="button" class="save_but submit_time_sheet" value="<?php echo $submitText;?> Timesheet"
     	 onclick="submitWeekTimesheet(<?php echo $selWeek; ?>,<?php echo$calWeekNo;?>,<?php echo "'".$submitText."'";?>);">
     	<?php  	
 			}
     	}     
     ?></div></td>
 	  </tbody>	  
-
+	  <!--<td class="valign_bottom"><div class="save_but_div"><a>Weekly Erase</a>&nbsp;&nbsp;&nbsp;<input type="button" value="Save" class="save_but"/></div></td>-->
 	  </tr>
-     
+     <!--  <tr class="proj_col" data-toggle="collapse" data-target=".proj_task_col">
+        <td>Swapmamas</td>
+        <td id="td_sun_2">&nbsp;</td>
+        <td id="td_mon_2">&nbsp;</td>
+        <td id="td_tue_2">&nbsp;</td>
+        <td id="td_wed_2" class="active">&nbsp;</td>
+        <td id="td_thu_2">&nbsp;</td>
+        <td id="td_fri_2">&nbsp;</td>
+        <td id="td_sat_2">&nbsp;</td>       
+        <td class="tol_hrs">&nbsp;</td>
+      </tr>
+      <tr class="proj_task_col">
+        <td class="project_name_txt">Analysis</td>
+        <td id="td_sun_3">&nbsp;</td>
+        <td id="td_mon_3">2:20</td>
+        <td id="td_tue_3">2:00</td>
+        <td id="td_wed_3" class="active">2:15</td>
+        <td id="td_thu_3">5:20</td>
+        <td id="td_fri_3">2:20</td>
+        <td id="td_sat_3">1:40</td>
+        <td class="tol_hrs">&nbsp;</td>
+      </tr>
+      <tr class="proj_task_col">
+        <td class="project_name_txt">Development</td>
+        <td id="td_sun_4">&nbsp;</td>
+        <td id="td_mon_4">2:20</td>
+        <td id="td_tue_4">2:00</td>
+        <td id="td_wed_4" class="active">2:15</td>
+        <td id="td_thu_4">5:20</td>
+        <td id="td_fri_4">2:20</td>
+        <td id="td_sat_4">1:40</td>
+        <td class="tol_hrs">&nbsp;</td>
+      </tr>
+      <tr class="proj_task_col">
+        <td class="project_name_txt">Unit Testing</td>
+        <td id="td_sun_5">&nbsp;</td>
+        <td id="td_mon_5">2:20</td>
+        <td id="td_tue_5">2:00</td>
+        <td id="td_wed_5" class="active">2:15</td>
+        <td id="td_thu_5">5:20</td>
+        <td id="td_fri_5">2:20</td>
+        <td id="td_sat_5">1:40</td>
+        <td class="tol_hrs">&nbsp;</td>
+      </tr>
+      <tr class="proj_task_col">
+        <td class="project_name_txt">Bug Fixing</td>
+        <td id="td_sun_6">&nbsp;</td>
+        <td id="td_mon_6">2:20</td>
+        <td id="td_tue_6">2:00</td>
+        <td id="td_wed_6" class="active">2:15</td>
+        <td id="td_thu_6">5:20</td>
+        <td id="td_fri_6">2:20</td>
+        <td id="td_sat_6">1:40</td>
+        <td class="tol_hrs">&nbsp;</td>
+      </tr>
+      <tr class="proj_col"  data-toggle="collapse" data-target=".proj_task_col">
+        <td>Hog93</td>
+        <td id="td_sun_7">&nbsp;</td>
+        <td id="td_mon_7">&nbsp;</td>
+        <td id="td_tue_7">&nbsp;</td>
+        <td id="td_wed_7" class="active">&nbsp;</td>
+        <td id="td_thu_7">&nbsp;</td>
+        <td id="td_fri_7">&nbsp;</td>
+        <td id="td_sat_7">&nbsp;</td>
+        <td class="tol_hrs">&nbsp;</td>
+      </tr>
+       <tr class="proj_task_col">
+        <td>Bug Fixing</td>
+        <td id="td_sun_8">&nbsp;</td>
+        <td id="td_mon_8">2:20</td>
+        <td id="td_tue_8">2:00</td>
+        <td id="td_wed_8" class="active">2:15</td>
+        <td id="td_thu_8">5:20</td>
+        <td id="td_fri_8">2:20</td>
+        <td id="td_sat_8">1:40</td>
+        <td class="tol_hrs">&nbsp;</td>
+      </tr> -->
     </table>
     </div>
-   
+    <!-- 
+    <div class="right_container">
+    	
+    	<div class="responsive-calendar">
+        <div class="controls">
+            <a class="pull-left" data-go="prev"><i class="fa fa-arrow-left fa-1"></i></a>
+            <h4><span data-head-year></span> <span data-head-month></span></h4>
+            <a class="pull-right" data-go="next"><i class="fa fa-arrow-right fa-1"></i></a>
+        </div>
+        <div class="day-headers">
+          <div class="day header">Sun</div>
+          <div class="day header">Mon</div>
+          <div class="day header">Tue</div>
+          <div class="day header">Wed</div>
+          <div class="day header">Thu</div>
+          <div class="day header">Fri</div>
+          <div class="day header">Sat</div>         
+        </div>
+        <div class="days" data-group="days">
+          
+        </div>
+         
+      </div>
+      <div id="res_div_link" >  
+      
+      <a onclick="monthlyView();" href="javascript:void(0);" class="weekly_view_butt" >Monthly View</a>
+      </div>
+       
+    </div>
+     -->
 </div>
 
 <div id="leaverequestform" style="display:none;">
@@ -1675,7 +1992,11 @@ $(document).ready(function(){
 			   },3000);
 	<?php } ?>
 
-
+    $('.rejected_note').powerTip({
+         placement: 'e',
+         mouseOnToPopup: true,
+         smartPlacement: true
+    });
 
 	var empDoj = $('#empDoj').val();
    // var dt = new Date(empDoj);
diff --git a/application/modules/timemanagement/views/scripts/notifications/getnotifications.ajax.phtml b/application/modules/timemanagement/views/scripts/notifications/getnotifications.ajax.phtml
new file mode 100644
index 000000000..43cd8bc6d
--- /dev/null
+++ b/application/modules/timemanagement/views/scripts/notifications/getnotifications.ajax.phtml
@@ -0,0 +1,167 @@
+
+<div id="<?php echo $this->type;?>" >
+	<div id="logmanagerview" >
+		<p>
+		<div class="pj_task_content" >
+             <div id='task_content_div'>
+				<table border='0' class='tm_grid tablesorter tm_body_content' align="left" id='idaddtaskstbl' cellpadding="0" cellspacing="0">
+				<thead>
+					<tr>
+						<th align="left">Timesheet Date<span class="sort_icon"></span></th>
+						<th align="left">Status<span class="sort_icon"></span></th>
+					</tr>
+				</thead>
+				<?php if(count($this->dataArray)>0) { 
+				$noOfRow = 0;$curPageNo = 1;$style = "";
+				?>
+				<?php foreach($this->dataArray as $key=>$status){
+				  	if($noOfRow >= $this->perPage){
+		           		$noOfRow = 0;
+						$curPageNo++;
+		        	}
+					if($curPageNo != 1){
+		        		$style = 'display:none;';
+		        	}
+					$classColor = 'row1';
+				?>
+				<?php if($status!='submitted' && $status!='approved') { ?>
+				<tr class="rowshowhideTr_<?php echo $curPageNo;?> <?php echo $classColor;?>" style="<?php echo $style;?>" onclick="selectrow(logmanagerview,this);">
+					<td style="cursor:pointer" onclick = "weekEdit('<?php echo date('Y-m',strtotime($key));?>','<?php echo date('d',strtotime($key));?>')"><?php echo sapp_Global::change_date($key,'view');?></td>
+					<?php 
+					$classArray = array('Approved'=>'approved','for_approval','Yet to submit'=>'yet_to_submit','no_entry','rejected'=>'rejected','enabled'=>'enabled','blocked'=>'blocked','weekend');
+					$display_status = $status;
+					$class = '';
+					if($status=='saved' || $status=='no_entry')
+						{
+							$display_status = 'Yet to submit';
+						}					
+					?>
+					<td class = '<?php echo $classArray[$display_status];?>'><?php echo ucfirst($display_status); ?></td>
+				</tr>
+				<?php $noOfRow++;
+				}
+				} ?>
+				<?php } else { ?>
+				<tr id="nodata"><td class="no-data-td" colspan="2"><p class="no-data">No data found.</p></td></tr>
+				<?php } ?>
+				</table>
+				<input type="hidden" id="pageno" value="<?php echo $this->pageNo;?>" />
+<input type="hidden" id="totalcount" value="<?php echo $this->totalJsonCount;?>" />
+<input type="hidden" id="per_page" value="<?php echo $this->perPage;?>" />
+<input type="hidden" id="lastpageno" value="" />
+
+   <div class="table-btm">
+		<div class="pagination_block">
+		 <?php if(count($this->dataArray) >0){?>
+			<div class="records_block">
+				<div class="page_txt">
+					<span>Records per page</span>
+					<div class="records_number-drop-down">						
+						<select id="sel_per_page" class="table_inputs not_appli clearall fltleft">
+						<option value="10" <?php echo ($this->perPage == 10)?"selected":"" ;?>>10</option>
+						    <option value="20" <?php echo ($this->perPage == 20)?"selected":"" ;?>>20</option>
+						    <option value="50" <?php echo ($this->perPage == 50)?"selected":"" ;?>>50</option>
+						    <option value="100" <?php echo ($this->perPage == 100)?"selected":"" ;?>>100</option>
+						    <option value="150" <?php echo ($this->perPage == 150)?"selected":"" ;?>>150</option>
+						    <option value="200" <?php echo ($this->perPage == 200)?"selected":"" ;?>>200</option>
+						</select>
+					</div>
+					
+				</div>
+			</div>
+                   
+            <div class="pagination_view">
+				<?php sapp_Global::pagination_html(); ?>
+			</div>
+
+<?php }?>
+		</div>
+	</div>
+				
+			</div>
+		</div>
+		</p>
+	</div>
+	</div>
+	<script type='text/javascript'>
+	$(document).ready(function(){
+	$( "#tabs" ).tabs();
+	var perpage = parseInt($('#per_page').val());
+     var totalrecords = parseInt($('#totalcount').val());
+     var lastpageNo = Math.ceil(totalrecords /parseInt(perpage)); 
+     $('#lastpageno').val(lastpageNo);
+     
+		  if(parseInt($('#lastpageno').val()) > 1)
+	     {
+		   $('.pagination_view').show();
+            
+		   $('.pagination').jqPagination({
+		    link_string	: '/?page={page_number}',
+		    current_page    : parseInt($('#pageno').val()),
+		    max_page	: parseInt($('#lastpageno').val()),
+		    paged		: function(page) { 
+	
+		    $('#pageno').val(page);
+		    $(".row1").hide();
+		    $(".row2").hide();
+	
+		    var perpage = parseInt($('#per_page').val());
+		    //var startRecord = (page-1) * perpage; 
+			var startRecord =((page-1) * perpage) + 1;
+		    var endRecord = startRecord + perpage;
+			  for(i = startRecord ; i < endRecord; i++){
+		        $("table tr:nth-child("+i+")" ).show();
+			  }
+		   }
+		});
+	 }else{
+		 $('.pagination_view').hide();
+
+		 $(".row1").hide();
+		 $(".row2").hide(); 
+	
+		 var perpage = parseInt($('#per_page').val());
+		 var startRecord = 0; 
+		 var endRecord = startRecord + perpage; 
+		  for(i = startRecord ; i < endRecord; i++){
+		      $("table tr:nth-child("+i+")" ).show();
+		  }
+
+	 }
+
+
+	 $('#sel_per_page').change(function(){
+	        var val = $(this).val();
+	        $('#per_page').val(val);
+	        $('#pageno').val('1');
+
+	        $(".row1").hide();
+		    $(".row2").hide();
+
+		    perpage = parseInt(val);
+		    var startRecord = 0; 
+		    var endRecord = startRecord + perpage;
+			  for(i = startRecord ; i < endRecord; i++){
+		        $("table tr:nth-child("+i+")" ).show();
+			  }
+
+			  lastpageNo = Math.ceil(totalrecords /perpage);
+			  $('#lastpageno').val(lastpageNo);
+
+			  if(lastpageNo > 1){
+				  $('.pagination_view').show();
+              	  $('.pagination').jqPagination('option', 'current_page', 1);
+			      $('.pagination').jqPagination('option', 'max_page', lastpageNo);
+			  }else{
+				  $('.pagination_view').hide();
+			  }
+			  
+			 
+	        
+	    });
+
+    $('table#idaddtaskstbl').tablesorter({
+        widgets: ['zebra']
+    });
+	});
+	</script>
\ No newline at end of file
diff --git a/application/modules/timemanagement/views/scripts/notifications/index.phtml b/application/modules/timemanagement/views/scripts/notifications/index.phtml
new file mode 100644
index 000000000..c169cd5a2
--- /dev/null
+++ b/application/modules/timemanagement/views/scripts/notifications/index.phtml
@@ -0,0 +1,239 @@
+<?php 
+/********************************************************************************* 
+ *  This file is part of Sentrifugo.
+ *  Copyright (C) 2014 Sapplica
+ *   
+ *  Sentrifugo is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Sentrifugo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Sentrifugo.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  Sentrifugo Support <support@sentrifugo.com>
+ ********************************************************************************/
+?>
+<?php 
+$yet_to_submit_cnt = '';
+$rejected_cnt='';
+$blocked_cnt = '';
+$enabled_cnt = '';
+$all_cnt ='';
+if(count($this->yet_to_submit_dates) >0)
+{
+	$yet_to_submit_cnt = '('.count($this->yet_to_submit_dates).')';
+}
+if($this->rejectedCount>0)
+{
+	$rejected_cnt = '('.$this->rejectedCount.')';
+}
+if($this->blockedCount>0)
+{
+	$blocked_cnt = '('.$this->blockedCount.')';
+}
+if($this->enabledCount>0)
+{
+	$enabled_cnt = '('.$this->enabledCount.')';
+}
+if($this->allCount>0)
+{
+	$all_cnt	= '('.$this->allCount.')';
+}
+?>
+<div id="tabs" style="clear: both;" class="employee_appraisal_tabs employee_notifi_tabs ui-tabs">
+	<ul class="ui-tabs-nav" style="clear:both;">
+		<li class="ui-state-active" onclick="pagination_click('yet_to_submit');"><a href="#yet_to_submit">Yet To Submit <span class="note_con_num"><?php echo $yet_to_submit_cnt;?></span></a></li>
+		<li onclick="pagination_click('rejected');" style="position: relative;"><a href="#rejected">Rejected<span class="note_con_num"><?php echo $rejected_cnt;?></span></a></li>
+		<li onclick="pagination_click('blocked');" style="position: relative;"><a href="#blocked">Blocked<span class="note_con_num"><?php echo $blocked_cnt;?></span></a></li>
+		<li onclick="pagination_click('enabled');" style="position: relative;"><a href="#enabled">Enabled<span class="note_con_num"><?php echo $enabled_cnt;?></span></a></li>
+		<li onclick="pagination_click('all');" style="position: relative;"><a href="#all">All<span class="note_con_num"><?php echo $all_cnt;?></span></a></li>
+	</ul>
+	
+	<div id="main_div">
+	<div id="yet_to_submit" >
+	<div id="logmanagerview" >
+		<p>
+		<div class="pj_task_content" >
+             <div id='task_content_div'>
+				<table border='0' class='tm_grid tablesorter tm_body_content' align="left" id='idaddtaskstbl' cellpadding="0" cellspacing="0">
+				<thead>
+					<tr>
+						<th align="left">Timesheet Date<span class="sort_icon"></span></th>
+						<th align="left">Status<span class="sort_icon"></span></th>
+					</tr>
+				</thead>
+				<?php if(count($this->yet_to_submit_dates)>0) { 
+				$noOfRow = 0;$curPageNo = 1;$style = "";
+				?>
+				<?php foreach($this->yet_to_submit_dates as $key=>$status){
+				
+				  	if($noOfRow >= $this->perPage){
+		           		$noOfRow = 0;
+						$curPageNo++;
+		        	}
+					if($curPageNo != 1){
+		        		$style = 'display:none;';
+		        	}
+					$classColor = 'row1';
+				?>
+				<tr class="rowshowhideTr_<?php echo $curPageNo;?> <?php echo $classColor;?>" style="<?php echo $style;?>" onclick="selectrow(logmanagerview,this);">
+					<td style="cursor:pointer" onclick = "weekEdit('<?php echo date('Y-m',strtotime($key));?>','<?php echo date('d',strtotime($key));?>')"><?php echo sapp_Global::change_date($key,'view');?></td>
+					<?php 
+					$display_status = $status;
+					$classArray = array('Approved'=>'approved','for_approval','Yet to submit'=>'yet_to_submit','no_entry','rejected'=>'rejected','enabled'=>'enabled','blocked'=>'blocked','weekend');
+					$class = '';
+					if($status=='saved' || $status=='no_entry')
+						{
+							$display_status = 'Yet to submit';
+							$class = 'yet_to_submit';
+						}					
+					?>
+					<td class = '<?php echo $classArray[$display_status];?>'><?php echo ucfirst($display_status); ?></td>
+				</tr>
+				<?php $noOfRow++;} ?>
+				<?php } else { ?>
+				<tr id="nodata"><td class="no-data-td" colspan="2"><p class="no-data">No data found.</p></td></tr>
+				<?php } ?>
+				</table>
+
+				<input type="hidden" id="pageno" value="<?php echo $this->pageNo;?>" />
+<input type="hidden" id="totalcount" value="<?php echo $this->totalJsonCount;?>" />
+<input type="hidden" id="per_page" value="<?php echo $this->perPage;?>" />
+<input type="hidden" id="lastpageno" value="" />
+
+   <div class="table-btm">
+		<div class="pagination_block">
+		 <?php if(count($this->yet_to_submit_dates) >0){?>
+			<div class="records_block">
+				<div class="page_txt">
+					<span>Records per page</span>
+					<div class="records_number-drop-down">						
+						<select id="sel_per_page" class="table_inputs not_appli clearall fltleft">
+						<option value="10" <?php echo ($this->perPage == 10)?"selected":"" ;?>>10</option>
+						    <option value="20" <?php echo ($this->perPage == 20)?"selected":"" ;?>>20</option>
+						    <option value="50" <?php echo ($this->perPage == 50)?"selected":"" ;?>>50</option>
+						    <option value="100" <?php echo ($this->perPage == 100)?"selected":"" ;?>>100</option>
+						    <option value="150" <?php echo ($this->perPage == 150)?"selected":"" ;?>>150</option>
+						    <option value="200" <?php echo ($this->perPage == 200)?"selected":"" ;?>>200</option>
+						</select>
+					</div>
+					
+				</div>
+			</div>
+                   
+            <div class="pagination_view">
+				<?php sapp_Global::pagination_html(); ?>
+			</div>
+
+<?php }?>
+		</div>
+	</div>
+			</div>
+		</div>
+		</p>
+	</div>
+	</div>
+</div>
+</div>
+<script type='text/javascript'>
+function pagination_click(type)
+{
+    $.ajax({
+		url: base_url + "/timemanagement/notifications/getnotifications/format/html",
+		data: 'type='+type,
+		dataType: 'html',
+		success: function(response) {
+			$('#main_div').html(response);
+		}
+	});
+}
+
+$(document).ready(function(){
+$('.breadcrumbs').append("<span class='arrows'>&rsaquo;</span><span>Notifications</span>");
+	var perpage = parseInt($('#per_page').val());
+     var totalrecords = parseInt($('#totalcount').val());
+     var lastpageNo = Math.ceil(totalrecords /parseInt(perpage)); 
+     $('#lastpageno').val(lastpageNo);
+     
+		  if(parseInt($('#lastpageno').val()) > 1)
+	     {
+		   $('.pagination_view').show();
+            
+		   $('.pagination').jqPagination({
+		    link_string	: '/?page={page_number}',
+		    current_page    : parseInt($('#pageno').val()),
+		    max_page	: parseInt($('#lastpageno').val()),
+		    paged		: function(page) { 
+	
+		    $('#pageno').val(page);
+		    $(".row1").hide();
+		    $(".row2").hide();
+	
+		    var perpage = parseInt($('#per_page').val());
+		    //var startRecord = (page-1) * perpage; 
+			var startRecord =((page-1) * perpage) + 1;
+		    var endRecord = startRecord + perpage;
+			  for(i = startRecord ; i < endRecord; i++){
+		        $("table tr:nth-child("+i+")" ).show();
+			  }
+		   }
+		});
+	 }else{
+		 $('.pagination_view').hide();
+
+		 $(".row1").hide();
+		 $(".row2").hide(); 
+	
+		 var perpage = parseInt($('#per_page').val());
+		 var startRecord = 0; 
+		 var endRecord = startRecord + perpage; 
+		  for(i = startRecord ; i < endRecord; i++){
+		      $("table tr:nth-child("+i+")" ).show();
+		  }
+
+	 }
+
+
+	 $('#sel_per_page').change(function(){
+	        var val = $(this).val();
+	        $('#per_page').val(val);
+	        $('#pageno').val('1');
+
+	        $(".row1").hide();
+		    $(".row2").hide();
+
+		    perpage = parseInt(val);
+		    var startRecord = 0; 
+		    var endRecord = startRecord + perpage;
+			  for(i = startRecord ; i < endRecord; i++){
+		        $("table tr:nth-child("+i+")" ).show();
+			  }
+
+			  lastpageNo = Math.ceil(totalrecords /perpage);
+			  $('#lastpageno').val(lastpageNo);
+
+			  if(lastpageNo > 1){
+				  $('.pagination_view').show();
+              	  $('.pagination').jqPagination('option', 'current_page', 1);
+			      $('.pagination').jqPagination('option', 'max_page', lastpageNo);
+			  }else{
+				  $('.pagination_view').hide();
+			  }
+			  
+			 
+	        
+	    });
+
+    $('table#idaddtaskstbl').tablesorter({
+        widgets: ['zebra']
+    });
+	$( "#tabs" ).tabs();
+	//$('.breadcrumbs').append("<span class='arrows'>&rsaquo;</span><a href='<?php echo BASE_URL; ?>timemanagement/projects'>Projects</a><span class='arrows'>&rsaquo;</span><span>View</span>");
+});
+</script>
diff --git a/application/modules/timemanagement/views/scripts/notifications/pendingsubmissions.phtml b/application/modules/timemanagement/views/scripts/notifications/pendingsubmissions.phtml
new file mode 100644
index 000000000..7072dcc1e
--- /dev/null
+++ b/application/modules/timemanagement/views/scripts/notifications/pendingsubmissions.phtml
@@ -0,0 +1,322 @@
+<?php 
+/********************************************************************************* 
+ *  This file is part of Sentrifugo.
+ *  Copyright (C) 2014 Sapplica
+ *   
+ *  Sentrifugo is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Sentrifugo is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Sentrifugo.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  Sentrifugo Support <support@sentrifugo.com>
+ ********************************************************************************/
+?>
+
+<?php
+//echo '<pre/>';
+$sunday = strtotime("last sunday");
+$sunday = date('w', $sunday)==date('w') ? $sunday+7*86400 : $sunday;
+$satday = strtotime(date("Y-m-d",$sunday)." +6 days");
+$this_week_sd = date("Y-m-d",$sunday);
+$get_current_weekNum = date("W") - date("W", strtotime(date("Y-m-01", time()))) + 1;
+if($this_week_sd==date('Y-m-01'))//if month start with sunday
+{
+	$get_current_weekNum = $get_current_weekNum-1;
+}
+$weeks = $this->prevweeks;
+$total_weeks_count = count($this->prevweeks);
+$pending_submission = $this->pending_submission;
+$hidweek=$this->total_weeks;
+$emp_names=$this->emp_names;
+$is_current_week = $this->is_current_week;
+$currentMonth = date('Y-m');
+if($is_current_week==0)
+{
+	$currentMonth = date('Y-m', strtotime(date('Y-m')." -1 month"));
+}
+$datesArray =  iterator_to_array(new DatePeriod(new DateTime("first sunday of $currentMonth"),
+DateInterval::createFromDateString('next sunday'),new DateTime("last day of $currentMonth")));
+
+$firstDay = DateTime::createFromFormat('Y-m-d', "$currentMonth".'-1');
+$firstDayName =  $firstDay->format('D');
+$wCounter = 1;
+if($firstDayName != 'Sun')  $wCounter = 2;
+
+if($hidweek == 1) {
+$startDate = $currentMonth."-1";
+$weekStartDay = date('F d, Y', strtotime('last sunday', strtotime($startDate)));
+if($startDate==date('Y-m-1'))
+{	
+	$weekStartDay = date('F d, Y', strtotime($startDate));		
+}					
+} else  {			
+$startDate = $datesArray[($hidweek-$wCounter)]->format("Y-m-d");
+$weekStartDay = date('F d, Y', strtotime($startDate));
+}
+$lastwkend_date_mnth = date('Y-m',strtotime('next saturday', strtotime($weekStartDay)));
+$lastweek_start_mnth = date('Y-m', strtotime('last sunday', strtotime($startDate)));
+
+$weekendDay = date('F d, Y', strtotime('next saturday', strtotime($weekStartDay)));
+
+if($lastweek_start_mnth != $lastwkend_date_mnth && $is_current_week==0)
+{
+	$weekendDay = date("F d, Y", strtotime("last day of previous month"));
+}
+
+$hidstartweek_date=min($this->prevweeks[$hidweek]);
+$hidendweek_date=max($this->prevweeks[$hidweek]);
+$weekStartDay = date('F d, Y', strtotime($hidstartweek_date));
+$weekendDay = date("F d, Y", strtotime($hidendweek_date));
+
+$class_arros='';
+if($this->total_weeks>1)
+{
+	$class_arros='down_week_arrow';
+}
+?>
+<div id="tabs" style="clear: both;" class="employee_appraisal_tabs employee_notifi_tabs ui-tabs">
+	<ul class="toggle_btn mont_week right_week_toggle" style="clear:both;">
+		<li id="week" class="ui-state-active" onclick="pending_submission_click('week','week_view');">Week</li>
+		<li id="month" onclick="pending_submission_click('month','month_view');" style="position: relative;">Month</li>
+	
+	</ul>
+<div id="main_div" class="clear">
+	<div id="week_view" >
+	<div id="logmanagerview" >
+		<p>
+			<div class="week_select" style="margin-top: 54px; height: 20px;">
+			<ul class="scroll_change scroll_change_single marg_top_0 flt_lft single" id="show_hide" onclick="show_hide_ul();">
+
+				<li>
+				<span class="main_txt"><span  id="weeknamedisplay" > Week-<?php echo $hidweek;?></span><div class="<?php echo $class_arros;?>"></div></span>
+				<span class="sub_txt" id="weekdatesdisplay"><?php echo $weekStartDay." - ".$weekendDay; ?></span>
+				</li>
+			</ul>
+		<?php if($this->total_weeks>1) { ?>
+            <ul class="scroll_change week_select_list" style="display:none;">
+			<!--<li class="prev_click"><i class="fa fa-arrow-left fa-2"></i></li>-->
+			
+<?php
+
+
+    for($i=1;$i<=$this->total_weeks;$i++)           
+            {
+			
+				$is_valid_week=array();
+				foreach($pending_submission as $key => $data)
+				{
+					if($get_current_weekNum>1)
+					{
+						$is_valid_arrayy = array();
+						$is_diff_arrayy = array();
+						if(isset($pending_submission[$key][$i])){
+						foreach($pending_submission[$key][$i] as $dtkey => $stusval)
+						{
+							if($dtkey>=date('Y-m-01') && $dtkey<=date('Y-m-t'))
+							{
+								$is_valid_arrayy[] = 1;
+							}
+							else
+							{
+								$is_diff_arrayy[$dtkey] = $stusval;
+							}
+						}
+						}
+						if(isset($is_diff_arrayy) && count($is_diff_arrayy)>0)
+						{
+							$data[$i] = array_diff_key($data[$i],$is_diff_arrayy);
+						}
+					}
+					if(isset($pending_submission[$key][$i])&& !empty($data[$i]) && (in_array('No Entry',$data[$i]) || in_array('saved',$data[$i]) || in_array('blocked',$data[$i]) || in_array('enabled',$data[$i]) || in_array('rejected',$data[$i]) || in_array('Saved',$data[$i])))
+					{
+						$is_valid_week[] = 1;
+					}
+				}
+				if(in_array(1,$is_valid_week))
+				{
+					$starday_w=min($weeks[$i]);
+					$endday_w=max($weeks[$i]);
+					if($i!=$hidweek)
+					{    
+	?>                      <li id="highlight_<?php echo $i;?>"><a href="javascript:void(0)" onclick="weeklyPendingSubmission('<?php echo $i;?>')"><span class="main_txt"> Week-<?php echo $i;?></span></a></li>
+	<?php           }
+					else 
+					{
+	?>                      <li id="highlight_<?php echo $i;?>" class="active"><a href="javascript:void(0)" onclick="weeklyPendingSubmission('<?php echo $i;?>')"><span class="main_txt"> Week-<?php echo $i;?></span></a></li>
+	<?php                        
+					}
+				}
+				
+            }   
+?>
+<!--<li class="next_click"><i class="fa fa-arrow-right fa-2"></i></li>-->
+            </ul>
+			<?php } ?>
+			</div>
+			<?php 
+			$display_month = date('F Y');
+			if($is_current_week==0) { 
+				$display_month = date('F Y', strtotime(date('F Y')." -1 month"));
+			}
+			?>
+			 <div class="div_mnth"><?php echo $display_month;?></div>
+			<table border='0' class='notifi_table_grid table_top_padding tm_grid tablesorter tm_body_content' align="left" id='idaddtaskstbl' cellpadding="0" cellspacing="0"  style="table-layout: auto;">
+				<tr><td colspan="9" class="tm_grid_header">Pending Submissions </td></tr>
+				<tr>
+					<th  align="left" >Employee</th>
+					<?php foreach($this->prevweeks[$total_weeks_count] as $wek) { 
+					$new_wek=new DateTime($wek);
+             $day_name=$new_wek->format('D');
+?>          <th  align="left" ><div class="week_date_note"><?php echo $new_wek->format('d')."  ".$day_name;?></div></th>
+					<?php } ?>
+				</tr>
+				<?php 
+				foreach($pending_submission as $key => $data){
+					if($get_current_weekNum>1)
+					{
+						$is_valid_array = array();
+						$is_diff_array = array();
+						if(isset($pending_submission[$key][$total_weeks_count])){
+						foreach($pending_submission[$key][$total_weeks_count] as $dtkey => $stusval)
+						{
+							if($dtkey>=date('Y-m-01') && $dtkey<=date('Y-m-t'))
+							{
+								$is_valid_array[] = 1;
+							}
+							else
+							{
+								$is_diff_array[$dtkey] = $stusval;
+							}
+						}
+						}
+						if(isset($is_diff_array) && count($is_diff_array)>0)
+						{
+							$pending_submission[$key][$total_weeks_count] = array_diff_key($pending_submission[$key][$total_weeks_count],$is_diff_array);
+						}
+					}
+				   if(isset($pending_submission[$key][$total_weeks_count]) && (in_array('No Entry',$pending_submission[$key][$total_weeks_count]) || in_array('saved',$pending_submission[$key][$total_weeks_count]) || in_array('blocked',$pending_submission[$key][$total_weeks_count]) || in_array('enabled',$pending_submission[$key][$total_weeks_count]) || in_array('rejected',$pending_submission[$key][$total_weeks_count]) || in_array('Saved',$pending_submission[$key][$total_weeks_count]))){
+				?>
+
+				<tr>
+				<?php if(isset($data[$total_weeks_count]) && !empty($data[$total_weeks_count])) {?>
+				<td  align="left" ><?php echo $emp_names[$key];?></td>
+				<?php 
+				         $j = 0;
+						 $class='';
+				       foreach($this->prevweeks[$total_weeks_count] as $week_date) { 
+					   if(isset($data[$total_weeks_count][$week_date])){
+					    $class=strtolower($data[$total_weeks_count][$week_date]);
+					   if($data[$total_weeks_count][$week_date]=='No Entry')
+					   {
+						$class='no_entry';
+					   }else if($data[$total_weeks_count][$week_date]=='Week end')
+					   {
+						$class='week_end';
+					   }else if($data[$total_weeks_count][$week_date]=='Holiday')
+					   {
+						$class='holiday';
+					   }else if($data[$total_weeks_count][$week_date]=='Leave')
+					   {
+						$class='leave';
+					   }else if($data[$total_weeks_count][$week_date]=='submitted')
+					   {
+						$class='for_approval'; 
+					   }
+					   }
+					   
+				        ?>
+				<td  align="left" class="<?php echo $class;?>"><?php if(isset($data[$total_weeks_count][$week_date])){
+							if($data[$total_weeks_count][$week_date]=='saved')
+							{
+								echo 'Yet to Submit';
+							}else {
+					        echo ucfirst($data[$total_weeks_count][$week_date]);
+							}
+						  }else{
+						    echo '';
+						  }?>
+				</td>
+				<?php  $j++;
+				   } 
+				  } 
+				  }?>
+				</tr>
+				<?php }?>
+			</table>
+		</p>
+	</div>
+	</div>
+</div>
+</div>
+<script type='text/javascript'>
+
+function show_hide_ul()
+{
+	if($('.week_select_list').css('display') == 'none')
+	{
+		$('.week_select_list').css('display','block');
+	}
+	else
+	{
+		$('.week_select_list').css('display','none');
+	}
+	
+}
+$(document).ready(function(){	
+$('.breadcrumbs').append("<span class='arrows'>&rsaquo;</span><span>Pending Submissions</span>");	
+	$(document).click(function(e)  {
+		$('.week_select_list').css('display','none');
+	});
+	});
+$("#show_hide").mouseover(function() {
+	$('.week_select_list').css('display','block');
+});
+
+function weeklyPendingSubmission(type)
+{
+	$("li").removeClass("active");
+	$('#highlight_'+type).addClass('active');
+	var obj = '<?php echo json_encode($pending_submission); ?>';
+	var previous_week = '<?php echo json_encode($this->prevweeks)?>';
+	var emp_names = '<?php echo json_encode($this->emp_names)?>';
+	var is_current_week = '<?php echo $is_current_week?>';
+    $.ajax({
+		url: base_url + "/timemanagement/notifications/pendingsubmissionsweeklyview/format/html",
+		data: 'type='+type+'&display_array='+obj+'&weekly_preview='+previous_week+'&emp_names='+emp_names+'&is_current_week='+is_current_week,
+		type: 'POST',
+		dataType: 'html',
+		success: function(response) {
+			$('#idaddtaskstbl').html(response);
+			//$('#idaddtaskstbl').html(response);
+			//$('#idaddtaskstbl').html(response);
+		}
+	});
+}
+function pending_submission_click(input_type,div_name)
+{
+	$("li").removeClass("ui-state-active");
+	$('#'+input_type).addClass('ui-state-active');
+	var obj = '<?php echo json_encode($pending_submission); ?>';
+	var previous_week = '<?php echo json_encode($this->prevweeks);?>';
+	var emp_names = '<?php echo json_encode($emp_names)?>';
+	var total_weeks = '<?php echo $this->total_weeks?>';
+	var is_current_week = '<?php echo $is_current_week?>';
+	    $.ajax({
+		url: base_url + "/timemanagement/notifications/weeklymonthlyview/format/html",
+		data: 'input_type='+input_type+'&display_array='+obj+'&weekly_preview='+previous_week+'&div_name='+div_name+'&total_weeks='+total_weeks+'&emp_names='+emp_names+'&is_current_week='+is_current_week,
+		type: 'POST',
+		dataType: 'html',
+		success: function(response) {
+			$('#main_div').html(response);
+		}
+	});
+}
+</script>
diff --git a/application/modules/timemanagement/views/scripts/notifications/pendingsubmissionsweeklyview.ajax.phtml b/application/modules/timemanagement/views/scripts/notifications/pendingsubmissionsweeklyview.ajax.phtml
new file mode 100644
index 000000000..0b4584f7b
--- /dev/null
+++ b/application/modules/timemanagement/views/scripts/notifications/pendingsubmissionsweeklyview.ajax.phtml
@@ -0,0 +1,104 @@
+			<?php
+			$sunday = strtotime("last sunday");
+$sunday = date('w', $sunday)==date('w') ? $sunday+7*86400 : $sunday;
+$satday = strtotime(date("Y-m-d",$sunday)." +6 days");
+$this_week_sd = date("Y-m-d",$sunday);
+$get_current_weekNum = date("W") - date("W", strtotime(date("Y-m-01", time()))) + 1;
+if($this_week_sd==date('Y-m-01'))//if month start with sunday
+{
+	$get_current_weekNum = $get_current_weekNum-1;
+}
+			//$get_current_weekNum = date("W") - date("W", strtotime(date("Y-m-01", time()))) + 1;
+			$pending_submission = $this->pending_submission;
+			$emp_names = $this->emp_names;
+			?>
+			<table border='0' class='tm_grid tablesorter tm_body_content' align="left" id='idaddtaskstbl' cellpadding="0" cellspacing="0" style="table-layout: auto;">
+			<tr><td colspan="9" class="tm_grid_header">Pending Submissions </td></tr>
+				<tr>
+					<th align="left" >Employee</th>
+					<?php foreach($this->prevweeks[$this->type] as $wek) { 
+					$new_wek=new DateTime($wek);
+             $day_name=$new_wek->format('D');
+?>          <th align="left" ><div class="week_date_note"><?php echo $new_wek->format('d')."  ".$day_name;?></div></th>
+					<?php } ?>
+				</tr>
+				<?php 
+				foreach($pending_submission as $key => $data){
+					if($get_current_weekNum>1)
+					{
+						$is_valid_array = array();
+						$is_diff_array = array();
+						if(isset($pending_submission[$key][$this->type])){
+						foreach($pending_submission[$key][$this->type] as $dtkey => $stusval)
+						{
+							if($dtkey>=date('Y-m-01') && $dtkey<=date('Y-m-t'))
+							{
+								$is_valid_array[] = 1;
+							}
+							else
+							{
+								$is_diff_array[$dtkey] = $stusval;
+							}
+						}
+						}
+						if(isset($is_diff_array) && count($is_diff_array)>0)
+						{
+							$pending_submission[$key][$this->type] = array_diff_key($pending_submission[$key][$this->type],$is_diff_array);
+						}
+					}
+				   if(isset($pending_submission[$key][$this->type]) && (in_array('No Entry',$pending_submission[$key][$this->type]) || in_array('Saved',$pending_submission[$key][$this->type]) || in_array('blocked',$pending_submission[$key][$this->type]) || in_array('enabled',$pending_submission[$key][$this->type]) || in_array('rejected',$pending_submission[$key][$this->type]) || in_array('saved',$pending_submission[$key][$this->type]))){
+				?>
+				<tr>
+				<td align="left" ><?php echo $emp_names[$key];?></td>
+				<?php if(isset($data[$this->type]) && !empty($data[$this->type])) {
+				         $j = 0;
+						 $class='';
+				       foreach($this->prevweeks[$this->type] as $week_date) { 
+					   if(isset($data[$this->type][$week_date])){
+					   $class=strtolower($data[$this->type][$week_date]);
+					   if($data[$this->type][$week_date]=='No Entry')
+					   {
+						$class='no_entry';
+					   }else if($data[$this->type][$week_date]=='Week end')
+					   {
+						$class='week_end';
+					   }else if($data[$this->type][$week_date]=='Holiday')
+					   {
+						$class='holiday';
+					   }else if($data[$this->type][$week_date]=='Leave')
+					   {
+						$class='leave';
+					   }else if($data[$this->type][$week_date]=='submitted')
+					   {
+						$class='for_approval'; 
+					   }
+					   }
+				        ?>
+				<td align="left"  class="<?php echo $class;?>"><?php if(isset($data[$this->type][$week_date])){
+							if($data[$this->type][$week_date]=='saved')
+							{
+								echo 'Yet to Submit';
+							}
+							else
+							{
+								echo ucfirst($data[$this->type][$week_date]);
+							}
+						  }else{
+						    echo '';
+						  }?>
+				</td>
+				<?php  $j++;
+				   } 
+				  } ?>
+				  </tr>
+				  <?php }  ?>
+				  
+				<?php }?>				
+			</table>
+			
+			<script>
+			$(document).ready(function(){
+				$('#weeknamedisplay').html('Week-'+<?php echo $this->type;?> );
+			 $('#weekdatesdisplay').html('<?php echo $this->display_date;?>');
+			});
+			</script>
\ No newline at end of file
diff --git a/application/modules/timemanagement/views/scripts/notifications/weeklymonthlyview.ajax.phtml b/application/modules/timemanagement/views/scripts/notifications/weeklymonthlyview.ajax.phtml
new file mode 100644
index 000000000..f50c9372e
--- /dev/null
+++ b/application/modules/timemanagement/views/scripts/notifications/weeklymonthlyview.ajax.phtml
@@ -0,0 +1,456 @@
+	<?php
+	//$get_current_weekNum = date("W") - date("W", strtotime(date("Y-m-01", time()))) + 1;
+	$sunday = strtotime("last sunday");
+$sunday = date('w', $sunday)==date('w') ? $sunday+7*86400 : $sunday;
+$satday = strtotime(date("Y-m-d",$sunday)." +6 days");
+$this_week_sd = date("Y-m-d",$sunday);
+$get_current_weekNum = date("W") - date("W", strtotime(date("Y-m-01", time()))) + 1;
+if($this_week_sd==date('Y-m-01'))//if month start with sunday
+{
+	$get_current_weekNum = $get_current_weekNum-1;
+}
+	$pending_submission = $this->pending_submission;
+	$weeks = $this->prevweeks;
+	$hidweek=$this->total_weeks;
+	$emp_names=$this->emp_names;
+
+	 $currentMonth = date('Y-m');
+	if($this->is_current_week==0)
+	{
+		$currentMonth = date('Y-m', strtotime(date('Y-m')." -1 month"));
+	}
+	$datesArray =  iterator_to_array(new DatePeriod(new DateTime("first sunday of $currentMonth"),
+    	 	DateInterval::createFromDateString('next sunday'),new DateTime("last day of $currentMonth")));
+        
+//    	foreach($datesArray as $sunday) {
+//    			//echo $sunday->format("Y-m-d\n");
+//		}
+
+		$firstDay = DateTime::createFromFormat('Y-m-d', "$currentMonth".'-1');
+		$firstDayName =  $firstDay->format('D');
+		$wCounter = 1;
+		if($firstDayName != 'Sun')  $wCounter = 2;
+			
+		if($hidweek == 1) {
+			$startDate = $currentMonth."-1";
+			$weekStartDay = date('F d, Y', strtotime('last sunday', strtotime($startDate)));
+			if($startDate==date('Y-m-1'))
+			{		
+				$weekStartDay = date('F d, Y', strtotime($startDate));		
+			}		
+		} else  {			
+			$startDate = $datesArray[($hidweek-$wCounter)]->format("Y-m-d");
+			$weekStartDay = date('F d, Y', strtotime($startDate));
+		}
+		
+		$lastwkend_date_mnth = date('Y-m',strtotime('next saturday', strtotime($weekStartDay)));
+$lastweek_start_mnth = date('Y-m', strtotime('last sunday', strtotime($startDate)));
+$weekendDay = date('F d, Y', strtotime('next saturday', strtotime($weekStartDay)));
+if($lastweek_start_mnth != $lastwkend_date_mnth && $this->is_current_week==0)
+{
+	$weekendDay = date("F d, Y", strtotime("last day of previous month"));
+}	?>
+	<?php 
+	
+	$hidstartweek_date=min($weeks[$hidweek]);
+		$hidendweek_date=max($weeks[$hidweek]);
+		$weekStartDay = date('F d, Y', strtotime($hidstartweek_date));
+		$weekendDay = date("F d, Y", strtotime($hidendweek_date));
+	
+	
+			$display_month = date('F Y');
+			if($this->is_current_week==0) { 
+				$display_month = date('F Y', strtotime(date('F Y')." -1 month"));
+			}
+			$class_arrow = '';
+			if($this->total_weeks>1)
+			{
+				$class_arrow = 'down_week_arrow';
+			}
+			?>
+	<?php if($this->input_type=='week') {
+	
+	?>
+	<div id="<?php echo $this->div_name;?>" >
+	<div id="logmanagerview" >
+		<p>
+			<div class="week_select" style="margin-top: 54px; height: 20px;">
+			<ul class="scroll_change scroll_change_single marg_top_0 flt_lft single" id="show_hide" onclick="show_hide_ul();">
+
+				<li>
+				<span class="main_txt"><span  id="weeknamedisplay" > Week-<?php echo $hidweek;?></span><div class="<?php echo $class_arrow;?>"></div></span>
+				<span class="sub_txt" id="weekdatesdisplay"><?php echo $weekStartDay." - ".$weekendDay; ?></span>
+				</li>
+			</ul>
+		<?php if($this->total_weeks>1) { ?>
+            <ul class="scroll_change week_select_list" style="display:none;">
+			<!--<li class="prev_click"><i class="fa fa-arrow-left fa-2"></i></li>-->
+<?php       for($i=1;$i<=$this->total_weeks;$i++)           
+            {
+				$is_valid_week=array();
+				foreach($pending_submission as $key => $data)
+				{
+					if($get_current_weekNum>1)
+					{
+						$is_valid_arrayyy = array();
+						$is_diff_arrayyy = array();
+						if(isset($pending_submission[$key][$i])){
+						foreach($pending_submission[$key][$i] as $dtkeyy => $stusvall)
+						{
+							if($dtkeyy>=date('Y-m-01') && $dtkeyy<=date('Y-m-t'))
+							{
+								$is_valid_arrayyy[] = 1;
+							}
+							else
+							{
+								$is_diff_arrayyy[$dtkeyy] = $stusvall;
+							}
+						}
+						}
+						if(isset($is_diff_arrayyy) && count($is_diff_arrayyy)>0)
+						{
+							$data[$i] = array_diff_key($data[$i],$is_diff_arrayyy);
+						}
+					}
+				
+					if(isset($pending_submission[$key][$i])&& !empty($data[$i]) && (in_array('No Entry',$data[$i]) || in_array('Saved',$data[$i]) || in_array('saved',$data[$i]) || in_array('blocked',$data[$i]) || in_array('rejected',$data[$i]) || in_array('enabled',$data[$i])))
+					{
+						$is_valid_week[] = 1;
+					}
+				}
+				if(in_array(1,$is_valid_week))
+				{
+						$starday_w=min($weeks[$i]);
+						$endday_w=max($weeks[$i]);
+						if($i!=$hidweek)
+						{    
+		?>                      <li id="highlight_<?php echo $i;?>"><a href="javascript:void(0)" onclick="weeklyPendingSubmission('<?php echo $i;?>')"><span class="main_txt"> Week-<?php echo $i;?></span></a></li>
+		<?php           }
+						else 
+						{
+		?>                      <li id="highlight_<?php echo $i;?>" class="active"><a href="javascript:void(0)" onclick="weeklyPendingSubmission('<?php echo $i;?>')"><span class="main_txt"> Week-<?php echo $i;?></span></a></li>
+		<?php                        
+						}
+					
+				}
+            }   
+?>
+<!--<li class="next_click"><i class="fa fa-arrow-right fa-2"></i></li>-->
+            </ul>
+			<?php } ?>
+			</div>
+			<div class="div_mnth"><?php echo $display_month;?></div>
+			<table border='0' class='notifi_table_grid table_top_padding tm_grid tablesorter tm_body_content' align="left" id='idaddtaskstbl' cellpadding="0" cellspacing="0" style="table-layout: auto;">
+				<tr><td colspan="9" class="tm_grid_header">Pending Submissions</td></tr>
+				<tr>
+					<th  align="left" >Employee</th>
+					<?php foreach($this->prevweeks[$this->total_weeks] as $wek) { 
+					$new_wek=new DateTime($wek);
+             $day_name=$new_wek->format('D');
+?>          <th  align="left" ><div class="week_date_note"><?php echo $new_wek->format('d')."  ".$day_name;?></div></th>
+					<?php } ?>
+				</tr>
+				<?php 
+				foreach($pending_submission as $key => $data){
+					if($get_current_weekNum>1)
+					{
+						$is_valid_array = array();
+						$is_diff_array = array();
+						if(isset($pending_submission[$key][$this->total_weeks])) { 
+						foreach($pending_submission[$key][$this->total_weeks] as $dtkey => $stusval)
+						{
+							if($dtkey>=date('Y-m-01') && $dtkey<=date('Y-m-t'))
+							{
+								$is_valid_array[] = 1;
+							}
+							else
+							{
+								$is_diff_array[$dtkey] = $stusval;
+							}
+						}
+						}
+						if(isset($is_diff_array) && count($is_diff_array)>0)
+						{
+							$pending_submission[$key][$this->total_weeks] = array_diff_key($pending_submission[$key][$this->total_weeks],$is_diff_array);
+						}
+					}
+				   if(isset($pending_submission[$key][$this->total_weeks]) && (in_array('Saved',$pending_submission[$key][$this->total_weeks]) || in_array('saved',$pending_submission[$key][$this->total_weeks]) || in_array('No Entry',$pending_submission[$key][$this->total_weeks]) || in_array('blocked',$pending_submission[$key][$this->total_weeks]) || in_array('rejected',$pending_submission[$key][$this->total_weeks]) || in_array('enabled',$pending_submission[$key][$this->total_weeks]))){
+				?>
+				<tr>
+				<td align="left" ><?php echo $emp_names[$key];?></td>
+				<?php if(isset($data[$this->total_weeks]) && !empty($data[$this->total_weeks])) {
+				         $j = 0;
+						 $class='';
+				       foreach($this->prevweeks[$this->total_weeks] as $week_date) { 
+					   if(isset($data[$this->total_weeks][$week_date])){
+					   $class=strtolower($data[$this->total_weeks][$week_date]);
+					   if($data[$this->total_weeks][$week_date]=='No Entry')
+					   {
+						$class='no_entry';
+					   }else if($data[$this->total_weeks][$week_date]=='Week end')
+					   {
+						$class='week_end';
+					   }else if($data[$this->total_weeks][$week_date]=='Holiday')
+					   {
+						$class='holiday';
+					   }else if($data[$this->total_weeks][$week_date]=='Leave')
+					   {
+						$class='leave';
+					   }else if($data[$this->total_weeks][$week_date]=='submitted')
+					   {
+						$class='for_approval'; 
+					   }
+					   }
+				        ?>
+						
+				<td align="left" class="<?php echo $class;?>"><?php if(isset($data[$this->total_weeks][$week_date])){
+							if($data[$this->total_weeks][$week_date]=='saved')
+							{
+								echo "Yet to Submit";
+							}else
+							{
+								echo ucfirst($data[$this->total_weeks][$week_date]);
+							}
+						  }else{
+						    echo '';
+						  }?>
+				</td>
+				<?php  $j++;
+				   } 
+				  } 
+				  }?>
+				</tr>
+				<?php }?>
+			</table>
+		</p>
+	</div>
+	</div>
+	<?php } else if($this->input_type=='month') {
+	?>
+	<div class="notif_month">
+	 <div class="div_mnth"><?php echo $display_month;?></div>
+	<table border='0' class='table_top_padding tm_grid tablesorter tm_body_content' align="left" id='idaddtaskstb2' cellpadding="0" cellspacing="0" style="table-layout: auto;">
+		<tr><td colspan="7" class="tm_grid_header">Pending Submissions </td></tr>
+		<tr>
+		<th align="left" >Employee</th>
+		<?php	
+		$available_weeks_array = array();
+		for($i=1;$i<=$this->total_weeks;$i++)
+         {
+			$is_valid_array = array();
+			
+			foreach($pending_submission as $key => $value)
+			{
+				if($get_current_weekNum>1)
+					{
+						$is_valid_arrayyy = array();
+						$is_diff_arrayyy = array();
+						if(isset($pending_submission[$key][$i])){
+						foreach($pending_submission[$key][$i] as $dtkeyy => $stusvall)
+						{
+							if($dtkeyy>=date('Y-m-01') && $dtkeyy<=date('Y-m-t'))
+							{
+								$is_valid_arrayyy[] = 1;
+							}
+							else
+							{
+								$is_diff_arrayyy[$dtkeyy] = $stusvall;
+							}
+						}
+						}
+						if(isset($is_diff_arrayyy) && count($is_diff_arrayyy)>0)
+						{
+							$pending_submission[$key][$i] = array_diff_key($pending_submission[$key][$i],$is_diff_arrayyy);
+						}
+					}
+				if(isset($pending_submission[$key][$i]) && (in_array('Saved',$pending_submission[$key][$i]) || in_array('No Entry',$pending_submission[$key][$i]) || in_array('blocked',$pending_submission[$key][$i]) || in_array('rejected',$pending_submission[$key][$i])  || in_array('enabled',$pending_submission[$key][$i]) || in_array('saved',$pending_submission[$key][$i]))) {
+					$is_valid_array[] = 1;
+					$available_weeks_array[] = $i;
+				}
+				else
+				{
+					$is_valid_array[] = 0;
+					$available_weeks_array[] = 0;
+				}
+			}
+			//print_r($is_valid_array);
+			if(in_array(1,$is_valid_array))
+			{
+?>          <th align="left" >Week-<?php echo $i;?></th>
+	<?php } ?>
+<?php             
+         }?>
+		</tr>
+		
+		<?php foreach($pending_submission as $key => $value){ ?>
+		<?php $is_valid = $toolTip = array();
+		for($i=1; $i<=$this->total_weeks;$i++ ) {
+		if(isset($pending_submission[$key][$i]) && (in_array('Saved',$pending_submission[$key][$i]) || in_array('No Entry',$pending_submission[$key][$i]) || in_array('blocked',$pending_submission[$key][$i]) || in_array('rejected',$pending_submission[$key][$i])  || in_array('enabled',$pending_submission[$key][$i]) || in_array('saved',$pending_submission[$key][$i]))) {
+				$is_valid[] = 1;
+		        $toolTip[$i] = '';
+				$toolTip[$i].= "<b><span class = 'note_tool_text'>Yet to submit</span></b><br/>";
+				 foreach($weeks[$i] as $week_date) { 
+					   if(isset($pending_submission[$key][$i][$week_date])){
+						   if($pending_submission[$key][$i][$week_date] == 'No Entry' || $pending_submission[$key][$i][$week_date] == 'Saved' || $pending_submission[$key][$i][$week_date] == 'rejected' || $pending_submission[$key][$i][$week_date] == 'blocked' || $pending_submission[$key][$i][$week_date] == 'enabled' || $pending_submission[$key][$i][$week_date] == 'saved'){
+						  // if((in_array('saved',$pending_submission[$key][$i]) || in_array('Saved',$pending_submission[$key][$i]) || in_array('blocked',$pending_submission[$key][$i]) || in_array('enabled',$pending_submission[$key][$i]) || in_array('rejected',$pending_submission[$key][$i]) || in_array('No Entry',$pending_submission[$key][$i]))){
+							   $penDate=new DateTime($week_date);
+							   $pendDate = $penDate->format('d').' ';
+							   $toolTip[$i].= "<span class = 'note_tool_date'>".$pendDate.$penDate->format('l')."</span><br/>";
+						   }
+					   
+					   }
+				 }
+			}else {$is_valid[] = 0;}
+		} ?>
+		<?php if(in_array(1,$is_valid)) { ?>
+		<tr>
+			
+			<td align="left" ><?php echo $emp_names[$key];?></td>
+		<?php for($i=1; $i<=$this->total_weeks;$i++ ) {?>
+			
+		<?php  
+		
+					if($get_current_weekNum>1)
+					{
+						$is_valid_arrayy = array();
+						$is_diff_array = array();
+						if(isset($pending_submission[$key][$i])){
+						foreach($pending_submission[$key][$i] as $dtkey => $stusval)
+						{
+							if($dtkey>=date('Y-m-01') && $dtkey<=date('Y-m-t'))
+							{
+								$is_valid_arrayy[] = 1;
+							}
+							else
+							{
+								$is_diff_array[$dtkey] = $stusval;
+							}
+						}
+						}
+						if(isset($is_diff_array) && count($is_diff_array)>0)
+						{
+							$pending_submission[$key][$i] = array_diff_key($pending_submission[$key][$i],$is_diff_array);
+						}
+					}
+		
+		$tdata = '';
+		if(in_array($i,$available_weeks_array)){
+		     if(isset($pending_submission[$key][$i]) && (in_array('saved',$pending_submission[$key][$i]) || in_array('Saved',$pending_submission[$key][$i]) || in_array('blocked',$pending_submission[$key][$i]) || in_array('enabled',$pending_submission[$key][$i]) || in_array('rejected',$pending_submission[$key][$i]) || in_array('No Entry',$pending_submission[$key][$i]))) {
+		            $tdata='data-powertip="'.$toolTip[$i].'"';
+					
+		$note='Yet to Submit';
+		$class='yet_to_submit';
+		if(isset($pending_submission[$key][$i])){
+				if(in_array('No Entry',$pending_submission[$key][$i]) || in_array('Saved',$pending_submission[$key][$i]) || in_array('saved',$pending_submission[$key][$i]))
+				{
+					$note='Yet to Submit';
+					$class='yet_to_submit';
+				}else
+				if(in_array('blocked',$pending_submission[$key][$i]))
+				{
+					$note = 'Blocked';
+					$class = 'blocked';
+				}else if(in_array('rejected',$pending_submission[$key][$i]))
+				{
+					$note = 'Rejected';
+					$class = 'rejected';
+				}else if(in_array('enabled',$pending_submission[$key][$i]))
+				{
+					$note = 'Enabled';
+					$class = 'enabled';
+				}else if(in_array('submitted',$pending_submission[$key][$i]))
+				{
+					$note = 'Submitted';
+					$class = 'for_approval';
+				}else if(in_array('approved',$pending_submission[$key][$i]))
+				{
+					$note = 'Approved';
+					$class = 'approved';
+				}
+				}
+					
+		?>
+		<td align="left" class="<?php echo $class;?>"> <div class=" checklist_mouseon"  <?php echo $tdata;?> ><?php echo $note;?></div></td>
+		<?php } else {
+		$note='';
+		$class='';
+		if(isset($pending_submission[$key][$i])){
+				if(in_array('blocked',$pending_submission[$key][$i]))
+				{
+					$note = 'Blocked';
+					$class = 'blocked';
+				}else if(in_array('rejected',$pending_submission[$key][$i]))
+				{
+					$note = 'Rejected';
+					$class = 'rejected';
+				}else if(in_array('submitted',$pending_submission[$key][$i]))
+				{
+					$note = 'Submitted';
+					$class = 'for_approval';
+				}else if(in_array('approved',$pending_submission[$key][$i]))
+				{
+					$note = 'Approved';
+					$class = 'approved';
+				}
+				}
+		?>
+		<td align="left" class="<?php echo $class;?>"><?php echo $note;?></td>
+		<?php } ?>
+		<?php } ?>
+		
+		<?php } ?>
+		</tr>
+		<?php } ?>
+		<?php } ?>
+		
+	</table>
+	</div>
+	<?php } ?>
+	<script type='text/javascript'>
+	function show_hide_ul()
+{
+	if($('.week_select_list').css('display') == 'none')
+	{
+		$('.week_select_list').css('display','block');
+	}
+	else
+	{
+		$('.week_select_list').css('display','none');
+	}
+	
+}
+$(document).ready(function(){		
+	$(document).click(function(e)  {
+		$('.week_select_list').css('display','none');
+	});
+	});
+$("#show_hide").mouseover(function() {
+	$('.week_select_list').css('display','block');
+});
+	$(document).ready(function(){
+	        $('.checklist_mouseon').powerTip({
+	                placement: 'e',
+	                mouseOnToPopup: true,
+	                smartPlacement: true
+	        });
+	});
+	
+function weeklyPendingSubmission(type)
+{
+	$("li").removeClass("active");
+	$('#highlight_'+type).addClass('active');
+	var obj = '<?php echo json_encode($pending_submission); ?>';
+	var previous_week = '<?php echo json_encode($this->prevweeks)?>';
+	var emp_names = '<?php echo json_encode($emp_names)?>';
+	var is_current_week = '<?php echo $this->is_current_week?>';
+    $.ajax({
+		url: base_url + "/timemanagement/notifications/pendingsubmissionsweeklyview/format/html",
+		data: 'type='+type+'&display_array='+obj+'&weekly_preview='+previous_week+'&emp_names='+emp_names+'&is_current_week='+is_current_week,
+		type: 'POST',
+		dataType: 'html',
+		success: function(response) {
+			$('#idaddtaskstbl').html(response);
+		}
+	});
+}
+</script>
\ No newline at end of file
diff --git a/application/modules/timemanagement/views/scripts/projectresources/addresources.ajax.phtml b/application/modules/timemanagement/views/scripts/projectresources/addresources.ajax.phtml
index 887cb6314..5e65ac7aa 100644
--- a/application/modules/timemanagement/views/scripts/projectresources/addresources.ajax.phtml
+++ b/application/modules/timemanagement/views/scripts/projectresources/addresources.ajax.phtml
@@ -1,9 +1,11 @@
 <?php $projectData = $this->projectData;?>
 <table border='0' class='tm_grid tablesorter tm_body_content' align="left" id='idaddresourcestbl' cellpadding="0" cellspacing="0">
                     <thead>
-                     	<tr><td class="tm_grid_header" colspan="2"><strong>Resources</strong><span class="add-coloum" onclick="javascript:addresource('<?php echo $projectData[0]['id'];?>');"> Add Resource </span></td></tr>
+                     	<tr><td class="tm_grid_header" colspan="4"><strong>Resources</strong><span class="add-coloum" onclick="javascript:addresource('<?php echo $projectData[0]['id'];?>');"> Add Resource </span></td></tr>
                         <tr>
                             <th align="left" width="15%">Employee<span class="sort_icon"></span></th>
+                            <th width="30%" class="left_align">Billable Rate/hr (<?php echo $projectData[0]['currencycode'];?>) <span class="sort_icon"></span></th>
+                            <th width="30%" class="left_align">Cost Rate/hr (<?php echo $projectData[0]['currencycode'];?>) <span class="sort_icon"></span></th>
                             <th width="25%" class="left_align">Actions<span class="sort_icon"></span></th>
                         </tr>
                       </thead>
@@ -44,6 +46,10 @@
                                 <input type='hidden' name='hid_resourceid[]' value='<?php echo $resource['emp_id'];?>' class='sel_deftask' />
                             </td>
                             <td class="center_align emprole" emprole = "<?php echo $resource['tm_role'];?>" style="display:none;"><span class='disp_emprole' style="display:none;"><?php echo $resource['tm_role'];?></span></td>    
+                            <td class="center_align"><span class='disp_billable_rate' style="display:none;"><?php echo $resource['billable_rate'];?></span><span class=''><input type='text' class='cls_quoted_hrs' maxlength="6" name='txt_billable_rate<?php echo $resource['id'];?>' id='idtxt_billable_rate<?php echo $i;?>' value='<?php echo ($resource['billable_rate']>0)?$resource['billable_rate']:'';?>' onkeypress="return dotnumber(event)" /></span></td>  
+                            
+                            <td class="center_align"><span class='disp_cost_rate' style="display:none;"><?php echo $resource['cost_rate'];?></span><span class=''><input type='text' class='cls_quoted_hrs' maxlength="6" name='txt_cost_rate<?php echo $resource['id'];?>' id='idtxt_cost_rate<?php echo $i;?>' value='<?php echo ($resource['cost_rate']>0)?$resource['cost_rate']:'';?>' onkeypress="return dotnumber(event)" /></span></td>  
+                            
                             <td class="center_align">
 	                            <a class="sprite asi_resor" title="Assign Resources" href="javascript:void(0)" onclick='assignTasks("<?php echo $resource['project_id'];?>","<?php echo $resource['emp_id'];?>")' name="1"></a>
 	                            
diff --git a/application/modules/timemanagement/views/scripts/projectresources/addresourcesproject.ajax.phtml b/application/modules/timemanagement/views/scripts/projectresources/addresourcesproject.ajax.phtml
index 8f9d4dce7..2ebc0d1d7 100644
--- a/application/modules/timemanagement/views/scripts/projectresources/addresourcesproject.ajax.phtml
+++ b/application/modules/timemanagement/views/scripts/projectresources/addresourcesproject.ajax.phtml
@@ -37,7 +37,7 @@
 			     $emp['employeeId'] = ($emp['employeeId'] != '')?$emp['employeeId']:'';
 			     $emp['jobtitle'] = ($emp['jobtitle'] != '')?$emp['jobtitle']:'';
 					?>
-					<div class="users_left_list_div users_left_listt user_div_<?php echo $emp['empid'];?>" style="cursor:pointer;" onclick="javascript:fnAddRemoveProjectUser(1,'<?php echo $emp['empid'];?>','<?php echo $this->projectId;?>','<?php echo addslashes($emp['empname']);?>','<?php echo $emp['profileimg'];?>','<?php echo $emp['employeeId'];?>','<?php echo $emp['jobtitle'];?>');" alt="Add" title="Add" name="<?php echo addslashes($emp['empname']);?>">
+					<div class="users_left_list_div users_left_list user_div_<?php echo $emp['empid'];?>" style="cursor:pointer;" onclick="javascript:fnAddRemoveProjectUser(1,'<?php echo $emp['empid'];?>','<?php echo $this->projectId;?>','<?php echo addslashes($emp['empname']);?>','<?php echo $emp['profileimg'];?>','<?php echo $emp['employeeId'];?>','<?php echo $emp['jobtitle'];?>');" alt="Add" title="Add" name="<?php echo addslashes($emp['empname']);?>">
 						<span class="values">
 						   <div class="profile_img"><img src="<?php echo DOMAIN; ?>public/uploads/profile/<?php echo $emp['profileimg'];?>" width="28px"  height="28px" onerror="this.src='<?php echo DOMAIN; ?>public/media/images/default-profile-pic.jpg'"/></div> 
 						</span> 
@@ -72,7 +72,7 @@
 					         $emp['employeeId'] = ($emp['employeeId'] != '')?$emp['employeeId']:'';
 			                 $emp['jobtitle'] = ($emp['jobtitle'] != '')?$emp['jobtitle']:'';
 							?>
-							<div class="users_left_list_div otherres_div users_left_listt user_div_<?php echo $emp['empid'];?>" style="cursor:pointer;" onclick="javascript:fnAddRemoveProjectUser(1,'<?php echo $emp['empid'];?>','<?php echo $this->projectId;?>','<?php echo addslashes($emp['empname']);?>','<?php echo $emp['profileimg'];?>','<?php echo $emp['employeeId'];?>','<?php echo $emp['jobtitle'];?>');" alt="Add" title="Add" name="<?php echo addslashes($emp['empname']);?>">
+							<div class="users_left_list_div otherres_div users_left_list user_div_<?php echo $emp['empid'];?>" style="cursor:pointer;" onclick="javascript:fnAddRemoveProjectUser(1,'<?php echo $emp['empid'];?>','<?php echo $this->projectId;?>','<?php echo addslashes($emp['empname']);?>','<?php echo $emp['profileimg'];?>','<?php echo $emp['employeeId'];?>','<?php echo $emp['jobtitle'];?>');" alt="Add" title="Add" name="<?php echo addslashes($emp['empname']);?>">
 								<span class="values">
 								   <div class="profile_img"><img src="<?php echo DOMAIN; ?>public/uploads/profile/<?php echo $emp['profileimg'];?>" width="28px"  height="28px" onerror="this.src='<?php echo DOMAIN; ?>public/media/images/default-profile-pic.jpg'"/></div> 
 								</span> 
@@ -215,8 +215,8 @@ $(document).ready(function()
 
 function searchLeft(){
 	var txt = $.trim($('#search_emp_by_name').val());
-	$('div.users_left_listt').hide();
-    $('div.users_left_listt').each(function(){
+	$('div.users_left_list').hide();
+    $('div.users_left_list').each(function(){
        if($(this).attr("name").toUpperCase().indexOf(txt.toUpperCase()) != -1){
            $(this).show();
        }
@@ -224,7 +224,7 @@ function searchLeft(){
 	
 	//alert($('div.users_left_list:visible').length);
 	
-	if($('div.users_left_listt:visible').length < 1)
+	if($('div.users_left_list:visible').length < 1)
 	{
 		$('div.no_search_results').show();
 	}
@@ -288,8 +288,8 @@ function clearSearchData()
 	$('#idclear').hide();
 	
 	var txt = $.trim($('#search_emp_by_name').val());
-	$('div.users_left_listt').hide();
-    $('div.users_left_listt').each(function(){
+	$('div.users_left_list').hide();
+    $('div.users_left_list').each(function(){
        if($(this).attr("name").toUpperCase().indexOf(txt.toUpperCase()) != -1){
            $(this).show();
        }
diff --git a/application/modules/timemanagement/views/scripts/projectresources/assigntasktoresources.ajax.phtml b/application/modules/timemanagement/views/scripts/projectresources/assigntasktoresources.ajax.phtml
index 33c3d6c72..a0b3f8e19 100644
--- a/application/modules/timemanagement/views/scripts/projectresources/assigntasktoresources.ajax.phtml
+++ b/application/modules/timemanagement/views/scripts/projectresources/assigntasktoresources.ajax.phtml
@@ -45,6 +45,7 @@ $type = $this->type;
 			<thead>			 
 				<tr>
 					<th align="left" width="30%">Task</th>
+					<th width="20%" class="left_align">Estimated hours</th>
 				</tr>
 			</thead>
 					<?php 
@@ -55,6 +56,7 @@ $type = $this->type;
 			?>
 			<tr>
 				<td class="task_search dtask_search" task = "<?php echo $data[0]['task'];?>"><input type='checkbox' name="unassigned_tasks" id="unassigned_tasks" class='unasgnd_cls' value="<?php echo $data[0]['task_id'];?>" project_task_id="<?php echo $data[0]['id'];?>"/>&nbsp;<span class='disp_taskname' ><?php echo $data[0]['task'];?></span></td>
+				<td><span><?php echo $data[0]['estimated_hrs'];?></span></td>
 			</tr>
 			<?php } ?>
 			
@@ -88,6 +90,7 @@ $type = $this->type;
 			<thead>			 
 				<tr>
 					<th align="left" width="30%">Task assigned</th>
+					<th width="20%" class="left_align">Estimated hours</th>
 				</tr>
 			</thead>
 					<?php 
@@ -104,6 +107,7 @@ $type = $this->type;
 			
 			<tr>
 				<td class="task_search dtask_search" task = "<?php echo $data['task'];?>"><input type='checkbox' checked='checked' <?php echo $read_only;?> name="assigned_tasks" id="assigned_tasks" class='asgnd_cls' value="<?php echo $data['task_id'];?>"  project_task_primary_id="<?php echo $data['id'];?>" />&nbsp;<span class='disp_taskname'><?php echo $data['task'];?></span></td>
+				<td><span><?php echo $data['estimated_hrs'];?></span></td>
 			</tr>
 			<?php } ?>
 			
@@ -137,6 +141,7 @@ $type = $this->type;
 			<thead>			 
 				<tr>
 					<th align="left" width="30%">Task all</th>
+					<th width="20%" class="left_align">Estimated hours</th>
 				</tr>
 			</thead>
 					<?php 
@@ -158,6 +163,7 @@ $type = $this->type;
 			?>
 			<tr>
 				<td class="task_search dtask_search" task = "<?php echo $data['task'];?>"><input type='checkbox' <?php echo $checked; echo $read_only;?> name="asgn_unassigned_tasks" id="asgn_unassigned_tasks" class='asgn_unasgnd_cls' value="<?php echo $data['task_id'];?>" project_task_id="<?php echo $data['id'];?>" />&nbsp;<span class='disp_taskname'><?php echo $data['task'];?></span></td>
+				<td><span><?php echo $data['estimated_hrs'];?></span></td>
 			</tr>
 			<?php } ?>
 			
diff --git a/application/modules/timemanagement/views/scripts/projectresources/resources.phtml b/application/modules/timemanagement/views/scripts/projectresources/resources.phtml
index ad577479a..cda41c60c 100644
--- a/application/modules/timemanagement/views/scripts/projectresources/resources.phtml
+++ b/application/modules/timemanagement/views/scripts/projectresources/resources.phtml
@@ -41,7 +41,7 @@ else
             	<div class="left_tab_content">
                 	<div class="completed_icon"></div>
                 	<h3 class="tab_title">Project</h3>
-                    <span class="tab_txt">Configure the project details</span>
+                    <span class="tab_txt">Configure the project details and define the project type along with the estimates</span>
                 </div>
             
             </li>
@@ -50,14 +50,14 @@ else
           		 <div class="left_tab_content">
                  	<div class="completed_icon"></div>
                 	<h3 class="tab_title">Tasks</h3>
-                    <span class="tab_txt">Add the project related tasks and assign the resources</span>
+                    <span class="tab_txt">Add the project related tasks, provide estimates, billable rate per hour and assign the resources</span>
                  </div>
             </li>
            <li id="project_resource" class="step_3 active"><div class="step_round">Step<span class="num_txt">3</span></div>
            		<div class="left_tab_content">
                 	<div class="completed_icon"></div>
                 	<h3 class="tab_title">Resources</h3>
-                    <span class="tab_txt">Add the project related resources and assign tasks</span>
+                    <span class="tab_txt">Add the project related resources, provide billable, cost rate and assign tasks</span>
                  </div>
             </li>
         </ul>
@@ -120,7 +120,10 @@ if (count($this->messages)) {?>
 	<div id="error_message" style="display:none;"></div>
 	   <span id="iderr_tasks" class="task_errors main_task_errors error" style="width: 63%;"></span>
 	<form name="projectresourcesform" id="projectresourcesform" action="" method="post">
+          
+		
 			<div class="total-form-controller">
+		
             <div class="prsn_box prsn_box_right project_resour_div" id="idprojtaskcontent">
             <div class="role_drop_down" <?php echo $style;?>>
                 <label>Role</label>			
@@ -143,9 +146,11 @@ if (count($this->messages)) {?>
                     <?php if($this->rowexist == 'rows'){?>
 	                    <table border='0' class='tm_grid tablesorter tm_body_content' align="left"  id='idaddresourcestbl' cellpadding="0" cellspacing="0">
 	                    <thead>
-	                     	<tr><td class="tm_grid_header" colspan="2"><strong>Resources</strong><span class="add-coloum" onclick="javascript:addresource('<?php echo $projectData[0]['id'];?>');"> Add Resource </span></td></tr>
+	                     	<tr><td class="tm_grid_header" colspan="4"><strong>Resources</strong><span class="add-coloum" onclick="javascript:addresource('<?php echo $projectData[0]['id'];?>');"> Add Resource </span></td></tr>
 	                        <tr>
 	                            <th align="left" width="15%">Employee<span class="sort_icon"></span></th>
+	                            <th width="30%" class="left_align">Billable Rate/hr (<?php echo $projectData[0]['currencycode'];?>) <span class="sort_icon"></span></th>
+	                            <th width="30%" class="left_align">Cost Rate/hr (<?php echo $projectData[0]['currencycode'];?>) <span class="sort_icon"></span></th>
 	                            <th width="25%" class="left_align header">Actions<span class="sort_icon"></span></th>
 	                        </tr>
 	                      </thead>
@@ -153,7 +158,8 @@ if (count($this->messages)) {?>
 	             <?php           
 	                $i=1;
 	                if(count($projectResourcesData)>0)
-	                {   
+	                {    //echo '<pre>';print_r($projectResourcesData);exit;
+	                	
 	                    foreach($projectResourcesData as $key=>$resource)
 	                    {
 	                       $role_label = $role_class='';
@@ -177,7 +183,11 @@ if (count($this->messages)) {?>
 	                                <input type='hidden' name='hid_resourceprojid[]' value='<?php echo $resource['id'];?>' />
 	                                <input type='hidden' name='hid_resourceid[]' value='<?php echo $resource['emp_id'];?>' class='sel_deftask' />
 	                            </td>
-	                            <td class=" emprole" emprole = "<?php echo $resource['tm_role'];?>" style="display:none;"><span class='disp_emprole' style="display:none;"><?php echo $resource['tm_role'];?></span></td>
+	                            <td class=" emprole" emprole = "<?php echo $resource['tm_role'];?>" style="display:none;"><span class='disp_emprole' style="display:none;"><?php echo $resource['tm_role'];?></span></td>    
+	                            <td class=""><span class='disp_billable_rate' style="display:none;"><?php echo $resource['billable_rate'];?></span><span class=''><input type='text' class='cls_quoted_hrs' maxlength="5" name='txt_billable_rate<?php echo $resource['id'];?>' id='idtxt_billable_rate<?php echo $i;?>' value='<?php echo ($resource['billable_rate']>0)?$resource['billable_rate']:'';?>' onkeypress="return dotnumber(event)" /></span></td>  
+	                            
+	                            <td class=""><span class='disp_cost_rate' style="display:none;"><?php echo $resource['cost_rate'];?></span><span class=''><input type='text' class='cls_quoted_hrs' maxlength="5" name='txt_cost_rate<?php echo $resource['id'];?>' id='idtxt_cost_rate<?php echo $i;?>' value='<?php echo ($resource['cost_rate']>0)?$resource['cost_rate']:'';?>' onkeypress="return dotnumber(event)" /></span></td>  
+	                            
 	                            <td class="">
 		                            <a class="sprite asi_resor" title="Assign Tasks" href="javascript:void(0)" onclick='assignTasks("<?php echo $resource['project_id'];?>","<?php echo $resource['emp_id'];?>")' name="1"></a>
 		                          
diff --git a/application/modules/timemanagement/views/scripts/projectresources/viewemptasks.ajax.phtml b/application/modules/timemanagement/views/scripts/projectresources/viewemptasks.ajax.phtml
index d96d6cd6b..77882efb4 100644
--- a/application/modules/timemanagement/views/scripts/projectresources/viewemptasks.ajax.phtml
+++ b/application/modules/timemanagement/views/scripts/projectresources/viewemptasks.ajax.phtml
@@ -36,7 +36,8 @@ $emp_arr = $this->emp_arr;
 		<table border='0' class='tm_grid tablesorter clear' id='idaddtaskstbl' cellpadding="0" cellspacing="0">
 			<thead>			
 				<tr>
-					<th align="left" width="30%" id="taskheader">Task</th>
+					<th align="left" width="30%">Task</th>
+					<th width="20%" class="left_align">Estimated hours</th>
 					<th width="20%" class="left_align">Actual hours</th>
 				</tr>
 			</thead>
@@ -48,8 +49,9 @@ $emp_arr = $this->emp_arr;
 			<tr>
 				<td class="task_search" task = "<?php echo $data['task'];?>"><span class='disp_taskname'><?php echo $data['task'];?></span>
 				 <input type='hidden' name='hid_taskprojid[]' value='<?php echo $data['project_id'];?>' />
-                 <input type='hidden' name='hid_taskid[]' value='<?php echo $data['task_id'];?>' class='sel_deftask' /></td>
-                 <td><span><?php echo $data['actual_hrs'];?></span></td>
+                                <input type='hidden' name='hid_taskid[]' value='<?php echo $data['task_id'];?>' class='sel_deftask' /></td>
+				<td><span><?php echo $data['estimated_hrs'];?></span></td>
+				<td><span><?php echo $data['actual_hrs'];?></span></td>
 			</tr>
 			<?php } ?>
 			
@@ -58,7 +60,7 @@ $emp_arr = $this->emp_arr;
 		else
 		{
 			?> 
-			<tr id="nodata"><td class="no-data-td" colspan="2"><p class="no-data">No data found</p></td></tr>
+			<tr id="nodata"><td class="no-data-td" colspan="18"><p class="no-data">No data found</p></td></tr>
 			<?php
 		}
 		?>
@@ -130,8 +132,4 @@ function clearSearchData()
 	$('#idclear').hide();
 	search();
 }
-
-$(function() {
-	$("#taskheader").width(340);
-});
 </script>
diff --git a/application/modules/timemanagement/views/scripts/projects/addtasks.ajax.phtml b/application/modules/timemanagement/views/scripts/projects/addtasks.ajax.phtml
index bb6c76ca4..4fb1b4a1c 100644
--- a/application/modules/timemanagement/views/scripts/projects/addtasks.ajax.phtml
+++ b/application/modules/timemanagement/views/scripts/projects/addtasks.ajax.phtml
@@ -1,9 +1,12 @@
 <table border='0' class='tm_grid tablesorter  tm_body_content' align="left"   id='idaddtaskstbl' cellpadding="0" cellspacing="0">
     <thead>
-        <tr><td class="tm_grid_header" colspan="2">Tasks<span class="add-coloum" onclick="javascript:addtasks('<?php echo $this->projectId;?>');"> Add Task </span></td></tr>
+        <tr><td class="tm_grid_header" colspan="5">Tasks<span class="add-coloum" onclick="javascript:addtasks('<?php echo $this->projectId;?>');"> Add Task </span></td></tr>
                         
         <tr>
             <th align="left" width="30%">Name</th>
+            <th width="20%" class="left_align">Estimated hours</th>
+            <th width="20%" class="left_align">Billable Rate/hr(<?php echo $this->projectCurrencyCode;?>)</th>
+            <th width="15%" class="left_align">Billable</th>
             <th width="15%" class="left_align">Actions</th>
         </tr>
      </thead>
@@ -31,6 +34,11 @@
                    <input type='hidden' name='hid_taskprojid[]' value='<?php echo $task['id'];?>' />
                    <input type='hidden' name='hid_taskid[]' value='<?php echo $task['task_id'];?>' class='sel_deftask' />
              </td>  
+             <td class="center_align"><span class='disp_estimated_hrs' style="display:none;"><?php echo $task['estimated_hrs'];?></span><span class=''><input type='text' onchange='check_quoted_hrs(this)' class='cls_quoted_hrs' maxlength="6" name='txt_taskhrs<?php echo $task['id'];?>' id='idtxt_taskhrs<?php echo $i;?>' value='<?php echo ($task['estimated_hrs']>0)?$task['estimated_hrs']:'';?>' onkeyup="return time_frmat(this)" onchange='check_quoted_hrs(this)' /></span></td>  
+                            
+             <td class="center_align"><span class='disp_billable_rate' style="display:none;"><?php echo $task['billable_rate'];?></span><span class=''><input type='text' onchange='check_quoted_hrs(this)' class='cls_quoted_hrs' maxlength="6" name='txt_taskbillable_rate<?php echo $task['id'];?>' id='idtxt_taskbillable_rate<?php echo $i;?>' value='<?php echo ($task['billable_rate']>0)?$task['billable_rate']:'';?>' onkeyup="time_frmat(this)" /></span></td>  
+                            
+             <td class="center_align"><span class='disp_is_billable' style="display:none;"><?php echo $task['is_billable'];?></span><span class=''><input type='checkbox' class='cls_taskbillable' name='txt_taskbillable<?php echo $task['id'];?>' id='idtxt_taskbillable<?php echo $i;?>' <?php echo ($task['is_billable'])?'checked':'';?> /></span></td>  
              <td class="center_align">
 	                <a class="sprite asi_resor" title="Assign Resources" href="javascript:void(0)" onclick="assignResources('<?php echo $task['project_id'];?>','<?php echo $task['task_id'];?>','<?php echo $task['id'];?>')" name="1"></a>
 	                <a onclick="javascript:viewResources('<?php echo $task['project_id'];?>','<?php echo $task['task_id'];?>')" href="javascript:void(0);" class="sprite view" title="View Resources"></a>
diff --git a/application/modules/timemanagement/views/scripts/projects/edit.phtml b/application/modules/timemanagement/views/scripts/projects/edit.phtml
index 6f2df5354..b9f6449e8 100644
--- a/application/modules/timemanagement/views/scripts/projects/edit.phtml
+++ b/application/modules/timemanagement/views/scripts/projects/edit.phtml
@@ -45,7 +45,7 @@ $data = $this->data;
             	<div class="left_tab_content">
                 	<div class="completed_icon"></div>
                 	<h3 class="tab_title">Project</h3>
-                    <span class="tab_txt">Configure the project details</span>
+                    <span class="tab_txt">Configure the project details and define the project type along with the estimates</span>
                 </div>
             
             </li>
@@ -54,14 +54,14 @@ $data = $this->data;
           		 <div class="left_tab_content">
                  	<div class="completed_icon"></div>
                 	<h3 class="tab_title">Tasks</h3>
-                    <span class="tab_txt">Add the project related tasks and assign the resources</span>
+                    <span class="tab_txt">Add the project related tasks, provide estimates, billable rate per hour and assign the resources</span>
                  </div>
             </li>
            <li id="project_resource" class="step_3"><div class="step_round">Step<span class="num_txt">3</span></div>
            		<div class="left_tab_content">
                 	<div class="completed_icon"></div>
                 	<h3 class="tab_title">Resources</h3>
-                    <span class="tab_txt">Add the project related resources and assign tasks</span>
+                    <span class="tab_txt">Add the project related resources, provide billable, cost rate and assign tasks</span>
                  </div>
             </li>
         </ul>
@@ -121,6 +121,61 @@ $data = $this->data;
 				</div>
 			</div>
 			
+			<div class="new-form-ui clearb">
+			    <label class="required">Currency</label>
+				<div class="division"><?php echo $this->form->currency_id; ?>
+				<?php if(isset($this->msgarray['currency_id'])){?>
+				   <span class="errors" id="errors-<?php echo $this->form->currency_id->getId(); ?>"><?php echo $this->msgarray['currency_id'];?></span>
+				<?php }?>
+				<?php if(in_array('currency',$this->popConfigPermission)) { ?>	
+                         <span class="add-coloum" onclick="displaydeptform('<?php echo BASE_URL.'currency/addpopup' ?>','Currency');"> Add Currency </span>			
+                 <?php } ?>
+				</div>
+			</div>
+			
+			<div class="new-form-ui radioclass" style="width: 316px;">
+	            <label class="required">Project Type </label>
+	            <div class="division"><?php echo $this->form->project_type; ?>
+	            <?php if(isset($this->msgarray['project_type'])){?>
+				   <span class="errors" id="errors-<?php echo $this->form->project_type->getId(); ?>"><?php echo $this->msgarray['project_type'];?></span>
+				<?php }?>
+	             </div>
+            </div>
+            
+           <div class="new-form-ui proj_estima">
+					  <label>Estimate</label>
+			
+            <div class="saprate_bg">
+			
+				<div class="new-form-ui new-form-ui_pro">
+					  <label>Dates</label>
+					<div class="division"><?php echo $this->form->start_date; ?><span class="estim_to_txt">To</span>				
+					<?php if(isset($this->msgarray['start_date'])){?>
+					   <span class="errors" id="errors-<?php echo $this->form->start_date->getId(); ?>"><?php echo $this->msgarray['start_date'];?></span>
+					<?php }?>
+					</div>
+				</div>
+				
+				<div class="new-form-ui new-form-ui_pro">
+					 <label>&nbsp;</label> 
+					<div class="division"><?php echo $this->form->end_date; ?>				
+					<?php if(isset($this->msgarray['end_date'])){?>
+					   <span class="errors" id="errors-<?php echo $this->form->end_date->getId(); ?>"><?php echo $this->msgarray['end_date'];?></span>
+					<?php }?>
+					</div>
+				</div>
+				
+				 <div class="new-form-ui clearb">
+					  <label >Estimation Hours </label>
+					   <div class="division"><?php echo $this->form->estimated_hrs; ?>
+					<?php if(isset($this->msgarray['estimated_hrs'])){?>
+					   <span class="errors" id="errors-<?php echo $this->form->estimated_hrs->getId(); ?>"><?php echo $this->msgarray['estimated_hrs'];?></span>
+					<?php }?>
+					</div>
+				</div>
+				<div class="clear"></div>
+			</div>
+			</div>
 			<div class="new-form-ui clearb textareaheight">
 			  <label>Description</label>
 			<div class="division"><?php echo $this->form->description; ?></div>
@@ -142,6 +197,15 @@ $data = $this->data;
 
 	<iframe id="clientsCont" class="business_units_iframe" frameborder="0"></iframe>
 </div>
+<div id="currencyContainer"  style="display: none; overflow: auto;">
+	<div class="heading">
+		<a href="javascript:void(0)">
+	    <img src="<?php echo $this->baseUrl().'/public/media/';?>images/close.png" name="" align="right" border="0" hspace="3" vspace="5" class="closeAttachPopup" style="margin: -24px 8px 0 0;"> </a>
+	</div>
+
+	<iframe id="currencyCont" class="business_units_iframe" frameborder="0"></iframe>
+</div>
+
 <script type="text/javascript" language="javascript">
 $(document).ready(function(){
 	$('.breadcrumbs').append("<span class='arrows'>&rsaquo;</span><a href='<?php echo BASE_URL; ?>timemanagement/projects'>Projects</a><span class='arrows'>&rsaquo;</span><span><?php echo $this->inpage;?></span>");
@@ -150,6 +214,29 @@ $(document).ready(function(){
 	var projectId = '<?php echo $this->id;?>';
 
 	 var yearrange = <?php echo "'".YEAR.':'.date('Y')."'"; ?>;
+	$('#start_date,#end_date').datepicker({
+        showOn:'both',
+		//minDate: 0,
+	    //yearRange: yearrange,
+        dateFormat: '<?php echo DATEFORMAT_JS;?>',
+        buttonImage: "<?php echo $this->baseUrl("public/media/images/cal.jpg");?>",
+        buttonImageOnly: true,
+        buttonText: "",
+        changeMonth: true,
+        changeYear: true ,
+        showButtonPanel: true ,
+        onClose:function(){
+        	 $(this).trigger('blur');
+             var msg = "";
+             if(this.id == 'end_date')
+                 msg = "End date should be greater than Start date.";
+             else 
+                 msg = "Start date should be less than End date.";
+             from_to_date_validation('start_date','end_date',this,msg);
+        }
+		
+    });	
+
 	    $('#project_task').click(function(){ 
 	    	if(inPage == 'Edit'){
 				$.blockUI({ width:'50px',message: $("#spinner").html() });
@@ -182,7 +269,8 @@ $(document).ready(function(){
 						  if(response.exists == 'yes'){ 
 							  $('#errors-project_status').remove();  
 							  $('#project_status').after("<span class='errors' id='errors-project_status'>Employees already assigned to this project.</span>");
-							  $('#project_status').select2('val', '');	
+							  $('#project_status').select2('val', '');
+							
 						  }
 					}
 			    });	
diff --git a/application/modules/timemanagement/views/scripts/projects/tasks.phtml b/application/modules/timemanagement/views/scripts/projects/tasks.phtml
index 8b87721c4..0a3d94437 100644
--- a/application/modules/timemanagement/views/scripts/projects/tasks.phtml
+++ b/application/modules/timemanagement/views/scripts/projects/tasks.phtml
@@ -38,7 +38,7 @@ else
             	<div class="left_tab_content">
                 	<div class="completed_icon"></div>
                 	<h3 class="tab_title">Project</h3>
-                    <span class="tab_txt">Configure the project details</span>
+                    <span class="tab_txt">Configure the project details and define the project type along with the estimates</span>
                 </div>
             
             </li>
@@ -47,14 +47,14 @@ else
           		 <div class="left_tab_content">
                  	<div class="completed_icon"></div>
                 	<h3 class="tab_title">Tasks</h3>
-                    <span class="tab_txt">Add the project related tasks and assign the resources</span>
+                    <span class="tab_txt">Add the project related tasks, provide estimates, billable rate per hour and assign the resources</span>
                  </div>
             </li>
            <li id="project_resource" class="step_3 incomplete"><div class="step_round">Step<span class="num_txt">3</span></div>
            		<div class="left_tab_content">
                 	<div class="completed_icon"></div>
                 	<h3 class="tab_title">Resources</h3>
-                    <span class="tab_txt">Add the project related resources and assign tasks</span>
+                    <span class="tab_txt">Add the project related resources, provide billable, cost rate and assign tasks</span>
                  </div>
             </li>
         </ul>
@@ -83,7 +83,9 @@ if(empty($this->projectTasksData)) {
 	$style = "style='display:none;'";
 	$first_task_addStyle =  "style='display:block;'";
 } 
-else if(!empty($this->projectTasksData)){	
+else if(!empty($this->projectTasksData)){
+	
+//sapp_Global::generateClientValidations($this->form);
 $projectTasksData = $this->projectTasksData;
 }
 
@@ -129,14 +131,20 @@ if (count($this->messages)) {?>
             </div>
             
             <input type='hidden' name='project_id' value='<?php echo $projectData[0]['id'];?>' />
+             <input type='hidden' id='project_estimated_hrs' value='<?php echo $projectData[0]['estimated_hrs'];?>' />
+             
+             
                     <div class="pj_task_content" >
                     <div id='task_content_div'>
                     <?php if(count($this->projectTasksData)>0) { ?>
                     <table border='0' class='tm_grid tablesorter tm_body_content' align="left" id='idaddtaskstbl' cellpadding="0" cellspacing="0">
                     <thead>
-                     	<tr><td class="tm_grid_header" colspan="2"><strong>Tasks</strong><span class="add-coloum" onclick="javascript:addtasks('<?php echo $projectData[0]['id'];?>');"> Add Task </span></td></tr>
+                     	<tr><td class="tm_grid_header" colspan="5"><strong>Tasks</strong><span class="add-coloum" onclick="javascript:addtasks('<?php echo $projectData[0]['id'];?>');"> Add Task </span></td></tr>
                         <tr>
                             <th align="left" ><div class="task_name_th_width"> Name<span class="sort_icon"></span></div></th>
+                            <th width="20%" class="left_align">Estimated hours<span class="sort_icon"></span></th>
+                            <th width="20%" class="left_align">Billable Rate/hr (<?php echo $projectData[0]['currencycode'];?>)<span class="sort_icon"></span></th>
+                            <th width="15%" class="left_align">Billable<span class="sort_icon"></span></th>
                            <th width="15%" class="left_align">Actions</th>
                         </tr>
                       </thead>
@@ -161,7 +169,13 @@ if (count($this->messages)) {?>
                             <?php }?>
                             
                                 <input type='hidden' name='hid_taskprojid[]' value='<?php echo $task['id'];?>' />
-                                <input type='hidden' name='hid_taskid[]' value='<?php echo $task['task_id'];?>' class='sel_deftask' />                      
+                                <input type='hidden' name='hid_taskid[]' value='<?php echo $task['task_id'];?>' class='sel_deftask' />
+                            </td>  
+                            <td class=""><span class='disp_estimated_hrs' style="display:none;"><?php echo $task['estimated_hrs'];?></span><span class=''><input type='text' class='cls_quoted_hrs cls_quoted_hrs_est' maxlength="5" name='txt_taskhrs<?php echo $task['id'];?>' id='idtxt_taskhrs<?php echo $i;?>' value='<?php echo ($task['estimated_hrs']>0)?$task['estimated_hrs']:'';?>' onkeyup="return time_frmat(this)" onchange='check_quoted_hrs(this)'/></span></td>  
+                            
+                            <td class=""><span class='disp_billable_rate' style="display:none;"><?php echo $task['billable_rate'];?></span><span class=''><input type='text' class='cls_quoted_hrs' maxlength="5" name='txt_taskbillable_rate<?php echo $task['id'];?>' id='idtxt_taskbillable_rate<?php echo $i;?>' value='<?php echo ($task['billable_rate']>0)?$task['billable_rate']:'';?>' onkeypress="return dotnumber(event)" /></span></td>  
+                            
+                             <td class=""><span class='disp_is_billable' style="display:none;"><?php echo $task['is_billable'];?></span><span class=''><input type='checkbox' class='cls_taskbillable' name='txt_taskbillable<?php echo $task['id'];?>' id='idtxt_taskbillable<?php echo $i;?>' <?php echo ($task['is_billable'])?'checked':'';?> /></span></td>  
                             <td class="">
 	                            <a class="sprite asi_resor" title="Assign Resources" href="javascript:void(0)" onclick="assignResources('<?php echo $task['project_id'];?>','<?php echo $task['task_id'];?>','<?php echo $task['id'];?>')" name="1"></a>
 	                            <a onclick="javascript:viewResources('<?php echo $task['project_id'];?>','<?php echo $task['task_id'];?>')" href="javascript:void(0);" class="sprite view" title="View Resources"></a>
@@ -179,6 +193,7 @@ if (count($this->messages)) {?>
                  <input type="hidden" name="fieldchange" id="fieldchange" />   
                     <div id="task_submit" class="new-form-ui-submit" <?php echo $style;?>>
 		                <input type="submit" value="Update" id="submitbutton" name="submit">
+		                <!-- button type="button" onclick="window.location.href='<?php //echo BASE_URL; ?>timemanagement/projects';">Cancel</button> -->
 		           </div>
 		          
                     <span id="duplicate_task_error"></span>
@@ -192,7 +207,7 @@ if (count($this->messages)) {?>
 <div id="idaddtasks" style="display:none">
     <div class="radio_tasks">
         <input type="radio" name="radtasktype" id="idradtasktype_default" value="default" class="rad_tasks" onclick="radiotask_onclick(this)" />Default Tasks
-        <input type="radio" name="radtasktype" id="idradtasktype_most" value="most" class="rad_tasks" onclick="radiotask_onclick(this)" />Mostly used Tasks
+        <input type="radio" name="radtasktype" id="idradtasktype_most" value="most" class="rad_tasks" onclick="radiotask_onclick(this)" />Frequently used Tasks
         <input type="radio" name="radtasktype" id="idradtasktype_new" value="new" class="rad_tasks" checked="checked" onclick="radiotask_onclick(this)" />New Task
     </div>
     <div id="idtaskcontent">
@@ -215,6 +230,8 @@ if (count($this->messages)) {?>
 
 <script type='text/javascript'>
 $(document).ready(function(){
+
+
   $(window).keydown(function(event){
     if(event.keyCode == 13) {
       event.preventDefault();
diff --git a/application/modules/timemanagement/views/scripts/projects/view.phtml b/application/modules/timemanagement/views/scripts/projects/view.phtml
index 871c359a0..c7fd3c05c 100644
--- a/application/modules/timemanagement/views/scripts/projects/view.phtml
+++ b/application/modules/timemanagement/views/scripts/projects/view.phtml
@@ -35,7 +35,10 @@ else
 {
 $data = $this->data;
 $projectStatusArray = array('initiated'=>'Initiated','draft'=>'Draft','in-progress'=>'In Progress','hold'=>'Hold','completed'=>'Completed');
-?>
+
+	?>
+					
+
 <div class="total-form-controller project_view_page"> 
 	<div id="error_message" style="display:none;"></div>
 	
@@ -44,7 +47,9 @@ $projectStatusArray = array('initiated'=>'Initiated','draft'=>'Draft','in-progre
 					<div style="position: relative; float: right; top: 0px;" class="back-to-page">
 						<input type="button" style="margin-right: 0px;" value="Back" name="Back" onclick="window.location.href='<?php echo BASE_URL; ?>timemanagement/projects';">
 					</div>
-					<input type="button" class="fltright" onclick="window.location.href='<?php echo BASE_URL; ?>timemanagement/projects/edit/id/<?php echo $data[0]['id'];?>';" value="Edit">								
+					<input type="button" class="fltright" onclick="window.location.href='<?php echo BASE_URL; ?>timemanagement/projects/edit/id/<?php echo $data[0]['id'];?>';" value="Edit">
+												
+												
 	            </div>
 	</div>
 		<table width="100%" cellspacing="0" cellpadding="0" border="0" class="requisition-table view-table-data">
@@ -58,12 +63,53 @@ $projectStatusArray = array('initiated'=>'Initiated','draft'=>'Draft','in-progre
 				<tr class="req-no-form">
 					<td><span class="head_txt">Description</span></td>
 					<td><?php echo $data[0]['description']; ?></td>
+					<td><span class="head_txt">Currency</span></td>
+					<td><?php echo $data[0]['currencyname']; ?></td>
+				</tr>
+				<tr class="req-bg-form">
 					<td><span class="head_txt">Status</span></td>
 					<td><?php echo $projectStatusArray[$data[0]['project_status']]; ?></td>
-				</tr>	
+					<td><span class="head_txt">Project Type </span></td>
+					
+					<?php if($data[0]['project_type']=='billable')
+					{
+						$project_type = 'Billable';
+					}else if($data[0]['project_type']=='non_billable')
+					{
+						$project_type = 'Non Billable';
+					}
+					else
+					{
+						$project_type = 'Revenue generation';
+					}
+					?>
+					<td><?php echo $project_type; ?></td>
+				</tr>
+				<tr class="req-no-form">
+
+					
+					
+					<td><span class="head_txt">Start Date</span></td>
+					<td><?php echo 
+sapp_Global::change_date($data[0]['start_date'],'view'); ?></td>
+					<td><span class="head_txt">End Date</span></td>
+					<td><?php echo sapp_Global::change_date($data[0]['end_date'],'view'); ?></td>
+				</tr>
+				<tr class="req-bg-form">
+					<td ><span class="head_txt">Estimated Hours </span></td>
+					<td colspan="3"><?php echo $data[0]['estimated_hrs']; ?></td>
+					<!--<td><span class="head_txt">Lead Approve  </span></td>
+					<td><?php //echo ($data[0]['lead_approve_ts']==0)?'No':'Yes'; ?></td>-->
+					
+					
+				</tr>
+				
 			</tbody>
 		</table>
+
 </div>	
+
+
 <div id="tabs" style="clear: both;" class="employee_appraisal_tabs ui-tabs">
 	<ul class="ui-tabs-nav" style="clear:both;">
 		<li class="ui-state-active"><a href="#tabs-1">Tasks</a></li>
@@ -102,8 +148,10 @@ $projectStatusArray = array('initiated'=>'Initiated','draft'=>'Draft','in-progre
     </div>
 </div>
 <div id="idviewResources" style="display:none">
- <div id="idviewResourcescontent">
-         </div>
+
+    <div id="idviewResourcescontent">
+        
+    </div>
 </div>
 </div>
 <script type='text/javascript'>
diff --git a/application/modules/timemanagement/views/scripts/projecttasks/assignresourcestotask.ajax.phtml b/application/modules/timemanagement/views/scripts/projecttasks/assignresourcestotask.ajax.phtml
index 868ea784d..7029ffdae 100644
--- a/application/modules/timemanagement/views/scripts/projecttasks/assignresourcestotask.ajax.phtml
+++ b/application/modules/timemanagement/views/scripts/projecttasks/assignresourcestotask.ajax.phtml
@@ -14,15 +14,23 @@
 <div class='task_details'>
 <?php if(count($this->taskDetails)>0) { 
 	$task_arr = $this->taskDetails;
+	$is_billable='Non Billable';
+	if($task_arr[0]['is_billable']==1)
+	{
+		$is_billable = 'Billable';
+	}
 ?>
-<span class="head_txt_info">Task:</span><span class="head_txt_conte"><?php echo $task_arr[0]['taskname'];?></span>&nbsp;
+<span class="head_txt_info">Task:</span><span class="head_txt_conte"><?php echo $task_arr[0]['taskname'].'('.$is_billable.')';?></span>&nbsp;
+<span class="head_txt_info">Estimated Hours:</span><span class="head_txt_conte"><?php echo $task_arr[0]['estimated_hrs'];?></span>
 <?php }?>
 </div>
 
 <div class="users_list">
 <div class="errors"></div>
+
 <div class="left-user">
-   <div>Resources</div>
+
+    <div>Resources</div>
     <div class="search_emp_by_name_div">
 		<input type="text" name="search_emp_by_name" id="search_emp_by_name" value="" placeholder="Search Resource"/>
 		<input type="button" value="Go" name="search" id="search">&nbsp;
@@ -83,14 +91,18 @@
 	</div>
 	
 	<div class="users_list_right_title">Task Resources (Click on resource to remove from task)</div>
+	
 	<div class="users_list_right">
+	
+	
 	<div class="users_right_list_div add_info no_right_data_found"><span class="values">Add resources to task.</span></div>
 	
 	
 	<?php
 	$noresourcesStyle = "style='display:none'";
 	if(count($this->assignedEmployees) > 0)
-	{ 
+	{ //echo '<pre>';print_r($this->assignedEmployees);
+		
 		foreach($this->assignedEmployees as $emp)
 		{
 		?>
@@ -203,6 +215,9 @@ function searchLeft(){
            $(this).show();
        }
     });
+	
+	//alert($('div.users_left_list:visible').length);
+	
 	if($('div.users_left_list:visible').length < 1)
 	{
 		$('div.no_search_results').show();
@@ -229,6 +244,8 @@ function searchRight(){
            $(this).show();
        }
     });
+    
+    //alert($('div.users_left_list:visible').length);
 	if($('div.search_right:visible').length < 1)
 	{
 		$('div.no_search_results_sel').show();
diff --git a/application/modules/timemanagement/views/scripts/projecttasks/viewtasksresources.ajax.phtml b/application/modules/timemanagement/views/scripts/projecttasks/viewtasksresources.ajax.phtml
index fd0d9ce29..6f21808db 100644
--- a/application/modules/timemanagement/views/scripts/projecttasks/viewtasksresources.ajax.phtml
+++ b/application/modules/timemanagement/views/scripts/projecttasks/viewtasksresources.ajax.phtml
@@ -8,8 +8,14 @@ $task_arr = $this->task_arr;
 <div class="" style="padding-bottom: 40px;">
 <div class="total-form-controller_">
 <?php if(count($task_arr)>0) { 
+$is_billable='Non Billable';
+if($task_arr[0]['is_billable']==1)
+{
+	$is_billable = 'Billable';
+}
 ?>
-<span class="head_txt_info">Task:</span><span class="head_txt_conte"><?php echo $task_arr[0]['task'];?></span>&nbsp;
+<span class="head_txt_info">Task:</span><span class="head_txt_conte"><?php echo $task_arr[0]['task'].'('.$is_billable.')';?></span>&nbsp;
+<span class="head_txt_info">Estimated Hours:</span><span class="head_txt_conte"><?php echo $task_arr[0]['estimated_hrs'];?></span>
 <h3 class="dilog_tit">Resources</h3>
 		
         <div class="prsn_box prsn_box_right" id="idprojtaskcontent">
@@ -108,6 +114,9 @@ function searchLeft(){
            $(this).show();
        }
     });
+	
+	//alert($('div.users_left_list_assign:visible').length);
+	
 	if($('div.users_left_list_assign:visible').length < 1)
 	{
 		$('div.no_search_results').show();
diff --git a/application/modules/timemanagement/views/scripts/reports/getempduration.ajax.phtml b/application/modules/timemanagement/views/scripts/reports/getempduration.ajax.phtml
index 49e7f80ea..353a17878 100644
--- a/application/modules/timemanagement/views/scripts/reports/getempduration.ajax.phtml
+++ b/application/modules/timemanagement/views/scripts/reports/getempduration.ajax.phtml
@@ -40,8 +40,8 @@ $emp_data = $this->get_emp_proj_duration;
 			foreach($emp_data as $data){
 			?>
 			<tr>
-				<td align="left" width="30%"><span><?php echo $data['project_name'];?></span></td>
-				<td width="20%" class="left_align"><span><?php echo $data['duration'];?></span></td>
+				<td><span><?php echo $data['project_name'];?></span></td>
+				<td><span><?php echo $data['duration'];?></span></td>
 			</tr>
 			<?php 
 			$tot_dur = explode(':',$data['duration']);
diff --git a/application/modules/timemanagement/views/scripts/reports/getprojecttaskduration.ajax.phtml b/application/modules/timemanagement/views/scripts/reports/getprojecttaskduration.ajax.phtml
index 76cc70a08..0ac935236 100644
--- a/application/modules/timemanagement/views/scripts/reports/getprojecttaskduration.ajax.phtml
+++ b/application/modules/timemanagement/views/scripts/reports/getprojecttaskduration.ajax.phtml
@@ -38,8 +38,8 @@ $proj_data = $this->get_proj_task_duration;
 			foreach($proj_data as $data){
 			?>
 			<tr>
-				<td align="left" width="30%"><span><?php echo $data['task'];?></span></td>
-				<td width="20%" class="left_align"><span><?php echo $data['duration'];?></span></td>
+				<td><span><?php echo $data['task'];?></span></td>
+				<td><span><?php echo $data['duration'];?></span></td>
 			</tr>
 			<?php 
 			$tot_dur = explode(':',$data['duration']);
diff --git a/application/modules/timemanagement/views/scripts/reports/tmreport.phtml b/application/modules/timemanagement/views/scripts/reports/tmreport.phtml
index eb0d14a1a..73c263ae0 100644
--- a/application/modules/timemanagement/views/scripts/reports/tmreport.phtml
+++ b/application/modules/timemanagement/views/scripts/reports/tmreport.phtml
@@ -176,7 +176,9 @@ function tm_from_to_date_validation(from_date_id,to_date_id,obj,message)
 			 <li class="active" id="employee">Employee</li>
 	         <li id="projects">Projects</li>
 		</ul>
-		
+		<!-- div class="search_emp_by emp_time_sheet">
+			<input type="text" onkeyup="javascript:search_employee_or_project(event,'searchstring');" placeholder="Employee or Project" class="table_inputs"  id="searchstring" name="searchstring" maxlength="50">
+		</div -->
 		<div class="period_icon period_icon_new periodleft" onchange="getOnchangeDates();">
 			<input type="hidden" id="selected_period_hidden" value="<?php echo $this->selected_period_hidden;?>"/>
 			<div id ="selectedPeriodDiv" class="fltleftnew marginright padding-top from_text" ><?php echo $this->selected_period_hidden;?></div>
diff --git a/application/modules/timemanagement/views/scripts/tmmailtemplates/empmonthlyremainder.phtml b/application/modules/timemanagement/views/scripts/tmmailtemplates/empmonthlyremainder.phtml
index e64c73d61..40c1d672a 100644
--- a/application/modules/timemanagement/views/scripts/tmmailtemplates/empmonthlyremainder.phtml
+++ b/application/modules/timemanagement/views/scripts/tmmailtemplates/empmonthlyremainder.phtml
@@ -12,10 +12,10 @@
 	<span style='color:#3b3b3b;'>Hello <?php echo $this->emp_name;?>,</span><br />
 	
 	<div style='padding:20px 0 10px 0;'>		
-		Your time sheet for the period <?php echo $this->period;?> will be blocked tomorrow. Please fill your time sheet on or before <?php echo $reminder_date;?> to avoid blocking. 
+		Your timesheet for the period <?php echo $this->period;?> will be blocked tomorrow. Please fill your timesheet on or before <?php echo $reminder_date;?> to avoid blocking. 
 	</div>
 			
-	<div style="padding:20px 0 10px 0;">Please <a href="<?php echo $this->base_url;?>" target="_blank" style="color:#b3512f;">click here</a> to login and check the time sheet details.</div>
+	<div style="padding:20px 0 10px 0;">Please <a href="<?php echo $this->base_url;?>" target="_blank" style="color:#b3512f;">click here</a> to login and check the timesheet details.</div>
 
 </div> 
 
diff --git a/application/modules/timemanagement/views/scripts/tmmailtemplates/monthlyemptimesheet.phtml b/application/modules/timemanagement/views/scripts/tmmailtemplates/monthlyemptimesheet.phtml
index e60ea7691..b401ccf4e 100644
--- a/application/modules/timemanagement/views/scripts/tmmailtemplates/monthlyemptimesheet.phtml
+++ b/application/modules/timemanagement/views/scripts/tmmailtemplates/monthlyemptimesheet.phtml
@@ -25,7 +25,7 @@
 	<span style='color:#3b3b3b;'>Dear <?php echo ucfirst($this->mgr_name);?>,</span><br />
 	
 	<div style='padding:20px 0 0 0;'>		
-		Time sheet for the period <?php echo $this->period;?> has been blocked for the following employee(s).
+		Timesheet for the period <?php echo $this->period;?> has been blocked for the following employee(s).
 	</div>
 			
 	<div style='padding:10px 0 0 0;'>
@@ -41,7 +41,7 @@
 		</ol>
 	</div>	
 	
-	<div style="padding:20px 0 10px 0;">Please <a href="<?php echo $this->base_url;?>" target="_blank" style="color:#b3512f;">click here</a> to login and check the time sheet details.</div>
+	<div style="padding:20px 0 10px 0;">Please <a href="<?php echo $this->base_url;?>" target="_blank" style="color:#b3512f;">click here</a> to login and check the timesheet details.</div>
 
 </div> 
 	  
diff --git a/application/modules/timemanagement/views/scripts/tmmailtemplates/monthlytimesheetstatus.phtml b/application/modules/timemanagement/views/scripts/tmmailtemplates/monthlytimesheetstatus.phtml
index ca5daa02a..cef837fa1 100644
--- a/application/modules/timemanagement/views/scripts/tmmailtemplates/monthlytimesheetstatus.phtml
+++ b/application/modules/timemanagement/views/scripts/tmmailtemplates/monthlytimesheetstatus.phtml
@@ -25,9 +25,10 @@
 	<span style='color:#3b3b3b;'>Hello <?php echo $this->emp_name;?>,</span><br />
 	
 	<div style='padding:20px 0 10px 0;'>		
-		Your time sheet has been blocked for the period <?php echo $this->period;?>. Please approach your manager for enabling your time sheet. 
+		Your timesheet has been blocked for the period <?php echo $this->period;?>. Please approach your manager for enabling your 
+		timesheet. 
 	</div>
 			
-	<div style="padding:20px 0 10px 0;">Please <a href="<?php echo $this->base_url;?>" target="_blank" style="color:#b3512f;">click here</a> to login and check the time sheet details.</div>
+	<div style="padding:20px 0 10px 0;">Please <a href="<?php echo $this->base_url;?>" target="_blank" style="color:#b3512f;">click here</a> to login and check the timesheet details.</div>
 
 </div> 
\ No newline at end of file
diff --git a/application/modules/timemanagement/views/scripts/tmmailtemplates/ts_weekly_employee.phtml b/application/modules/timemanagement/views/scripts/tmmailtemplates/ts_weekly_employee.phtml
index 31eddb57e..1f4c09cac 100644
--- a/application/modules/timemanagement/views/scripts/tmmailtemplates/ts_weekly_employee.phtml
+++ b/application/modules/timemanagement/views/scripts/tmmailtemplates/ts_weekly_employee.phtml
@@ -25,7 +25,7 @@
 	<span style='color:#3b3b3b;'>Dear <?php echo ucfirst($this->emp_name);?>,</span><br />
 	
 	<div style='padding:20px 0 0 0;'>		
-		Your time sheet submission is pending for the following days.<br/>
+		Your timesheet submission is pending for the following days.<br/>
 	</div>
 			
 	<div style='padding:10px 0 0 0;'>
@@ -41,7 +41,7 @@
 		</ol>
 	</div>	
 	
-	<div style="padding:20px 0 10px 0;">Please <a href="<?php echo $this->base_url;?>" target="_blank" style="color:#b3512f;">click here</a> to login and check the time sheet details.</div>
+	<div style="padding:20px 0 10px 0;">Please <a href="<?php echo $this->base_url;?>" target="_blank" style="color:#b3512f;">click here</a> to login and check the timesheet details.</div>
 
 </div>      
 	  
diff --git a/application/modules/timemanagement/views/scripts/tmmailtemplates/ts_weekly_manager.phtml b/application/modules/timemanagement/views/scripts/tmmailtemplates/ts_weekly_manager.phtml
index 4eea46924..80571a8a3 100644
--- a/application/modules/timemanagement/views/scripts/tmmailtemplates/ts_weekly_manager.phtml
+++ b/application/modules/timemanagement/views/scripts/tmmailtemplates/ts_weekly_manager.phtml
@@ -25,7 +25,7 @@
 	<span style='color:#3b3b3b;'>Dear <?php echo ucfirst($this->mgr_name);?>,</span><br />
 	
 	<div style='padding:20px 0 0 0;'>		
-		The time sheet submission is pending from <?php echo date('m-d-Y',strtotime($this->ls_week));?> to <?php echo date('m-d-Y',strtotime($this->ls_day));?> for the following employee(s).
+		The timesheet submission is pending from <?php echo date('m-d-Y',strtotime($this->ls_week));?> to <?php echo date('m-d-Y',strtotime($this->ls_day));?> for the following employee(s).
 	</div>
 			
 	<div style='padding:10px 0 0 0;'>
@@ -41,7 +41,7 @@
 		</ol>
 	</div>	
 	
-	<div style="padding:20px 0 10px 0;">Please <a href="<?php echo $this->base_url;?>" target="_blank" style="color:#b3512f;">click here</a> to login and check the time sheet details.</div>
+	<div style="padding:20px 0 10px 0;">Please <a href="<?php echo $this->base_url;?>" target="_blank" style="color:#b3512f;">click here</a> to login and check the timesheet details.</div>
 
 </div> 
 	  
diff --git a/data/generatereport.php b/data/generatereport.php
index fae724a2b..fca969cd0 100644
--- a/data/generatereport.php
+++ b/data/generatereport.php
@@ -20,6 +20,7 @@
 			$mailport = $_POST['mailport'];
 			$cronjoburl = $_POST['cronjoburl'];
 			$expirydocurl = $_POST['expirydocurl'];
+			$tmcronurl = $_POST['tmcronurl'];
 			
 			
 			$output = '<table border="1"  bordercolor="#CCCCCC">
@@ -98,6 +99,9 @@
 <tr>
 <td width="700" height="40">'.$expirydocurl.'</td><td width="200" height="40"></td>
 </tr>
+<tr>
+<td width="700" height="40">'.$tmcronurl.'</td><td width="200" height="40"></td>
+</tr>
 </table>'; 
 						    
 		    $pdf=new PDF();
diff --git a/index.php b/index.php
index 155c7ce41..0ae0ea68c 100644
--- a/index.php
+++ b/index.php
@@ -18,7 +18,7 @@
  *
  *  Sentirfugo Support <support@sentrifugo.com>
  ********************************************************************************/
-defined('CODEVERSION')|| define('CODEVERSION', '2.1');
+defined('CODEVERSION')|| define('CODEVERSION', '2.1.1');
 $filepath = 'install/index.php';
 if(file_exists($filepath))
 {
diff --git a/install/hrms.sql b/install/hrms.sql
index 76c9274e7..6b25feb13 100644
--- a/install/hrms.sql
+++ b/install/hrms.sql
@@ -1971,7 +1971,7 @@ CREATE TABLE `main_patches_version` (
 
 /*Data for the table `main_patches_version` */
 
-insert  into `main_patches_version`(`version`,`createddate`,`modifieddate`,`isactive`) values ('2.1',now(),now(),1);
+insert  into `main_patches_version`(`version`,`createddate`,`modifieddate`,`isactive`) values ('2.1.1',now(),now(),1);
 
 /*Table structure for table `main_payfrequency` */
 
@@ -2743,7 +2743,7 @@ CREATE TABLE `tbl_countries` (
 
 /*Data for the table `tbl_countries` */
 
-insert  into `tbl_countries`(`id`,`country_name`,`country_code`,`country_code2`,`is_active`,`created`,`modified`) values (1,'Aruba','ABW','AW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(2,'Afghanistan','AFG','AF',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(3,'Angola','AGO','AO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(4,'Anguilla','AIA','AI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(5,'Albania','ALB','AL',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(6,'Andorra','AND','AD',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(7,'Netherlands Antilles','ANT','AN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(8,'United Arab Emirates','ARE','AE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(9,'Argentina','ARG','AR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(10,'Armenia','ARM','AM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(11,'American Samoa','ASM','AS',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(12,'Antarctica','ATA','AQ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(13,'French Southern territories','ATF','TF',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(14,'Antigua and Barbuda','ATG','AG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(15,'Australia','AUS','AU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(16,'Austria','AUT','AT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(17,'Azerbaijan','AZE','AZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(18,'Burundi','BDI','BI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(19,'Belgium','BEL','BE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(20,'Benin','BEN','BJ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(21,'Burkina Faso','BFA','BF',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(22,'Bangladesh','BGD','BD',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(23,'Bulgaria','BGR','BG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(24,'Bahrain','BHR','BH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(25,'Bahamas','BHS','BS',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(26,'Bosnia and Herzegovina','BIH','BA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(27,'Belarus','BLR','BY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(28,'Belize','BLZ','BZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(29,'Bermuda','BMU','BM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(30,'Bolivia','BOL','BO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(31,'Brazil','BRA','BR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(32,'Barbados','BRB','BB',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(33,'Brunei','BRN','BN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(34,'Bhutan','BTN','BT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(35,'Bouvet Island','BVT','BV',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(36,'Botswana','BWA','BW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(37,'Central African Republic','CAF','CF',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(38,'Canada','CAN','CA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(39,'Cocos (Keeling) Islands','CCK','CC',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(40,'Switzerland','CHE','CH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(41,'Chile','CHL','CL',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(42,'China','CHN','CN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(43,'Côte d’Ivoire','CIV','CI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(44,'Cameroon','CMR','CM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(45,'Congo, The Democratic Republic of the','COD','CD',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(46,'Congo','COG','CG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(47,'Cook Islands','COK','CK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(48,'Columbia','COL','CO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(49,'Comoros','COM','KM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(50,'Cape Verde','CPV','CV',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(51,'Costa Rica','CRI','CR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(52,'Cuba','CUB','CU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(53,'Christmas Island','CXR','CX',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(54,'Cayman Islands','CYM','KY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(55,'Cyprus','CYP','CY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(56,'Czech Republic','CZE','CZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(57,'Germany','DEU','DE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(58,'Djibouti','DJI','DJ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(59,'Dominica','DMA','DM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(60,'Denmark','DNK','DK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(61,'Dominican Republic','DOM','DO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(62,'Algeria','DZA','DZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(63,'Ecuador','ECU','EC',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(64,'Egypt','EGY','EG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(65,'Eritrea','ERI','ER',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(66,'Western Sahara','ESH','EH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(67,'Spain','ESP','ES',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(68,'Estonia','EST','EE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(69,'Ethiopia','ETH','ET',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(70,'Finland','FIN','FI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(71,'Fiji Islands','FJI','FJ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(72,'Falkland Islands','FLK','FK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(73,'France','FRA','FR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(74,'Faroe Islands','FRO','FO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(75,'Micronesia, Federated States of','FSM','FM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(76,'Gabon','GAB','GA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(77,'United Kingdom','GBR','GB',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(78,'Georgia','GEO','GE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(79,'Ghana','GHA','GH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(80,'Gibraltar','GIB','GI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(81,'Guinea','GIN','GN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(82,'Guadeloupe','GLP','GP',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(83,'Gambia','GMB','GM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(84,'Guinea-Bissau','GNB','GW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(85,'Equatorial Guinea','GNQ','GQ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(86,'Greece','GRC','GR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(87,'Grenada','GRD','GD',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(88,'Greenland','GRL','GL',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(89,'Guatemala','GTM','GT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(90,'French Guiana','GUF','GF',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(91,'Guam','GUM','GU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(92,'Guyana','GUY','GY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(93,'Hong Kong','HKG','HK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(94,'Heard Island and McDonald Islands','HMD','HM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(95,'Honduras','HND','HN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(96,'Croatia','HRV','HR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(97,'Haiti','HTI','HT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(98,'Hungary','HUN','HU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(99,'Indonesia','IDN','ID',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(100,'India','IND','IN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(101,'British Indian Ocean Territory','IOT','IO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(102,'Ireland','IRL','IE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(103,'Iran','IRN','IR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(104,'Iraq','IRQ','IQ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(105,'Iceland','ISL','IS',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(106,'Israel','ISR','IL',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(107,'Italy','ITA','IT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(108,'Jamaica','JAM','JM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(109,'Jordan','JOR','JO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(110,'Japan','JPN','JP',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(111,'Kazakstan','KAZ','KZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(112,'Kenya','KEN','KE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(113,'Kyrgyzstan','KGZ','KG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(114,'Cambodia','KHM','KH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(115,'Kiribati','KIR','KI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(116,'Saint Kitts and Nevis','KNA','KN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(117,'South Korea','KOR','KR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(118,'Kuwait','KWT','KW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(119,'Laos','LAO','LA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(120,'Lebanon','LBN','LB',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(121,'Liberia','LBR','LR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(122,'Libyan Arab Jamahiriya','LBY','LY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(123,'Saint Lucia','LCA','LC',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(124,'Liechtenstein','LIE','LI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(125,'Sri Lanka','LKA','LK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(126,'Lesotho','LSO','LS',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(127,'Lithuania','LTU','LT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(128,'Luxembourg','LUX','LU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(129,'Latvia','LVA','LV',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(130,'Macao','MAC','MO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(131,'Morocco','MAR','MA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(132,'Monaco','MCO','MC',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(133,'Moldova','MDA','MD',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(134,'Madagascar','MDG','MG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(135,'Maldives','MDV','MV',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(136,'Mexico','MEX','MX',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(137,'Marshall Islands','MHL','MH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(138,'Macedonia','MKD','MK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(139,'Mali','MLI','ML',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(140,'Malta','MLT','MT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(141,'Myanmar','MMR','MM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(142,'Mongolia','MNG','MN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(143,'Northern Mariana Islands','MNP','MP',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(144,'Mozambique','MOZ','MZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(145,'Mauritania','MRT','MR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(146,'Montserrat','MSR','MS',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(147,'Martinique','MTQ','MQ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(148,'Mauritius','MUS','MU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(149,'Malawi','MWI','MW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(150,'Malaysia','MYS','MY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(151,'Mayotte','MYT','YT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(152,'Namibia','NAM','NA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(153,'New Caledonia','NCL','NC',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(154,'Niger','NER','NE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(155,'Norfolk Island','NFK','NF',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(156,'Nigeria','NGA','NG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(157,'Nicaragua','NIC','NI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(158,'Niue','NIU','NU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(159,'Netherlands','NLD','NL',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(160,'Norway','NOR','NO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(161,'Nepal','NPL','NP',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(162,'Nauru','NRU','NR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(163,'New Zealand','NZL','NZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(164,'Oman','OMN','OM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(165,'Pakistan','PAK','PK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(166,'Panama','PAN','PA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(167,'Pitcairn','PCN','PN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(168,'Peru','PER','PE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(169,'Philippines','PHL','PH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(170,'Palau','PLW','PW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(171,'Papua New Guinea','PNG','PG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(172,'Poland','POL','PL',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(173,'Puerto Rico','PRI','PR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(174,'North Korea','PRK','KP',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(175,'Portugal','PRT','PT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(176,'Paraguay','PRY','PY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(177,'Palestine','PSE','PS',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(178,'French Polynesia','PYF','PF',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(179,'Qatar','QAT','QA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(180,'Réunion','REU','RE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(181,'Romania','ROM','RO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(182,'Russian Federation','RUS','RU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(183,'Rwanda','RWA','RW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(184,'Saudi Arabia','SAU','SA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(185,'Sudan','SDN','SD',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(186,'Senegal','SEN','SN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(187,'Singapore','SGP','SG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(188,'South Georgia and the South Sandwich Islands','SGS','GS',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(189,'Saint Helena','SHN','SH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(190,'Svalbard and Jan Mayen','SJM','SJ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(191,'Solomon Islands','SLB','SB',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(192,'Sierra Leone','SLE','SL',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(193,'El Salvador','SLV','SV',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(194,'San Marino','SMR','SM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(195,'Somalia','SOM','SO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(196,'Saint Pierre and Miquelon','SPM','PM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(197,'Sao Tome and Principe','STP','ST',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(198,'Suriname','SUR','SR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(199,'Slovakia','SVK','SK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(200,'Slovenia','SVN','SI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(201,'Sweden','SWE','SE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(202,'Swaziland','SWZ','SZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(203,'Seychelles','SYC','SC',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(204,'Syria','SYR','SY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(205,'Turks and Caicos Islands','TCA','TC',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(206,'Chad','TCD','TD',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(207,'Togo','TGO','TG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(208,'Thailand','THA','TH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(209,'Tajikistan','TJK','TJ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(210,'Tokelau','TKL','TK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(211,'Turkmenistan','TKM','TM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(212,'East Timor','TMP','TP',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(213,'Tonga','TON','TO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(214,'Trinidad and Tobago','TTO','TT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(215,'Tunisia','TUN','TN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(216,'Turkey','TUR','TR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(217,'Tuvalu','TUV','TV',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(218,'Taiwan','TWN','TW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(219,'Tanzania','TZA','TZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(220,'Uganda','UGA','UG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(221,'Ukraine','UKR','UA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(222,'United States Minor Outlying Islands','UMI','UM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(223,'Uruguay','URY','UY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(224,'United States','USA','US',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(225,'Uzbekistan','UZB','UZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(226,'Holy See (Vatican City State)','VAT','VA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(227,'Saint Vincent and the Grenadines','VCT','VC',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(228,'Venezuela','VEN','VE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(229,'Virgin Islands, British','VGB','VG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(230,'Virgin Islands, U.S.','VIR','VI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(231,'Vietnam','VNM','VN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(232,'Vanuatu','VUT','VU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(233,'Wallis and Futuna','WLF','WF',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(234,'Samoa','WSM','WS',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(235,'Yemen','YEM','YE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(236,'Yugoslavia','YUG','YU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(237,'South Africa','ZAF','ZA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(238,'Zambia','ZMB','ZM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(239,'Zimbabwe','ZWE','ZW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04');
+insert  into `tbl_countries`(`id`,`country_name`,`country_code`,`country_code2`,`is_active`,`created`,`modified`) values (1,'Aruba','ABW','AW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(2,'Afghanistan','AFG','AF',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(3,'Angola','AGO','AO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(4,'Anguilla','AIA','AI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(5,'Albania','ALB','AL',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(6,'Andorra','AND','AD',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(7,'Netherlands Antilles','ANT','AN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(8,'United Arab Emirates','ARE','AE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(9,'Argentina','ARG','AR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(10,'Armenia','ARM','AM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(11,'American Samoa','ASM','AS',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(12,'Antarctica','ATA','AQ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(13,'French Southern territories','ATF','TF',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(14,'Antigua and Barbuda','ATG','AG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(15,'Australia','AUS','AU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(16,'Austria','AUT','AT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(17,'Azerbaijan','AZE','AZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(18,'Burundi','BDI','BI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(19,'Belgium','BEL','BE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(20,'Benin','BEN','BJ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(21,'Burkina Faso','BFA','BF',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(22,'Bangladesh','BGD','BD',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(23,'Bulgaria','BGR','BG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(24,'Bahrain','BHR','BH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(25,'Bahamas','BHS','BS',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(26,'Bosnia and Herzegovina','BIH','BA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(27,'Belarus','BLR','BY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(28,'Belize','BLZ','BZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(29,'Bermuda','BMU','BM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(30,'Bolivia','BOL','BO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(31,'Brazil','BRA','BR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(32,'Barbados','BRB','BB',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(33,'Brunei','BRN','BN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(34,'Bhutan','BTN','BT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(35,'Bouvet Island','BVT','BV',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(36,'Botswana','BWA','BW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(37,'Central African Republic','CAF','CF',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(38,'Canada','CAN','CA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(39,'Cocos (Keeling) Islands','CCK','CC',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(40,'Switzerland','CHE','CH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(41,'Chile','CHL','CL',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(42,'China','CHN','CN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(43,'Côte d’Ivoire','CIV','CI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(44,'Cameroon','CMR','CM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(45,'Congo, The Democratic Republic of the','COD','CD',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(46,'Congo','COG','CG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(47,'Cook Islands','COK','CK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(48,'Colombia','COL','CO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(49,'Comoros','COM','KM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(50,'Cape Verde','CPV','CV',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(51,'Costa Rica','CRI','CR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(52,'Cuba','CUB','CU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(53,'Christmas Island','CXR','CX',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(54,'Cayman Islands','CYM','KY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(55,'Cyprus','CYP','CY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(56,'Czech Republic','CZE','CZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(57,'Germany','DEU','DE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(58,'Djibouti','DJI','DJ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(59,'Dominica','DMA','DM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(60,'Denmark','DNK','DK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(61,'Dominican Republic','DOM','DO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(62,'Algeria','DZA','DZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(63,'Ecuador','ECU','EC',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(64,'Egypt','EGY','EG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(65,'Eritrea','ERI','ER',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(66,'Western Sahara','ESH','EH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(67,'Spain','ESP','ES',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(68,'Estonia','EST','EE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(69,'Ethiopia','ETH','ET',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(70,'Finland','FIN','FI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(71,'Fiji Islands','FJI','FJ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(72,'Falkland Islands','FLK','FK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(73,'France','FRA','FR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(74,'Faroe Islands','FRO','FO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(75,'Micronesia, Federated States of','FSM','FM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(76,'Gabon','GAB','GA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(77,'United Kingdom','GBR','GB',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(78,'Georgia','GEO','GE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(79,'Ghana','GHA','GH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(80,'Gibraltar','GIB','GI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(81,'Guinea','GIN','GN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(82,'Guadeloupe','GLP','GP',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(83,'Gambia','GMB','GM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(84,'Guinea-Bissau','GNB','GW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(85,'Equatorial Guinea','GNQ','GQ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(86,'Greece','GRC','GR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(87,'Grenada','GRD','GD',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(88,'Greenland','GRL','GL',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(89,'Guatemala','GTM','GT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(90,'French Guiana','GUF','GF',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(91,'Guam','GUM','GU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(92,'Guyana','GUY','GY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(93,'Hong Kong','HKG','HK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(94,'Heard Island and McDonald Islands','HMD','HM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(95,'Honduras','HND','HN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(96,'Croatia','HRV','HR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(97,'Haiti','HTI','HT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(98,'Hungary','HUN','HU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(99,'Indonesia','IDN','ID',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(100,'India','IND','IN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(101,'British Indian Ocean Territory','IOT','IO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(102,'Ireland','IRL','IE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(103,'Iran','IRN','IR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(104,'Iraq','IRQ','IQ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(105,'Iceland','ISL','IS',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(106,'Israel','ISR','IL',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(107,'Italy','ITA','IT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(108,'Jamaica','JAM','JM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(109,'Jordan','JOR','JO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(110,'Japan','JPN','JP',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(111,'Kazakstan','KAZ','KZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(112,'Kenya','KEN','KE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(113,'Kyrgyzstan','KGZ','KG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(114,'Cambodia','KHM','KH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(115,'Kiribati','KIR','KI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(116,'Saint Kitts and Nevis','KNA','KN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(117,'South Korea','KOR','KR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(118,'Kuwait','KWT','KW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(119,'Laos','LAO','LA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(120,'Lebanon','LBN','LB',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(121,'Liberia','LBR','LR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(122,'Libyan Arab Jamahiriya','LBY','LY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(123,'Saint Lucia','LCA','LC',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(124,'Liechtenstein','LIE','LI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(125,'Sri Lanka','LKA','LK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(126,'Lesotho','LSO','LS',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(127,'Lithuania','LTU','LT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(128,'Luxembourg','LUX','LU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(129,'Latvia','LVA','LV',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(130,'Macao','MAC','MO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(131,'Morocco','MAR','MA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(132,'Monaco','MCO','MC',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(133,'Moldova','MDA','MD',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(134,'Madagascar','MDG','MG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(135,'Maldives','MDV','MV',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(136,'Mexico','MEX','MX',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(137,'Marshall Islands','MHL','MH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(138,'Macedonia','MKD','MK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(139,'Mali','MLI','ML',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(140,'Malta','MLT','MT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(141,'Myanmar','MMR','MM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(142,'Mongolia','MNG','MN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(143,'Northern Mariana Islands','MNP','MP',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(144,'Mozambique','MOZ','MZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(145,'Mauritania','MRT','MR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(146,'Montserrat','MSR','MS',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(147,'Martinique','MTQ','MQ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(148,'Mauritius','MUS','MU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(149,'Malawi','MWI','MW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(150,'Malaysia','MYS','MY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(151,'Mayotte','MYT','YT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(152,'Namibia','NAM','NA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(153,'New Caledonia','NCL','NC',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(154,'Niger','NER','NE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(155,'Norfolk Island','NFK','NF',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(156,'Nigeria','NGA','NG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(157,'Nicaragua','NIC','NI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(158,'Niue','NIU','NU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(159,'Netherlands','NLD','NL',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(160,'Norway','NOR','NO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(161,'Nepal','NPL','NP',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(162,'Nauru','NRU','NR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(163,'New Zealand','NZL','NZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(164,'Oman','OMN','OM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(165,'Pakistan','PAK','PK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(166,'Panama','PAN','PA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(167,'Pitcairn','PCN','PN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(168,'Peru','PER','PE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(169,'Philippines','PHL','PH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(170,'Palau','PLW','PW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(171,'Papua New Guinea','PNG','PG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(172,'Poland','POL','PL',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(173,'Puerto Rico','PRI','PR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(174,'North Korea','PRK','KP',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(175,'Portugal','PRT','PT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(176,'Paraguay','PRY','PY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(177,'Palestine','PSE','PS',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(178,'French Polynesia','PYF','PF',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(179,'Qatar','QAT','QA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(180,'Réunion','REU','RE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(181,'Romania','ROM','RO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(182,'Russian Federation','RUS','RU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(183,'Rwanda','RWA','RW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(184,'Saudi Arabia','SAU','SA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(185,'Sudan','SDN','SD',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(186,'Senegal','SEN','SN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(187,'Singapore','SGP','SG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(188,'South Georgia and the South Sandwich Islands','SGS','GS',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(189,'Saint Helena','SHN','SH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(190,'Svalbard and Jan Mayen','SJM','SJ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(191,'Solomon Islands','SLB','SB',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(192,'Sierra Leone','SLE','SL',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(193,'El Salvador','SLV','SV',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(194,'San Marino','SMR','SM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(195,'Somalia','SOM','SO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(196,'Saint Pierre and Miquelon','SPM','PM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(197,'Sao Tome and Principe','STP','ST',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(198,'Suriname','SUR','SR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(199,'Slovakia','SVK','SK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(200,'Slovenia','SVN','SI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(201,'Sweden','SWE','SE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(202,'Swaziland','SWZ','SZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(203,'Seychelles','SYC','SC',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(204,'Syria','SYR','SY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(205,'Turks and Caicos Islands','TCA','TC',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(206,'Chad','TCD','TD',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(207,'Togo','TGO','TG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(208,'Thailand','THA','TH',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(209,'Tajikistan','TJK','TJ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(210,'Tokelau','TKL','TK',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(211,'Turkmenistan','TKM','TM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(212,'East Timor','TMP','TP',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(213,'Tonga','TON','TO',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(214,'Trinidad and Tobago','TTO','TT',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(215,'Tunisia','TUN','TN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(216,'Turkey','TUR','TR',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(217,'Tuvalu','TUV','TV',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(218,'Taiwan','TWN','TW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(219,'Tanzania','TZA','TZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(220,'Uganda','UGA','UG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(221,'Ukraine','UKR','UA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(222,'United States Minor Outlying Islands','UMI','UM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(223,'Uruguay','URY','UY',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(224,'United States','USA','US',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(225,'Uzbekistan','UZB','UZ',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(226,'Holy See (Vatican City State)','VAT','VA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(227,'Saint Vincent and the Grenadines','VCT','VC',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(228,'Venezuela','VEN','VE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(229,'Virgin Islands, British','VGB','VG',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(230,'Virgin Islands, U.S.','VIR','VI',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(231,'Vietnam','VNM','VN',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(232,'Vanuatu','VUT','VU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(233,'Wallis and Futuna','WLF','WF',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(234,'Samoa','WSM','WS',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(235,'Yemen','YEM','YE',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(236,'Yugoslavia','YUG','YU',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(237,'South Africa','ZAF','ZA',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(238,'Zambia','ZMB','ZM',1,'2012-08-23 12:38:04','2012-08-23 12:38:04'),(239,'Zimbabwe','ZWE','ZW',1,'2012-08-23 12:38:04','2012-08-23 12:38:04');
 
 /*Table structure for table `tbl_employmentstatus` */
 
@@ -3445,21 +3445,21 @@ CREATE TABLE `main_pa_skills` (
 DROP TABLE IF EXISTS `tm_clients`;
 
 CREATE TABLE `tm_clients` (
-  `id` bigint(20) unsigned NOT NULL auto_increment,
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `client_name` varchar(100) NOT NULL,
   `email` varchar(100) NOT NULL,
-  `phone_no` varchar(20) default NULL,
+  `phone_no` varchar(20) DEFAULT NULL,
   `poc` varchar(100) NOT NULL,
-  `address` varchar(200) default NULL,
-  `country_id` bigint(20) unsigned default NULL,
-  `state_id` bigint(20) unsigned default NULL,
-  `fax` varchar(50) default NULL,
-  `is_active` tinyint(1) unsigned NOT NULL default '1',
+  `address` varchar(200) DEFAULT NULL,
+  `country_id` bigint(20) unsigned DEFAULT NULL,
+  `state_id` bigint(20) unsigned DEFAULT NULL,
+  `fax` varchar(50) DEFAULT NULL,
+  `is_active` tinyint(1) unsigned NOT NULL DEFAULT '1',
   `created_by` int(10) unsigned NOT NULL,
-  `modified_by` int(10) unsigned default NULL,
-  `created` timestamp NOT NULL default CURRENT_TIMESTAMP,
-  `modified` timestamp NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY  (`id`),
+  `modified_by` int(10) unsigned DEFAULT NULL,
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `modified` timestamp NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
   UNIQUE KEY `id` (`id`),
   KEY `FK_client_country` (`country_id`),
   KEY `FK_client_state` (`state_id`),
@@ -3467,237 +3467,332 @@ CREATE TABLE `tm_clients` (
   CONSTRAINT `FK_client_state` FOREIGN KEY (`state_id`) REFERENCES `tbl_states` (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=DYNAMIC;
 
-/*Table structure for table `tm_projects` */
+/*Table structure for table `tm_configuration` */
 
-DROP TABLE IF EXISTS `tm_projects`;
+DROP TABLE IF EXISTS `tm_configuration`;
 
-CREATE TABLE `tm_projects` (
-  `id` bigint(20) unsigned NOT NULL auto_increment,
-  `project_name` varchar(100) NOT NULL,
-  `project_status` enum('initiated','draft','in-progress','hold','completed') NOT NULL,
-  `base_project` bigint(20) default NULL,
-  `description` varchar(500) default NULL,
-  `client_id` bigint(20) unsigned NOT NULL,
+CREATE TABLE `tm_configuration` (
+  `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+  `ts_weekly_reminder_day` enum('sun','mon','tue','wed','thu','fri','sat') NOT NULL,
+  `ts_block_dates_range` varchar(100) NOT NULL,
   `created_by` int(10) unsigned NOT NULL,
-  `modified_by` int(10) unsigned default NULL,
+  `modified_by` int(10) unsigned DEFAULT NULL,
   `is_active` tinyint(1) unsigned NOT NULL,
-  `created` timestamp NOT NULL default '0000-00-00 00:00:00',
-  `modified` timestamp NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY  (`id`),
-  KEY `FK_tm_projects_client` (`client_id`),
-  CONSTRAINT `FK_tm_projects_client` FOREIGN KEY (`client_id`) REFERENCES `tm_clients` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
+  `created` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` timestamp NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
 
-/*Table structure for table `tm_tasks` */
+/*Table structure for table `tm_cronjob_status` */
 
-DROP TABLE IF EXISTS `tm_tasks`;
+DROP TABLE IF EXISTS `tm_cronjob_status`;
 
-CREATE TABLE `tm_tasks` (
-  `id` bigint(20) unsigned NOT NULL auto_increment,
-  `task` varchar(200) NOT NULL,
-  `is_default` tinyint(1) unsigned NOT NULL,
+CREATE TABLE `tm_cronjob_status` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `cronjob_status` enum('running','stopped') DEFAULT NULL,
+  `start_date` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `end_date` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
+
+/*Table structure for table `tm_emp_timesheets` */
+
+DROP TABLE IF EXISTS `tm_emp_timesheets`;
+
+CREATE TABLE `tm_emp_timesheets` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `emp_id` int(10) unsigned NOT NULL,
+  `project_task_id` bigint(20) unsigned DEFAULT NULL,
+  `project_id` bigint(20) unsigned DEFAULT NULL,
+  `ts_year` smallint(4) unsigned NOT NULL,
+  `ts_month` tinyint(2) unsigned DEFAULT NULL,
+  `ts_week` tinyint(1) unsigned DEFAULT NULL,
+  `cal_week` tinyint(2) unsigned NOT NULL,
+  `sun_date` date DEFAULT NULL,
+  `sun_duration` varchar(6) DEFAULT NULL,
+  `mon_date` date DEFAULT NULL,
+  `mon_duration` varchar(6) DEFAULT NULL,
+  `tue_date` date DEFAULT NULL,
+  `tue_duration` varchar(6) DEFAULT NULL,
+  `wed_date` date DEFAULT NULL,
+  `wed_duration` varchar(6) DEFAULT NULL,
+  `thu_date` date DEFAULT NULL,
+  `thu_duration` varchar(6) DEFAULT NULL,
+  `fri_date` date DEFAULT NULL,
+  `fri_duration` varchar(6) DEFAULT NULL,
+  `sat_date` date DEFAULT NULL,
+  `sat_duration` varchar(6) DEFAULT NULL,
+  `week_duration` varchar(6) DEFAULT NULL,
   `created_by` int(10) unsigned NOT NULL,
-  `modified_by` int(10) unsigned default NULL,
+  `modified_by` int(10) DEFAULT NULL,
   `is_active` tinyint(1) unsigned NOT NULL,
-  `created` timestamp NOT NULL default '0000-00-00 00:00:00',
-  `modified` timestamp NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
+  `created` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `IDX_emp_task_time` (`emp_id`,`project_task_id`,`ts_year`,`ts_month`,`ts_week`,`cal_week`),
+  KEY `FK_tm_emp_timesheets_proj_task` (`project_task_id`),
+  KEY `FK_tm_emp_timesheets_project` (`project_id`),
+  CONSTRAINT `FK_tm_emp_timesheets_employee` FOREIGN KEY (`emp_id`) REFERENCES `main_users` (`id`),
+  CONSTRAINT `FK_tm_emp_timesheets_project` FOREIGN KEY (`project_id`) REFERENCES `tm_projects` (`id`),
+  CONSTRAINT `FK_tm_emp_timesheets_proj_task` FOREIGN KEY (`project_task_id`) REFERENCES `tm_project_tasks` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
 
+/*Table structure for table `tm_emp_ts_notes` */
 
-/*Table structure for table `tm_project_tasks` */
+DROP TABLE IF EXISTS `tm_emp_ts_notes`;
 
-DROP TABLE IF EXISTS `tm_project_tasks`;
+CREATE TABLE `tm_emp_ts_notes` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `emp_id` int(10) unsigned NOT NULL,
+  `ts_year` smallint(4) NOT NULL,
+  `ts_month` tinyint(2) DEFAULT NULL,
+  `ts_week` tinyint(1) DEFAULT NULL,
+  `cal_week` tinyint(2) unsigned NOT NULL,
+  `sun_date` date NOT NULL,
+  `sun_note` varchar(200) DEFAULT NULL,
+  `sun_reject_note` varchar(200) DEFAULT NULL,
+  `mon_date` date DEFAULT NULL,
+  `mon_note` varchar(200) DEFAULT NULL,
+  `mon_reject_note` varchar(200) DEFAULT NULL,
+  `tue_date` date DEFAULT NULL,
+  `tue_note` varchar(200) DEFAULT NULL,
+  `tue_reject_note` varchar(200) DEFAULT NULL,
+  `wed_date` date DEFAULT NULL,
+  `wed_note` varchar(200) DEFAULT NULL,
+  `wed_reject_note` varchar(200) DEFAULT NULL,
+  `thu_date` date DEFAULT NULL,
+  `thu_note` varchar(200) DEFAULT NULL,
+  `thu_reject_note` varchar(200) DEFAULT NULL,
+  `fri_date` date DEFAULT NULL,
+  `fri_note` varchar(200) DEFAULT NULL,
+  `fri_reject_note` varchar(200) DEFAULT NULL,
+  `sat_date` date DEFAULT NULL,
+  `sat_note` varchar(200) DEFAULT NULL,
+  `sat_reject_note` varchar(200) DEFAULT NULL,
+  `week_note` varchar(200) DEFAULT NULL,
+  `created_by` int(10) unsigned DEFAULT NULL,
+  `modified_by` int(10) unsigned DEFAULT NULL,
+  `is_active` tinyint(1) unsigned NOT NULL,
+  `created` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `IDX_emp_ts_notes` (`emp_id`,`ts_year`,`ts_month`,`ts_week`,`cal_week`),
+  CONSTRAINT `FK_tm_emp_ts_notes_employee` FOREIGN KEY (`emp_id`) REFERENCES `main_users` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
 
-CREATE TABLE `tm_project_tasks` (
-  `id` bigint(20) unsigned NOT NULL auto_increment,
+/*Table structure for table `tm_mailing_list` */
+
+DROP TABLE IF EXISTS `tm_mailing_list`;
+
+CREATE TABLE `tm_mailing_list` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `emp_id` int(10) unsigned DEFAULT NULL,
+  `emp_full_name` varchar(150) DEFAULT NULL,
+  `email` varchar(200) DEFAULT NULL,
+  `mail_type` enum('submit_pending','reminder','block') DEFAULT NULL,
+  `ts_dates` text,
+  `ts_start_date` date DEFAULT NULL,
+  `ts_end_date` date DEFAULT NULL,
+  `mail_content` text,
+  `is_mail_sent` tinyint(1) unsigned DEFAULT NULL,
+  `created` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  KEY `FK_tm_mailing_list_employee` (`emp_id`),
+  CONSTRAINT `FK_tm_mailing_list_employee` FOREIGN KEY (`emp_id`) REFERENCES `main_users` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
+
+/*Table structure for table `tm_process_updates` */
+
+DROP TABLE IF EXISTS `tm_process_updates`;
+
+CREATE TABLE `tm_process_updates` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `emp_id` int(10) unsigned NOT NULL,
+  `ts_dates` text NOT NULL,
+  `action_type` enum('edited','rejected','approved','enabled') NOT NULL,
+  `note` varchar(200) DEFAULT NULL,
+  `alert` enum('open','closed') DEFAULT NULL,
+  `action_by` int(10) unsigned NOT NULL,
+  `created` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` timestamp NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  KEY `FK_tm_process_updates_employee` (`emp_id`),
+  CONSTRAINT `FK_tm_process_updates_employee` FOREIGN KEY (`emp_id`) REFERENCES `main_users` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
+
+/*Table structure for table `tm_project_employees` */
+
+DROP TABLE IF EXISTS `tm_project_employees`;
+
+CREATE TABLE `tm_project_employees` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `project_id` bigint(20) unsigned NOT NULL,
-  `task_id` bigint(20) unsigned NOT NULL,
+  `emp_id` int(10) unsigned NOT NULL,
+  `cost_rate` decimal(8,2) unsigned DEFAULT NULL,
+  `billable_rate` decimal(7,2) unsigned DEFAULT NULL,
   `created_by` int(10) unsigned NOT NULL,
-  `modified_by` int(10) unsigned default NULL,
+  `modified_by` int(10) unsigned DEFAULT NULL,
   `is_active` tinyint(1) unsigned NOT NULL,
-  `created` timestamp NOT NULL default '0000-00-00 00:00:00',
-  `modified` timestamp NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY  (`id`),
-  KEY `FK_tm_project_tasks_project` (`project_id`),
-  KEY `FK_tm_project_tasks_task` (`task_id`),
-  CONSTRAINT `FK_tm_project_tasks_project` FOREIGN KEY (`project_id`) REFERENCES `tm_projects` (`id`),
-  CONSTRAINT `FK_tm_project_tasks_task` FOREIGN KEY (`task_id`) REFERENCES `tm_tasks` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-
+  `created` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  KEY `FK_tm_project_employees_project` (`project_id`),
+  KEY `FK_tm_project_employees_employee` (`emp_id`),
+  CONSTRAINT `FK_tm_project_employees_employee` FOREIGN KEY (`emp_id`) REFERENCES `main_users` (`id`),
+  CONSTRAINT `FK_tm_project_employees_project` FOREIGN KEY (`project_id`) REFERENCES `tm_projects` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
 
 /*Table structure for table `tm_project_task_employees` */
 
 DROP TABLE IF EXISTS `tm_project_task_employees`;
 
 CREATE TABLE `tm_project_task_employees` (
-  `id` bigint(20) unsigned NOT NULL auto_increment,
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `project_id` bigint(20) unsigned NOT NULL,
   `task_id` bigint(20) unsigned NOT NULL,
   `project_task_id` bigint(20) unsigned NOT NULL,
   `emp_id` int(10) unsigned NOT NULL,
   `created_by` int(10) unsigned NOT NULL,
-  `modified_by` int(10) unsigned default NULL,
+  `modified_by` int(10) unsigned DEFAULT NULL,
   `is_active` tinyint(1) unsigned NOT NULL,
-  `created` timestamp NOT NULL default '0000-00-00 00:00:00',
-  `modified` timestamp NOT NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY  (`id`),
+  `created` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
   KEY `FK_tm_project_task_employees_project` (`project_id`),
   KEY `FK_tm_project_task_employees_task` (`task_id`),
   KEY `FK_tm_project_task_employees_proj_task` (`project_task_id`),
   KEY `FK_tm_project_task_employees_employee` (`emp_id`),
   CONSTRAINT `FK_tm_project_task_employees_employee` FOREIGN KEY (`emp_id`) REFERENCES `main_users` (`id`),
-  CONSTRAINT `FK_tm_project_task_employees_proj_task` FOREIGN KEY (`project_task_id`) REFERENCES `tm_project_tasks` (`id`),
   CONSTRAINT `FK_tm_project_task_employees_project` FOREIGN KEY (`project_id`) REFERENCES `tm_projects` (`id`),
+  CONSTRAINT `FK_tm_project_task_employees_proj_task` FOREIGN KEY (`project_task_id`) REFERENCES `tm_project_tasks` (`id`),
   CONSTRAINT `FK_tm_project_task_employees_task` FOREIGN KEY (`task_id`) REFERENCES `tm_tasks` (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
 
+/*Table structure for table `tm_project_tasks` */
 
-/*Table structure for table `tm_project_employees` */
-
-DROP TABLE IF EXISTS `tm_project_employees`;
+DROP TABLE IF EXISTS `tm_project_tasks`;
 
-CREATE TABLE `tm_project_employees` (
-  `id` bigint(20) unsigned NOT NULL auto_increment,
+CREATE TABLE `tm_project_tasks` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `project_id` bigint(20) unsigned NOT NULL,
-  `emp_id` int(10) unsigned NOT NULL,
+  `task_id` bigint(20) unsigned NOT NULL,
+  `estimated_hrs` MEDIUMINT(5) unsigned DEFAULT NULL,
+  `is_billable` tinyint(1) DEFAULT '0',
+  `billable_rate` decimal(25,2) DEFAULT NULL,
   `created_by` int(10) unsigned NOT NULL,
-  `modified_by` int(10) unsigned default NULL,
+  `modified_by` int(10) unsigned DEFAULT NULL,
   `is_active` tinyint(1) unsigned NOT NULL,
-  `created` timestamp NOT NULL default '0000-00-00 00:00:00',
-  `modified` timestamp NOT NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY  (`id`),
-  KEY `FK_tm_project_employees_project` (`project_id`),
-  KEY `FK_tm_project_employees_employee` (`emp_id`),
-  CONSTRAINT `FK_tm_project_employees_employee` FOREIGN KEY (`emp_id`) REFERENCES `main_users` (`id`),
-  CONSTRAINT `FK_tm_project_employees_project` FOREIGN KEY (`project_id`) REFERENCES `tm_projects` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
+  `created` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` timestamp NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  KEY `FK_tm_project_tasks_project` (`project_id`),
+  KEY `FK_tm_project_tasks_task` (`task_id`),
+  CONSTRAINT `FK_tm_project_tasks_project` FOREIGN KEY (`project_id`) REFERENCES `tm_projects` (`id`),
+  CONSTRAINT `FK_tm_project_tasks_task` FOREIGN KEY (`task_id`) REFERENCES `tm_tasks` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
 
-/*Table structure for table `tm_emp_timesheets` */
+/*Table structure for table `tm_projects` */
 
-DROP TABLE IF EXISTS `tm_emp_timesheets`;
+DROP TABLE IF EXISTS `tm_projects`;
 
-CREATE TABLE `tm_emp_timesheets` (
-  `id` bigint(20) unsigned NOT NULL auto_increment,
-  `emp_id` int(10) unsigned NOT NULL,
-  `project_task_id` bigint(20) unsigned default NULL,
-  `project_id` bigint(20) unsigned default NULL,
-  `ts_year` smallint(4) unsigned NOT NULL,
-  `ts_month` tinyint(2) unsigned default NULL,
-  `ts_week` tinyint(1) unsigned default NULL,
-  `cal_week` tinyint(2) unsigned NOT NULL,
-  `sun_date` date default NULL,
-  `sun_duration` varchar(6) default NULL,
-  `mon_date` date default NULL,
-  `mon_duration` varchar(6) default NULL,
-  `tue_date` date default NULL,
-  `tue_duration` varchar(6) default NULL,
-  `wed_date` date default NULL,
-  `wed_duration` varchar(6) default NULL,
-  `thu_date` date default NULL,
-  `thu_duration` varchar(6) default NULL,
-  `fri_date` date default NULL,
-  `fri_duration` varchar(6) default NULL,
-  `sat_date` date default NULL,
-  `sat_duration` varchar(6) default NULL,
-  `week_duration` varchar(6) default NULL,
+CREATE TABLE `tm_projects` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `project_name` varchar(100) NOT NULL,
+  `project_status` enum('initiated','draft','in-progress','hold','completed') NOT NULL,
+  `base_project` bigint(20) DEFAULT NULL,
+  `description` varchar(500) DEFAULT NULL,
+  `client_id` bigint(20) unsigned NOT NULL,
+  `currency_id` int(10) unsigned NOT NULL,
+  `project_type` enum('billable','non_billable','revenue') NOT NULL,
+  `lead_approve_ts` tinyint(1) NOT NULL,
+  `estimated_hrs` mediumint(5) DEFAULT NULL,
+  `start_date` date DEFAULT NULL,
+  `end_date` date DEFAULT NULL,
+  `initiated_date` timestamp NULL DEFAULT NULL,
+  `hold_date` timestamp NULL DEFAULT NULL,
+  `completed_date` timestamp NULL DEFAULT NULL,
   `created_by` int(10) unsigned NOT NULL,
-  `modified_by` int(10) default NULL,
+  `modified_by` int(10) unsigned DEFAULT NULL,
   `is_active` tinyint(1) unsigned NOT NULL,
-  `created` timestamp NOT NULL default '0000-00-00 00:00:00',
-  `modified` timestamp NOT NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `IDX_emp_task_time` (`emp_id`,`project_task_id`,`ts_year`,`ts_month`,`ts_week`,`cal_week`),
-  KEY `FK_tm_emp_timesheets_proj_task` (`project_task_id`),
-  KEY `FK_tm_emp_timesheets_project` (`project_id`),
-  CONSTRAINT `FK_tm_emp_timesheets_employee` FOREIGN KEY (`emp_id`) REFERENCES `main_users` (`id`),
-  CONSTRAINT `FK_tm_emp_timesheets_proj_task` FOREIGN KEY (`project_task_id`) REFERENCES `tm_project_tasks` (`id`),
-  CONSTRAINT `FK_tm_emp_timesheets_project` FOREIGN KEY (`project_id`) REFERENCES `tm_projects` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
+  `created` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` timestamp NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  KEY `FK_tm_projects_client` (`client_id`),
+  KEY `FK_tm_projects_currency` (`currency_id`),
+  CONSTRAINT `FK_tm_projects_client` FOREIGN KEY (`client_id`) REFERENCES `tm_clients` (`id`),
+  CONSTRAINT `FK_tm_projects_currency` FOREIGN KEY (`currency_id`) REFERENCES `main_currency` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
 
-/*Table structure for table `tm_emp_ts_notes` */
+/*Table structure for table `tm_tasks` */
 
-DROP TABLE IF EXISTS `tm_emp_ts_notes`;
+DROP TABLE IF EXISTS `tm_tasks`;
 
-CREATE TABLE `tm_emp_ts_notes` (
-  `id` bigint(20) unsigned NOT NULL auto_increment,
-  `emp_id` int(10) unsigned NOT NULL,
-  `ts_year` smallint(4) NOT NULL,
-  `ts_month` tinyint(2) default NULL,
-  `ts_week` tinyint(1) default NULL,
-  `cal_week` tinyint(2) unsigned NOT NULL,
-  `sun_date` date NOT NULL,
-  `sun_note` varchar(200) default NULL,
-  `mon_date` date default NULL,
-  `mon_note` varchar(200) default NULL,
-  `tue_date` date default NULL,
-  `tue_note` varchar(200) default NULL,
-  `wed_date` date default NULL,
-  `wed_note` varchar(200) default NULL,
-  `thu_date` date default NULL,
-  `thu_note` varchar(200) default NULL,
-  `fri_date` date default NULL,
-  `fri_note` varchar(200) default NULL,
-  `sat_date` date default NULL,
-  `sat_note` varchar(200) default NULL,
-  `week_note` varchar(200) default NULL,
-  `created_by` int(10) unsigned default NULL,
-  `modified_by` int(10) unsigned default NULL,
+CREATE TABLE `tm_tasks` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `task` varchar(200) NOT NULL,
+  `is_default` tinyint(1) unsigned NOT NULL,
+  `created_by` int(10) unsigned NOT NULL,
+  `modified_by` int(10) unsigned DEFAULT NULL,
   `is_active` tinyint(1) unsigned NOT NULL,
-  `created` timestamp NOT NULL default '0000-00-00 00:00:00',
-  `modified` timestamp NOT NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `IDX_emp_ts_notes` (`emp_id`,`ts_year`,`ts_month`,`ts_week`,`cal_week`),
-  CONSTRAINT `FK_tm_emp_ts_notes_employee` FOREIGN KEY (`emp_id`) REFERENCES `main_users` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
+  `created` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` timestamp NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
 
 /*Table structure for table `tm_ts_status` */
 
 DROP TABLE IF EXISTS `tm_ts_status`;
 
 CREATE TABLE `tm_ts_status` (
-  `id` bigint(20) unsigned NOT NULL auto_increment,
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `emp_id` int(10) unsigned NOT NULL,
-  `project_id` bigint(20) unsigned default NULL,
+  `project_id` bigint(20) unsigned DEFAULT NULL,
   `ts_year` smallint(4) unsigned NOT NULL,
-  `ts_month` tinyint(2) unsigned default NULL,
-  `ts_week` tinyint(1) unsigned default NULL,
-  `cal_week` tinyint(2) default NULL,
-  `sun_date` date default NULL,
-  `sun_project_status` enum('saved','submitted','no_entry') default NULL,
-  `sun_status` enum('saved','submitted','no_entry') default NULL,
-  `sun_status_date` timestamp NULL default NULL,
-  `mon_date` date default NULL,
-  `mon_project_status` enum('saved','submitted','no_entry') default NULL,
-  `mon_status` enum('saved','submitted','no_entry') default NULL,
-  `mon_status_date` timestamp NULL default NULL,
-  `tue_date` date default NULL,
-  `tue_project_status` enum('saved','submitted','no_entry') default NULL,
-  `tue_status` enum('saved','submitted','no_entry') default NULL,
-  `tue_status_date` timestamp NULL default NULL,
-  `wed_date` date default NULL,
-  `wed_project_status` enum('saved','submitted','no_entry') default NULL,
-  `wed_status` enum('saved','submitted','no_entry') default NULL,
-  `wed_status_date` timestamp NULL default NULL,
-  `thu_date` date default NULL,
-  `thu_project_status` enum('saved','submitted','no_entry') default NULL,
-  `thu_status` enum('saved','submitted','no_entry') default NULL,
-  `thu_status_date` timestamp NULL default NULL,
-  `fri_date` date default NULL,
-  `fri_project_status` enum('saved','submitted','no_entry') default NULL,
-  `fri_status` enum('saved','submitted','no_entry') default NULL,
-  `fri_status_date` timestamp NULL default NULL,
-  `sat_date` date default NULL,
-  `sat_project_status` enum('saved','submitted','no_entry') default NULL,
-  `sat_status` enum('saved','submitted','no_entry') default NULL,
-  `sat_status_date` timestamp NULL default NULL,
-  `week_status` enum('saved','submitted','no_entry') default NULL,
-  `created_by` int(10) unsigned default NULL,
-  `modified_by` int(10) unsigned default NULL,
+  `ts_month` tinyint(2) unsigned DEFAULT NULL,
+  `ts_week` tinyint(1) unsigned DEFAULT NULL,
+  `cal_week` tinyint(2) DEFAULT NULL,
+  `sun_date` date DEFAULT NULL,
+  `sun_project_status` enum('saved','submitted','approved','enabled','rejected','blocked','no_entry') DEFAULT NULL,
+  `sun_status` enum('saved','submitted','approved','enabled','rejected','blocked','no_entry') DEFAULT NULL,
+  `sun_status_date` timestamp NULL DEFAULT NULL,
+  `sun_reject_note` varchar(200) DEFAULT NULL,
+  `mon_date` date DEFAULT NULL,
+  `mon_project_status` enum('saved','submitted','approved','enabled','rejected','blocked','no_entry') DEFAULT NULL,
+  `mon_status` enum('saved','submitted','approved','enabled','rejected','blocked','no_entry') DEFAULT NULL,
+  `mon_status_date` timestamp NULL DEFAULT NULL,
+  `mon_reject_note` varchar(200) DEFAULT NULL,
+  `tue_date` date DEFAULT NULL,
+  `tue_project_status` enum('saved','submitted','approved','enabled','rejected','blocked','no_entry') DEFAULT NULL,
+  `tue_status` enum('saved','submitted','approved','enabled','rejected','blocked','no_entry') DEFAULT NULL,
+  `tue_status_date` timestamp NULL DEFAULT NULL,
+  `tue_reject_note` varchar(200) DEFAULT NULL,
+  `wed_date` date DEFAULT NULL,
+  `wed_project_status` enum('saved','submitted','approved','enabled','rejected','blocked','no_entry') DEFAULT NULL,
+  `wed_status` enum('saved','submitted','approved','enabled','rejected','blocked','no_entry') DEFAULT NULL,
+  `wed_status_date` timestamp NULL DEFAULT NULL,
+  `wed_reject_note` varchar(200) DEFAULT NULL,
+  `thu_date` date DEFAULT NULL,
+  `thu_project_status` enum('saved','submitted','approved','enabled','rejected','blocked','no_entry') DEFAULT NULL,
+  `thu_status` enum('saved','submitted','approved','enabled','rejected','blocked','no_entry') DEFAULT NULL,
+  `thu_status_date` timestamp NULL DEFAULT NULL,
+  `thu_reject_note` varchar(200) DEFAULT NULL,
+  `fri_date` date DEFAULT NULL,
+  `fri_project_status` enum('saved','submitted','approved','enabled','rejected','blocked','no_entry') DEFAULT NULL,
+  `fri_status` enum('saved','submitted','approved','enabled','rejected','blocked','no_entry') DEFAULT NULL,
+  `fri_status_date` timestamp NULL DEFAULT NULL,
+  `fri_reject_note` varchar(200) DEFAULT NULL,
+  `sat_date` date DEFAULT NULL,
+  `sat_project_status` enum('saved','submitted','approved','enabled','rejected','blocked','no_entry') DEFAULT NULL,
+  `sat_status` enum('saved','submitted','approved','enabled','rejected','blocked','no_entry') DEFAULT NULL,
+  `sat_status_date` timestamp NULL DEFAULT NULL,
+  `sat_reject_note` varchar(200) DEFAULT NULL,
+  `week_status` enum('saved','submitted','approved','enabled','rejected','blocked','no_entry') DEFAULT NULL,
+  `created_by` int(10) unsigned DEFAULT NULL,
+  `modified_by` int(10) unsigned DEFAULT NULL,
   `is_active` tinyint(1) unsigned NOT NULL,
-  `created` timestamp NOT NULL default '0000-00-00 00:00:00',
-  `modified` timestamp NOT NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY  (`id`),
+  `created` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
   UNIQUE KEY `IDX_emp_ts_project_status` (`emp_id`,`project_id`,`ts_year`,`ts_month`,`ts_week`,`cal_week`),
   KEY `FK_tm_ts_status_project` (`project_id`),
   CONSTRAINT `FK_tm_ts_status_employee` FOREIGN KEY (`emp_id`) REFERENCES `main_users` (`id`),
diff --git a/install/step5.php b/install/step5.php
index 996299cec..2f083d586 100644
--- a/install/step5.php
+++ b/install/step5.php
@@ -44,9 +44,9 @@
 	foreach($req_html_arr as $req => $req_value)
 	{
 ?>                    
-        <li><?php echo $req_value;?> <div class="status_yes"></div></li>
+            <li><?php echo $req_value;?> <div class="status_yes"></div></li>
 <?php                 
-    }   
+        }   
 ?>        
     </div>
           
@@ -78,6 +78,7 @@
     <div>
     <li><?php echo str_replace("install/", "",BASE_URL.'cronjob');?></li>
     <li><?php echo str_replace("install/", "",BASE_URL).'cronjob/empdocsexpiry';?></li>
+    <li><?php echo str_replace("install/", "",BASE_URL).'timemanagement/cronjob';?></li>
     </div>
     
     </ul> 
@@ -134,6 +135,7 @@
     <div>
     <li  style="border-bottom: 1px solid rgb(204, 204, 204); margin: 0px; padding: 10px 5px 10px 15px;"><?php echo str_replace("install/", "",BASE_URL.'cronjob');?></li>
     <li  style="border-bottom: 1px solid rgb(204, 204, 204); margin: 0px; padding: 10px 5px 10px 15px;"><?php echo str_replace("install/", "",BASE_URL).'cronjob/empdocsexpiry';?></li>
+    <li style="border-bottom: 1px solid rgb(204, 204, 204); margin: 0px; padding: 10px 5px 10px 15px;"><?php echo str_replace("install/", "",BASE_URL).'timemanagement/cronjob';?></li>
     </div>
     
     </ul> 
@@ -155,6 +157,7 @@
 	<input type="hidden" id="mailauth" name="mailauth" value="<?php echo MAIL_AUTH;?>" />
     <input type="hidden" id="cronjoburl" name="cronjoburl" value="<?php echo str_replace("install/", "",BASE_URL.'cronjob');?>" />
     <input type="hidden" id="expirydocurl" name="expirydocurl" value="<?php echo str_replace("install/", "",BASE_URL).'cronjob/empdocsexpiry';?>" />
+	<input type="hidden" id="tmcronurl" name="tmcronurl" value="<?php echo str_replace("install/", "",BASE_URL).'timemanagement/cronjob';?>" />
     <input type="submit" name="btnfinish" id="idbtnfinish"   class="save_button finish_step" value="Finish" />
     <button name="previous" id="previous" type="button" class="previous_button"  onclick="window.location='index.php?s=<?php echo sapp_Global::_encrypt(4);?>';">Previous</button>
 </form>
diff --git a/public/downloads/import_employees.xlsx b/public/downloads/import_employees.xlsx
index 105c11e9f..0f5405b8f 100644
Binary files a/public/downloads/import_employees.xlsx and b/public/downloads/import_employees.xlsx differ
diff --git a/public/downloads/performanceappraisal.pdf b/public/downloads/performanceappraisal.pdf
index c43370217..82b0a950a 100644
Binary files a/public/downloads/performanceappraisal.pdf and b/public/downloads/performanceappraisal.pdf differ
diff --git a/public/downloads/time.pdf b/public/downloads/time.pdf
index 27b00d87d..b5b787766 100644
Binary files a/public/downloads/time.pdf and b/public/downloads/time.pdf differ
diff --git a/public/media/css/style.css b/public/media/css/style.css
index 72e2da123..c9951c7b9 100644
--- a/public/media/css/style.css
+++ b/public/media/css/style.css
@@ -2546,7 +2546,7 @@ text-shadow: 0 1px 0 #FFFFFF; color: #000000; width:10%; }
 .agency-ui ul li.active:hover { cursor: default; }
 .agency-ui ul.new-agency-li  li:hover { cursor: default; color: #3b3b3b; }
 .agency-ui ul.new-agency-li  li  span:hover{ color: #1F8ABC; cursor: pointer; }
-.right-block-data { float:left; border:1px solid #cfcfcf; padding: 10px 15px; background-color: #ffffff;min-height: 388px; -webkit-border-radius: 5px;  -moz-border-radius: 5px; border-radius: 5px; }
+.right-block-data { float:left; border:1px solid #cfcfcf; padding: 10px 15px; background-color: #ffffff; min-height: 388px; -webkit-border-radius: 5px;  -moz-border-radius: 5px; border-radius: 5px; }
 #tabs .right-block-data { /*min-height: 435px; */ min-height:350px; }
 .popup-agency-selecters .right-block-data { min-height: 270px; }
 #mydetails-height .right-block-data { /*min-height: 636px; min-height:552px;  min-height: 634px; */ min-height: 716px; }
diff --git a/public/media/js/hrms.js b/public/media/js/hrms.js
index 87be3cc8e..c8eecf091 100644
--- a/public/media/js/hrms.js
+++ b/public/media/js/hrms.js
@@ -773,7 +773,7 @@ function paginationndsorting(url){
 			var searchData = $("#"+divid+"_searchdata").val();
 			var perfTimes = $("#gridblock *").serialize();
 			searchData = decodeURIComponent(searchData);
-			$.post(url,{searchData:searchData,dashboardcall:dashboardcall,context:'sort'} , function(response) {		
+			$.post(url,{searchData:searchData,dashboardcall:dashboardcall} , function(response) {		
 				$('#grid_'+divid).html(response);
 		},'html');
 }	
@@ -1680,7 +1680,7 @@ function closeiframeAddPopup(addpopupdata,controllername,con,textstr,newId)
 	/** to set the new category as selected value - start **/
 	if(newId != '' && con == 'category_id')
 	{
-		window.parent.$('#category_id').select2('val',newId);
+		window.parent.$('#'+con).select2('val',newId);
 	}
 	/** to set the new category as selected value - end **/
 
@@ -2695,7 +2695,7 @@ function validateselecteddate(ele)
 						$.blockUI({ width:'50px',message: $("#spinner").html() });
 					},
 					success : function(response){
-						    if(response['result'] == 'success' && response['result'] !='' && response['days'] !='') 
+						     if(response['result'] == 'success' && response['result'] !='' && response['days'] !='') 
 							{
 							  $("#appliedleavesdaycount").val(response['days']);
 							  $("#errors-"+selector).remove();
@@ -2726,7 +2726,7 @@ function validateselecteddate(ele)
 					}
 				});
 	  } else {
-		  if(selector=='from_date') {
+		 if(selector=='from_date') {
 			  if($("#to_date").val()!='') {
 				$("#"+selector).val('');
 			  }	
@@ -2736,8 +2736,9 @@ function validateselecteddate(ele)
 			  }		
 		  }
 		  $("#appliedleavesdaycount").val('');
-		  if(leavetypeselectedval=='')
-			  jAlert("Please select leave type."); 
+		  if(leavetypeselectedval == '') {
+			  jAlert("Please select leave type.");
+		  }
 	  }
 }
 
@@ -5038,6 +5039,14 @@ function displayCountryCode(ele)
 	 id = ele[ele.selectedIndex].value;
 	}else{
 		id = '';
+	}
+	if(id == '')
+	{
+	  $("#countrycode").val("");
+	}
+	else
+	{
+		$("#errors-countrycode").hide();
 	}
 	   if(id == 'other')
 		{
diff --git a/public/media/js/joyride.js b/public/media/js/joyride.js
index b75086cdd..17de656a2 100644
--- a/public/media/js/joyride.js
+++ b/public/media/js/joyride.js
@@ -55,7 +55,7 @@
 						"bgcolor"	: "black",
 						"color"		: "white",
 						"position"	: "T",
-						"text"		: application_name + " is an Open Source Human Resource Management Software, ideally providing Employee Management, Performance Appraisal, Feedforward, Recruitment Process, Leave Management, Background Check, Announcements, Analytics and Logs. It enables the administrators to configure the standards used in the organization such as currency codes, date formats, ethnic codes, etc. The software also meets the employee's everyday needs like Leave Management, Performance Appraisal etc... It tracks existing employee data which traditionally includes personal history, skills, capabilities and accomplishments." ,
+						"text"		: application_name + " is an Open Source Human Resource Management Software, ideally providing Employee Management, Appraisal, Talent Acquisition, Leave Management, Background Check, Announcements, Analytics and Logs. It enables the administrators to configure the standards used in the organization such as currency codes, date formats, ethnic codes, etc. This application also meets the employee's everyday needs like Leave Management, Service Requests etc. It tracks existing employee data which includes personal history, skills, capabilities and accomplishments." ,
 						"time" 		: 5000
 						};
 					configArr.push(obj);
@@ -67,7 +67,7 @@
 						"bgcolor"	: "black",
 						"color"		: "white",
 						"position"	: "TL",
-						"text"		: 'Sentrifugo Dashboard is a real time user interface allowing you to have all the menus that are used regularly, at one place. The easy to read display of the menus covers overall information present in each menu with clickable sub menus to navigate to the desired page avoiding tiresome menu redirections. The display of dandy default features, birthdays and announcements, takes Sentrifugo to another level altogether.' ,
+						"text"		: "Dashboard allows you to create Shortcuts and Widgets. You can have all the menus that are used regularly at one place. The easy to access Shortcuts and Widgets present in the dashboard will take you directly to your desired page hence avoiding tiresome menu redirections. You can also display your company announcements and employee's birthdays on the dashboard." ,
 						"time" 		: 5000
 						};
 					configArr.push(obj);
@@ -78,7 +78,7 @@
 						"name":"tour_employeeselfservice",
 						"bgcolor":"black",
 						"color":"white",
-						"text":"Employee Self-Service module provides employees with access to their personal records and leave details. It also includes the team details and the leave summary for managers.",
+						"text":"Self-Service enables you to raise and handle leave requests.  You can access your personal information, documents and leave details. You can also check your team details.",
 						"position":"L",
 						"time":5000
 					};
@@ -90,7 +90,7 @@
 						"name":"tour_service",
 						"bgcolor":"black",
 						"color":"white",
-						"text":"Service Request Management delivers a comprehensive and easy to use IT self-service portal with access to key services and information which is required by the employees. Configure the service request workflows and entitlements without coding or scripting.",
+						"text":"Service Request delivers an easy to use IT portal with access to key services and information which are required by the employees. Configure the service request workflow without coding or scripting. You can raise and handle service requests.",
 						"position":"TL",
 						"time":5000
 					};
@@ -101,7 +101,7 @@
 					var obj = {"name":"tour_humanresource",
 						"bgcolor":"black",
 						"color":"white",
-						"text":"Human Resource module deals with the leave and holiday management. It tracks the employee data which includes personal history, skills, capabilities and accomplishments.",
+						"text":"HR (Human Resource) deals with the user, leave and holiday management configuration. It stores the employee data which includes personal history, skills, documents, education, visa & immigration etc.",
 						"position":"L",
 						"time":5000
 					};
@@ -113,7 +113,7 @@
 						"name":"tour_performanceappraisal",
 						"bgcolor":"black",
 						"color":"white",
-						"text":"Performance Appraisal is a systematic evaluation of performance of the employees and to understand the abilities of a person for further career transition. It is generally done by the supervisors based on measuring criterion such as parameters, questions, ratings and more.",
+						"text":"Appraisals let you configure appraisal settings like parameters, skills, ratings and questions. You can provide a self-appraisal and appraise your employees. Users can also give a feedback about their manager using the Feed Forward feature.",
 						"position":"TL",
 						"time":5000
 					};
@@ -124,7 +124,7 @@
 					var obj = {"name":"tour_requisition",
 						"bgcolor":"black",
 						"color":"white",
-						"text":"Resource Requisition modules helps you to monitor and maintain processes like initializing a requisition, managing CVs, scheduling interviews, shortlisting and selecting a resource.",
+						"text":"Talent Acquisition helps you to monitor and maintain processes like initializing a requisition, managing CVs, scheduling interviews, shortlisting and selecting a candidate.",
 						"position":"TL",
 						"time":5000
 					};
@@ -148,7 +148,7 @@
 						"name":"tour_organization",
 						"bgcolor":"black",
 						"color":"white",
-						"text":"Manage your organization's information, announcements, business units, departments and organization hierarchy here.",
+						"text":"Manage your organization's details, announcements, business units, departments and organization hierarchy here.",
 						"position":"TL",
 						"time":5000
 					};
@@ -160,7 +160,7 @@
 						"name":"tour_reports",
 						"bgcolor":"black",
 						"color":"white",
-						"text":"Analytics module uses descriptive techniques to represent your organization's data and allows you to generate custom reports and then export them to Excel or PDF.",
+						"text":"Analytics uses descriptive techniques to represent your organization's data and allows you to generate custom reports and then export them to Excel or PDF.",
 						"position":"R",
 						"time":5000
 					};
@@ -172,7 +172,7 @@
 						"name":"tour_siteconfiguration",
 						"bgcolor":"black",
 						"color":"white",
-						"text":"Site Configuration allows you to configure the standards used in your organization such as locations, currency codes, date formats, ethnic codes, etc...",
+						"text":"Site Configuration allows you to configure the standards used in your organization such as locations, currency codes, date formats, ethnic codes, etc.",
 						"position":"R",
 						"time":5000
 					};
@@ -185,7 +185,7 @@
 						"bgcolor"	: "black",
 						"color"		: "white",
 						"position"	: "R",
-						"text"		: "Manage your " + application_name + " system by choosing the modules required for your organization. You can enable or disable the modules anytime." ,
+						"text"		: "Manage your " + application_name + " system by choosing the modules required for your organization. You can enable or disable the modules at any given time." ,
 						"time" 		: 5000
 						};
 					configArr.push(obj);
@@ -197,7 +197,7 @@
 						"bgcolor"	: "black",
 						"color"		: "white",
 						"position"	: "R",
-						"text"		: "Time Management Module consists of Timesheet maintenance, Leave Management, Tracking employees’ activities & time offs. Generate accurate time reports on the basis of Employees, Projects and Time Period. Configure you organization’s projects and clients. Raise requests for leave using a very handy calendar plugin." ,
+						"text"		: "Time consists of timesheet management, tracking employee's activities & time offs. Generate accurate time reports on the basis of employees, projects and time period. Configure your organization’s projects and clients.",
 						"time" 		: 5000
 						};
 					configArr.push(obj);
@@ -209,7 +209,7 @@
 						"name":"tour_logs",
 						"bgcolor":"black",
 						"color":"white",
-						"text":"Logs module allows you to check the rate of activity happening on the site along with the daily user logins record for audit.",
+						"text":"Logs allow you to check the amount of activity happening on the application along with the daily users' login record.",
 						"position":"R",
 						"time":5000
 					};
diff --git a/public/media/timemanagement/js/timemanagement.js b/public/media/timemanagement/js/timemanagement.js
index ab9854376..43caa40ca 100644
--- a/public/media/timemanagement/js/timemanagement.js
+++ b/public/media/timemanagement/js/timemanagement.js
@@ -76,8 +76,8 @@ function submitDayTimesheet(day) {
     var url = base_url + module_name + "/index/submit/format/json";
     var yeMonArr = selYrMon.split("-");
     
-    var messageAlert = 'Are you sure you want to submit time sheet for day : ' + day +'-'+yeMonArr[1]+'-'+yeMonArr[0]+ '? ';
-    jConfirm(messageAlert, "Submit timesheet", function(r) {
+    var messageAlert = 'Are you sure you want to submit timesheet for day : ' + day +'-'+yeMonArr[1]+'-'+yeMonArr[0]+ '? ';
+    jConfirm(messageAlert, "Submit Timesheet", function(r) {
 
 		if (r == true) {
 		
@@ -133,7 +133,7 @@ function submitWeekTimesheet(week, calWeek, submitText) {
 	} else {
 	*/	
 		var url = base_url + module_name + "/index/submit/format/json";
-		var messageAlert = 'Are you sure you want to '+submitText.toLowerCase()+' time sheet for the filled days of week : ' + week + '? ';
+		var messageAlert = 'Are you sure you want to '+submitText.toLowerCase()+' timesheet for the filled days of week : ' + week + '? ';
     jConfirm(messageAlert, submitText+" timesheet", function(r) {
 
       		if (r == true) {
@@ -177,8 +177,8 @@ function saveAndSubmitTimesheet(weekNo,calWeek,weekStart,weekEnd) {
     if(eraseVisible) {
 
   	  var selYrMon = $("#calSelYrMonth").val();
-      var messageAlert = 'Are you sure you want to save and submit time sheet for the filled days of week : ' + weekNo + '? ';
-      jConfirm(messageAlert, "Save and Submit timesheet", function(r) {
+      var messageAlert = 'Are you sure you want to save and submit the timesheet for week : ' + weekNo + '? ';
+      jConfirm(messageAlert, "Save and Submit Timesheet", function(r) {
   
         		if (r == true) {
                 var selYrMon = $("#calSelYrMonth").val();
@@ -266,7 +266,7 @@ function saveAndSubmitTimesheet(weekNo,calWeek,weekStart,weekEnd) {
                         					 //$('#error_message').css('display', 'block');
                                    $("#error_message").show(); 
                                    $('#error_message').empty();	         
-                        					 $("#error_message").html('<div id="messageData" class="ml-alert-1-' + flag + '"><div style="display:block;"><span class="style-1-icon ' + flag + '"></span>Saved and Submitted successfully for week'+ weekNo +' </div></div>'); 
+                        					 $("#error_message").html('<div id="messageData" class="ml-alert-1-' + flag + '"><div style="display:block;"><span class="style-1-icon ' + flag + '"></span>Saved and Submitted successfully for week'+ weekNo +'.'+' </div></div>'); 
                         					 setTimeout(function() {
                         							$('#error_message').fadeIn('slow').fadeOut(function() {
                         				         location.href = base_url + "/timeentry/"+selYrMon+"/"+weekNo+"/"+calWeek+"/time";			
@@ -278,7 +278,17 @@ function saveAndSubmitTimesheet(weekNo,calWeek,weekStart,weekEnd) {
                         			}
                         	    });	          						
             					  }
+								  else
+								  {
+									  $("#error_message").html('<div id="messageData" class="ml-alert-1-error"><div style="display:block;"><span class="style-1-icon error"></span>Date of joining should be greater than current date</div></div>');
+										setTimeout(function() {
+											$('#error_message').fadeIn('slow').fadeOut(function() {
+											location.href = base_url + "/timeentry/"+selYrMon+"/"+weekNo+"/"+calWeek+"/time";		
+												});
+										}, 3000);
+								  }
             				  }
+							  
             		    });
             		}
             	}	    		
@@ -286,7 +296,7 @@ function saveAndSubmitTimesheet(weekNo,calWeek,weekStart,weekEnd) {
     });
   } else {
   
-     		var message = "Enter time to save and submit time sheet for this week.";     		
+     		var message = "Enter time to save and submit timesheet for this week.";     		
     		if(!$('#error_message').is(':visible'))
     		{ 
     			$('#error_message').css('display', 'block');
@@ -323,8 +333,8 @@ function eraseWeek(weekNo,calWeek) {
 	var selYrMon = $("#calSelYrMonth").val();
 	var url = base_url + module_name + "/index/eraseweek/format/json";	
 	
-	var messageAlert = 'Are you sure you want to erase time sheet for this week '+weekNo+'? ';
-	jConfirm(messageAlert, "Erase time sheet for week " + weekNo, function(r) {
+	var messageAlert = 'Are you sure you want to erase timesheet for this week '+weekNo+'? ';
+	jConfirm(messageAlert, "Erase timesheet for week " + weekNo, function(r) {
 
 			if (r == true) {			
 				$.ajax({
@@ -345,6 +355,15 @@ function eraseWeek(weekNo,calWeek) {
 								}, 3000);
 							//location.href = base_url + module_name + "/index/week?selYrMon="+selYrMon+"&week="+weekNo+"&calWeek="+calWeek+"&flag=time";
 						
+						  }else
+						  {
+								 $("#error_message").html('<div id="messageData" class="ml-alert-1-error"><div style="display:block;"><span class="style-1-icon error"></span>Date of joining should be greater than current date</div></div>');
+								    setTimeout(function() {
+          								$('#error_message').fadeIn('slow').fadeOut(function() {
+          						        location.href = base_url + "/timeentry/"+selYrMon+"/"+weekNo+"/"+calWeek+"/time";		
+          									});
+          							}, 3000);
+								
 						  }
 					}
 			    });
@@ -485,7 +504,15 @@ function saveTimesheet(weekNo,calWeek,weekStart,weekEnd) {
           			    	//	}
           						//location.href = base_url + module_name + "/index/week?selYrMon="+selYrMon+"&week="+weekNo+"&calWeek="+calWeek+"&flag=time";
           						
-          					  }
+          					  }else
+							  {
+								  $("#error_message").html('<div id="messageData" class="ml-alert-1-error"><div style="display:block;"><span class="style-1-icon error"></span>Date of joining should be greater than current date</div></div>');
+								    setTimeout(function() {
+          								$('#error_message').fadeIn('slow').fadeOut(function() {
+          						        location.href = base_url + "/timeentry/"+selYrMon+"/"+weekNo+"/"+calWeek+"/time";		
+          									});
+          							}, 3000);
+							  }
           				}
           		    });
           		}
@@ -493,7 +520,7 @@ function saveTimesheet(weekNo,calWeek,weekStart,weekEnd) {
 	} else {
   
        // $("#error_message").html('');
-     		var message = "Enter time to save time sheet for this week.";
+     		var message = "Enter time to save timesheet for this week.";
     		if(!$('#error_message').is(':visible'))
     		{
     			//console.log("not visible");
@@ -1351,6 +1378,8 @@ function saveResourceToProject(type,projectId,projRes){
 
 function fnAddRemoveProjectUser(addremove,userId,projectId,userName,imgName,userCmpId,userDesign)
 {
+	/* if(userId != '' && projectId != '') 
+	{ */
 	if(userId != '')
 	{  
          var selectedRadioType = 'Resources';   
@@ -1369,7 +1398,7 @@ function fnAddRemoveProjectUser(addremove,userId,projectId,userName,imgName,user
 		{
 			//To check whether current div is last div (If it is last div then create new div of no user exists and make it as display:none)
 			
-			if ($(".users_left_list_div.users_left_listt").length == 1) 
+			if ($(".users_left_list_div.users_left_list").length == 1) 
 			{
 				if($(".no_left_data_found").length < 1)
 				{
@@ -1395,7 +1424,7 @@ function fnAddRemoveProjectUser(addremove,userId,projectId,userName,imgName,user
 			}
 			
 			 
-			var newDivToAppend = '<div onclick="javascript:fnAddRemoveProjectUser(0,\''+userId+'\',\''+projectId+'\',\''+addslashes(userName)+'\',\''+imgName+'\',\''+addslashes(userCmpId)+'\',\''+addslashes(userDesign)+'\');" style="cursor:pointer;" class="search_right users_right_list_div users_right_listt user_div_'+userId+'" alt="Remove" title="Remove" name="'+addslashes(userName)+'"><span class="values"><div class="profile_img"><img width="28px" height="28px" onerror="this.src=\''+domain_data+'/public/media/images/default-profile-pic.jpg\'" src="'+domain_data+'/public/uploads/profile/'+imgName+'"></div> </span> <span class="member_name">'+userName+'</span>'+spantmRole+'<span class="empuid member_id">'+userCmpId+'</span><span class="emprole member_jname">'+userDesign+'</span></div>';
+			var newDivToAppend = '<div onclick="javascript:fnAddRemoveProjectUser(0,\''+userId+'\',\''+projectId+'\',\''+addslashes(userName)+'\',\''+imgName+'\',\''+addslashes(userCmpId)+'\',\''+addslashes(userDesign)+'\');" style="cursor:pointer;" class="search_right users_right_list_div users_right_list user_div_'+userId+'" alt="Remove" title="Remove" name="'+addslashes(userName)+'"><span class="values"><div class="profile_img"><img width="28px" height="28px" onerror="this.src=\''+domain_data+'/public/media/images/default-profile-pic.jpg\'" src="'+domain_data+'/public/uploads/profile/'+imgName+'"></div> </span> <span class="member_name">'+userName+'</span>'+spantmRole+'<span class="empuid member_id">'+userCmpId+'</span><span class="emprole member_jname">'+userDesign+'</span></div>';
 			
 			if ($(".users_right_list_div").length > 0) 
 			{
@@ -1448,7 +1477,7 @@ function fnAddRemoveProjectUser(addremove,userId,projectId,userName,imgName,user
 			    spantmRole = '<span class="role_disp manager_role">M</span>';
 		    }
 			
-			var newDivToAppend = '<div onclick="javascript:fnAddRemoveProjectUser(1,\''+userId+'\',\''+projectId+'\',\''+addslashes(userName)+'\',\''+imgName+'\',\''+addslashes(userCmpId)+'\',\''+addslashes(userDesign)+'\');" style="cursor:pointer;" class="users_left_list_div users_left_listt user_div_'+userId+'" alt="Add" title="Add" name="'+addslashes(userName)+'"><span class="values"><div class="profile_img"><img width="28px" height="28px" onerror="this.src=\''+domain_data+'/public/media/images/default-profile-pic.jpg\'" src="'+domain_data+'/public/uploads/profile/'+imgName+'"></div> </span> <span class="member_name">'+userName+'</span>'+spantmRole+'<span class="empuid member_id">'+userCmpId+'</span><span class="emprole member_jname">'+userDesign+'</span></div>';
+			var newDivToAppend = '<div onclick="javascript:fnAddRemoveProjectUser(1,\''+userId+'\',\''+projectId+'\',\''+addslashes(userName)+'\',\''+imgName+'\',\''+addslashes(userCmpId)+'\',\''+addslashes(userDesign)+'\');" style="cursor:pointer;" class="users_left_list_div users_left_list user_div_'+userId+'" alt="Add" title="Add" name="'+addslashes(userName)+'"><span class="values"><div class="profile_img"><img width="28px" height="28px" onerror="this.src=\''+domain_data+'/public/media/images/default-profile-pic.jpg\'" src="'+domain_data+'/public/uploads/profile/'+imgName+'"></div> </span> <span class="member_name">'+userName+'</span>'+spantmRole+'<span class="empuid member_id">'+userCmpId+'</span><span class="emprole member_jname">'+userDesign+'</span></div>';
 			
 			if ($(".users_left_list_div").length > 0) 
 			{
@@ -1490,7 +1519,7 @@ function fnAddRemoveProjectUser(addremove,userId,projectId,userName,imgName,user
 		
 		//alert($("#existetd_mem_str").val());
 		$("#search_emp_by_name").val('');
-		$('div.users_left_listt').show();
+		$('div.users_left_list').show();
 		$('#idclear').hide();
 
 		$('#actionButtonsDiv').show();
@@ -1656,7 +1685,7 @@ function viewTaskResources(projectId,projectTaskId,content_id)
 
 /*delete task from project function*/
 function delProjTask(tableRowId,projectId,taskProjectId,taskCount,taskId){
-    var messageAlert = 'Are you sure you want to delete the selected task ? ';
+    var messageAlert = 'Are you sure you want to delete the selected task? ';
 	jConfirm(messageAlert, "Delete Task", function(r) {
 
 		if (r == true) {
@@ -1699,7 +1728,7 @@ function delProjTask(tableRowId,projectId,taskProjectId,taskCount,taskId){
 }
 
 function delProjResource(tableRowId,resourceProjectId,empId,projectId,existedEmpId,resCount){
-    var messageAlert = 'Are you sure you want to delete the selected resource ? ';
+    var messageAlert = 'Are you sure you want to delete the selected resource? ';
 	jConfirm(messageAlert, "Delete Resource", function(r) {
 
 		if (r == true) {
@@ -1761,7 +1790,7 @@ function assignTasks(projectId,employeeId)
 {
 	 var myPos = [ $(window).width() / 5, 150 ];
     $("#idassignTasks").dialog({
-        title:'Add Task To Resource',
+        title:'Assign Task To Resource',
 		position: myPos,
         modal: true, 
       close:function()
@@ -1981,8 +2010,7 @@ function saveResourceToTask(oldRes,newRes,projectId,taskId,projectTaskId){
 	else 
 	{ 
 	   $('.errors').find('.res_errors').remove();
-	  // $('.errors').append("<span class='res_errors'>Please select resources.</span>"); 
-	    $('.errors').append("<span class='res_errors' ><div class='ml-alert-1-error' id='messageData' style='margin-top: 0px; margin-bottom: 0px;width:99%;'><span class='style-1-icon error'></span>Please select resources.</div></span>"); 
+	   $('.errors').append("<span class='res_errors'>Please select resources.</span>"); 
 	   return false;
 	}    
 }
@@ -2207,7 +2235,50 @@ function viewEmployeeTimesheet(selmn,user_id,manager_id,type,hidweek,emp_list_fl
 	locationUrl = base_url+"/timemanagement/emptimesheets/employeetimesheet?"+data;
 	window.location.href = locationUrl*/
 }
-
+function viewApproveAlert()
+{
+	 var myPos = [ $(window).width() / 5, 150 ];
+    $("#idviewapprovedsheets").dialog({
+        title:'Approved Timesheets',
+		position: myPos,
+        modal: true, 
+      close:function()
+      {          
+          $(this).dialog("destroy");
+      },
+      open:function()
+      { 
+	      $('.ui-widget-overlay').addClass('ui-front-overwrite');
+		  $('.ui-dialog').removeClass('ui-dialog-buttons');
+		  $('.ui-dialog').removeClass('ui-front');
+		  $('.ui-dialog').addClass('ui-btn-overwrite');
+       		  
+		  $.ajax({
+				url: base_url + "/timemanagement/index/getapprovedtimesheet/format/html",
+				dataType: 'html',
+				success: function(response) {
+				
+					  $('#idapprovedaheetcontent').html(response);
+				}
+			});
+	
+      }
+    });
+}
+function closeApproveAlert()
+{
+	$.ajax({
+		url: base_url + "/timemanagement/index/closeapprovealert/format/json",
+		type: 'POST',
+		dataType: 'json',
+		success: function(response) { 
+			 //alert('rest');
+			  setTimeout(function(){
+					$('#close_div').hide();
+				  },100);
+		}
+	});
+}
 
 function enableEmpTimesheet(selmn,emp_id,type,hideweek,manager_id,flag,emp_list_flag){
 	$.ajax({
@@ -2258,7 +2329,7 @@ function approveEmpTimesheet(selmn,emp_id,type,hideweek,manager_id,flag,emp_list
         type: 'POST',
         success:function(data){
 		
-        	$("#grid_msg").html("<span class='style-1-icon success'></span>Approved Successfully");
+        	$("#grid_msg").html("<span class='style-1-icon success'></span>Approved Successfully.");
         	$("#grid_msg").show();
         	 setTimeout(function(){
      			$('#grid_msg').fadeOut('slow');
@@ -2307,7 +2378,7 @@ function rejectEmpTimesheet(selmn,emp_id,type,hideweek,manager_id,flag,emp_list_
                   
                   if(txtval=='')
                   {                                                 
-	                 $('#idtxtrejectnote').parent().append("<span class='note_errors  task_errors'>Please enter comment.</span>"); 
+	                 $('#idtxtrejectnote').parent().append("<span class='note_errors  task_errors' style='font-size:12px;color:red;'>Please enter comment.</span>"); 
 	                 setTimeout(function(){ $('.note_errors').fadeOut('slow');},3000);
                   }
                   else
@@ -2319,7 +2390,7 @@ function rejectEmpTimesheet(selmn,emp_id,type,hideweek,manager_id,flag,emp_list_
                 	        type: 'POST',
                 	        success:function(data){
                 	        	$('#idtxtrejectnote').val("");
-                	        	$("#grid_msg").html("<span class='style-1-icon success'></span>Rejected Successfully");
+                	        	$("#grid_msg").html("<span class='style-1-icon success'></span>Rejected Successfully.");
                 	        	$("#grid_msg").show();
                 	        	 setTimeout(function(){
                 	     			$('#grid_msg').fadeOut('slow');
@@ -2437,7 +2508,7 @@ function approveEmpDayTimesheet(selmn,emp_id,day,flag,emp_list_flag){
         dataType:'json',
         type: 'POST',
         success:function(data){
-        	$("#grid_msg").html("<span class='style-1-icon success'></span>Approved Successfully");
+        	$("#grid_msg").html("<span class='style-1-icon success'></span>Approved Successfully.");
         	$("#grid_msg").show();
         	 setTimeout(function(){
      			$('#grid_msg').fadeOut('slow');
@@ -2469,7 +2540,7 @@ function rejectEmpDayTimesheet(selmn,emp_id,day,flag,emp_list_flag){
                  
                  if(txtval=='')
                  {                                                 
-	                 $('#idtxtrejectnote').parent().append("<span class='note_errors  task_errors'>Please enter comment.</span>"); 
+	                 $('#idtxtrejectnote').parent().append("<span class='note_errors  task_errors' style='font-size:12px;color:red;'>Please enter comment.</span>"); 
 	                 setTimeout(function(){ $('.note_errors').fadeOut('slow');},3000);
                  }
                  else
@@ -2481,7 +2552,7 @@ function rejectEmpDayTimesheet(selmn,emp_id,day,flag,emp_list_flag){
                	        type: 'POST',
                	        success:function(data){
                	        	$('#idtxtrejectnote').val("");
-               	        	$("#grid_msg").html("<span class='style-1-icon success'></span>Rejected Successfully");
+               	        	$("#grid_msg").html("<span class='style-1-icon success'></span>Rejected Successfully.");
             	        	$("#grid_msg").show();
             	        	 setTimeout(function(){
             	     			$('#grid_msg').fadeOut('slow');
@@ -2776,18 +2847,18 @@ function validateselecteddate(ele)
 					}
 				});
 	  } else {
-		  if(selector=='from_date') {
+			if(selector=='from_date') {
 			  if($("#to_date").val()!='') {
 				$("#"+selector).val('');
 			  }	
-		  }else{
+			}else{
 			  if($("#from_date").val()!='') {
 					$("#"+selector).val('');
 			  }		
-		  }
-		  $("#appliedleavesdaycount").val('');
+			}
+			$("#appliedleavesdaycount").val('');
 		  if(leavetypeselectedval == ''){
-		     jAlert("Please select leave type."); 
+			 jAlert("Please select leave type."); 
 		  }
 	  }
 }
diff --git a/success.php b/success.php
index 1cc870dc7..346392544 100644
--- a/success.php
+++ b/success.php
@@ -202,6 +202,7 @@ function renamefolder()
 	$mailport = $_POST['mailport'];
 	$cronjoburl = $_POST['cronjoburl'];
 	$expirydocurl = $_POST['expirydocurl'];
+	$tmcronurl = $_POST['tmcronurl'];
 	
 ?>	
 
@@ -244,6 +245,7 @@ function renamefolder()
 		    <input type="hidden" id="mailport" name="mailport" value="<?php echo $mailport;?>" />
 		    <input type="hidden" id="cronjoburl" name="cronjoburl" value="<?php echo $cronjoburl;?>" />
 		    <input type="hidden" id="expirydocurl" name="expirydocurl" value="<?php echo $expirydocurl;?>" />
+		    <input type="hidden" id="tmcronurl" name="tmcronurl" value="<?php echo $tmcronurl;?>" />
 			<input type="submit" name="btnfinish" id="idbtnfinish"    value="Download PDF" />
 			</form>
         </div>