v26.6.0 updates

2019-07-26 03:53:24 +02:00
parent c3344b99fa
commit fd99ea299e
195 changed files with 18838 additions and 2639 deletions
--- a/core/modules/attendance/index.php
+++ b/core/modules/attendance/index.php
@@ -5,6 +5,7 @@
 */

 $moduleName = 'attendance';
+$moduleGroup = 'modules';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
--- a/core/modules/attendance/meta.json
+++ b/core/modules/attendance/meta.json
@@ -2,7 +2,7 @@
    "label": "Attendance",
    "menu": "Time Management",
    "order": "2",
-    "icon": "fa-clock-o",
+    "icon": "fa-clock",
    "user_levels": [
        "Admin",
        "Manager",
@@ -12,4 +12,4 @@
    "permissions": [],
    "model_namespace": "\\Attendance\\Common\\Model",
    "manager": "\\Attendance\\User\\Api\\AttendanceModulesManager"
-}
+}
--- a/core/modules/dashboard/index.php
+++ b/core/modules/dashboard/index.php
@@ -5,6 +5,7 @@
 */

 $moduleName = 'dashboard';
+$moduleGroup = 'modules';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
--- a/core/modules/dependents/index.php
+++ b/core/modules/dependents/index.php
@@ -4,7 +4,8 @@
 Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
 */

-$moduleName = 'emergency_contact';
+$moduleName = 'dependents';
+$moduleGroup = 'modules';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
--- a/core/modules/dependents/meta.json
+++ b/core/modules/dependents/meta.json
@@ -2,7 +2,7 @@
 "label":"Dependents",
 "menu":"Personal Information",
 "order":"5",
-"icon":"fa-sliders",
+"icon":"fa-expand",
 "user_levels":["Admin","Manager","Employee"],

 "permissions":
--- a/core/modules/emergency_contact/index.php
+++ b/core/modules/emergency_contact/index.php
@@ -5,6 +5,7 @@
 */

 $moduleName = 'emergency_contact';
+$moduleGroup = 'modules';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
--- a/core/modules/employees/index.php
+++ b/core/modules/employees/index.php
@@ -5,6 +5,7 @@
 */

 $moduleName = 'employees';
+$moduleGroup = 'modules';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
@@ -30,7 +31,7 @@ if (defined('SYM_CLIENT')) {
 } else if (defined('REST_API_BASE')){
    $restApiBase = REST_API_BASE;
 } else {
-    $restApiBase = CLIENT_BASE_PATH.'api/';
+    $restApiBase = CLIENT_BASE_URL.'api/';
 }
 ?>
 <script type="text/javascript" src="<?=BASE_URL.'js/d3js/d3.js?v='.$jsVersion?>"></script>
--- a/core/modules/loans/index.php
+++ b/core/modules/loans/index.php
@@ -5,6 +5,7 @@
 */

 $moduleName = 'loans';
+$moduleGroup = 'modules';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
--- a/core/modules/loans/meta.json
+++ b/core/modules/loans/meta.json
@@ -2,7 +2,7 @@
    "label": "Loans",
    "menu": "Finance",
    "order": "3",
-    "icon": "fa-shield",
+    "icon": "fa-money-check",
    "user_levels": [
        "Admin",
        "Manager",
@@ -11,4 +11,4 @@
    "permissions": [],
    "model_namespace": "\\Loans\\Common\\Model",
    "manager": "\\Loans\\User\\Api\\LoansModulesManager"
-}
+}
--- a/core/modules/meta.json
+++ b/core/modules/meta.json
@@ -1,13 +1,13 @@
 {
 "Discussions":"fa-comments",
-"Personal Information":"fa-male",
-"Leave":"fa-calendar-o",
-"Time Management":"fa-clock-o",
-"Documents":"fa-files-o",
+"Personal Information":"fa-grip-horizontal",
+"Leave":"fa-calendar-alt",
+"Time Management":"fa-hourglass-half",
+"Documents":"fa-file-alt",
 "Company":"fa-building",
 "Training":"fa-briefcase",
-"Performance":"fa-crosshairs",
-"Travel Management":"fa-plane",
-"Finance":"fa-money",
-"User Reports":"fa-file-text"
+"Performance":"fa-bezier-curve",
+"Travel Management":"fa-globe",
+"Finance":"fa-calculator",
+"User Reports":"fa-book-reader"
 }
--- a/core/modules/overtime/index.php
+++ b/core/modules/overtime/index.php
@@ -5,6 +5,7 @@
 */

 $moduleName = 'overtime';
+$moduleGroup = 'modules';
 $moduleMainName = "EmployeeOvertime"; // for creating module js lib
 $subModuleMainName = "SubordinateEmployeeOvertime";
 $moduleItemName = "Overtime Request"; // For permissions
--- a/core/modules/overtime/meta.json
+++ b/core/modules/overtime/meta.json
@@ -2,7 +2,7 @@
    "label": "Overtime Requests",
    "menu": "Time Management",
    "order": "5",
