DMC/scipro
7
0
Fork 0
Code Issues43 Pull Requests9 Actions Projects1 Releases Wiki Activity

some markup improvements

Browse Source
This commit is contained in:
Fredrik Friis 2012-03-26 15:34:51 +09:00
parent 25f9417c5e
commit fbf4023c09
2 changed files with 55 additions and 53 deletions
src/main/java/se/su/dsv/scipro/admin/panels
ProjectIdeaStatisticsPanel.htmlProjectIdeaStatisticsPanel.java

88
src/main/java/se/su/dsv/scipro/admin/panels/ProjectIdeaStatisticsPanel.html

@ -1,41 +1,63 @@
<!DOCTYPE html>
<html
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<body>
<wicket:panel>
<wicket:panel>
<div>
<table class="rounded-corner">
<thead>
<tr>
<th class="rounded-left-top">Status</th>
<th class="rounded-right-top">Total</th>
</tr>
</thead>
<tfoot>
<tr>
<td colspan="2" class="rounded-foot">&nbsp;</td>
</tr>
</tfoot>
<tbody>
<tr wicket:id="listview">
<td wicket:id="statusNameLabel"></td>
<td wicket:id="statusCountLabel"></td>
</tr>
</tbody>
</table>
</div>
<div wicket:id="listview">
<div><span wicket:id="statusNameLabel"></span> <span wicket:id="statusCountLabel"></span></div>
</div>
<!--<div wicket:id="listview">-->
<!--<div><span wicket:id="statusNameLabel"></span> <span wicket:id="statusCountLabel"></span></div>-->
<!--</div>-->
<!--<div wicket:id="container">-->
<!--<table class="rounded-corner">-->
<!--<thead>-->
<!--<tr>-->
<!--<th class="rounded-left-top">Application period</th><th>End date</th><th>Number of students</th><th>Number of project ideas</th>-->
<!--</tr>-->
<!--</thead>-->
<!--<tbody>-->
<!--<tr wicket:id="periodList">-->
<!--&lt;!&ndash; <td><span wicket:id="name"></span></</td> &ndash;&gt;-->
<!--<td wicket:id="applicationPeriodName"></td>-->
<!--<td wicket:id="applicationPeriodEndDate"></td>-->
<!--<td wicket:id="numberOfStudents"></td>-->
<!--<td wicket:id="numberOfPIs"></td>-->
<!--</tr>-->
<!--</tbody>-->
<!--<tfoot>-->
<!--<tr>-->
<!--<td colspan="6" class="rounded-foot">&nbsp;</td>-->
<!--</tr>-->
<!--</tfoot>-->
<!--</table>-->
<!--</div>-->
<!--<div wicket:id="nav"></div>-->
<a wicket:id="testLink">BLABLA</a>
</wicket:panel>
<!--<div wicket:id="container">-->
<!--<table class="rounded-corner">-->
<!--<thead>-->
<!--<tr>-->
<!--<th class="rounded-left-top">Application period</th><th>End date</th><th>Number of students</th><th>Number of project ideas</th>-->
<!--</tr>-->
<!--</thead>-->
<!--<tbody>-->
<!--<tr wicket:id="periodList">-->
<!--&lt;!&ndash; <td><span wicket:id="name"></span></</td> &ndash;&gt;-->
<!--<td wicket:id="applicationPeriodName"></td>-->
<!--<td wicket:id="applicationPeriodEndDate"></td>-->
<!--<td wicket:id="numberOfStudents"></td>-->
<!--<td wicket:id="numberOfPIs"></td>-->
<!--</tr>-->
<!--</tbody>-->
<!--<tfoot>-->
<!--<tr>-->
<!--<td colspan="6" class="rounded-foot">&nbsp;</td>-->
<!--</tr>-->
<!--</tfoot>-->
<!--</table>-->
<!--</div>-->
<!--<div wicket:id="nav"></div>-->
</wicket:panel>
</body>
</html>

20
src/main/java/se/su/dsv/scipro/admin/panels/ProjectIdeaStatisticsPanel.java

@ -1,17 +1,13 @@
package se.su.dsv.scipro.admin.panels;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import se.su.dsv.scipro.match.dataobject.ProjectIdea;
import se.su.dsv.scipro.springdata.services.ProjectIdeaService;
import java.util.ArrayList;
import java.util.Date;
import static se.su.dsv.scipro.match.dataobject.Match.Status;
@ -48,22 +44,6 @@ public class ProjectIdeaStatisticsPanel extends Panel {
add(listview);
AjaxLink<Void> createLink = new AjaxLink("testLink"){
private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget target) {
Iterable<ProjectIdea> projectIdeaIterable = projectIdeaService.findProjectIdeasCreatedBefore(new Date());
for (ProjectIdea projectIdea : projectIdeaIterable){
System.out.println(projectIdea.getTitle());
}
}
};
add(createLink);
}
}