Skip to content

Commit

Permalink
Sentrifugo 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@sapplica
sapplica committed Dec 22, 2016
1 parent 4384003 commit ed8eb78
Show file tree
Hide file tree
Showing 305 changed files with 14,275 additions and 4,560 deletions.
8 changes: 4 additions & 4 deletions Zend/Db/Adapter/Abstract.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ public function insert($table, array $bind)
{


if( $val=='')
if( $val==='')
{

$bind[$tbl_data['Field']]=null;
Expand All @@ -564,7 +564,7 @@ public function insert($table, array $bind)
{
if($tbl_data['Null']=='YES')
{
if( $val=='')
if( $val==='')
{
$bind[$tbl_data['Field']]=0;
}
Expand Down Expand Up @@ -656,7 +656,7 @@ public function update($table, array $bind, $where = '')
{


if( $val=='')
if( $val==='')
{

$bind[$tbl_data['Field']]=null;
Expand All @@ -667,7 +667,7 @@ public function update($table, array $bind, $where = '')
{
if($tbl_data['Null']=='YES')
{
if( $val=='')
if( $val==='')
{

$bind[$tbl_data['Field']]=0;
Expand Down
6 changes: 3 additions & 3 deletions Zend/View/Helper/Breadcrumbs.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,11 @@ public function breadcrumbs($baseUrlString = '')
else if($actionName == 'activeuser')
$breadCrumbsData .= '<span class="arrows">&rsaquo;</span>User Management<span class="arrows">&rsaquo;</span><span>Users & Employees Report</span>';
else if($actionName == 'requisitionstatusreport')
$breadCrumbsData .= '<span class="arrows">&rsaquo;</span>Talent Acquisition<span class="arrows">&rsaquo;</span><span>Acquisitions Report</span>';
$breadCrumbsData .= '<span class="arrows">&rsaquo;</span>Recruitments<span class="arrows">&rsaquo;</span><span>Recruitments Report</span>';
else if($actionName == 'candidatesreport')
$breadCrumbsData .= '<span class="arrows">&rsaquo;</span>Resource Requisition<span class="arrows">&rsaquo;</span><span>Candidate Details Report</span>';
$breadCrumbsData .= '<span class="arrows">&rsaquo;</span>Recruitments<span class="arrows">&rsaquo;</span><span>Candidate Details Report</span>';
else if($actionName == 'interviewrounds')
$breadCrumbsData .= '<span class="arrows">&rsaquo;</span>Resource Requisition<span class="arrows">&rsaquo;</span><span>Scheduled Interviews Report</span>';
$breadCrumbsData .= '<span class="arrows">&rsaquo;</span>Recruitments<span class="arrows">&rsaquo;</span><span>Scheduled Interviews Report</span>';
else if($actionName == 'empscreening')
$breadCrumbsData .= '<span class="arrows">&rsaquo;</span>Background Check<span class="arrows">&rsaquo;</span><span>Employee / Candidate Screening Report</span>';
else if($actionName == 'agencylistreport')
Expand Down
173 changes: 110 additions & 63 deletions Zend/View/Helper/Employeedetails.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ public function employeedetails($emparr,$conText,$userId)

$loggedinuser = $data['id'];
$group_id = $data['group_id'];
$loggedinUserRole=$data['emprole'];
$empdata = '';
$employeetabsStr = '';

$empdata ='<div class="ml-alert-1-success" id="empdetailsmsgdiv" style="display:none;">';
$empdata ='<div class="ml-alert-1-success" id="empdetailsmsgdiv" style="display:none;">';
$empdata .='<div class="style-1-icon success" style="display:block;"></div>';
$empdata .='<div id="successtext"></div>';
$empdata .='</div>';
Expand All @@ -65,20 +65,46 @@ public function employeedetails($emparr,$conText,$userId)
}

}
if($conText != 'mydetails')
/* if($conText != 'mydetails')
{
$empdata .= '<div class="back-to-page"><input type="button" value="Back" name="Back" onclick="gobacktocontroller(\''.$conText.'\');"></div>';
}

*/
$empdata .= '<div class="emp-screen-view">';
$empdata .= '<div class="display-img-div" id="displayimg" >';
$empdata .= '<div class="employee-pic-emp">';
if($emparr['profileimg']!=''){
$empdata .= '<img id="userImage" src="'.DOMAIN.("public/uploads/profile/").$emparr['profileimg'].'" onerror="this.src=\''.DOMAIN.'public/media/images/default-profile-pic.jpg\'"/>';
}
else{
$empdata .= '<img id="userImage" src="'.DOMAIN.'public/media/images/employee-deafult-pic.jpg" />';
if($loggedinUserRole!=''&& $loggedinUserRole == '4')
{
$empdata .= '<div class="chg-img_profile">';
if($emparr['profileimg']!=''){
$empdata .= '<img id="blah" class="imgbrdr" src="'.DOMAIN.("public/uploads/profile/").$emparr['profileimg'].'" onerror="this.src=\''.DOMAIN.'public/media/images/default-profile-pic.jpg\'"/>';
}
else{
$empdata .= '<img id="blah" class="imgbrdr" src="'.DOMAIN.'public/media/images/employee-deafult-pic.jpg" />';
}
$empdata.='</div>';
?>
<!-- Start Div for updating photoupload-->
<!--End Update div -->
<input type="hidden" id="uploadimagepathedit" name="uploadimagepath" value="<?php echo $emparr['profileimg'];?>"/>
<input type="hidden" name="profile_image" value=""/>
<!-- End Photo Upload -->
<!-- <div class="uploaderror_profile" style="display:none;"></div>-->

<?php
}
else
{
if($emparr['profileimg']!='')
{
$empdata .= '<img id="userImage" src="'.DOMAIN.("public/uploads/profile/").$emparr['profileimg'].'" onerror="this.src=\''.DOMAIN.'public/media/images/default-profile-pic.jpg\'"/>';
}
else
{
$empdata .= '<img id="userImage" src="'.DOMAIN.'public/media/images/employee-deafult-pic.jpg" />';
}
}

/**
** Active/inactve buttons 18-03-2015
** should not be available in my details page
Expand All @@ -87,69 +113,86 @@ public function employeedetails($emparr,$conText,$userId)
**/
if($conText != 'mydetails' && $emparr['is_orghead'] != 1)
{
if($group_id == HR_GROUP || $loggedinuser == SUPERADMIN || $group_id == MANAGEMENT_GROUP)//for activate inactivate user
{
$sel_act = $sel_dact = "";
if($emparr['isactive'] < 2 && $emparr['emptemplock'] == 0)
if($group_id == HR_GROUP || $loggedinuser == SUPERADMIN || $group_id == MANAGEMENT_GROUP)//for activate inactivate user
{
if($emparr['isactive'] == 1)
$sel_act = $sel_dact = "";
if($emparr['isactive'] < 2 && $emparr['emptemplock'] == 0)
{
$sel_act = "selected";
if($emparr['isactive'] == 1)
{
$sel_act = "selected";
}
else if($emparr['isactive'] == 0)
{
$sel_dact = "selected";
}
/** disable the buttons for organization head **/

if($loggedinUserRole!=''&& $loggedinUserRole == '4')
{

$empdata .= '<div class="left_div" >
<span class="uploadbut uploadbutsel" id="upload_custom_div_profile" style="display:block;"> Edit Profile Photo</span>
<div id="loaderimgprofileedit" style="display:none;"><img src="'.DOMAIN.'public/media/images/loaderwhite_21X21.gif" style="width:21px; height: 21px; float: none; "/></div>
</div>
<div id="profile_edit" style="display:none; margin: 0 auto; width: 80px;">
<div class="mrgetop10 fltleft">
<input type="button" class="submit_bg" value="Update" onclick="empprofileImageSave('.$emparr['id'].');" /></div>
</div>
<div class="uploaderror_profile" style="display:none;"></div>
<p class="field switch"><label class="cb-enable '.$sel_act.'"><span>Active</span></label><label class="cb-disable '.$sel_dact.'"><span>Inactive</span></label> </p>';
}else
{
$empdata .= '<p class="field switch"><label class="cb-enable '.$sel_act.'"><span>Active</span></label><label class="cb-disable '.$sel_dact.'"><span>Inactive</span></label> </p>';
}

if($sel_act == "selected")
{
$empdata .= "
<script type='text/javascript' language='javascript'>
$('.cb-disable').click(function(){
makeActiveInactive('inactive','".$emparr['id']."');
});
</script> ";
}
else if($sel_dact == "selected")
{
$empdata .= "
<script type='text/javascript' language='javascript'>
$('.cb-enable').click(function(){
makeActiveInactive('active','".$emparr['id']."');
});
</script> ";
}

}
else if($emparr['isactive'] == 0)
{
$sel_dact = "selected";
}
/** disable the buttons for organization head **/

$empdata .= '<p class="field switch"><label class="cb-enable '.$sel_act.'"><span>Active</span></label><label class="cb-disable '.$sel_dact.'"><span>Inactive</span></label> </p>';
if($sel_act == "selected")
else if($emparr['isactive'] < 2 && $emparr['emptemplock'] == 1)
{
$sel_dact = "selected";$sel_act = "";
$empdata .= '<p class="field switch"><label class="cb-enable '.$sel_act.'"><span>Active</span></label><label class="cb-disable '.$sel_dact.'"><span>Inactive</span></label> </p>';
$empdata .= "
<script type='text/javascript' language='javascript'>
$('.cb-disable').click(function(){
makeActiveInactive('inactive','".$emparr['id']."');
$('.cb-enable').click(function(){
makeActiveInactive('active','".$emparr['id']."');
});
</script> ";
</script>
";
}
else if($sel_dact == "selected")
else
{
$sel_dact = "selected";$sel_act = "";
$empdata .= '<p class="field switch"><label class="cb-enable '.$sel_act.'"><span>Active</span></label><label class="cb-disable '.$sel_dact.'"><span>Inactive</span></label> </p>';
$empdata .= "
<script type='text/javascript' language='javascript'>
$('.cb-enable').click(function(){
makeActiveInactive('active','".$emparr['id']."');
$('.cb-enable,.cb-disable').click(function(){
makeActiveInactive('other','".$emparr['isactive']."');
});
</script> ";
</script>
";
}

}
else if($emparr['isactive'] < 2 && $emparr['emptemplock'] == 1)
{
$sel_dact = "selected";$sel_act = "";
$empdata .= '<p class="field switch"><label class="cb-enable '.$sel_act.'"><span>Active</span></label><label class="cb-disable '.$sel_dact.'"><span>Inactive</span></label> </p>';
$empdata .= "
<script type='text/javascript' language='javascript'>
$('.cb-enable').click(function(){
makeActiveInactive('active','".$emparr['id']."');
});
</script>
";
}
else
{
$sel_dact = "selected";$sel_act = "";
$empdata .= '<p class="field switch"><label class="cb-enable '.$sel_act.'"><span>Active</span></label><label class="cb-disable '.$sel_dact.'"><span>Inactive</span></label> </p>';
$empdata .= "
<script type='text/javascript' language='javascript'>
$('.cb-enable,.cb-disable').click(function(){
makeActiveInactive('other','".$emparr['isactive']."');
});
</script>
";
}
}
}

$empdata .= '</div>';
Expand Down Expand Up @@ -253,7 +296,10 @@ public function employeetabs($conText,$userId)
}
}

$tabsHtml = '<div class="poc-ui-data-control" id="'.$tabHeightClass.'"><div class="left-block-ui-data"><div class="agency-ui"><ul>';
$tabsHtml = '<div class="poc-ui-data-control" id="'.$tabHeightClass.'">
<div class="left-block-ui-data">
<div class="agency-ui">
<ul>';
if($conText == "edit")
{

Expand Down Expand Up @@ -334,8 +380,6 @@ public function employeetabs($conText,$userId)

if(!empty($empOrganizationTabs) && in_array("assetdetails", $empOrganizationTabs))
$tabsHtml .= '<li id= "assetdetails" onclick="changeempeditscreen(\'assetdetails\','.$userId.');">'.TAB_EMP_ASSETS.'</li>';


}
else if($conText == "view")
{
Expand Down Expand Up @@ -577,9 +621,12 @@ public function employeetabs($conText,$userId)
if(!empty($empOrganizationTabs) && in_array("emp_additional", $empOrganizationTabs))
$tabsHtml .= '<li id = "emp_additional" onclick="changemyempviewscreen(\'myemployees\',\'additionaldetailsedit\','.$userId .');">'.TAB_EMP_ADDITIONAL.'</li>';
}
$tabsHtml .= '</ul></div></div>';
$tabsHtml .= '</ul></div></div>';
echo $tabsHtml;
}


}
?>
?>


48 changes: 34 additions & 14 deletions Zend/View/Helper/Grid.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,17 +196,35 @@ public function grid ($dataArray)
'.((in_array('delete',$actions_arr)?$delete_str:'')).'
</div>'); //onclick ="javascript:editlocdata(\'{{id}}\')"
}
/*if($dataArray['objectname'] == 'candidatedetails')
if($dataArray['objectname'] == 'candidatedetails')
{

$schedule_str = '<a href= "'.BASE_URL.'scheduleinterviews'.'/add/cid/{{id}}" name="{{id}}" class="sprite schedule_interview" id="cv{{id}}" title=\'Schedule interview\'></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:'')).'
'.((in_array('schedule',$actions_arr)?'':$schedule_str)).'
</div>');
}*/
$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 || $loginuserGroup == HR_GROUP || $loginuserGroup == MANAGEMENT_GROUP)
{
$schedule_str = '<a href= "'.BASE_URL.'scheduleinterviews'.'/add/cid/{{id}}" name="{{id}}" class="sprite schedule_interview" id="cv{{id}}" title=\'Schedule interview\'></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:'')).'
'.((in_array('schedule',$actions_arr)?'':$schedule_str)).'
</div>');
}
else{

$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>');
}
}
}
$extra['options'] = array();
$addaction= '';
Expand Down Expand Up @@ -682,7 +700,7 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
</script>";
}

/*if($controllerName == 'candidatedetails' && $p['cand_status'] != 'Not Scheduled')
if($controllerName == 'candidatedetails' && $p['cand_status'] != 'Not Scheduled')
{

echo "<script type='text/javascript'>
Expand All @@ -691,9 +709,10 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
$('#cv'+".$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')
/* if($controllerName == 'announcements')
{
//echo "<pre>";print_r($p);
$businessunit_id = $department_id ='';
Expand Down Expand Up @@ -725,7 +744,7 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
}
}
} */

//
/**
Expand Down Expand Up @@ -753,7 +772,8 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
case 'Announcements':
switch ($k) {
case 'description':
$output .= "<span ".$dataclass." title='".html_entity_decode($p[$k])."' >".html_entity_decode($valToInclude)."</span>";
$output .= "<span ".$dataclass." title='".html_entity_decode($p[$k])."' >".html_entity_decode($valToInclude)."</span>";

break;
default:
$output .= "<span ".$dataclass." title='".htmlentities(trim($p[$k]), ENT_QUOTES, "UTF-8")."' >".htmlentities($valToInclude, ENT_QUOTES, "UTF-8")."</span>";
Expand Down
Loading

0 comments on commit ed8eb78

Please sign in to comment.