Skip to content

Codecrew / Moya

Go to a project
Commit 02859a50 by Liv Haapala
Options

viplist

1 parent 5f0685c6
Inline Side-by-side
Showing with 52 additions and 19 deletions
code/moya-angular/moyaproxy.conf.json
{ {
"/MoyaWeb": { "/MoyaWeb": {
"target": "http://localhost:8080", "target": "http://localhost:8080",
"secure": false "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'; ...@@ -5,7 +5,8 @@ import {FrontpageComponent} from './components/frontpage/frontpage.component';
const APP_ROUTES: Routes = [ const APP_ROUTES: Routes = [
{ path: 'login', component: LoginComponent }, { 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: 'old', loadChildren: 'app/modules/old-moya/old-moya.module#OldMoyaModule' },
{ path: 'index', component: FrontpageComponent }, { path: 'index', component: FrontpageComponent },
{ path: '', pathMatch: 'full' , redirectTo: '/index', } { path: '', pathMatch: 'full' , redirectTo: '/index', }
......
code/moya-angular/src/app/app.module.ts
...@@ -19,6 +19,7 @@ import { FrontpageComponent } from './components/frontpage/frontpage.component'; ...@@ -19,6 +19,7 @@ import { FrontpageComponent } from './components/frontpage/frontpage.component';
import {HttpLink, HttpLinkModule} from 'apollo-angular-link-http'; import {HttpLink, HttpLinkModule} from 'apollo-angular-link-http';
import {APOLLO_OPTIONS, ApolloModule} from 'apollo-angular'; import {APOLLO_OPTIONS, ApolloModule} from 'apollo-angular';
import {createApollo} from './shared/config/moya.config'; import {createApollo} from './shared/config/moya.config';
import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
@NgModule({ @NgModule({
declarations: [ declarations: [
...@@ -38,7 +39,7 @@ import {createApollo} from './shared/config/moya.config'; ...@@ -38,7 +39,7 @@ import {createApollo} from './shared/config/moya.config';
ApolloModule, ApolloModule,
HttpLinkModule, HttpLinkModule,
BrowserAnimationsModule,
AlertModule.forRoot(), AlertModule.forRoot(),
TranslateModule.forRoot({ TranslateModule.forRoot({
......
code/moya-angular/src/app/menu/defines/menu.ts
...@@ -21,7 +21,8 @@ export class MENU { ...@@ -21,7 +21,8 @@ export class MENU {
'name': 'users', 'name': 'users',
'items': [ 'items': [
{ 'path': '/old/info', 'name': 'listusers', 'params': {p: 'useradmin/list.jsf'} }, { '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 { ...@@ -68,6 +68,8 @@ export class ViplistService {
} }
/** /**
* Delete vip. * Delete vip.
* *
......
code/moya-angular/src/assets/i18n/en.json
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
"users": { "users": {
"group": "Users", "group": "Users",
"listusers": "List users", "listusers": "List users",
"viplist": "Vips" "viplist": "Vips",
"usersearch": "Search users"
}, },
"frontpage": { "frontpage": {
"frontpage": "Frontpage", "frontpage": "Frontpage",
...@@ -86,5 +87,21 @@ ...@@ -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 @@ ...@@ -26,8 +26,10 @@
"users": { "users": {
"group": "Käyttäjät", "group": "Käyttäjät",
"listusers": "Listaa käyttäjät", "listusers": "Listaa käyttäjät",
"viplist": "Vipit" "viplist": "Vipit",
"usersearch": "Etsi käyttäjiä"
}, },
"frontpage": { "frontpage": {
"frontpage": "Etusivu", "frontpage": "Etusivu",
"group": "" "group": ""
...@@ -85,5 +87,19 @@ ...@@ -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 @@ ...@@ -18,16 +18,14 @@
*/ */
package fi.codecrew.moya.web.cdiview.user; package fi.codecrew.moya.web.cdiview.user;
import java.util.ArrayList; import java.util.*;
import java.util.EnumMap; import java.util.stream.Collectors;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.ConversationScoped;
import javax.inject.Named; import javax.inject.Named;
import fi.codecrew.moya.model.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -38,10 +36,6 @@ import fi.codecrew.moya.entitysearch.UserSearchQuery; ...@@ -38,10 +36,6 @@ import fi.codecrew.moya.entitysearch.UserSearchQuery;
import fi.codecrew.moya.enums.BortalApplication; import fi.codecrew.moya.enums.BortalApplication;
import fi.codecrew.moya.enums.apps.IAppPermission; import fi.codecrew.moya.enums.apps.IAppPermission;
import fi.codecrew.moya.enums.apps.UserPermission; 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.utilities.SearchResult;
import fi.codecrew.moya.web.cdiview.GenericCDIView; import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.helpers.BortalApplicationWrapper; import fi.codecrew.moya.web.helpers.BortalApplicationWrapper;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!