License updated to GPLv3

🧲 New features
Custom user role permissions
Employee edit form updated
Employee daily task list
Attendance and employee distribution charts on dashboard
Improvements to company structure and company assets module
Improved tables for displaying data in several modules
Faster data loading (specially for employee module)
Initials based profile pictures
Re-designed login page
Re-designed user profile page
Improvements to filtering
New REST endpoints for employee qualifications

🐛 Bug fixes
Fixed, issue with managers being able to create performance reviews for employees who are not their direct reports
Fixed, issues related to using full profile image instead of using smaller version of profile image
Changing third gender to other
Improvements and fixes for internal frontend data caching

core/modules/employees/customTemplates/myDetails.html

@@ -67,7 +67,6 @@
 				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="gender"></label>
 			</div>
 		</div>
-		<hr/>
 	    <div class="row-fluid">
 
 			<div class="col-xs-6 col-md-3" style="font-size:16px;">
@@ -109,7 +108,6 @@
 				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="country_Name"></label>
 			</div>
 		</div>
-		<hr/>
 	    <div class="row-fluid">
 			<div class="col-xs-6 col-md-3" style="font-size:16px;">
 				<label class="control-label col-xs-12" style="font-size:13px;">#_label_postal_code_#</label>
@@ -154,7 +152,6 @@
 				<label class="control-label col-xs-12 iceLabel" style="font-size:13px;font-weight: bold;" id="subordinates"></label>
 			</div>
 		</div>
-		<hr/>
 		<div class="row-fluid">
 			<div class="col-xs-6 col-md-3" style="font-size:16px;">
 				<label class="control-label col-xs-12" style="font-size:13px;">#_label_department_#</label>

core/modules/employees/index.php

@@ -4,35 +4,19 @@
  Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
  */
 
+use Classes\BaseService;
+use Classes\JwtTokenService;
+
 $moduleName = 'employees';
 $moduleGroup = 'modules';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
-$fieldNameMap = \Classes\BaseService::getInstance()->getFieldNameMappings("Employee");
-$customFields = \Classes\BaseService::getInstance()->getCustomFields("Employee");
+$fieldNameMap = BaseService::getInstance()->getFieldNameMappings("Employee");
+$customFields = BaseService::getInstance()->getCustomFields("Employee");
 
-$restApiBase = '';
-$user = \Classes\BaseService::getInstance()->getCurrentUser();
-if (empty($user)) {
-    return;
-}
-$dbUser = new \Users\Common\Model\User();
-$dbUser->Load("id = ?", array($user->id));
-$resp = \Classes\RestApiManager::getInstance()->getAccessTokenForUser($dbUser);
-if ($resp->getStatus() != \Classes\IceResponse::SUCCESS) {
-    \Utils\LogManager::getInstance()->error(
-        "Error occurred while creating REST Api access token for ".$user->username
-    );
-}
-
-if (defined('SYM_CLIENT')) {
-    $restApiBase = WEB_APP_BASE_URL.'/api/'.SYM_CLIENT.'/';
-} else if (defined('REST_API_BASE')){
-    $restApiBase = REST_API_BASE;
-} else {
-    $restApiBase = CLIENT_BASE_URL.'api/';
-}
+$jwtService = new JwtTokenService();
+$threeMonthAccessToken = $jwtService->create(3600 * 24 * 180);
 ?>
 <script type="text/javascript" src="<?=BASE_URL.'js/d3js/d3.js?v='.$jsVersion?>"></script>
 <script type="text/javascript" src="<?=BASE_URL.'js/d3js/d3.layout.js?v='.$jsVersion?>"></script>
