Subversion Repositories WebE

Compare Revisions

Last modification

Ignore whitespace Rev 22 → Rev 21

/trunk/src/ch/ffhs/webE/action/UserAction.java
3,11 → 3,6
import java.util.ArrayList;
import java.util.List;
 
import javax.servlet.http.HttpServletRequest;
 
import org.apache.struts2.ServletActionContext;
 
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.ModelDriven;
import ch.ffhs.webE.dao.UserDAO;
22,22 → 17,28
private User user = new User();
private List<User> userList = new ArrayList<User>();
private UserDAO userDAO = new UserDAOImpl();
 
@Override
public User getModel() {
return user;
}
 
public String add() {
public String add()
{
userDAO.saveUser(user);
return SUCCESS;
}
 
public String list() {
public String addForm() {
return SUCCESS;
}
public String list()
{
userList = userDAO.listUser();
return SUCCESS;
}
 
public User getUser() {
return user;
}
54,11 → 55,4
this.userList = userList;
}
 
public String delete() {
HttpServletRequest request = (HttpServletRequest) ActionContext
.getContext().get(ServletActionContext.HTTP_REQUEST);
userDAO.deleteUser(Integer.parseInt(request.getParameter("id")));
return SUCCESS;
}
 
}
/trunk/src/ch/ffhs/webE/dao/UserDAO.java
9,5 → 9,4
List<User> listUser();
void saveUser(User user);
User searchUsername(String username);
void deleteUser(int userId);
}
/trunk/src/ch/ffhs/webE/dao/UserDAOImpl.java
10,7 → 10,7
import ch.ffhs.webE.domain.*;
 
public class UserDAOImpl implements UserDAO {
 
@SessionTarget
Session session;
@TransactionTarget
18,14 → 18,14
 
@SuppressWarnings("unchecked")
@Override
public List<User> listUser() {
List<User> user = null;
public List<User> listUser() {
List<User> courses = null;
try {
user = session.createQuery("from User").list();
courses = session.createQuery("from User").list();
} catch (Exception e) {
e.printStackTrace();
}
return user;
}
return courses;
}
 
@Override
35,40 → 35,25
} catch (Exception e) {
transaction.rollback();
e.printStackTrace();
}
}
}
 
/**
* Used to delete a user.
*/
@Override
public void deleteUser(int userId) {
try {
User user = (User) session.get(User.class, userId);
session.delete(user);
} catch (Exception e) {
transaction.rollback();
e.printStackTrace();
}
}
 
/**
* Returns a single user with this user name (used for login)
*
* @param username
* : String - entire user name
* @return User: Returns a user object if something is found. If not, null
* is returned
* @param username: String - entire user name
* @return User: Returns a user object if something is found. If not, null is returned
*/
public User searchUsername(String username) {
User user = null;
 
try {
user = (User) session
.createQuery("FROM User " + "WHERE username = :username")
.setParameter("username", username).uniqueResult();
user = (User) session.createQuery(
"FROM User " +
"WHERE username = :username")
.setParameter("username", username)
.uniqueResult();
} catch (Exception e) {
// TODO: Log error
//TODO: Log error
}
return user;
}
/trunk/src/struts.xml
3,7 → 3,7
"http://struts.apache.org/dtds/struts-2.0.dtd">
 
<struts>
<constant name="struts.devMode" value="true" /> <!-- activates debugging output -->
<constant name="struts.devMode" value="false" /> <!-- set to true for more debugging output -->
<!-- User environment -->
<package name="user" namespace="/user" extends="struts-default">
10,8 → 10,6
</package>
<!-- Admin environment -->
<package name="admin" namespace="/admin" extends="hibernate-default">
<action name="userAddForm">
18,22 → 16,15
<result>/admin/userAddForm.jsp</result>
</action>
<action name="doUserAdd" method="add" class="ch.ffhs.webE.action.UserAction">
<result name="success">/admin/userAdd.jsp</result>
<action name="doUserAdd" method="addForm" class="ch.ffhs.webE.action.UserAction">
<result name="success" type="redirect">/admin/userAdd.jsp</result>
</action>
<action name="userList" method="list" class="ch.ffhs.webE.action.UserAction">
<result name="success">/admin/userList.jsp</result>
<action name="userList">
<result>/admin/userList.jsp</result>
</action>
<action name="deleteUser" method="delete" class="ch.ffhs.webE.action.UserAction">
<result name="success" type="redirect">/admin/userList</result>
</action>
</package>
<!-- Remaining environment of the session-->
<package name="default" namespace="" extends="hibernate-default">
/trunk/WebContent/admin/userAdd.jsp
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: trunk/WebContent/admin/userList.jsp
===================================================================
--- trunk/WebContent/admin/userList.jsp (revision 22)
+++ trunk/WebContent/admin/userList.jsp (revision 21)
@@ -1,4 +1,3 @@
-<%@taglib uri="/struts-tags" prefix="s"%>
<html>
<head>
<title>User bearbeiten</title>
@@ -6,36 +5,6 @@
<body>
<h1>UserListe</h1>
-<p>Die Liste:</p>
-
-<s:if test="userList.size() == 0">
-<p>Keine Benutzer gefunden</p>
-</s:if>
-<s:else>
-<table>
- <tr>
- <th>Username</th>
- <th>Vorname</th>
- <th>Nachname</th>
- <th>Admin?</th>
- </tr>
-<s:iterator value="userList" status="stat">
- <tr>
- <td><s:property value="username" /></td>
- <td><s:property value="firstname" /></td>
- <td><s:property value="lastname" /></td>
- <td><s:property value="admin" /></td>
-
- <td><s:url id="editURL" action="editUser">
- <s:param name="id" value="%{id}"></s:param>
- </s:url> <s:a href="%{editURL}">Edit</s:a></td>
- <td><s:url id="deleteURL" action="deleteUser">
- <s:param name="id" value="%{id}"></s:param>
- </s:url> <s:a href="%{deleteURL}">Delete</s:a></td>
- </tr>
-</s:iterator>
-</table>
-</s:else>
-
+<p>Noch nicht umgesetzt</p>
</body>
</html>
\ No newline at end of file
/trunk/WebContent/admin/userAddForm.jsp
5,8 → 5,8
</head>
<body>
 
<h1>User hinzuf&uuml;gen</h1>
<p>Bitte geben Sie die Benutzerdaten ein</p>
<h1>User Hinzuf&uuml;gen</h1>
<p>Noch nicht umgesetzt...</p>
<s:form action="doUserAdd">
<s:textfield name="username" label="User Name" />
<s:password name="password" label="Password" />
/trunk
Property changes:
Modified: svn:ignore
## -1,5 +1 ##
svn history.txt
-
-hibernate.reveng.xml
-
-hibernate.properties