galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Updates from pro v19

Browse Source
This commit is contained in:
Gamonoid
2016-11-25 17:20:39 +01:00
parent 4c171bfce3
commit e6b4245334
273 changed files with 867 additions and 67718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/modules/attendance/api/AttendanceModulesManager.php
View File

@@ -21,4 +21,4 @@ if (!class_exists('AttendanceModulesManager')) {
}
}
}
}

2
ext/modules/attendance/dashboard.html
View File

@@ -14,4 +14,4 @@
<t>Record Attendance</t> <i class="fa fa-arrow-circle-right"></i>
</a>
</div>
</div>
</div>

2
ext/modules/attendance/index.php
View File

@@ -74,4 +74,4 @@ var modJs = modJsList['tabAttendance'];
</div>
</div>
</div>
<?php include APP_BASE_PATH.'footer.php';?>
<?php include APP_BASE_PATH.'footer.php';?>

2
ext/modules/dashboard/index.php
View File

@@ -95,4 +95,4 @@ modJs.getInitData();
*/
</script>
<?php include APP_BASE_PATH.'footer.php';?>
<?php include APP_BASE_PATH.'footer.php';?>

2
ext/modules/dependents/index.php
View File

@@ -60,4 +60,4 @@ modJsList['tabEmployeeDependent'].setShowEdit(false);
var modJs = modJsList['tabEmployeeDependent'];
</script>
<?php include APP_BASE_PATH.'footer.php';?>
<?php include APP_BASE_PATH.'footer.php';?>

2
ext/modules/emergency_contact/index.php
View File

@@ -61,4 +61,4 @@ modJsList['tabEmergencyContact'].setShowEdit(false);
var modJs = modJsList['tabEmergencyContact'];
</script>
<?php include APP_BASE_PATH.'footer.php';?>
<?php include APP_BASE_PATH.'footer.php';?>

9
ext/modules/employees/customTemplates/myDetails.html
View File

@@ -167,7 +167,14 @@
<div class="row" id="customFieldsCont" style="margin-left:10px;margin-top:20px;">
<div class="panel panel-default" style="width:97.5%;">
<div class="panel-heading"><h4>Other Details</h4></div>
<div class="panel-body">
<div class="row-fluid" id="customFields">
</div>
</div>
</div>
</div>
@@ -207,4 +214,4 @@
</div>
</div>
</div>
</div>
</div>

2
ext/modules/employees/dashboard.html
View File

@@ -14,4 +14,4 @@
<t>View/Edit Profile</t> <i class="fa fa-arrow-circle-right"></i>
</a>
</div>
</div>
</div>

2
ext/modules/employees/index.php
View File

@@ -83,4 +83,4 @@ modJsList['tabCompanyGraph'] = new CompanyGraphAdapter('CompanyStructure');
var modJs = modJsList['tabEmployee'];
</script>
<?php include APP_BASE_PATH.'footer.php';?>
<?php include APP_BASE_PATH.'footer.php';?>

2
ext/modules/employees/lib.js
View File

@@ -263,7 +263,7 @@ EmployeeAdapter.method('modEmployeeGetSuccessCallBack' , function(data) {
}
}
html = html.replace(/#_.+_#/i,"");
html = html.replace(/#_.+_#/gi,"");
html = html.replace(/_id_/g,data.id);

2
ext/modules/loans/index.php
View File

@@ -55,4 +55,4 @@ modJsList['tabEmployeeCompanyLoan'].setShowEdit(true);
var modJs = modJsList['tabEmployeeCompanyLoan'];
</script>
<?php include APP_BASE_PATH.'footer.php';?>
<?php include APP_BASE_PATH.'footer.php';?>

2
ext/modules/projects/api/ProjectsModulesManager.php
View File

@@ -62,4 +62,4 @@ if (!class_exists('EmployeeProject')) {
return new IceResponse(IceResponse::SUCCESS,$obj);
}
}
}
}

2
ext/modules/projects/index.php
View File

@@ -61,4 +61,4 @@ modJsList['tabEmployeeProject'].setShowEdit(false);
var modJs = modJsList['tabEmployeeProject'];
</script>
<?php include APP_BASE_PATH.'footer.php';?>
<?php include APP_BASE_PATH.'footer.php';?>

2
ext/modules/qualifications/index.php
View File

@@ -81,4 +81,4 @@ modJsList['tabEmployeeLanguage'] = new EmployeeLanguageAdapter('EmployeeLanguage
var modJs = modJsList['tabEmployeeSkill'];
</script>
<?php include APP_BASE_PATH.'footer.php';?>
<?php include APP_BASE_PATH.'footer.php';?>

2
ext/modules/salary/index.php
View File

@@ -61,4 +61,4 @@ modJsList['tabEmployeeSalary'].setShowEdit(false);
var modJs = modJsList['tabEmployeeSalary'];
</script>
<?php include APP_BASE_PATH.'footer.php';?>
<?php include APP_BASE_PATH.'footer.php';?>

2
ext/modules/time_sheets/api/Time_sheetsModulesManager.php
View File

@@ -149,4 +149,4 @@ if (!class_exists('EmployeeTimeSheet')) {
}
}
}

2
ext/modules/time_sheets/dashboard.html
View File

@@ -14,4 +14,4 @@
<t>Update Time Sheet</t> <i class="fa fa-arrow-circle-right"></i>
</a>
</div>
</div>
</div>

2
ext/modules/time_sheets/lib.js
View File

@@ -696,4 +696,4 @@ EmployeeTimeEntryAdapter.method('deleteRow', function(id) {
EmployeeTimeEntryAdapter.method('deleteSuccessCallBack', function(callBackData,serverData) {
modJs.getTimeEntries();
});
});

2
ext/modules/time_sheets/templates/form_template.html
View File

@@ -20,4 +20,4 @@
<button id="add_time_sheet_entry" style="margin-left:5px;display:none;" onclick="try{modJs.openTimeEntryDialog()}catch(e){};return false;" class="btn"><span class="icon-plus-sign"></span> <t>Add Time Entry</t></button>
<button id="submit_sheet" onclick="modJs.changeTimeSheetStatusWithId(modJs.currentId,'Submitted');return false;" class="btn" style="display:none;"><span class="icon-ok"></span> <t>Submit</t></button>
</div>
</form>
</form>

2
ext/modules/travel/api/TravelActionManager.php
View File

@@ -16,4 +16,4 @@ class TravelActionManager extends ApproveModuleActionManager{
public function getModuleTabUrl(){
return "g=modules&n=travel&m=module_Travel_Management#tabSubordinateEmployeeTravelRecord";
}
}
}

2
ext/modules/travel/dashboard.html
View File

@@ -14,4 +14,4 @@
<t>Travel Management</t> <i class="fa fa-arrow-circle-right"></i>
</a>
</div>
</div>
</div>

2
ext/modules/travel/index.php
View File

@@ -100,4 +100,4 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
var modJs = modJsList['tab<?=$moduleMainName?>'];
</script>
<?php include APP_BASE_PATH.'footer.php';?>
<?php include APP_BASE_PATH.'footer.php';?>