DMC/scipro
7
0
Fork 0
Code Issues41 Pull Requests8 Actions Projects1 Releases Wiki Activity

added match manually to a popup

Browse Source
This commit is contained in:
Fredrik Friis 2012-02-28 10:21:46 +09:00
parent cb00edb412
commit 2ecf6ff435
3 changed files with 36 additions and 1 deletions

2
src/main/java/se/su/dsv/scipro/admin/panels/match/AdminEditProjectIdeaPanel.java

@ -30,7 +30,7 @@ public class AdminEditProjectIdeaPanel extends Panel {
Match match = model.getObject().getMatch(); Match match = model.getObject().getMatch();
if (match != null) { if (match != null) {
watsonPanel = new WatsonInfoPanel("mainPanel", match.getProjectIdea()); watsonPanel = new ManualWatsonPanel("mainPanel", model);
actionPanel = new ProjectIdeaActionPanel("mainPanel", new PropertyModel<Match>(model, "match")); actionPanel = new ProjectIdeaActionPanel("mainPanel", new PropertyModel<Match>(model, "match"));
currentPanel = watsonPanel; currentPanel = watsonPanel;
currentPanel.setOutputMarkupId(true); currentPanel.setOutputMarkupId(true);

12
src/main/java/se/su/dsv/scipro/admin/panels/match/ManualWatsonPanel.html Normal file

@ -0,0 +1,12 @@
<!DOCTYPE html>
<html
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<body>
<wicket:panel>
<wicket:enclosure child="manual">
<div wicket:id="manual" class="append-bottom"></div>
<div wicket:id="watson"></div>
</wicket:enclosure>
</wicket:panel>
</body>
</html>

23
src/main/java/se/su/dsv/scipro/admin/panels/match/ManualWatsonPanel.java Normal file

@ -0,0 +1,23 @@
package se.su.dsv.scipro.admin.panels.match;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.PropertyModel;
import se.su.dsv.scipro.admin.panels.ManualMatchPanel;
import se.su.dsv.scipro.match.dataobject.Match;
import se.su.dsv.scipro.match.dataobject.ProjectIdea;
import se.su.dsv.scipro.supervisor.panels.WatsonInfoPanel;
public class ManualWatsonPanel extends Panel {
private static final long serialVersionUID = 1L;
public ManualWatsonPanel(String id, IModel<ProjectIdea> model) {
super(id);
if (model.getObject()!=null){
add(new ManualMatchPanel("manual", new PropertyModel<Match>(model, "match")));
add(new WatsonInfoPanel("watson", model.getObject().getMatch().getProjectIdea()));
}
}
}