sapplica · powmeister · Feb 13, 2017 · Feb 13, 2017 · Apr 17, 2017
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,79 +1,44 @@
 CHANGELOG Sentrifugo
 ====================
-RELEASE 3.0 Beta
------------------
+RELEASE 3.2 
+------------
 
 Changes in Controllers
 ------------------------
+./application/modules/exit/controllers/ExittypesController.php 
+./application/modules/exit/controllers/ConfigureexitqsController.php 
+./application/modules/exit/controllers/ExitprocsettingsController.php 
+./application/modules/exit/controllers/AllexitprocController.php 
+./application/modules/exit/controllers/ExitprocController.php 
+./application/modules/default/controllers/EmployeeController.php 
+./application/modules/default/controllers/LeavemanagementController.php 
+./application/modules/default/controllers/holidaydatesController.php 
 
-./application/modules/expenses/controllers/AdvancesController.php 
-./application/modules/expenses/controllers/EmployeeadvancesController.php 
-./application/modules/expenses/controllers/ExpensecategoriesController.php 
-./application/modules/expenses/controllers/ExpensesController.php 
-./application/modules/expenses/controllers/IndexController.php 
-./application/modules/expenses/controllers/MyemployeeexpensesController.php 
-./application/modules/expenses/controllers/PaymentmodeController.php 
-./application/modules/expenses/controllers/ReceiptsController.php 
-./application/modules/expenses/controllers/TripsController.php 
-./application/modules/default/controllers/EmployeeController.php
-./application/modules/default/controllers/LeaverequestController.php
-./application/modules/default/controllers/AppraisalhistoryController.php
-./application/modules/default/controllers/MyteamappraisalController.php
-./application/modules/default/controllers/MyemployeesController.php
-./application/modules/assets/controllers/AssetcategoriesController.php
-./application/modules/assets/controllers/AssetsController.php
 
-- AdvancesController.php
-  view employee advances.
-
-- EmployeeadvancesController.php
-  Add,edit,delete advances to employee.
-
-- ExpensecategoriesController.php
-  Add,edit,view,delete expense categories.
-
-- ExpensesController.php
-  Add,edit,view,delete expense , submit expenses.
+
+- ExittypesController.php
+  Management,hr can add,edit,delete exit types.
+
+- ConfigureexitqsController.php 
+  Management,hr can add,edit,delete questions for exit types.
 
-- IndexController.php
-  view expenses. 
-
-- MyemployeeexpensesController.php
-  approve ,reject,view employee submitted expenses. 
+- ExitprocsettingsController.php 
+  Management,hr can configure managers for exit process.
 
-- PaymentmodeController.php
-  add,edit,delete,view payment modes. 
-
-- ReceiptsController.php
-  add,edit,delete,view,download , add receipt to expense,trip .  
+- AllexitprocController.php
+  Configured managers can approve or reject exit process.
 
-- TripsController.php
-  add,edit,delete,view, approve,reject,submit trip. 
+- ExitprocController.php
+  Employee can initiate exit process.He can check status of exit process.
 
-- EmployeeController.php 
-  Management and Hr can edit employee id.
 
-- LeaverequestController.php
-  Leave request calender leaves are distinguished with status approved(A) and pending(p).  
 
-- AppraisalhistoryController.php 
-  Employees can view their appraisal history and manager can view their team appraisal history.
-
-- MyteamappraisalController.php
-  Manager and employess can print current appraisal forms.
-
 Note: You can find the respective view files in below scripts: 
-./application/modules/expenses/views/scripts
-./application/modules/assets/views/scripts
-./application/modules/default/views/scripts
+./application/modules/exit/views/scripts
 
 Changes in scripts
 ------------------------
-./public/media/expenses/js/expenses.js
+./public/media/exit/js/expenses.js
 ./public/media/js/hrms.js
-./public/media/js/hrmsv2.js
 ./public/media/css/style.css
-./public/media/css/successstyle.css
-
-
-
+./public/media/css/successstyle.css
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ Sentrifugo is a free and powerful new-age Human Resource Management System that
 
 
 
-Installing Sentrifugo Version 3.1
+Installing Sentrifugo Version 3.1.1
 ======================================
 
 Sentrifugo comes with its own web-installer to help guide you through the installation process. 
@@ -209,22 +209,22 @@ Table of Contents:
 	1. Download Sentrifugo.zip
 	2. Extract the zip file
 	3. Check for patches folder in the extracted Sentrifugo folder
