Skip to content

Commit

Permalink
Sentrifugo 1.1.5
Browse files Browse the repository at this point in the history 
1. New feature enabling Management and Managers to export the reports of their team to Excel or PDF.
2. New feature enabling Super Admin to configure the site from one place using the Configure Wizard.
  • Loading branch information
sapplica committed Feb 24, 2015
1 parent dd23dda commit 3eb4ebb
Show file tree
Hide file tree
Showing 211 changed files with 40,368 additions and 1,086 deletions.
72 changes: 17 additions & 55 deletions CHANGELOG.txt
View file
Original file line number Diff line number Diff line change
@@ -1,72 +1,34 @@
CHANGELOG Sentrifugo
===========================

RELEASE 1.1.4
RELEASE 1.1.5
-------------
Changes in controllers
------------------------
application/modules/default/controllers/MyemployeesController.php
application/modules/default/controllers/EmppersonaldetailsController.php
application/modules/default/controllers/MydetailsController.php
application/modules/default/controllers/EmpcommunicationdetailsController.php
application/modules/default/controllers/DepartmentsController.php;
application/modules/default/controllers/EmployeeController.php;
application/modules/default/controllers/OrganisationinfoController.php;
/application/modules/default/controllers/DepartmentsController.php;
/application/modules/default/controllers/IndexController.php;
/application/modules/default/controllers/MyemployeesController.php;
/application/modules/default/controllers/WizardController.php;
/application/modules/default/controllers/OrganisationinfoController.php;

- EmpsalarydetailsController.php
Removed mandatory condition for fields

- MydetailsController.php
Removed mandatory condition for fields

- ReportsController.php
Multiple business unit as a filter in employee analytics report

- PayfrequencyController.php
Removed mandatory condition for fields

- DependencydetailsController.php
Removed mandatory condition for fields

- EmployeeController.php
Salary/Wage as an optional field in the employee import function.

- CreditcarddetailsController.php
Removed mandatory condition for fields

- DisabilitydetailsController.php
Removed mandatory condition for fields

- EmpcommunicationdetailsController.php
Removed mandatory condition for fields

- EmppersonaldetailsController.php
Removed mandatory condition for fields

- VisaandimmigrationdetailsController.php
Removed mandatory condition for fields

- WorkeligibilitydetailsController.php
Removed mandatory condition for fields

- EmpconfigurationController.php
Renamed few Employee Tabs in human resource module

- DepartmentsController.php
Updating business unit and department for department head, while a department is added.
Modified empty checking condition for department head result set

- EmployeeController.php
Resolved the issue for displaying firstname and lastname after adding a department head.
- MyemployeesController.php
Added My team report for Employee Self Service > My Team, for Management and Manager roles

- OrganisationinfoController.php
Removed mandatory condition for prefix,jobtitles and position while adding organisation head.
Removed mandatory conditions while adding organisation information.

- WizardController.php
Added Configure wizard functionality for Super Admin role

- IndexController.php
Added Configure Wizard links for Super Admin role

- Fixed issues with breadcrumbs in service request.

Changes in scripts
---------------------
public/media/js/ajaxupload.3.5.js
public/media/js/hrmsv2.js




