DMC/scipro
7
0
Fork 0
Code Issues28 Pull Requests3 Actions Projects1 Releases Wiki Activity

Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop

Browse Source
This commit is contained in:
Alexander Kozynchenko 2012-03-02 11:22:37 +01:00
commit 3aed0817a9
4 changed files with 1 additions and 17 deletions

5
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorAcceptDeclinePanel2.java

@ -86,10 +86,5 @@ public abstract class SupervisorAcceptDeclinePanel2 extends Panel {
} }
}); });
} }
// @Override
// protected void onSubmit() {
// matchDao.changeStatus(SciProSession.get().getUser(), matchModel.getObject(), Status.CONFIRMED);
// }
} }
} }

4
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMatchedThesisPanel.html

@ -11,10 +11,6 @@
<div class="span-22 last" wicket:id="radioGroup"> <div class="span-22 last" wicket:id="radioGroup">
<div><label for="statusListView">Show: </label><span wicket:id="statusListView"><input type="radio" wicket:id="statusRadio"></input> <span <div><label for="statusListView">Show: </label><span wicket:id="statusListView"><input type="radio" wicket:id="statusRadio"></input> <span
wicket:id="statusName"></span></span></div> wicket:id="statusName"></span></span></div>
<!-- <div wicket:id="statusListView"> -->
<!-- <input type="radio" wicket:id="statusRadio"></input> <span -->
<!-- wicket:id="statusName"></span> -->
<!-- </div> -->
</div> </div>
<div class="span-22 last append-bottom" wicket:id="dataViewContainer"> <div class="span-22 last append-bottom" wicket:id="dataViewContainer">
<table class="rounded-corner"> <table class="rounded-corner">

4
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMatchedThesisPanel.java

@ -145,15 +145,11 @@ public class SupervisorMatchedThesisPanel extends Panel {
protected void populateItem(final ListItem<Match.Status> item) { protected void populateItem(final ListItem<Match.Status> item) {
Radio<Match.Status> radio = new Radio<Match.Status>("statusRadio", item.getModel()); Radio<Match.Status> radio = new Radio<Match.Status>("statusRadio", item.getModel());
item.add(radio); item.add(radio);
// Label levelName = new Label("statusName", item.getModelObject().toString());
if (item.getModelObject().equals(Match.Status.PUBLISHED)){ if (item.getModelObject().equals(Match.Status.PUBLISHED)){
item.add(new Label("statusName", "Suggested")); item.add(new Label("statusName", "Suggested"));
} else { } else {
item.add(new Label("statusName", "Accepted")); item.add(new Label("statusName", "Accepted"));
} }
// item.add(levelName);
} }
}; };
radioGroup.add(new AjaxFormChoiceComponentUpdatingBehavior() { radioGroup.add(new AjaxFormChoiceComponentUpdatingBehavior() {

5
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorProjectIdeaDialogPanel.java

@ -58,10 +58,7 @@ public abstract class SupervisorProjectIdeaDialogPanel extends Panel {
link.add(new Label("linkLabel", matchModel.getObject().getProjectIdea().getTitle())); link.add(new Label("linkLabel", matchModel.getObject().getProjectIdea().getTitle()));
add(link); add(link);
dialog.add(new WatsonInfoPanel("watsonPanel", matchModel.getObject().getProjectIdea())); dialog.add(new WatsonInfoPanel("watsonPanel", matchModel.getObject().getProjectIdea()));
// dialog.add(new SupervisorAcceptDeclinePanel("acceptDeclinePanel", matchModel.getObject()));
dialog.add(new SupervisorAcceptDeclinePanel2("acceptDeclinePanel", matchModel.getObject()){ dialog.add(new SupervisorAcceptDeclinePanel2("acceptDeclinePanel", matchModel.getObject()){
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -70,7 +67,7 @@ public abstract class SupervisorProjectIdeaDialogPanel extends Panel {
onUpdateUpdate(target); onUpdateUpdate(target);
dialog.close(target); dialog.close(target);
} }
}); }).setEnabled(!matchModel.getObject().getStatus().equals(Match.Status.CONFIRMED));
} }
} }