DMC/scipro
7
0
Fork 0
Code Issues44 Pull Requests6 Actions Projects1 Releases Wiki Activity

Removed unnecessary columns.

Browse Source
This commit is contained in:
Tom Vahlman 2012-03-23 20:29:35 +01:00
parent 6751ea7f63
commit f0a43fdf04
2 changed files with 5 additions and 27 deletions
src/main/java/se/su/dsv/scipro/supervisor/panels
SupervisorUnmatchedThesisPanel.htmlSupervisorUnmatchedThesisPanel.java

16
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorUnmatchedThesisPanel.html

@ -68,14 +68,11 @@
<div class="span-22 last">
<table class="rounded-corner">
<thead>
<tr>
<th class="rounded-left-top"><a href="#" wicket:id="levelSortLink">Level</a></th>
<th><a href="#" wicket:id="titleSortLink">Title</a></th>
<th>Author(s)</th>
<th><a href="#" wicket:id="supervisorSortLink">Matched to</a></th>
<th>Unit</th>
<th><a href="#" wicket:id="statusSortLink">Status</a></th>
</tr>
<tr>
<th class="rounded-left-top"><a href="#" wicket:id="levelSortLink">Level</a></th>
<th><a href="#" wicket:id="titleSortLink">Title</a></th>
<th>Author(s)</th>
</tr>
</thead>
<tfoot>
<tr>
@ -87,9 +84,6 @@
<td wicket:id="level"></td>
<td wicket:id="title"></td>
<td wicket:id="author"></td>
<td wicket:id="supervisor"></td>
<td wicket:id="supervisorUnit"></td>
<td wicket:id="status"></td>
</tr>
<tr>
<td colspan="7" wicket:id="emptyLabel"></td>

16
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorUnmatchedThesisPanel.java

@ -15,7 +15,6 @@ import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
@ -136,19 +135,6 @@ public class SupervisorUnmatchedThesisPanel extends Panel {
item.add(new Label("level", new Model<ProjectClass>(idea.getProjectClass())));
item.add(new Label("title", new Model<String>(idea.getTitle())));
item.add(new Label("author", new Model<String>(createAuthorString(idea))));
item.add(new EmptyPanel("supervisor"));
item.add(new EmptyPanel("supervisorUnit"));
item.add(new Label("status", new Model<String>(idea.getStatus() != null ? idea.getStatus() : "")));
if (idea.getMatch().getSupervisor() != null) {
item.replace(new Label("supervisor", new Model<String>(idea.getMatch().getSupervisor().getNameAsString())));
if (idea.getMatch().getSupervisor().getKeywords().getFiltered("Unit") != null) {
List<Keyword> keywordList = idea.getMatch().getSupervisor().getKeywords().getFiltered("Unit");
if (!keywordList.isEmpty()) {
Keyword kw = keywordList.get(0);
item.replace(new Label("supervisorUnit", new Model<String>(kw.getKeyword())));
}
}
}
}
};
@ -172,8 +158,6 @@ public class SupervisorUnmatchedThesisPanel extends Panel {
private void addSortingLinks(final WebMarkupContainer allContainer, final Params params) {
addSortLink("level", "projectClass.name", allContainer, params);
addSortLink("title", "title", allContainer, params);
addSortLink("status", "match.status", allContainer, params);
addSortLink("supervisor", "match.supervisor", allContainer, params);
}
private void addSortLink(String markup, final String sortField, final WebMarkupContainer allContainer, final Params params) {