@@ -69,12 +53,9 @@ path.link {
 
 	<div class="tab-content">
 		<div class="tab-pane active" id="tabPageEmployee">
-			<div id="Employee" class="container reviewBlock" data-content="List" style="padding:25px 0px 0px 0px; width:99%;">
-
-			</div>
-			<div id="EmployeeForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
-
-			</div>
+			<div id="Employee" class="container reviewBlock" data-content="List" style="padding:25px 0px 0px 0px; width:99%;"></div>
+			<div id="EmployeeForm"></div>
+			<div id="EmployeeFilterForm"></div>
 		</div>
 		<div class="tab-pane reviewBlock" id="tabPageCompanyGraph" style="overflow-x: scroll;">
 
@@ -84,9 +65,7 @@ path.link {
 			<div class="row">
 				<div class="panel panel-default" style="width:97.5%;">
 					<div class="panel-heading"><h4>Api Access Token</h4></div>
-					<div class="panel-body" id="apiToken">
-						<?=$resp->getData()?>
-					</div>
+					<div class="panel-body wrap" id="apiToken"><?=$threeMonthAccessToken?></div>
 			    </div>
                 <div class="panel panel-default" style="width:97.5%;">
                     <div class="panel-heading"><h4>Mobile Authentication Code</h4></div>
@@ -100,17 +79,23 @@ path.link {
 
 </div>
 <script>
-var modJsList = new Array();
+var modJsList = [];
 modJsList['tabEmployee'] = new EmployeeAdapter('Employee');
 modJsList['tabEmployee'].setFieldNameMap(<?=json_encode($fieldNameMap)?>);
 modJsList['tabEmployee'].setCustomFields(<?=json_encode($customFields)?>);
+
+modJsList['tabEmployee'].setObjectTypeName('Employee');
+modJsList['tabEmployee'].setModalType(EmployeeAdapter.MODAL_TYPE_STEPS);
+$(document).ready(() => modJsList['tabEmployee'].initForm());
+
 modJsList['tabCompanyGraph'] = new CompanyGraphAdapter('CompanyStructure');
 modJsList['tabApiAccess'] = new ApiAccessAdapter('ApiAccess');
 
-modJsList['tabApiAccess'].setApiUrl('<?=$restApiBase?>');
-modJsList['tabApiAccess'].setToken('<?=$resp->getData()?>');
+modJsList['tabApiAccess'].setToken('<?=$threeMonthAccessToken?>');
 
 var modJs = modJsList['tabEmployee'];
 
 </script>
+<div id="EmployeeFormReact"></div>
+<div id="dataGroup"></div>
 <?php include APP_BASE_PATH.'footer.php';?>

core/modules/reports/customTemplates/client_project_time_report.html

@@ -5,11 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link href="{{BASE_URL}}themecss/AdminLTE.css" rel="stylesheet">
-    <link href="{{BASE_URL}}themecss/bootstrap.min.css" rel="stylesheet">
-    <link href="{{BASE_URL}}themecss/font-awesome.min.css" rel="stylesheet">
-    <link href="{{BASE_URL}}themecss/ionicons.min.css" rel="stylesheet">
-    <script src="{{BASE_URL}}themejs/bootstrap.js"></script>
+    <link href="{{BASE_URL}}dist/third-party.css?v=<?=$cssVersion?>" rel="stylesheet">
+    <script type="text/javascript" src="{{BASE_URL}}dist/third-party.js?v=<?=$jsVersion?>"></script>
 </head>
 <body>
 <div class="container" style="margin-top:10px;">
@@ -153,4 +150,4 @@
     }
 </style>
 </body>
-</html>
+</html>

core/modules/reports/customTemplates/payslip.html

@@ -5,11 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link href="{{BASE_URL}}themecss/AdminLTE.css" rel="stylesheet">
-    <link href="{{BASE_URL}}themecss/bootstrap.min.css" rel="stylesheet">
-    <link href="{{BASE_URL}}themecss/font-awesome.min.css" rel="stylesheet">
-    <link href="{{BASE_URL}}themecss/ionicons.min.css" rel="stylesheet">
-    <script src="{{BASE_URL}}themejs/bootstrap.js"></script>
+    <link href="{{BASE_URL}}dist/third-party.css?v=<?=$cssVersion?>" rel="stylesheet">
+    <script type="text/javascript" src="{{BASE_URL}}dist/third-party.js?v=<?=$jsVersion?>"></script>
 </head>
 <body>
 <div class="container" style="margin-top:10px;">