Käyttäjänhallinta lisäys ja listaus tehtynä.

git-svn-id: https://dev.intra.insomnia.fi/svn/trunk@26 8cf89bec-f6a3-4178-919f-364fb3449fe5

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java

@@ -57,7 +57,11 @@ public class UserBean implements UserBeanLocal {
     @Override
     @Override
     public void mergeChanges(User currentUser) {
     public void mergeChanges(User currentUser) {
 	em.merge(currentUser);
 	em.merge(currentUser);
-
+    }
+    
+    public User getUser(String nick) {
+    User ret = em.createQuery("select u from User u where u.nick = :name", User.class).setParameter("name", nick).getSingleResult();
+    return ret;
     }
     }
 
 
 }
 }

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/UserBeanLocal.java

@@ -10,6 +10,8 @@ public interface UserBeanLocal {
     User createNewUser(String nick, String password);
     User createNewUser(String nick, String password);
     
     
     List<User> getUsers();
     List<User> getUsers();
+    
+    User getUser(String nick);
 
 
 
 
     void mergeChanges(User currentUser);
     void mergeChanges(User currentUser);

code/LanBortalWeb/WebContent/user/edit.xhtml

@@ -13,19 +13,31 @@
 		<ui:define name="content">
 		<ui:define name="content">
 		
 		
 			
 			
-		<h:dataTable id="user" value="#{userView.Users}" var="user">
-			<f:facet name="Nick">
-				<h:inputText value="#{user.id}"></h:inputText>
-			</f:facet>
-			<f:facet name="Real name">
-				<h:inputText value="#{user.realname}"></h:inputText>
-			</f:facet>
-			<f:facet name="Address">
-				<h:inputText value="#{user.address}"></h:inputText>
-			</f:facet>
-			<f:facet name="Town">
-				<h:inputText value="#{user.town}"></h:inputText>
-			</f:facet>
+		<h:dataTable id="user" value="#{userView.user}" var="user">
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="Nick" />
+				</f:facet>
+				<h:inputText value="{#user.nick}" />
+			</h:column>
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="Real name" />
+				</f:facet>
+				<h:inputText value="{#user.realname}" />
+			</h:column>
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="Address" />
+				</f:facet>
+				<h:inputText value="#{user.address}" />
+			</h:column>
+			<h:column>
+				<f:facet name="header">
+					<h:outputText value="Town" />
+				</f:facet>
+				<h:inputText value="{#user.town}" />
+			</h:column>
 		</h:dataTable>
 		</h:dataTable>
 		
 		
 		</ui:define>
 		</ui:define>

code/LanBortalWeb/WebContent/user/list.xhtml

@@ -11,7 +11,7 @@
 		<ui:define name="title">EditUser</ui:define>
 		<ui:define name="title">EditUser</ui:define>
 		<ui:define name="header">Edit user</ui:define>
 		<ui:define name="header">Edit user</ui:define>
 		<ui:define name="content">
 		<ui:define name="content">
-		Foo
+		<h:form>
 		<h:dataTable border="1" id="user" value="#{userView.users}" var="user">
 		<h:dataTable border="1" id="user" value="#{userView.users}" var="user">
 				<h:column>
 				<h:column>
 					<f:facet name="header">
 					<f:facet name="header">
@@ -37,8 +37,32 @@
 					</f:facet>
 					</f:facet>
 					<h:outputText value="#{user.town}" />
 					<h:outputText value="#{user.town}" />
 				</h:column>
 				</h:column>
+				<h:column>
+					<f:facet name="header">
+						<h:outputText value="Zip" />
+					</f:facet>
+					<h:outputText value="#{user.zip}" />
+				</h:column>
+				<h:column>
+					<f:facet name="header">
+						<h:outputText value="Phone number" />
+					</f:facet>
+					<h:outputText value="#{user.phone}" />
+				</h:column>
+				<h:column>
+					<f:facet name="header">
+						<h:outputText value="Sex" />
+					</f:facet>
+					<h:outputText value="#{user.female}" />
+				</h:column>
+				<h:column>
+					<f:facet name="header">
+						<h:outputText value="Edit" />
+					</f:facet>
+					<h:commandButton action="#{userView.edit()}" value="Edit" />
+				</h:column>
 			</h:dataTable>
 			</h:dataTable>
-
+		</h:form>
 		</ui:define>
 		</ui:define>
 		<ui:define name="footer">footer</ui:define>
 		<ui:define name="footer">footer</ui:define>
 	</ui:composition>
 	</ui:composition>

code/LanBortalWeb/src/fi/insomnia/bortal/view/UserView.java

@@ -43,6 +43,7 @@ public class UserView {
     private String zip = "default";
     private String zip = "default";
 
 
     private ListDataModel<User> items;
     private ListDataModel<User> items;
+    private User item;
 
 
     public UserBeanLocal getUserBean() {
     public UserBeanLocal getUserBean() {
 	return userBean;
 	return userBean;
@@ -182,5 +183,18 @@ public class UserView {
 	logger.info("Fetching users. Found {}", items.getRowCount());
 	logger.info("Fetching users. Found {}", items.getRowCount());
 	return items;
 	return items;
     }
     }
+    
+    public User getUser() {
+    return this.item;
+    }
+    
+    public void setItem(User user) {
+    	this.item = user;
+    }
+    
+    public String edit() {
+    setItem(items.getRowData());
+    return "edit";
+    }
 
 
 }
 }