Upgrade to v15.0.OS

ext/admin/users/api/UsersAdminManager.php

@@ -19,6 +19,14 @@ if (!class_exists('UsersAdminManager')) {
 			$this->addModelClass('User');
 		}
 
+        public function getDashboardItemData(){
+            $data = array();
+            $user = new User();
+            $data['numberOfUsers'] = $user->Count("1 = 1");
+            return $data;
+
+        }
+
 	}
 }
 
@@ -53,4 +61,18 @@ if (!class_exists('User')) {
 	
 		var $_table = 'Users';
 	}	
+}
+
+if (!class_exists('UserRole')) {
+    class UserRole extends ICEHRM_Record {
+        public function getAdminAccess(){
+            return array("get","element","save","delete");
+        }
+
+        public function getUserAccess(){
+            return array();
+        }
+
+        var $_table = 'UserRoles';
+    }
 }

ext/admin/users/dashboard.html

@@ -0,0 +1,17 @@
+<div class="col-lg-3 col-xs-12">
+
+    <div class="small-box bg-yellow">
+        <div class="inner">
+            <h3>Users</h3>
+            <p id="numberOfUsers">
+                #_numberOfUsers_# Users
+            </p>
+        </div>
+        <div class="icon">
+            <i class="ion ion-person-add"></i>
+        </div>
+        <a href="#_moduleLink_#" class="small-box-footer" id="usersLink">
+            Manage Users <i class="fa fa-arrow-circle-right"></i>
+        </a>
+    </div>
+</div>

ext/admin/users/index.php

@@ -30,6 +30,7 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 			  
 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
 		<li class="active"><a id="tabUser" href="#tabPageUser">Users</a></li>
+		<li class=""><a id="tabUserRole" href="#tabPageUserRole">User Roles</a></li>
 	</ul>
 	 
 	<div class="tab-content">
@@ -41,6 +42,14 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 		
 			</div>
 		</div>
+        <div class="tab-pane" id="tabPageUserRole">
+            <div id="UserRole" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+            </div>
+            <div id="UserRoleForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+            </div>
+        </div>
 	</div>
 
 </div>
@@ -50,7 +59,7 @@ modJsList['tabUser'] = new UserAdapter('User');
 <?php if(isset($_REQUEST['action']) && $_REQUEST['action'] == "new" && isset($_REQUEST['object'])){?>
 modJsList['tabUser'].newInitObject = JSON.parse(Base64.decode('<?=$_REQUEST['object']?>'));
 <?php }?>
-
+modJsList['tabUserRole'] = new UserRoleAdapter('UserRole');
 var modJs = modJsList['tabUser'];
 
 </script>

ext/admin/users/lib.js

@@ -35,7 +35,9 @@ UserAdapter.method('getFormFields', function() {
 	        [ "username", {"label":"User Name","type":"text","validation":"username"}],
 	        [ "email", {"label":"Email","type":"text","validation":"email"}],
 	        [ "employee", {"label":"Employee","type":"select2","allow-null":true,"remote-source":["Employee","id","first_name+last_name"]}],
-	        [ "user_level", {"label":"User Level","type":"select","source":[["Admin","Admin"],["Manager","Manager"],["Employee","Employee"]]}]
+	        [ "user_level", {"label":"User Level","type":"select","source":[["Admin","Admin"],["Manager","Manager"],["Employee","Employee"],["Other","Other"]]}],
+            [ "user_roles", {"label":"User Roles","type":"select2multi","remote-source":["UserRole","id","name"]}],
+            [ "default_module", {"label":"Default Module","type":"select2","null-label":"No Default Module","allow-null":true,"remote-source":["Module","id","menu+label"]}]
 	];
 });
 
@@ -62,8 +64,8 @@ UserAdapter.method('saveUserFailCallBack', function(callBackData,serverData) {
 
 UserAdapter.method('doCustomValidation', function(params) {
 	var msg = null;
-	if(params['user_level'] != "Admin" && params['employee'] == "NULL"){
-		msg = "For non Admin users, you have to assign an employee when adding or editing the user.<br/>";
+	if((params['user_level'] != "Admin" && params['user_level'] != "Other") && params['employee'] == "NULL"){
+		msg = "For this user type, you have to assign an employee when adding or editing the user.<br/>";
 		msg += " You may create a new employee through 'Admin'->'Employees' menu";
 	}
 	return msg;
@@ -154,9 +156,39 @@ UserAdapter.method('changePasswordFailCallBack', function(callBackData,serverDat
 	this.showMessage("Error",callBackData);
 });
 
-UserAdapter.method('getHelpLink', function () {
-	return 'http://blog.icehrm.com/?page_id=132';
+
+
+
+
+/**
+ * UserRoleAdapter
+ */
+
+function UserRoleAdapter(endPoint,tab,filter,orderBy) {
+    this.initAdapter(endPoint,tab,filter,orderBy);
+}
+
+UserRoleAdapter.inherits(AdapterBase);
+
+
+
+UserRoleAdapter.method('getDataMapping', function() {
+    return [
+        "id",
+        "name"
+    ];
 });
 
+UserRoleAdapter.method('getHeaders', function() {
+    return [
+        { "sTitle": "ID" ,"bVisible":false},
+        { "sTitle": "Name"}
+    ];
+});
 
-
+UserRoleAdapter.method('getFormFields', function() {
+    return [
+        [ "id", {"label":"ID","type":"hidden"}],
+        [ "name", {"label":"Name","type":"text","validation":""}]
+    ];
+});

ext/admin/users/meta.json

@@ -1,11 +1,12 @@
 {
-"label":"Users",
-"menu":"System",
-"order":"2",
-"icon":"fa-user",
-"user_levels":["Admin"],
+  "label":"Users",
+  "menu":"System",
+  "order":"2",
+  "icon":"fa-user",
+  "user_levels":["Admin"],
+  "dashboardPosition":3,
 
-"permissions":
-	{
-	}
+  "permissions":
+      {
+      }
 }