added match manually to a popup
This commit is contained in:
parent
cb00edb412
commit
2ecf6ff435
src/main/java/se/su/dsv/scipro/admin/panels/match
@ -30,7 +30,7 @@ public class AdminEditProjectIdeaPanel extends Panel {
|
||||
Match match = model.getObject().getMatch();
|
||||
if (match != null) {
|
||||
|
||||
watsonPanel = new WatsonInfoPanel("mainPanel", match.getProjectIdea());
|
||||
watsonPanel = new ManualWatsonPanel("mainPanel", model);
|
||||
actionPanel = new ProjectIdeaActionPanel("mainPanel", new PropertyModel<Match>(model, "match"));
|
||||
currentPanel = watsonPanel;
|
||||
currentPanel.setOutputMarkupId(true);
|
||||
|
@ -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>
|
@ -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()));
|
||||
}
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user