[jboss-svn-commits] JBL Code SVN: r18821 - in labs/jbosslabs/labs-3.0-build: views/admin/src/main/java/org/jboss/labs/admin/action/project and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: wrzep
Date: 2008-03-11 08:19:37 -0400 (Tue, 11 Mar 2008)
New Revision: 18821

Modified:
   labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/Request.java
   labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/RequestProject.java
   labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/JoinProject.java
   labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/requests.xhtml
Log:
finished JBLAB-934 (pending requests view)


Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/Request.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/Request.java	2008-03-11 11:36:07 UTC (rev 18820)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/Request.java	2008-03-11 12:19:37 UTC (rev 18821)
@@ -25,6 +25,7 @@
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
@@ -45,6 +46,7 @@
     protected String username;
     protected boolean finished;
     protected long taskId;
+    protected Date created;
 
     public Request() {}
 
@@ -52,6 +54,7 @@
         this.projectId = projectId;
         this.username = username;
         this.finished = false;
+        this.created = new Date();
     }
 
     /* getters and setters */
@@ -96,6 +99,14 @@
         this.taskId = taskId;
     }
 
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
     @Transient
     public abstract String getDescription();
 

Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/RequestProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/RequestProject.java	2008-03-11 11:36:07 UTC (rev 18820)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/RequestProject.java	2008-03-11 12:19:37 UTC (rev 18821)
@@ -33,6 +33,7 @@
 
 import javax.persistence.EntityManager;
 import java.util.List;
+import java.util.Date;
 
 /**
  * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
@@ -43,6 +44,7 @@
     @In private ProjectRequest req;
 
     @Out(scope= ScopeType.BUSINESS_PROCESS, required = false) private Integer projectRequestId;
+    @Out(scope= ScopeType.BUSINESS_PROCESS, required = false) private Date created;
 
     @In private List<String> projectIds;
 
@@ -57,6 +59,11 @@
 
         req.setUsername(actor.getId());
 
+        created = new Date();
+        req.setCreated(created);
+
+        System.out.println("RequestProject.request ");
+
         entityManager.persist(req);
 
         projectRequestId = req.getId();

Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/JoinProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/JoinProject.java	2008-03-11 11:36:07 UTC (rev 18820)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/JoinProject.java	2008-03-11 12:19:37 UTC (rev 18821)
@@ -40,6 +40,7 @@
 
 import javax.persistence.EntityManager;
 import java.util.List;
+import java.util.Date;
 
 
 @Name("joinProject")
@@ -55,7 +56,10 @@
     @Out(required = false) private List<ContributorAgreement> cas;
 
     @In private FacesMessages facesMessages;
+
     @Out(required = false, scope= ScopeType.BUSINESS_PROCESS) private Integer joinRequestId;
+    @Out(required = false, scope= ScopeType.BUSINESS_PROCESS) private Date created;
+
     @In(create = true) private EntityManager entityManager;
 
     public String join(Project project) {
@@ -81,6 +85,11 @@
         facesMessages.add("Your request has been sent to the project lead.");
 
         JoinRequest jr = new JoinRequest(project.getProjectId(), user.getName());
+
+        created = new Date();
+        jr.setCreated(created);
+
+
         entityManager.persist(jr);
 
         joinRequestId = jr.getId();

Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/requests.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/requests.xhtml	2008-03-11 11:36:07 UTC (rev 18820)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/requests.xhtml	2008-03-11 12:19:37 UTC (rev 18821)
@@ -19,7 +19,13 @@
               <f:facet name="header">Id</f:facet>
               #{task.id}
           </h:column>
-           <h:column>
+          <h:column>
+              <f:facet name="header">Date</f:facet>
+              <h:outputText value="#{task.variables['created']}">
+                <s:convertDateTime pattern="dd MMMM yyyy, HH:mm " />
+              </h:outputText>
+          </h:column>
+          <h:column>
                <f:facet name="header">Description</f:facet>
                <h:commandLink value="#{task.description}"
                               action="#{reviewProjectRequest.select(task.id, task.variables['projectRequestId'])}"
@@ -39,6 +45,12 @@
               #{r.id}
           </h:column>
           <h:column>
+              <f:facet name="header">Date</f:facet>
+              <h:outputText value="#{r.created}">
+                <s:convertDateTime pattern="dd MMMM yyyy, HH:mm " />
+              </h:outputText>
+          </h:column>
+          <h:column>
               <f:facet name="header">Description</f:facet>
               #{r.description}
           </h:column>