-	4. Check your application code version in index.php Ex: defined('CODEVERSION')|| define('CODEVERSION', '3.0');
-	5. If your code version is not 3.0, take patches <CODEVERSION> till patches 3.1  
-	  Eg: If CODEVERSION is 3.0, take patches from 3.0 to patches 3.1
-	6. If your code version is 3.0, consider patches_3.1 folder
+	4. Check your application code version in index.php Ex: defined('CODEVERSION')|| define('CODEVERSION', '3.1');
+	5. If your code version is not 3.1, take patches <CODEVERSION> till patches 3.1.1  
+	  Eg: If CODEVERSION is 3.0, take patches from 3.0 to patches 3.1.1
+	6. If your code version is 3.1, consider patches_3.1.1 folder
 
 	 AUTOMATION 
 
 	1. Login into your application as 'Super Admin'
 	2. Click on Profile pop-up on the right hand-side
 	3. Select Upgrade application
-	4. Current application version will be displayed. Choose version to upgrade as 3.1
-	5. On clicking 'Upgrade' button, patches_3.1 will be downloaded
+	4. Current application version will be displayed. Choose version to upgrade as 3.1.1
+	5. On clicking 'Upgrade' button, patches_3.1.1 will be downloaded
 
-	To install patch 3.1			
+	To install patch 3.1.1			
 
-	1. Extract the patches_3.1 .zip file 
+	1. Extract the patches_3.1.1 .zip file 
 	2. Copy and replace the files to your current application folder 
 	3. Execute the queries in sql/queries.txt file, if any (commands are mentioned at the bottom of this document)
 

diff --git a/UPGRADE.txt b/UPGRADE.txt
@@ -40,4 +40,4 @@ To import sql data file in Windows:
 
 [path-to-mysql] mysql.exe -h [hostname] -u [username] -p [DATA-BASE-NAME] < [path-to-sql-file]
 
-If you have followed the above steps, you have successfully updated your application. Login to enjoy the services.
+Yippiieeeee..... If you have followed the above steps, you have successfully updated your application. Login to enjoy the services.
diff --git a/Zend/View/Helper/Breadcrumbs.php b/Zend/View/Helper/Breadcrumbs.php
@@ -280,6 +280,10 @@ public  function breadcrumbs($baseUrlString = '')
 			{
 				$url = "/assets/".$pageName;
 			}
+			if($pageName=='allexitproc' || $pageName=='exitproc' || $pageName=='exitprocsettings' || $pageName=='exittypes' || $pageName=='configureexitqs')
+			{
+				$url = "/exit/".$pageName;
+			}
 			$breadCrumIds = $this->getBreadCrumDetails($url);
 
 			$breadCrumNames = array();	

diff --git a/Zend/View/Helper/Grid.php b/Zend/View/Helper/Grid.php
@@ -61,6 +61,7 @@ public function grid ($dataArray)
 		{ 
 			$actions_arr = array();
 		}
+
 		$gridFieldsArr=array();$tmpActionsArr=array();
 		$tmpActionsArr = $actions_arr;
 		array_pop($tmpActionsArr);	//last element of actions array is menuname so delete that & check the privileges are empty or not...
@@ -225,6 +226,77 @@ public function grid ($dataArray)
 										</div>');
 							}
 						}