-    "icon": "fa-align-center",
+    "icon": "fa-calendar-plus",
    "user_levels": [
        "Admin",
        "Manager",
@@ -12,4 +12,4 @@
    "permissions": [],
    "model_namespace": "\\Overtime\\Common\\Model",
    "manager": "\\Overtime\\User\\Api\\OvertimeModulesManager"
-}
+}
--- a/core/modules/projects/index.php
+++ b/core/modules/projects/index.php
@@ -5,6 +5,7 @@
 */

 $moduleName = 'projects';
+$moduleGroup = 'modules';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
--- a/core/modules/projects/meta.json
+++ b/core/modules/projects/meta.json
@@ -2,7 +2,7 @@
    "label": "Projects",
    "menu": "Time Management",
    "order": "1",
-    "icon": "fa-pencil-square",
+    "icon": "fa-project-diagram",
    "user_levels": [
        "Admin",
        "Manager",
@@ -23,4 +23,4 @@
    },
    "model_namespace": "\\Projects\\Common\\Model",
    "manager": "\\Projects\\User\\Api\\ProjectsModulesManager"
-}
+}
--- a/core/modules/qualifications/index.php
+++ b/core/modules/qualifications/index.php
@@ -5,6 +5,7 @@
 */

 $moduleName = 'qualifications';
+$moduleGroup = 'modules';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
--- a/core/modules/reports/index.php
+++ b/core/modules/reports/index.php
@@ -1,24 +1,25 @@
-<?php 
+<?php

-$moduleName = 'Reports';
+$moduleName = 'reports';
+$moduleGroup = 'modules';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 $additionalJs = array();
 include APP_BASE_PATH.'modulejslibs.inc.php';
 ?>
 <div class="span9">
-			  
+
 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
 		<li class="active"><a id="tabUserReport" href="#tabPageUserReport"><?=t('Reports')?></a></li>
 	</ul>
-	 
+
 	<div class="tab-content">
 		<div class="tab-pane active" id="tabPageUserReport">
 			<div id="UserReport" class="reviewBlock" data-content="List" style="padding-left:5px;">
-		
+
 			</div>
 			<div id="UserReportForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
-		
+
 			</div>
 		</div>

@@ -40,4 +41,4 @@ modJsList['tabReport'].setShowAddNew(false);
 var modJs = modJsList['tabUserReport'];

 </script>
-<?php include APP_BASE_PATH.'footer.php';?>      
+<?php include APP_BASE_PATH.'footer.php';?>
--- a/core/modules/reports/meta.json
+++ b/core/modules/reports/meta.json
@@ -2,7 +2,7 @@
    "label": "Reports",
    "menu": "User Reports",
    "order": "1",
-    "icon": "fa-file-o",
+    "icon": "fa-window-maximize",
    "user_levels": [
        "Admin",
        "Manager",
@@ -12,4 +12,4 @@
    "permissions": [],
    "model_namespace": "\\Reports\\Common\\Model",
    "manager": "\\Reports\\User\\Api\\ReportsModulesManager"
-}
+}
--- a/core/modules/salary/index.php
+++ b/core/modules/salary/index.php
@@ -5,6 +5,7 @@
 */

 $moduleName = 'salary';
+$moduleGroup = 'modules';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
--- a/core/modules/staffdirectory/index.php
+++ b/core/modules/staffdirectory/index.php
@@ -4,7 +4,8 @@
 Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
 */

-$moduleName = 'salary';
+$moduleName = 'staffdirectory';
+$moduleGroup = 'modules';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
--- a/core/modules/time_sheets/index.php
+++ b/core/modules/time_sheets/index.php
@@ -4,7 +4,8 @@
 Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
 */

-$moduleName = 'employee_TimeSheet';
+$moduleName = 'time_sheets';
+$moduleGroup = 'modules';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
@@ -97,7 +98,7 @@ modJsList['tabSubEmployeeTimeSheetAll'].setNeedStartEndTime(<?=$startEndTimeNeed
 modJsList['tabEmployeeTimeEntry'] = new EmployeeTimeEntryAdapter('EmployeeTimeEntry','EmployeeTimeEntry','','');
 modJsList['tabEmployeeTimeEntry'].setShowAddNew(false);

-modJsList['tabQtsheet'] = new QtsheetAdapter('Qtsheet','Qtsheet');
+modJsList['tabQtsheet'] = new QtsheetAdapter('Qtsheet','Qtsheet','','name');
 modJsList['tabQtsheet'].setRemoteTable(false);
 modJsList['tabQtsheet'].setShowAddNew(false);
 modJsList['tabQtsheet'].setModulePath('modules=time_sheets');
--- a/core/modules/time_sheets/meta.json
+++ b/core/modules/time_sheets/meta.json
@@ -2,7 +2,7 @@
 	"label":"Time Sheets",
 	"menu":"Time Management",
 	"order":"3",
-	"icon":"fa-check-circle-o",
+	"icon":"fa-stopwatch",
 	"user_levels":["Admin","Manager","Employee"],
 	  "dashboardPosition":104,

--- a/core/modules/travel/index.php
+++ b/core/modules/travel/index.php
@@ -5,6 +5,7 @@
 */

 $moduleName = 'travel';
+$moduleGroup = 'modules';
 $moduleMainName = "EmployeeTravelRecord"; // for creating module js lib
 $subModuleMainName = "SubordinateEmployeeTravelRecord";
 $moduleItemName = "Travel Request"; // For permissions