diff --git a/ext/admin/dashboard/index.php b/ext/admin/dashboard/index.php index 0e6c6581..bae7fcc4 100644 --- a/ext/admin/dashboard/index.php +++ b/ext/admin/dashboard/index.php @@ -26,24 +26,9 @@ define('MODULE_PATH',dirname(__FILE__)); include APP_BASE_PATH.'header.php'; include APP_BASE_PATH.'modulejslibs.inc.php'; ?>
-
-
-

Why not upgrade to IceHrm Pro Version

-

- IceHrm Pro is the feature rich upgrade to IceHrm open source version. It comes with improved modules for - employee management, leave management, LDAP support and number of other features over open source version. - Hit this link to do a full one to one comparison. - - Also you can learn more about IceHrm Pro here -
-
- Buy IceHrm Pro -

-
-
-
+
@@ -62,7 +47,7 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
-
+
@@ -79,7 +64,7 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
-
+
@@ -96,7 +81,7 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
-
+
@@ -112,11 +97,9 @@ include APP_BASE_PATH.'modulejslibs.inc.php'; Update Clients/Projects
-
-
- -
-
+
+ +
@@ -135,7 +118,7 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
-
+
@@ -152,7 +135,7 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
-
+
@@ -168,9 +151,63 @@ include APP_BASE_PATH.'modulejslibs.inc.php'; Update Settings
-
+
+
+ +
+
+

+ Travel +

+

+ Requests +

+
+
+ +
+ + Manage Travel + +
+
+
+ +
+
+

+ Help +

+

+ User Guide +

+
+
+ +
+ + Documentation + +
+
+
+
+

Why not upgrade to IceHrm Pro Version

+

+ IceHrm Pro is the feature rich upgrade to IceHrm open source version. It comes with improved modules for + employee management, leave management, LDAP support and number of other features over open source version. + Hit this link to do a full one to one comparison. + + Also you can learn more about IceHrm Pro here +
+
+ Buy IceHrm Pro +

+
+
+
@@ -189,6 +226,9 @@ $("#attendanceLink").attr("href",modJs.getCustomUrl('?g=admin&n=attendance&m=adm $("#leaveLink").attr("href",modJs.getCustomUrl('?g=admin&n=leaves&m=admin_Admin')); $("#reportsLink").attr("href",modJs.getCustomUrl('?g=admin&n=reports&m=admin_Reports')); $("#settingsLink").attr("href",modJs.getCustomUrl('?g=admin&n=settings&m=admin_System')); +$("#travelLink").attr("href",modJs.getCustomUrl('?g=admin&n=travel&m=admin_Employees')); + +$("#icehrmHelpLink").attr("href",modJs.getCustomUrl('http://blog.icehrm.com/docs/home/')); modJs.getInitData(); diff --git a/ext/modules/dashboard/index.php b/ext/modules/dashboard/index.php index f6b4feb0..6635c528 100644 --- a/ext/modules/dashboard/index.php +++ b/ext/modules/dashboard/index.php @@ -28,7 +28,7 @@ include APP_BASE_PATH.'modulejslibs.inc.php'; ?>
-
+
@@ -47,7 +47,7 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
-
+
@@ -64,7 +64,7 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
-
+
@@ -80,7 +80,131 @@ include APP_BASE_PATH.'modulejslibs.inc.php'; More info
-
+
+ +
+ +
+
+

+ My Travel +

+

+ Requests +

+
+
+ +
+ + Travel Requests + +
+
+ +
+ +
+
+

+ Help +

+

+ User Guide +

+
+
+ +
+ + Documentation + +
+
+ + user_level == "Manager" || $user->user_level == "Admin"){?> +
+ +
+
+

+ Employees +

+

+ Subordinates +

+
+
+ +
+ + Manage Subordinates + +
+
+ + +
+ +
+
+

+ Travel +

+

+ Management +

+
+
+ +
+ + Manage Travel + +
+
+ + +
+ +
+
+

+ Attendance +

+

+ Monitor +

+
+
+ +
+ + View Attendance + +
+
+ +
+ +
+
+

Reports

+

+ View / Download Reports +

+
+
+ +
+ + Create a Report + +
+
+ + +
@@ -92,9 +216,15 @@ modJsList['tabDashboard'] = new DashboardAdapter('Dashboard','Dashboard'); var modJs = modJsList['tabDashboard']; $("#atteandanceLink").attr("href",modJs.getCustomUrl('?g=modules&n=attendance&m=module_Time_Management')); +$("#attendanceAdminLink").attr("href",modJs.getCustomUrl('?g=admin&n=attendance&m=admin_Admin')); $("#leavesLink").attr("href",modJs.getCustomUrl('?g=modules&n=leaves&m=module_Leaves')); $("#timesheetLink").attr("href",modJs.getCustomUrl('?g=modules&n=time_sheets&m=module_Time_Management')); -$("#projectsLink").attr("href",modJs.getCustomUrl('?g=modules&n=projects&m=module_Personal_Information')); +$("#projectsLink").attr("href",modJs.getCustomUrl('?g=modules&n=projects&m=module_Time_Management')); +$("#traveAdminlLink").attr("href",modJs.getCustomUrl('?g=admin&n=travel&m=admin_Employees')); +$("#traveLink").attr("href",modJs.getCustomUrl('?g=modules&n=travel&m=module_Travel_Management')); +$("#reportsLink").attr("href",modJs.getCustomUrl('?g=admin&n=reports&m=admin_Reports')); + +$("#icehrmHelpLink").attr("href",modJs.getCustomUrl('http://blog.icehrm.com/docs/home/')); modJs.getPunch(); modJs.getPendingLeaves(); diff --git a/ext/modules/salary/meta.json b/ext/modules/salary/meta.json index 1cce4a78..1439ac84 100644 --- a/ext/modules/salary/meta.json +++ b/ext/modules/salary/meta.json @@ -1,7 +1,7 @@ { "label":"Salary", -"menu":"Personal Information", -"order":"4", +"menu":"Finance", +"order":"2", "icon":"fa-calculator", "user_levels":["Admin","Manager","Employee"], @@ -19,4 +19,4 @@ "Delete Salary":"No" } } -} \ No newline at end of file +} diff --git a/test/test.config.php b/test/test.config.php index bbe70ba5..ff49d35a 100644 --- a/test/test.config.php +++ b/test/test.config.php @@ -19,7 +19,7 @@ define('APP_DB', 'icehrm_os_db_test'); define('APP_USERNAME', MYSQL_ROT_USER); define('APP_PASSWORD', MYSQL_ROT_PASS); define('APP_HOST', 'localhost'); -define('APP_CON_STR', 'mysql://'.APP_USERNAME.':'.APP_PASSWORD.'@'.APP_HOST.'/'.APP_DB); +define('APP_CON_STR', 'mysqli://'.APP_USERNAME.':'.APP_PASSWORD.'@'.APP_HOST.'/'.APP_DB); //file upload define('FILE_TYPES', 'jpg,png,jpeg');