+						//for exit types grid and all exit types grid
+						if($dataArray['objectname'] == 'exittypes' || $dataArray['objectname'] == 'configureexitqs')
+						{
+							$view_str = '<a href= "'.BASE_URL.'exit'.'/'.$dataArray['objectname'].'/view/id/{{id}}" name="{{id}}" class="sprite view"  title=\'View\'></a>';
+							$edit_str = '<a href= "'.BASE_URL.'exit'.'/'.$dataArray['objectname'].'/edit/id/{{id}}" name="{{id}}" id="edit{{id}}" class="sprite edit"  title=\'Edit\'></a>';
+
+							$delete_str = '<a id="del{{id}}" name="{{id}}" 	href= javascript:void(0) title=\'Delete\' class="sprite delete" ></a>';
+
+							$extra['action'] = array('name' => 'edit', 'value' =>'<div class="grid-action-align">
+											'.((in_array('view',$actions_arr)?$view_str:'')).'
+											'.((in_array('edit',$actions_arr)?$edit_str:'')).'
+											'.((in_array('delete',$actions_arr)?$delete_str:'')).'
+										</div>');
+						}
+
+						if($dataArray['objectname'] == 'allexitproc' || $dataArray['objectname'] == 'exitproc')
+						{
+							$view_str = '<a href= "'.BASE_URL.'exit'.'/'.$dataArray['objectname'].'/view/id/{{id}}" name="{{id}}" class="sprite view"  title=\'View\'></a>';
+
+							/*if($dataArray['objectname'] == 'exitproc')
+								$edit_str = '<a href= "'.BASE_URL.'exit'.'/'.$dataArray['objectname'].'/questions/id/{{id}}" name="{{id}}" id="questions{{id}}" class="sprite assign_view_questions"  title=\'Edit\'></a>';
+							else
+								$edit_str = '<a href= "'.BASE_URL.'exit'.'/'.$dataArray['objectname'].'/edit/id/{{id}}" name="{{id}}" id="edit{{id}}" class="sprite assign_view_questions"  title=\'Edit\'></a>';*/
+
+							$auth = Zend_Auth::getInstance();
+							if($auth->hasIdentity())
+							{
+								$loginUserId = $auth->getStorage()->read()->id;
+								$loginuserGroup = $auth->getStorage()->read()->group_id;
+								$loginuserRole = $auth->getStorage()->read()->emprole;
+								$is_og_head = $auth->getStorage()->read()->is_orghead;
+							}
+							if($dataArray['objectname'] == 'exitproc')
+								$edit_str = '<a href= "'.BASE_URL.'exit'.'/'.$dataArray['objectname'].'/questions/id/{{id}}" name="{{id}}" id="questions{{id}}" class="sprite assign_view_questions"  title=\'Answer and View Questions/Comments\'></a>';
+							elseif($loginuserRole != SUPERADMINROLE && $is_og_head!=1)
+								$edit_str = '<a href= "'.BASE_URL.'exit'.'/'.$dataArray['objectname'].'/edit/id/{{id}}" name="{{id}}" id="edit{{id}}" class="sprite edit"  title=\'Edit\'></a>';
+							else
+								$edit_str='';	
+
+							// assign questions icon only for hr, management and superadmin
+							if(($loginuserRole == SUPERADMINROLE || $loginuserGroup == HR_GROUP || $loginuserGroup == MANAGEMENT_GROUP) && $dataArray['objectname'] == 'allexitproc'){
+								$assign_questions_str = '<a href= "'.BASE_URL.'exit'.'/'.$dataArray['objectname'].'/assignquestions/id/{{id}}" name="{{id}}" class="sprite assign_view_questions"  id="assign_ques{{id}}"  title=\'Assign and View Questions/Comments\'></a>';
+
+							}
+							else {
+								$assign_questions_str = '';
+							}
+
+							// no delete action for all exit process
+							if($loginuserRole == SUPERADMINROLE || $loginuserGroup == HR_GROUP || $loginuserGroup == MANAGEMENT_GROUP){
+								$delete_str = '<a name="{{id}}" id="overallupdate_{{id}}" 	href= javascript:void(0) title=\'Update Overall Status\' class="fa fa-ellipsis-v" ></a>';
+							}else{
+								$delete_str = '';
+							}
+
+
+
+							if($dataArray['objectname'] == 'exitproc')
+								$delete_str = '';
+							$extra['action'] = array('name' => 'edit', 'value' =>'<div class="grid-action-align">
+											'.((in_array('view',$actions_arr)?$view_str:'')).'
+											'.((in_array('edit',$actions_arr)?$edit_str:'')).'
+											'.((in_array('assign',$actions_arr)?'':$assign_questions_str )).'
+											'.((in_array('update',$actions_arr)?'':$delete_str)).'
+
+										</div>');
+						}
+
+
+
+
 		}
 		$extra['options'] = array(); 
         $addaction= '';  		
@@ -362,7 +434,27 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
 				$output .= "<div class='add-btn-div'>";
 				$output .= "<input type='button'  title = 'Raise an Incident' value='Raise an Incident' class='sprite addrequest' />";
 				$output .= "</div>";
-			}else{
+			}
+			elseif($name == 'exittypes' || $name == 'configureexitqs')
+			{
+				$output .= "<a href='".BASE_URL.'exit'.'/'.$name.'/'.$action."'><input type='button' title = 'Add' value='Add Record' class='sprite addrecord' /></a>";
+			}elseif($name == 'allexitproc')
+			{
+				$output .= "";
+			}else if($name=='exitproc'){
+				$auth = Zend_Auth::getInstance();
+				if($auth->hasIdentity())
+				{
+					$loginUserId = $auth->getStorage()->read()->id;
+					$loginuserGroup = $auth->getStorage()->read()->group_id;
+					$loginuserRole = $auth->getStorage()->read()->emprole;
+				}
+				if($loginuserRole == SUPERADMINROLE)
+					$output .= "";
+				else
+					$output .= "<a href='".BASE_URL.'exit'.'/'.$name.'/'.$action."'><input type='button' title = 'Add' value='Add Record' class='sprite addrecord' /></a>";
+			}
+			else{
 		  		$output .= "<a href='".BASE_URL.$name.'/'.$action."'><input type='button' title = 'Add' value='Add Record' class='sprite addrecord' /></a>";
 			}
 			$output .= "</div>";
