viplist

code/moya-angular/moyaproxy.conf.json

 {
-  "/MoyaWeb": {
-    "target": "http://localhost:8080",
-    "secure": false
-  }
-}
+ "/MoyaWeb": {
+   "target": "http://localhost:8080",
+   "secure": false
+ }
+}
\ No newline at end of file

code/moya-angular/src/app/app-routing.module.ts

@@ -5,7 +5,8 @@ import {FrontpageComponent} from './components/frontpage/frontpage.component';
 
 const APP_ROUTES: Routes = [
   { path: 'login', component: LoginComponent },
-  { path: 'viplist', loadChildren: 'app/modules/viplist/viplist.module#ViplistModule'  },
+  { path: 'viplist', loadChildren:    'app/modules/viplist/viplist.module#ViplistModule'  },
+  { path: 'usersearch', loadChildren: 'app/modules/usersearch/usersearch.module#UsersearchModule'  },
   { path: 'old', loadChildren: 'app/modules/old-moya/old-moya.module#OldMoyaModule'  },
   { path: 'index',   component: FrontpageComponent },
   { path: '',   pathMatch: 'full' , redirectTo: '/index', }

code/moya-angular/src/app/app.module.ts

@@ -19,6 +19,7 @@ import { FrontpageComponent } from './components/frontpage/frontpage.component';
 import {HttpLink, HttpLinkModule} from 'apollo-angular-link-http';
 import {APOLLO_OPTIONS, ApolloModule} from 'apollo-angular';
 import {createApollo} from './shared/config/moya.config';
+import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
 
 @NgModule({
   declarations: [
@@ -38,7 +39,7 @@ import {createApollo} from './shared/config/moya.config';
     ApolloModule,
     HttpLinkModule,
 
-
+    BrowserAnimationsModule,
 
     AlertModule.forRoot(),
     TranslateModule.forRoot({

code/moya-angular/src/app/menu/defines/menu.ts

@@ -21,7 +21,8 @@ export class MENU {
       'name': 'users',
       'items': [
         { 'path': '/old/info', 'name': 'listusers', 'params': {p: 'useradmin/list.jsf'} },
-        { 'path': '/viplist/info', 'name': 'viplist'}
+        { 'path': '/viplist/info', 'name': 'viplist'},
+        { 'path': '/usersearch/info', 'name': 'usersearch'}
       ]}
   ];
 

code/moya-angular/src/app/modules/viplist/viplist.service.ts

@@ -68,6 +68,8 @@ export class ViplistService {
   }
 
 
+
+
   /**
    * Delete vip.
    *

code/moya-angular/src/assets/i18n/en.json

@@ -27,7 +27,8 @@
     "users": {
       "group": "Users",
       "listusers": "List users",
-      "viplist": "Vips"
+      "viplist": "Vips",
+      "usersearch": "Search users"
     },
     "frontpage": {
       "frontpage": "Frontpage",
@@ -86,5 +87,21 @@
     }
 
 
+  },
+  "user": {
+    "nick": "Nick",
+    "login": "Login",
+    "firstnames": "Firstnames",
+    "lastname": "Lastname",
+    "email": "Email",
+    "search": "Get users",
+    "role": "Name of role",
+    "roles": {
+      "roles": "Roles",
+      "info": "Select roles"
+    }
   }
+
+
+
 }

code/moya-angular/src/assets/i18n/fi.json

@@ -26,8 +26,10 @@
     "users": {
       "group": "Käyttäjät",
       "listusers": "Listaa käyttäjät",
-      "viplist": "Vipit"
+      "viplist": "Vipit",
+      "usersearch": "Etsi käyttäjiä"
     },
+
     "frontpage": {
       "frontpage": "Etusivu",
       "group": ""
@@ -85,5 +87,19 @@
     }
 
 
+  },
+
+  "user": {
+    "nick": "Nick",
+    "login": "Käyttäjätunnus",
+    "firstnames": "Etunimet",
+    "lastname": "Sukunimi",
+    "email": "Sähköposti",
+    "search": "Hae käyttäjät",
+    "role": "Roolin nimi",
+    "roles": {
+      "roles": "Roolit",
+      "info": "Valitse roolit"
+    }
   }
 }

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/RoleView.java

@@ -18,16 +18,14 @@
  */
 package fi.codecrew.moya.web.cdiview.user;
 
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import javax.ejb.EJB;
 import javax.enterprise.context.ConversationScoped;
 import javax.inject.Named;
 
+import fi.codecrew.moya.model.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,10 +36,6 @@ import fi.codecrew.moya.entitysearch.UserSearchQuery;
 import fi.codecrew.moya.enums.BortalApplication;
 import fi.codecrew.moya.enums.apps.IAppPermission;
 import fi.codecrew.moya.enums.apps.UserPermission;
-import fi.codecrew.moya.model.ApplicationPermission;
-import fi.codecrew.moya.model.EventUser;
-import fi.codecrew.moya.model.Role;
-import fi.codecrew.moya.model.User;
 import fi.codecrew.moya.utilities.SearchResult;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 import fi.codecrew.moya.web.helpers.BortalApplicationWrapper;