Skip to content

Commit 0ddb8c1

Browse files
sapplicasapplica
committed
Sentrifugo 3.2
1 parent 2f7a4ee commit 0ddb8c1

102 files changed

Lines changed: 11301 additions & 1233 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.txt‎

Lines changed: 25 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,44 @@
11
CHANGELOG Sentrifugo
22
====================
3-
RELEASE 3.0 Beta
4-
-----------------
3+
RELEASE 3.2
4+
------------
55

66
Changes in Controllers
77
------------------------
8+
./application/modules/exit/controllers/ExittypesController.php
9+
./application/modules/exit/controllers/ConfigureexitqsController.php
10+
./application/modules/exit/controllers/ExitprocsettingsController.php
11+
./application/modules/exit/controllers/AllexitprocController.php
12+
./application/modules/exit/controllers/ExitprocController.php
13+
./application/modules/default/controllers/EmployeeController.php
14+
./application/modules/default/controllers/LeavemanagementController.php
15+
./application/modules/default/controllers/holidaydatesController.php
816

9-
./application/modules/expenses/controllers/AdvancesController.php
10-
./application/modules/expenses/controllers/EmployeeadvancesController.php
11-
./application/modules/expenses/controllers/ExpensecategoriesController.php
12-
./application/modules/expenses/controllers/ExpensesController.php
13-
./application/modules/expenses/controllers/IndexController.php
14-
./application/modules/expenses/controllers/MyemployeeexpensesController.php
15-
./application/modules/expenses/controllers/PaymentmodeController.php
16-
./application/modules/expenses/controllers/ReceiptsController.php
17-
./application/modules/expenses/controllers/TripsController.php
18-
./application/modules/default/controllers/EmployeeController.php
19-
./application/modules/default/controllers/LeaverequestController.php
20-
./application/modules/default/controllers/AppraisalhistoryController.php
21-
./application/modules/default/controllers/MyteamappraisalController.php
22-
./application/modules/default/controllers/MyemployeesController.php
23-
./application/modules/assets/controllers/AssetcategoriesController.php
24-
./application/modules/assets/controllers/AssetsController.php
2517

26-
- AdvancesController.php
27-
view employee advances.
28-
29-
- EmployeeadvancesController.php
30-
Add,edit,delete advances to employee.
31-
32-
- ExpensecategoriesController.php
33-
Add,edit,view,delete expense categories.
34-
35-
- ExpensesController.php
36-
Add,edit,view,delete expense , submit expenses.
18+
19+
- ExittypesController.php
20+
Management,hr can add,edit,delete exit types.
21+
22+
- ConfigureexitqsController.php
23+
Management,hr can add,edit,delete questions for exit types.
3724

38-
- IndexController.php
39-
view expenses.
40-
41-
- MyemployeeexpensesController.php
42-
approve ,reject,view employee submitted expenses.
25+
- ExitprocsettingsController.php
26+
Management,hr can configure managers for exit process.
4327

44-
- PaymentmodeController.php
45-
add,edit,delete,view payment modes.
46-
47-
- ReceiptsController.php
48-
add,edit,delete,view,download , add receipt to expense,trip .
28+
- AllexitprocController.php
29+
Configured managers can approve or reject exit process.
4930

50-
- TripsController.php
51-
add,edit,delete,view, approve,reject,submit trip.
31+
- ExitprocController.php
32+
Employee can initiate exit process.He can check status of exit process.
5233

53-
- EmployeeController.php
54-
Management and Hr can edit employee id.
5534

56-
- LeaverequestController.php
57-
Leave request calender leaves are distinguished with status approved(A) and pending(p).
5835

59-
- AppraisalhistoryController.php
60-
Employees can view their appraisal history and manager can view their team appraisal history.
61-
62-
- MyteamappraisalController.php
63-
Manager and employess can print current appraisal forms.
64-
6536
Note: You can find the respective view files in below scripts:
66-
./application/modules/expenses/views/scripts
67-
./application/modules/assets/views/scripts
68-
./application/modules/default/views/scripts
37+
./application/modules/exit/views/scripts
6938

7039
Changes in scripts
7140
------------------------
72-
./public/media/expenses/js/expenses.js
41+
./public/media/exit/js/expenses.js
7342
./public/media/js/hrms.js
74-
./public/media/js/hrmsv2.js
7543
./public/media/css/style.css
76-
./public/media/css/successstyle.css
77-
78-
79-
44+
./public/media/css/successstyle.css

‎UPGRADE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ To import sql data file in Windows:
4040

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

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

‎Zend/View/Helper/Breadcrumbs.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,10 @@ public function breadcrumbs($baseUrlString = '')
280280
{
281281
$url = "/assets/".$pageName;
282282
}
283+
if($pageName=='allexitproc' || $pageName=='exitproc' || $pageName=='exitprocsettings' || $pageName=='exittypes' || $pageName=='configureexitqs')
284+
{
285+
$url = "/exit/".$pageName;
286+
}
283287
$breadCrumIds = $this->getBreadCrumDetails($url);
284288

