* Terms - Prepared support for rename * ObjectType.java - Added ID for serialization - Added RELATIONSHIP class constant * struts.xml - Added Relationship actions * General - Relationships between two terms can be added and listed - Clean-up: + Renamed methods according to their purpose + Fixed RDM and corresponding properties/annotations + RelationShipTypeAction.java
/trunk/WebContent/user/nav.jsp |
---|
7,14 → 7,14 |
<li>Begriffe |
<ul> |
<li><a href="termAddForm">Hinzufügen</a></li> |
<li><a href="termList">Ändern, Löschen</a></li> |
<li><a href="termAdd">Hinzufügen</a></li> |
<li><a href="termList">Anzeigen<!-- Ändern, Löschen --></a></li> |
</ul></li> |
<li>Beziehungen |
<ul> |
<li><a href="">Hinzufügen</a></li> |
<li><a href="">Ändern, Löschen</a></li> |
<li><a href="relationshipAdd">Hinzufügen</a></li> |
<li><a href="relationshipList">Ändern, Löschen</a></li> |
</ul></li> |
<li>User-Settings |
/trunk/WebContent/user/termAddForm.jsp |
---|
7,7 → 7,11 |
<h1> |
Begriff hinzufügen |
</h1> |
<s:form action="doTermAdd"> |
<s:form action="termSave"> |
<s:if test="term.edit"> |
<s:hidden name="edit" value="1" /> |
</s:if> |
<s:hidden name="term.objectId" /> |
<s:textfield name="term.name" label="Name" /> |
<s:if test="term.name != ''"> |
<s:submit value="Umbenennen" /> |
/trunk/WebContent/user/userAdd.jsp |
---|
0,0 → 1,17 |
<html> |
<head> |
<title>User added</title> |
</head> |
<body> |
<h1> |
User hinzugefügt |
</h1> |
<p> |
Der Benutzer wurde hinzugefügt |
</p> |
<p> |
TODO: Weiterleitung!! |
</p> |
</body> |
</html> |
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+text/plain |
\ No newline at end of property |
Index: relationshipAdd.jsp |
=================================================================== |
--- relationshipAdd.jsp (nonexistent) |
+++ relationshipAdd.jsp (revision 34) |
@@ -0,0 +1,17 @@ |
+<html> |
+<head> |
+<title>Relationship added</title> |
+</head> |
+<body> |
+ |
+ <h1> |
+ Beziehung hinzugefügt |
+ </h1> |
+ <p> |
+ Die Beziehung wurde hinzugefügt |
+ </p> |
+ <p> |
+ TODO: Weiterleitung!! |
+ </p> |
+</body> |
+</html> |
\ No newline at end of file |
/relationshipAdd.jsp |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+text/plain |
\ No newline at end of property |
Index: relationshipList.jsp |
=================================================================== |
--- relationshipList.jsp (nonexistent) |
+++ relationshipList.jsp (revision 34) |
@@ -0,0 +1,47 @@ |
+<%@taglib uri="/struts-tags" prefix="s"%> |
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> |
+<c:set var="contextPath" value="${pageContext.request.contextPath}" /> |
+ |
+<html> |
+ <head> |
+ <title>Beziehung bearbeiten/löschen</title> |
+ </head> |
+ <body> |
+ |
+ <h1>Liste der Beziehungen</h1> |
+ |
+ <s:if test="relationshipList.size() == 0"> |
+ <p>Keine Beziehung definiert</p> |
+ </s:if> |
+ <s:else> |
+ <table> |
+ <thead> |
+ <th>Begriff 1</th> |
+ <th>Beziehung</th> |
+ <th>Begriff 2</th> |
+ </thead> |
+ <tbody> |
+ <s:iterator value="relationshipList" status="stat"> |
+ <tr> |
+ <td><s:property value="termFrom.name" /></td> |
+ <td><s:property value="relationshipType.nameFrom" /></td> |
+ <td><s:property value="termTo.name" /></td> |
+ |
+ <td><s:url id="editURL" action="editRelationship"> |
+ <s:param name="id" value="%{objectId}"></s:param> |
+ </s:url> <s:a href="%{editURL}"> |
+ <img src="${contextPath}/resources/icons/page_white_edit.png" alt="edit" /> |
+ </s:a></td> |
+ |
+ <td><s:url id="deleteURL" action="deleteRelationship"> |
+ <s:param name="id" value="%{objectId}"></s:param> |
+ </s:url> <s:a href="%{deleteURL}"> |
+ <img src="${contextPath}/resources/icons/delete.png" alt="delete" /> |
+ </s:a></td> |
+ </tr> |
+ </s:iterator> |
+ </tbody> |
+ </table> |
+ </s:else> |
+ </body> |
+</html> |
\ No newline at end of file |
/relationshipList.jsp |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+text/plain |
\ No newline at end of property |
Index: relationshipAddForm.jsp |
=================================================================== |
--- relationshipAddForm.jsp (nonexistent) |
+++ relationshipAddForm.jsp (revision 34) |
@@ -0,0 +1,18 @@ |
+<%@taglib uri="/struts-tags" prefix="s"%> |
+<html> |
+ <head> |
+ <title>Beziehung hinzufügen</title> |
+ </head> |
+ <body> |
+ <h1> |
+ Beziehung hinzufügen |
+ </h1> |
+ <s:form action="relationshipSave"> |
+ <s:hidden name="relationship.objectId" /> |
+ <s:select name="term1" list="terms" listKey="objectId" listValue="name" label="Begriff 1"/> |
+ <s:select name="type" list="relationshipTypes" listKey="id" listValue="nameFrom" label="Beziehungstyp"/> |
+ <s:select name="term2" list="terms" listKey="objectId" listValue="name" label="Begriff 2"/> |
+ <s:submit value="Hinzufügen" /> |
+ </s:form> |
+ </body> |
+</html> |
/relationshipAddForm.jsp |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+text/plain |
\ No newline at end of property |
Index: termList.jsp |
=================================================================== |
--- termList.jsp (revision 33) |
+++ termList.jsp (revision 34) |
@@ -15,26 +15,12 @@ |
</s:if> |
<s:else> |
<table> |
- <tr> |
- <th>Begriff</th> |
- </tr> |
- <s:iterator value="termList" status="stat"> |
- <tr> |
- <td><s:property value="name" /></td> |
- |
- <td><s:url id="editURL" action="editTerm"> |
- <s:param name="id" value="%{objectId}"></s:param> |
- </s:url> <s:a href="%{editURL}"> |
- <img src="${contextPath}/resources/icons/page_white_edit.png" alt="edit" /> |
- </s:a></td> |
- |
- <td><s:url id="deleteURL" action="deleteTerm"> |
- <s:param name="id" value="%{id}"></s:param> |
- </s:url> <s:a href="%{deleteURL}"> |
- <img src="${contextPath}/resources/icons/delete.png" alt="delete" /> |
- </s:a></td> |
- </tr> |
- </s:iterator> |
+ <s:iterator value="termList" status="stat"> |
+ <tr> |
+ <td><s:property value="name" /></td> |
+ </tr> |
+ </s:iterator> |
+ </tbody> |
</table> |
</s:else> |
</body> |