Skip to content

Commit 663030f

Browse files
committed
user operations related pages & beans
1 parent c400904 commit 663030f

17 files changed

+593
-163
lines changed

my-maps-webapp/src/main/java/cz/muni/fi/pv243/mymaps/jsf/AbstractBean.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ public User getUser() {
3939
return userService.getUserById(new Long(id));
4040
}
4141
return userService.getUserByLogin(UserService.UNREGISTRED_LOGIN_NAME);
42-
43-
44-
4542
}
4643

4744
protected boolean hasUserRights(User user, MyMap map, Permission permission) {

my-maps-webapp/src/main/java/cz/muni/fi/pv243/mymaps/jsf/LoginBean.java

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public String login() {
4444
if (!identity.isLoggedIn()) {
4545
return "login.xhtml";
4646
}
47-
return "maps.xhtml";
47+
return "index.xhtml";
4848
}
4949

5050
@Override
@@ -87,5 +87,30 @@ public void setCredentials(Credentials credentials) {
8787
this.credentials = credentials;
8888
}
8989

90+
public User getCurrentUser() {
91+
if (identity.isLoggedIn()) {
92+
String id = identity.getUser().getId();
93+
return userService.getUserById(new Long(id));
94+
}
95+
return userService.getUserByLogin(UserService.UNREGISTRED_LOGIN_NAME);
96+
}
97+
98+
public String getCurrentUserToString() {
99+
User u = getCurrentUser();
100+
101+
if (u == null) {
102+
return "";
103+
}
104+
String label = "";
105+
if (u.getNick() != null) {
106+
label += u.getNick();
107+
}
108+
109+
if (u.getNick() != null && u.getName() != null && !u.getName().isEmpty()) {
110+
label += " ( " + u.getName() + " )";
111+
}
112+
113+
return label;
114+
}
90115

91116
}
Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
package cz.muni.fi.pv243.mymaps.jsf;
2+
3+
import cz.muni.fi.pv243.mymaps.dto.User;
4+
import cz.muni.fi.pv243.mymaps.dto.View;
5+
import cz.muni.fi.pv243.mymaps.entities.Role;
6+
import java.util.ArrayList;
7+
import java.util.List;
8+
import javax.annotation.ManagedBean;
9+
import javax.enterprise.context.RequestScoped;
10+
import javax.inject.Named;
11+
12+
/**
13+
*
14+
* @author Kuba
15+
*/
16+
@ManagedBean
17+
@RequestScoped
18+
@Named(value = "userCreateBean")
19+
public class UserCreateBean extends AbstractBean {
20+
21+
private User user;
22+
23+
private String name;
24+
private String nick;
25+
private String password;
26+
private String password2;
27+
private String role;
28+
private String newUserText;
29+
30+
public UserCreateBean() {
31+
}
32+
33+
public String getName() {
34+
return name;
35+
}
36+
37+
public void setName(String name) {
38+
this.name = name;
39+
}
40+
41+
public String getNick() {
42+
return nick;
43+
}
44+
45+
public void setNick(String nick) {
46+
this.nick = nick;
47+
}
48+
49+
public String getPassword() {
50+
return password;
51+
}
52+
53+
public void setPassword(String password) {
54+
this.password = password;
55+
}
56+
57+
public String getPassword2() {
58+
return password2;
59+
}
60+
61+
public void setPassword2(String password) {
62+
this.password2 = password;
63+
}
64+
65+
public String getRole() {
66+
return role;
67+
}
68+
69+
public void setRole(String role) {
70+
this.role = role;
71+
}
72+
73+
public String getNewUserText() {
74+
return newUserText;
75+
}
76+
77+
public void setNewUserText(String newUserText) {
78+
this.newUserText = newUserText;
79+
}
80+
81+
public Role[] getRoles() {
82+
return Role.values();
83+
}
84+
85+
public String createForward() {
86+
return "createUser.xhtml";
87+
}
88+
89+
public String createUser() {
90+
91+
User newUser = new User();
92+
newUser.setName(name);
93+
newUser.setNick(nick);
94+
newUser.setRole(role);
95+
newUser.setPassword("");
96+
newUser = userService.createUser(newUser);
97+
98+
newUserText = "User: " + newUser.getNick() + " created. PASSWORD is: " + newUser.getPassword();
99+
100+
return "users.xhtml";
101+
}
102+
103+
public List<User> getUsers() {
104+
105+
return userService.geAllUsers();
106+
}
107+
108+
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package cz.muni.fi.pv243.mymaps.jsf;
2+
3+
import cz.muni.fi.pv243.mymaps.dto.User;
4+
import cz.muni.fi.pv243.mymaps.dto.View;
5+
import cz.muni.fi.pv243.mymaps.entities.Role;
6+
import java.util.ArrayList;
7+
import java.util.List;
8+
import javax.annotation.ManagedBean;
9+
import javax.enterprise.context.RequestScoped;
10+
import javax.inject.Named;
11+
12+
/**
13+
*
14+
* @author Jan Bliznak
15+
*/
16+
@ManagedBean
17+
@RequestScoped
18+
@Named(value = "userDeleteBean")
19+
public class UserDeleteBean extends AbstractBean {
20+
21+
public UserDeleteBean() {
22+
}
23+
24+
public String deleteUser(long id) {
25+
26+
User u = userService.getUserById(id);
27+
userService.deleteUser(u);
28+
29+
return "users.xhtml";
30+
}
31+
}
Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
package cz.muni.fi.pv243.mymaps.jsf;
2+
3+
import cz.muni.fi.pv243.mymaps.dto.User;
4+
import cz.muni.fi.pv243.mymaps.dto.View;
5+
import cz.muni.fi.pv243.mymaps.entities.Role;
6+
import java.util.ArrayList;
7+
import java.util.List;
8+
import javax.annotation.ManagedBean;
9+
import javax.enterprise.context.RequestScoped;
10+
import javax.inject.Named;
11+
12+
/**
13+
*
14+
* @author Jan Bliznak
15+
*/
16+
@ManagedBean
17+
@RequestScoped
18+
@Named(value = "userEditBean")
19+
public class UserEditBean extends AbstractBean {
20+
21+
private User user;
22+
23+
private String name;
24+
private String nick;
25+
private String role;
26+
private String newUserText;
27+
28+
public UserEditBean() {
29+
}
30+
31+
public String getName() {
32+
return name;
33+
}
34+
35+
public void setName(String name) {
36+
this.name = name;
37+
}
38+
39+
public String getNick() {
40+
return nick;
41+
}
42+
43+
public void setNick(String nick) {
44+
this.nick = nick;
45+
}
46+
47+
48+
public String getRole() {
49+
return role;
50+
}
51+
52+
public void setRole(String role) {
53+
this.role = role;
54+
}
55+
56+
public String getNewUserText() {
57+
return newUserText;
58+
}
59+
60+
public void setNewUserText(String newUserText) {
61+
this.newUserText = newUserText;
62+
}
63+
64+
65+
public Role[] getRoles() {
66+
return Role.values();
67+
}
68+
69+
70+
public String editUserForward(long x) {
71+
72+
// if (user == null || user.getId() == null) {
73+
// return "404.xhtml";
74+
// }
75+
user = userService.getUserById(x);
76+
return "editUser.xhtml?id=" + x;
77+
}
78+
79+
public String editUser() {
80+
81+
if (user == null || user.getId() == null) {
82+
return "404.xhtml";
83+
}
84+
85+
//get user
86+
User userToUpdate = userService.getUserById(user.getId());
87+
88+
//change what I want
89+
userToUpdate.setName(name);
90+
userToUpdate.setNick(nick);
91+
userToUpdate.setRole(role);
92+
93+
//persist
94+
userService.updateUser(userToUpdate);
95+
96+
//go back to list
97+
return "users.xhtml";
98+
}
99+
100+
101+
102+
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package cz.muni.fi.pv243.mymaps.jsf;
2+
3+
import cz.muni.fi.pv243.mymaps.dto.User;
4+
import cz.muni.fi.pv243.mymaps.dto.View;
5+
import cz.muni.fi.pv243.mymaps.entities.Role;
6+
import java.util.ArrayList;
7+
import java.util.List;
8+
import javax.annotation.ManagedBean;
9+
import javax.enterprise.context.RequestScoped;
10+
import javax.inject.Named;
11+
12+
/**
13+
*
14+
* @author Jan Bliznak
15+
*/
16+
@ManagedBean
17+
@RequestScoped
18+
@Named(value = "userListBean")
19+
public class UserListBean extends AbstractBean {
20+
21+
public UserListBean() {
22+
}
23+
24+
public List<User> getUsers() {
25+
return userService.geAllUsers();
26+
}
27+
}

0 commit comments

Comments
 (0)