285289
$breadCrumNames = array();

‎Zend/View/Helper/Grid.php‎

Lines changed: 160 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public function grid ($dataArray)
6161
{
6262
$actions_arr = array();
6363
}
64+
6465
$gridFieldsArr=array();$tmpActionsArr=array();
6566
$tmpActionsArr = $actions_arr;
6667
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)
225226
</div>');
226227
}
227228
}
229+
//for exit types grid and all exit types grid
230+
if($dataArray['objectname'] == 'exittypes' || $dataArray['objectname'] == 'configureexitqs')
231+
{
232+
$view_str = '<a href= "'.BASE_URL.'exit'.'/'.$dataArray['objectname'].'/view/id/{{id}}" name="{{id}}" class="sprite view" title=\'View\'></a>';
233+
$edit_str = '<a href= "'.BASE_URL.'exit'.'/'.$dataArray['objectname'].'/edit/id/{{id}}" name="{{id}}" id="edit{{id}}" class="sprite edit" title=\'Edit\'></a>';
234+
235+
$delete_str = '<a id="del{{id}}" name="{{id}}" onclick= changestatus(\''.$dataArray['objectname'].'\',\'{{id}}\',\''.$msgdta.'\') href= javascript:void(0) title=\'Delete\' class="sprite delete" ></a>';
236+
237+
$extra['action'] = array('name' => 'edit', 'value' =>'<div class="grid-action-align">
238+
'.((in_array('view',$actions_arr)?$view_str:'')).'
239+
'.((in_array('edit',$actions_arr)?$edit_str:'')).'
240+
'.((in_array('delete',$actions_arr)?$delete_str:'')).'
241+
</div>');
242+
}
243+
244+
if($dataArray['objectname'] == 'allexitproc' || $dataArray['objectname'] == 'exitproc')
245+
{
246+
$view_str = '<a href= "'.BASE_URL.'exit'.'/'.$dataArray['objectname'].'/view/id/{{id}}" name="{{id}}" class="sprite view" title=\'View\'></a>';
247+
248+
/*if($dataArray['objectname'] == 'exitproc')
249+
$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>';
250+
else
251+
$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>';*/
252+
253+
$auth = Zend_Auth::getInstance();
254+
if($auth->hasIdentity())
255+
{
256+
$loginUserId = $auth->getStorage()->read()->id;
257+
$loginuserGroup = $auth->getStorage()->read()->group_id;
258+
$loginuserRole = $auth->getStorage()->read()->emprole;
259+
$is_og_head = $auth->getStorage()->read()->is_orghead;
260+
}
261+
if($dataArray['objectname'] == 'exitproc')
262+
$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>';
263+
elseif($loginuserRole != SUPERADMINROLE && $is_og_head!=1)
264+
$edit_str = '<a href= "'.BASE_URL.'exit'.'/'.$dataArray['objectname'].'/edit/id/{{id}}" name="{{id}}" id="edit{{id}}" class="sprite edit" title=\'Edit\'></a>';
265+
else
266+
$edit_str='';
267+
268+
// assign questions icon only for hr, management and superadmin
269+
if(($loginuserRole == SUPERADMINROLE || $loginuserGroup == HR_GROUP || $loginuserGroup == MANAGEMENT_GROUP) && $dataArray['objectname'] == 'allexitproc'){
270+
$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>';
271+
272+
}
273+
else {
274+
$assign_questions_str = '';
275+
}
276+
277+
// no delete action for all exit process
278+
if($loginuserRole == SUPERADMINROLE || $loginuserGroup == HR_GROUP || $loginuserGroup == MANAGEMENT_GROUP){
279+
$delete_str = '<a name="{{id}}" id="overallupdate_{{id}}" onclick= displayexitform(\''.BASE_URL.'exit/allexitproc/editpopup/id/{{id}}'.'\',\'\') href= javascript:void(0) title=\'Update Overall Status\' class="fa fa-ellipsis-v" ></a>';
280+
}else{
281+
$delete_str = '';
282+
}
283+
284+
285+
286+
if($dataArray['objectname'] == 'exitproc')
287+
$delete_str = '';
288+
$extra['action'] = array('name' => 'edit', 'value' =>'<div class="grid-action-align">
289+
'.((in_array('view',$actions_arr)?$view_str:'')).'
290+
'.((in_array('edit',$actions_arr)?$edit_str:'')).'
291+
'.((in_array('assign',$actions_arr)?'':$assign_questions_str )).'
292+
'.((in_array('update',$actions_arr)?'':$delete_str)).'
293+
294+
</div>');
295+
}
296+
297+
298+
299+
228300
}
229301
$extra['options'] = array();
230302
$addaction= '';
@@ -362,7 +434,27 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
362434
$output .= "<div class='add-btn-div'>";
363435
$output .= "<input type='button' onclick='window.location.href=\"".BASE_URL.$name.'/'.$action."\"' title = 'Raise an Incident' value='Raise an Incident' class='sprite addrequest' />";
364436
$output .= "</div>";
365-
}else{
437+
}
438+
elseif($name == 'exittypes' || $name == 'configureexitqs')
439+
{
440+
$output .= "<a href='".BASE_URL.'exit'.'/'.$name.'/'.$action."'><input type='button' title = 'Add' value='Add Record' class='sprite addrecord' /></a>";
441+
}elseif($name == 'allexitproc')
442+
{
443+
$output .= "";
444+
}else if($name=='exitproc'){
445+
$auth = Zend_Auth::getInstance();
446+
if($auth->hasIdentity())
447+
{
448+
$loginUserId = $auth->getStorage()->read()->id;
449+
$loginuserGroup = $auth->getStorage()->read()->group_id;
450+
$loginuserRole = $auth->getStorage()->read()->emprole;
451+
}
452+
if($loginuserRole == SUPERADMINROLE)
453+
$output .= "";
454+
else
455+
$output .= "<a href='".BASE_URL.'exit'.'/'.$name.'/'.$action."'><input type='button' title = 'Add' value='Add Record' class='sprite addrecord' /></a>";
456+
}
457+
else{
366458
$output .= "<a href='".BASE_URL.$name.'/'.$action."'><input type='button' title = 'Add' value='Add Record' class='sprite addrecord' /></a>";
367459
}
368460
$output .= "</div>";
@@ -710,6 +802,60 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
710802
});
711803
</script>";
712804
}
805+
// remove edit and delete if isused=1
806+
if($controllerName == 'exittypes' || $controllerName == 'configureexitqs')
807+
{
808+
if($p['isused'] == 1)
809+
{
810+
echo "<script type='text/javascript'>
811+
$(document).ready(function() {
812+
$('#del".$p['id']."').remove();
813+
$('#edit'+".$p['id'].").remove();
814+
});
815+
</script>";
816+
}
817+
}
818+
819+
820+
//hide edit when overall status is approved in exitprocess
821+
if($controllerName == 'allexitproc' && $p['overall_status'] == 'Approved')
822+
{
823+
echo "<script type='text/javascript'>
824+
$(document).ready(function() {
825+
826+
$('#edit'+".$p['id'].").remove();
827+
});
828+
</script>";
829+
echo "<script type='text/javascript'>
830+
$(document).ready(function() {
831+
832+
$('#overallupdate_'+".$p['id'].").remove();
833+
});
834+
</script>";
835+
836+
837+
}
838+
//hide edit when overall status is approved in exitprocess
839+
if($controllerName == 'allexitproc' && $p['overall_status'] != 'Approved')
840+
{
841+
echo "<script type='text/javascript'>
842+
$(document).ready(function() {
843+
844+
$('#assign_ques'+".$p['id'].").remove();
845+
});
846+
</script>";
847+
}
848+
849+
if($controllerName == 'exitproc' && $p['overall_status'] != 'Approved')
850+
{
851+
echo "<script type='text/javascript'>
852+
$(document).ready(function() {
853+
854+
$('#questions'+".$p['id'].").remove();
855+
});
856+
</script>";
857+
}
858+
713859
// hr can edit and delete any businessunit and dept announcemets---3.1
714860
//removing edit,dele icons for announcements
715861
/* if($controllerName == 'announcements')
@@ -753,7 +899,6 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
753899
* Second Case - Grid field
754900
* Keep 'default' case to allow display other Grids, normal.
755901
*/
756-
757902
switch ($menuName) {
758903
case 'CV Management':
759904
switch ($k) {
@@ -801,9 +946,19 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
801946
}
802947
break;
803948
case 'All Exit Procedures':
804-
if($k == 'createddate')
949+
if($k == 'initiateddate')
950+
{
951+
$output .= "<span ".$dataclass.">".sapp_Global::change_date($p[$k],'view')."</span>";
952+
}
953+
else
954+
{
955+
$output .= "<span ".$dataclass." title='".htmlentities(trim($p[$k]), ENT_QUOTES, "UTF-8")."' >".htmlentities($valToInclude, ENT_QUOTES, "UTF-8")."</span>";
956+
}
957+
break;
958+
case 'Initiate/Check Status':
959+
if($k == 'initiateddate')
805960
{
806-
$output .= "<span ".$dataclass.">".sapp_Global::getDisplayDate($p[$k])."</span>";
961+
$output .= "<span ".$dataclass.">".sapp_Global::change_date($p[$k],'view')."</span>";
807962
}
808963
else
809964
{
@@ -827,7 +982,7 @@ public function generateGrid ($name, $fields = null,$paginator=null,$extracolumn
827982
$output.="</tr>";
828983
}
829984
if($ii == 0){
830-
$output.= "<tr><td colspan='$colinr' class='no-data-td'><p class='no-data'>No data found</p></td></tr>";
985+
$output.= "<tr><td colspan='$colinr' class='no-data-td'><p class='no-data'>No data found.</p></td></tr>";
831986
}
832987
$output .= "</tbody>";
833988
$output .="</table>

0 commit comments

Comments
 (0)