DMC/scipro
7
0
Fork 0
Code Issues40 Pull Requests8 Actions2 Projects1 Releases Wiki Activity

added daisy start date to project details panel

Browse Source
This commit is contained in:
Fredrik Friis 2012-03-22 12:45:41 +09:00
parent 815aa5230f
commit c1c128e544
2 changed files with 12 additions and 6 deletions
src/main/java/se/su/dsv/scipro/project/panels
ProjectDetailsPanel.htmlProjectDetailsPanel.java

2
src/main/java/se/su/dsv/scipro/project/panels/ProjectDetailsPanel.html

@ -13,6 +13,8 @@
</h5>
<div><b>Project status: </b></div>
<div wicket:id="status"></div>
<div><b>Daisy start date </b></div>
<div wicket:id="daisyStartDateLabel"></div>
<div><b>Title: </b></div>
<div wicket:id="title"></div>
<div><b>Authors: </b></div>

16
src/main/java/se/su/dsv/scipro/project/panels/ProjectDetailsPanel.java

@ -1,8 +1,5 @@
package se.su.dsv.scipro.project.panels;
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.list.ListItem;
@ -10,15 +7,16 @@ import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import se.su.dsv.scipro.data.dao.interfaces.ProjectDao;
import se.su.dsv.scipro.data.dataobjects.Project;
import se.su.dsv.scipro.data.dataobjects.ProjectFollower;
import se.su.dsv.scipro.data.dataobjects.Student;
import java.util.ArrayList;
import java.util.List;
public class ProjectDetailsPanel extends Panel {
private static final long serialVersionUID = 1L;
@ -40,7 +38,13 @@ public class ProjectDetailsPanel extends Panel {
else if(project.getProjectStatus()!=null){
add(new Label("status", "This project is " + project.getProjectStatus().toString()));
}
if (project.getDaisyStartDate()==null){
add(new Label("daisyStartDateLabel", "Cannot get Daisy start date"));
}
else {
add(new Label("daisyStartDateLabel", project.getDaisyStartDate().toString()));
}
add(new Label("title", new PropertyModel<Project>(project, "title")));