Expand Down
5 changes: 4 additions & 1 deletion Zend/Controller/Action/Helper/PdfHelper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ public function generateReport($field_names, $field_data, $field_widths, $data=a
$pdf->SetFont('Arial','',9);
$pdf->Cell(32, 10, date("F jS, Y", time()), 0, 1); // To show report generated date
$pdf->Ln(5);

if(isset($data['count_emp_reporting'])){
$pdf->Cell(60, 10, "My Team Count : ".$data['count_emp_reporting'], 0, 1);
$pdf->Ln(5);
}
$pdf->SetFont('Arial','',9);
//Table with 20 rows and 4 columns
$pdf->SetWidths($field_widths);
Expand Down
27 changes: 19 additions & 8 deletions Zend/View/Helper/Breadcrumbs.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ public function breadcrumbs($baseUrlString = '')
$pageUrl = explode("/",$_SERVER['REQUEST_URI']);

$serverUrl = $_SERVER['HTTP_HOST'];
$reportsArr = array('leavesreport'=>'Leaves','holidaygroupreports'=>'Holidays','activeuser'=>'Active Users',
/* $reportsArr = array('leavesreport'=>'Leaves','holidaygroupreports'=>'Holidays','activeuser'=>'Active Users',
'employeereport'=>'Employees','rolesgroup'=>'Roles','emprolesgroup'=>'Employee Roles',
'userlogreport'=>'User Logs','activitylogreport'=>'Activity Logs','requisitionstatusreport'=>'Requisition'
);
'userlogreport'=>'User Logs','activitylogreport'=>'Activity Logs','requisitionstatusreport'=>'Requisition','performancereport' => 'Year Wise'
);*/

$pageName = $controllerName;
$actionName = $action_Name;
Expand All @@ -125,7 +125,7 @@ public function breadcrumbs($baseUrlString = '')
'additionaldetailsview'=>'Additional Details','jobhistoryview'=>'Job History',
'perview'=>'Personal Details','expview'=>'Experience Details','eduview'=>'Education Details',
'skillsview'=>'Employee Skills','comview'=>'Contact Details','trainingview'=>'Training & Certification Details',
'view'=>'View',
'view'=>'View', 'employeereport' => 'My Team Report'
);

$myemployeesedit_arr = array(
Expand Down Expand Up @@ -215,12 +215,21 @@ public function breadcrumbs($baseUrlString = '')
$breadCrumbsData .= '<span class="arrows">&rsaquo;</span>Background Checks<span class="arrows">&rsaquo;</span><span>Employee / Candidate Screening Report</span>';
else if($actionName == 'agencylistreport')
$breadCrumbsData .= '<span class="arrows">&rsaquo;</span>Background Checks<span class="arrows">&rsaquo;</span><span>Background Checks Agencies Report</span>';
}
else if($actionName == 'performancereport')
$breadCrumbsData .= '<span class="arrows">&rsaquo;</span>Performance Appraisal<span class="arrows">&rsaquo;</span><span>Year Wise</span>';
}
else
$breadCrumbsData .= '<span>Analytics</span>';
$breadCrumbsData .='</div>';
}
else
else if($pageName == 'employee' && $actionName == 'changeorghead')
{

$breadCrumbsData = '<div class="breadcrumbs">';
$breadCrumbsData .= '<a href="'.$baseUrlString.'">Home</a> <span class="arrows">&rsaquo;</span> Human Resource<span class="arrows">&rsaquo;</span> <a href="'.$baseUrlString.'/employee">Employees</a><span class="arrows">&rsaquo;</span>Manage Organization Head';
$breadCrumbsData .='</div>';
}
else
{
$breadCrumbsData = '<div class="breadcrumbs">';
$url = "/".$pageName;
Expand Down Expand Up @@ -282,7 +291,9 @@ public function breadcrumbs($baseUrlString = '')
if((in_array('id',$pageUrl) || in_array('userid',$pageUrl)) && $pageName != 'myemployees')
{
$idval = intval($pageUrl[$idvalindex]);
if($idval != 0)

if($idval != 0 || $pageUrl[$idvalindex] != '')

$breadCrumbsData .= '<span class="arrows">&rsaquo;</span> <span>Edit</span>';
else
$breadCrumbsData .= '<span class="arrows">&rsaquo;</span> <span>Add</span>';
Expand Down Expand Up @@ -321,7 +332,7 @@ public function breadcrumbs($baseUrlString = '')
{
if($actionName == 'multipleresume')
$breadCrumbsData .= '<span class="arrows">&rsaquo;</span> <span>Add multiple CVs</span>';
if($actionName == 'edit' && $pageName == 'heirarchy')
if($actionName == 'edit' && ($pageName == 'heirarchy' || $pageName == 'appraisalself'))
$breadCrumbsData .= '<span class="arrows">&rsaquo;</span> <span>Edit</span>';
else if($actionName == 'edit' || $actionName == 'add')
$breadCrumbsData .= '<span class="arrows">&rsaquo;</span> <span>Add</span>';
Expand Down
8 changes: 6 additions & 2 deletions Zend/View/Helper/Employeegrid.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,8 @@ public function employeegrid ($dataArray)
public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn=array(),$sorting=false,$jsGridFnname='', $perPage='5',$page='1', $jsFillFnName='',$searchArray='',$formgrid='false',$addaction='',$menuName='',$unitId,$addpermission,$menunamestr,$call='',$sortStr='',$conText="",$search_filters = '',$dashboardCall='No',$actnArr,$sortname='',$by='') {
$request = Zend_Controller_Front::getInstance();
$params = $request->getRequest()->getParams();

$controllerName = $request->getRequest()->getControllerName();
$actionName = $request->getRequest()->getActionName();
// Store Extra Columns
$this->extra = $extracolumn; $sortIconStr ="";

Expand Down Expand Up @@ -483,8 +484,11 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
$sText = '';

if(!empty($searchArray)) $display = 'display: block;'; else $display = 'display: none;';
if(is_array($searchArray)) { if(array_key_exists($key,$searchArray)) $sText = $searchArray[$key]; else $sText = ''; }

if($controllerName == 'employee' && $actionName == 'index')
$display = '';

if(is_array($searchArray)) { if(array_key_exists($key,$searchArray)) $sText = $searchArray[$key]; else $sText = ''; }

if(isset($search_filters[$key]))
{
Expand Down
89 changes: 56 additions & 33 deletions Zend/View/Helper/Grid.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@ class Zend_View_Helper_Grid extends Zend_View_Helper_Abstract {
public $view = null;
public $extra = array();
private $output; // Container to hold the Grid

private $encrypt_status = "no";
public function grid ($dataArray)
{
$request = Zend_Controller_Front::getInstance();
$params = $request->getRequest()->getParams();

$menu_model = new Default_Model_Menu();
if(isset($dataArray['encrypt_status']) && $dataArray['encrypt_status'] == 'yes')
$this->encrypt_status = "yes";
$menu_model = new Default_Model_Menu();
$session=new Zend_Auth_Storage_Session();
$data=$session->read();
$role_id = $data['emprole'];
Expand Down Expand Up @@ -425,6 +427,9 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
$sText = '';

if(!empty($searchArray)) $display = 'display: block;'; else $display = 'display: none;';

if($controllerName == 'myemployees' && $actionName == 'index')
$display = '';
if(is_array($searchArray)) { if(array_key_exists($key,$searchArray)) $sText = $searchArray[$key]; else $sText = ''; }

if(isset($search_filters[$key]))
Expand Down Expand Up @@ -526,6 +531,19 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
if($k == 'backgroundchk_status' && $p[$k] == 'Complete' && $menuName == 'Employee/Candidate Screening'){
$dataclass = 'class="greendata"';
}

if($controllerName == 'appraisalmanager')
{
if($p['org_status'] == 2 || $p['org_status'] == 3)
{
echo "<script type='text/javascript'>
$(document).ready(function() {
$('div a.sprite.edit').remove();
$('div a.sprite.delete').remove();
});
</script>";
}
}
// Customize grid fields data - START
switch($menuName){
case 'CV Management':
Expand Down Expand Up @@ -630,37 +648,42 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
* @param array $p
* @return string
*/
public function _parseExtra($column,$p) {
public function _parseExtra($column,$p)
{
if(isset ($this->extra[$column]))
{
$val = '';

if(isset ($this->extra[$column])) {
$val = '';

$characterlimit = 15;
if(isset($this->extra[$column]['characterlimit']))
$characterlimit = $this->extra[$column]['characterlimit'];
preg_match_all('/\{\{(.*?)\}\}/', $this->extra[$column]['value'], $matches);
if(count($matches[1]) > 0) {
$matches[1] = array_unique($matches[1]);
$a = $this->extra[$column]['value'];
$characterlimit = 15;
if(isset($this->extra[$column]['characterlimit']))
$characterlimit = $this->extra[$column]['characterlimit'];
preg_match_all('/\{\{(.*?)\}\}/', $this->extra[$column]['value'], $matches);
if(count($matches[1]) > 0)
{
$matches[1] = array_unique($matches[1]);
$a = $this->extra[$column]['value'];

foreach($matches[1] AS $match) {
$p = (array)$p;
$a = str_replace('{{'.$match.'}}',$p[$match], $a);
preg_match_all('/\[\[(.*?)\]\]/', $a, $newMaches);
if(count($newMaches[1]) > 0) {
foreach($newMaches[1] AS $matchNew) {

$valToInclude = (strlen($p[$matchNew])>$characterlimit)? substr($p[$matchNew],0,$characterlimit)."..":$p[$matchNew];
$a = str_replace('[['.$matchNew.']]',$valToInclude, $a);
}
}

}
$val = $a;
}
return $val;
}

return '';
}
foreach($matches[1] AS $match)
{
$p = (array)$p;
$replaced_str = $p[$match];
if($this->encrypt_status == 'yes')
$replaced_str = sapp_Global::_encrypt ($p[$match]);
$a = str_replace('{{'.$match.'}}',$replaced_str, $a);
preg_match_all('/\[\[(.*?)\]\]/', $a, $newMaches);
if(count($newMaches[1]) > 0)
{
foreach($newMaches[1] AS $matchNew)
{
$valToInclude = (strlen($p[$matchNew])>$characterlimit)? substr($p[$matchNew],0,$characterlimit)."..":$p[$matchNew];
$a = str_replace('[['.$matchNew.']]',$valToInclude, $a);
}
}
}
$val = $a;
}
return $val;
}
return '';
}//end of _parseExtra
}
6 changes: 4 additions & 2 deletions application/layouts/scripts/hrmsfooter.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<div style="height: 20px;">&nbsp;</div>
</div>
<div class="copytxt">
<div class="copy-center"><span class="fltleft">&copy; <?php echo APPLICATION_NAME; ?>, <?php echo date('Y');?></span><span class="fltright">Powered By <a href="http://www.sapplica.com" target="new">Sapplica</a></span></div>
<div class="copy-center"><span class="copy_left">&copy; Sentrifugo, <?php echo date('Y');?></span><span class="copy_right">Powered By <a href="http://www.sapplica.com" target="new">Sapplica</a></span></div>
</div>
<div id="footer">
<div id="quickview" style="display:none"></div>
Expand Down Expand Up @@ -223,7 +223,9 @@ function tooltip_helper(div_id,links)
}else { ?>
<link rel="stylesheet" type="text/css" href="<?php echo MEDIA_PATH; ?>css/loginstyle.css" />
<footer>
<div class="footer-text">&copy; <?php echo APPLICATION_NAME; ?>, All Rights Reserved.</div>
<div class="copytxt">
<div class="copy-center"><span class="fltleft">&copy; Sentrifugo, <?php echo date('Y');?></span><span class="fltright">Powered By <a href="http://www.sapplica.com" target="new">Sapplica</a></span></div>
</div>
</footer>
<?php } ?>

Expand Down
Loading

0 comments on commit 3eb4ebb

Please sign in to comment.