Skip to content
Browse files

Fixed release. NEXT TIME TEST THAT THE FUCKING THING WORKS BEFORE COM…

…MITING!

git-svn-id: http://agilefant.googlecode.com/svn/trunk@53 29784df9-99d5-7e28-3e6c-ac1830307ffc
  • Loading branch information...
1 parent 79cc1a1 commit 4e748c94437a6d9a0037f53991c522cc0a8b31a8 kheleniu committed Nov 13, 2006
View
2 conf/classes/xwork.xml
@@ -88,10 +88,12 @@
<action name="editBacklog" method="edit" class="backlogAction">
<result name="editProduct" type="redirect">editProduct.action?productId=${backlogId}</result>
<result name="editDeliverable" type="redirect">editDeliverable.action?deliverableId=${backlogId}</result>
+ <result name="editIteration" type="redirect">editIteration.action?iterationId=${backlogId}</result>
</action>
<action name="moveBacklogItem" method="moveBacklogItem" class="backlogAction">
<result name="editProduct" type="redirect">editProduct.action?productId=${backlogId}</result>
<result name="editDeliverable" type="redirect">editDeliverable.action?deliverableId=${backlogId}</result>
+ <result name="editIteration" type="redirect">editIteration.action?iterationId=${backlogId}</result>
</action>
<!-- /Backlog actions -->
<!-- Task actions -->
View
30 doc/install.txt
@@ -0,0 +1,30 @@
+Quick install guide for AgilEFant 2007
+--------------------------------------
+
+What you need:
+---
+MySQL installation (4.1 preferred)
+Tomcat installation
+AgilEFant 2007 distribution package
+Basic knowledge of running MySQL and Tomcat
+
+1. Create database
+---
+Login to MySQL using command line tool:
+mysql -u <userName> -p<password>
+and create database:
+\. init-db.sql
+\. create-db.sql
+These scripts are found in doc/sql directory.
+
+2. Deploy web application
+---
+Create agilefant directory to your tomcat webbapps directory.
+Copy contents of webapp directory to directory you created.
+
+3. Run Tomcat
+---
+If all goes well, you should be able to access AgilEFant using context
+path agilefant (http://<yourServer>/agilefant. AgilEFant writes it log
+to logs/agilefant.log so you might want to check it, in you encounter
+any problems.
View
6 src/fi/hut/soberit/agilefant/model/Iteration.java
@@ -19,9 +19,9 @@
@Entity
public class Iteration extends Backlog {
- private Date startDate;
- private Date endDate;
- private Deliverable deliverable;
+ private Date startDate;
+ private Date endDate;
+ private Deliverable deliverable;
private User owner;
@ManyToOne
View
3 src/fi/hut/soberit/agilefant/web/BacklogAction.java
@@ -8,6 +8,7 @@
import fi.hut.soberit.agilefant.model.Backlog;
import fi.hut.soberit.agilefant.model.BacklogItem;
import fi.hut.soberit.agilefant.model.Deliverable;
+import fi.hut.soberit.agilefant.model.Iteration;
import fi.hut.soberit.agilefant.model.Product;
public class BacklogAction extends ActionSupport {
@@ -61,6 +62,8 @@ protected String solveResult(Backlog backlog){
return "editProduct";
} else if (backlog instanceof Deliverable){
return "editDeliverable";
+ } else if (backlog instanceof Iteration){
+ return "editIteration";
}
super.addActionError(super.getText("backlog.unknownType"));
return Action.ERROR;
View
26 src/fi/hut/soberit/agilefant/web/IterationAction.java
@@ -8,10 +8,8 @@
import fi.hut.soberit.agilefant.db.DeliverableDAO;
import fi.hut.soberit.agilefant.db.IterationDAO;
-import fi.hut.soberit.agilefant.model.ActivityType;
import fi.hut.soberit.agilefant.model.Deliverable;
import fi.hut.soberit.agilefant.model.Iteration;
-import fi.hut.soberit.agilefant.model.WorkType;
public class IterationAction extends ActionSupport {
@@ -21,20 +19,7 @@
private DeliverableDAO deliverableDAO;
private Deliverable deliverable;
private int deliverableId;
- private Collection<Iteration> iterations;
- public String getAll(){
- iterations = new ArrayList<Iteration>();
- deliverable = deliverableDAO.get(deliverableId);
- if (deliverable == null){
- iterations = iterationDAO.getAll();
- } else {
- iterations = deliverable.getIterations();
- }
-// iterations = iterationDAO.getAll();
- return Action.SUCCESS;
- }
-
public String create(){
Deliverable deliverable = deliverableDAO.get(deliverableId);
if (deliverable == null){
@@ -81,9 +66,6 @@ public String store(){
}
this.fillObject(fillable);
iterationDAO.store(fillable);
- // updating activitytypes here to make listing work correctly after storing
- // - turkka
-// sprints = iterationDAO.getAll();
return Action.SUCCESS;
}
@@ -119,18 +101,10 @@ public void setIteration(Iteration iteration){
this.iteration = iteration;
}
- public Collection<Iteration> getIterations() {
- return iterations;
- }
-
public void setIterationDAO(IterationDAO iterationDAO) {
this.iterationDAO = iterationDAO;
}
- public DeliverableDAO getDeliverableDAO() {
- return deliverableDAO;
- }
-
public void setDeliverableDAO(DeliverableDAO deliverableDAO) {
this.deliverableDAO = deliverableDAO;
}
View
24 web/WEB-INF/jsp/editBacklogItem.jsp
@@ -54,6 +54,16 @@
<option value="${deliverable.id}">&nbsp;&nbsp;&nbsp;&nbsp;${deliverable.name}</option>
</c:otherwise>
</c:choose>
+ <c:forEach items="${deliverable.iterations}" var="iteration">
+ <c:choose>
+ <c:when test="${iteration.id == backlogItem.backlog.id}">
+ <option selected="selected" value="${iteration.id}">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${iteration.name}</option>
+ </c:when>
+ <c:otherwise>
+ <option value="${iteration.id}">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${iteration.name}</option>
+ </c:otherwise>
+ </c:choose>
+ </c:forEach>
</c:forEach>
</c:forEach>
</select>
@@ -81,10 +91,12 @@
</ul>
</p>
</c:if>
- <p>
- <ww:url id="createLink" action="createTask" includeParams="none">
- <ww:param name="backlogItemId" value="${backlogItemId}"/>
- </ww:url>
- <ww:a href="%{createLink}">Add task</ww:a>
- </p>
+ <c:if test="${backlogItem.id > 0}">
+ <p>
+ <ww:url id="createLink" action="createTask" includeParams="none">
+ <ww:param name="backlogItemId" value="${backlogItemId}"/>
+ </ww:url>
+ <ww:a href="%{createLink}">Add task</ww:a>
+ </p>
+ </c:if>
<%@ include file="./inc/_footer.jsp" %>
View
5 web/WEB-INF/jsp/editDeliverable.jsp
@@ -37,7 +37,10 @@
<ww:param name="deliverableId" value="${deliverable.id}"/>
<ww:param name="iterationId" value="${iteration.id}"/>
</ww:url>
- ${iteration.name} - <ww:a href="%{editLink}">Edit</ww:a>|<ww:a href="%{deleteLink}">Delete</ww:a>
+ <ww:url id="createBacklogItemLink" action="createBacklogItem" includeParams="none">
+ <ww:param name="backlogId" value="${iteration.id}"/>
+ </ww:url>
+ ${iteration.name} - <ww:a href="%{editLink}">Edit</ww:a>|<ww:a href="%{deleteLink}">Delete</ww:a>|<ww:a href="%{createBacklogItemLink}">Add backlog item</ww:a>
</p>
</c:forEach>
</p>
View
53 web/WEB-INF/jsp/editIteration.jsp
@@ -26,52 +26,43 @@
<ww:hidden name="iterationId" value="${iteration.id}"/>
<ww:hidden name="deliverableId"/>
-<ww:date name="%{new java.util.Date()}" format="dd-MM-yyyy" id="date"/>
+<%--<ww:date name="%{new java.util.Date()}" format="dd-MM-yyyy" id="date"/>
<p>
Startdate: <ww:datepicker value="%{#date}" showstime="%{true}" format="%d-%m-%Y" name="iteration.startDate"/>
</p>
<p>
Enddate: <ww:datepicker value="%{#date}" showstime="%{true}" format="%d-%m-%Y" name="iteration.endDate"/>
- </p>
+ </p>--%>
<p>
Name: <ww:textfield name="iteration.name"/>
</p>
<p>
Description: <ww:richtexteditor name="iteration.description" width="600px" toolbarStartExpanded="false"/>
</p>
- <c:if test="${iteration.id > 0}">
- fixme: old stuff no longer valid, db model changed
- <%--
- <h3>Backlogs</h3>
- <p>
- <c:forEach items="${iteration.backlogs}" var="backlog">
- <p>
- <ww:url id="editLink" action="editBacklog" includeParams="none">
- <ww:param name="backlogId" value="${backlog.id}"/>
- <ww:param name="iterationId" value="${iteration.id}"/>
- </ww:url>
- <ww:url id="deleteLink" action="deleteBacklog" includeParams="none">
- <ww:param name="iterationId" value="${iteration.id}"/>
- <ww:param name="backlogId" value="${backlog.id}"/>
- </ww:url>
- ${backlog.name} - <ww:a href="%{editLink}">Edit</ww:a>|<ww:a href="%{deleteLink}">Delete</ww:a>
- </p>
- </c:forEach>
- </p>
- <p>
- <ww:url id="createLink" action="createBacklog" includeParams="none">
- <ww:param name="iterationId" value="${iteration.id}"/>
- <ww:param name="backlogId" value="${backlog.id}"/>
- </ww:url>
- <ww:a href="%{createLink}">Create new</ww:a>
- </p>
- --%>
- </c:if>
<p>
<ww:submit value="Store"/>
</p>
</ww:form>
- <p>
+ <c:if test="${!empty iteration.backlogItems}">
+ <p>
+ Has backlog items:
+ </p>
+ <p>
+ <ul>
+ <c:forEach items="${iteration.backlogItems}" var="item">
+ <ww:url id="editLink" action="editBacklogItem" includeParams="none">
+ <ww:param name="backlogItemId" value="${item.id}"/>
+ </ww:url>
+ <ww:url id="deleteLink" action="deleteBacklogItem" includeParams="none">
+ <ww:param name="backlogItemId" value="${item.id}"/>
+ </ww:url>
+ <li>
+ ${item.name} (${fn:length(item.tasks)} tasks) - <ww:a href="%{editLink}">Edit</ww:a>|<ww:a href="%{deleteLink}">Delete</ww:a>
+ </li>
+ </c:forEach>
+ </ul>
+ </p>
+ </c:if>
<%@ include file="./inc/_footer.jsp" %>

0 comments on commit 4e748c9

Please sign in to comment.
Something went wrong with that request. Please try again.