@@ -710,6 +802,60 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
 												});
 												</script>";
 								}
+								// remove edit and delete if isused=1
+								if($controllerName == 'exittypes' || $controllerName == 'configureexitqs')
+								{
+									if($p['isused'] == 1)
+									{
+										echo "<script type='text/javascript'>
+												$(document).ready(function() {
+												$('#del".$p['id']."').remove();
+												$('#edit'+".$p['id'].").remove();
+												});
+												</script>";
+									}
+								}
+
+
+								//hide edit when overall status is approved in exitprocess
+								if($controllerName == 'allexitproc' && $p['overall_status'] == 'Approved')
+								{
+									echo "<script type='text/javascript'>
+												$(document).ready(function() {
+
+												$('#edit'+".$p['id'].").remove();
+												});
+												</script>";
+									echo "<script type='text/javascript'>
+												$(document).ready(function() {
+
+												$('#overallupdate_'+".$p['id'].").remove();
+												});
+												</script>";			
+
+
+								}
+								//hide edit when overall status is approved in exitprocess
+								if($controllerName == 'allexitproc' && $p['overall_status'] != 'Approved')
+								{
+									echo "<script type='text/javascript'>
+												$(document).ready(function() {
+
+												$('#assign_ques'+".$p['id'].").remove();
+												});
+												</script>";
+								}
+
+								if($controllerName == 'exitproc' && $p['overall_status'] != 'Approved')
+								{
+									echo "<script type='text/javascript'>
+												$(document).ready(function() {
+
+												$('#questions'+".$p['id'].").remove();
+												});
+												</script>";
+								}
+
                                 // hr can edit and delete any businessunit and dept announcemets---3.1
 								//removing edit,dele icons for announcements
 								/* if($controllerName == 'announcements')
@@ -753,7 +899,6 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
 								 * Second Case - Grid field
 								 * Keep 'default' case to allow display other Grids, normal.
 								 */
-
 								switch ($menuName) {
 									case 'CV Management':
 										switch ($k) {
@@ -801,9 +946,19 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
 										}
 										break;
 									case 'All Exit Procedures':
-										if($k == 'createddate')
+										if($k == 'initiateddate')
+										{
+											$output .= "<span ".$dataclass.">".sapp_Global::change_date($p[$k],'view')."</span>";
+										}
+										else
+										{
+			 	                            	$output .= "<span ".$dataclass." title='".htmlentities(trim($p[$k]), ENT_QUOTES, "UTF-8")."' >".htmlentities($valToInclude, ENT_QUOTES, "UTF-8")."</span>";
+										}
+										break;
+									case 'Initiate/Check Status':	
+										if($k == 'initiateddate')
 										{
-											$output .= "<span ".$dataclass.">".sapp_Global::getDisplayDate($p[$k])."</span>";
+											$output .= "<span ".$dataclass.">".sapp_Global::change_date($p[$k],'view')."</span>";
 										}
 										else
 										{
@@ -827,7 +982,7 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
 			$output.="</tr>";
 		}
 		if($ii == 0){
-			$output.= "<tr><td colspan='$colinr' class='no-data-td'><p class='no-data'>No data found</p></td></tr>";
+			$output.= "<tr><td colspan='$colinr' class='no-data-td'><p class='no-data'>No data found.</p></td></tr>";
 		}
 		$output .= "</tbody>";
 		$output .="</table>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -40,4 +40,4 @@ To import sql data file in Windows:

		[path-to-mysql] mysql.exe -h [hostname] -u [username] -p [DATA-BASE-NAME] < [path-to-sql-file]

		If you have followed the above steps, you have successfully updated your application. Login to enjoy the services.
		Yippiieeeee..... If you have followed the above steps, you have successfully updated your application. Login to enjoy the services.