some gui improvements

This commit is contained in:
Fredrik Friis 2012-03-26 18:50:38 +09:00
parent 8b420811fa
commit 7914adc5a7

@ -6,6 +6,7 @@ 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.data.dataobjects.ProjectClass;
import se.su.dsv.scipro.match.dataobject.Match;
import se.su.dsv.scipro.springdata.services.ProjectClassService;
import se.su.dsv.scipro.springdata.services.ProjectIdeaService;
@ -44,7 +45,29 @@ public class ProjectIdeaStatisticsPanel extends Panel {
ListView listview = new ListView("listview", valueArray) {
protected void populateItem(ListItem item) {
Status s = (Status) item.getModelObject();
item.add(new Label("statusNameLabel", s.name()));
if (s.equals(Match.Status.CONFIRMED)){
item.add(new Label("statusNameLabel", item.getModelObject() + " (accepted by supervisor)"));
}
else if (s.equals(Match.Status.PUBLISHED)){
item.add(new Label("statusNameLabel", item.getModelObject() + " (suggested to supervisor)"));
}
else if (s.equals(Match.Status.INACTIVE)){
item.add(new Label("statusNameLabel", item.getModelObject() + " (e.g. cancelled)"));
}
else if (s.equals(Match.Status.REFUSED)){
item.add(new Label("statusNameLabel", item.getModelObject() + " (poorly written, sent back to author(s) for rewriting)"));
}
else if (s.equals(Match.Status.REJECTED)){
item.add(new Label("statusNameLabel", item.getModelObject() + " (e.g. declined by supervisor)"));
}
else if (s.equals(Match.Status.UNMATCHED)){
item.add(new Label("statusNameLabel", item.getModelObject() + " (waiting to be matched)"));
}
else if (s.equals(Match.Status.PENDING)){
item.add(new Label("statusNameLabel", item.getModelObject() + " (this status is almost never used)"));
}
item.add(new Label("statusCountLabel", String.valueOf(projectIdeaService.countProjectIdeaByMatchStatus(s))));
item.add(new Label("bachelorCountLabel", String.valueOf(projectIdeaService.countProjectIdeaByMatchStatusAndProjectClass(s, bachelor))));
item.add(new Label("masterCountLabel", String.valueOf(projectIdeaService.countProjectIdeaByMatchStatusAndProjectClass(s, master))));