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

some panel refactoring when sending ideas to service classes

Browse Source
This commit is contained in:
Emil Siverhall 2012-07-31 17:18:05 +02:00
parent ea53b74f45
commit 5786ce4f40
4 changed files with 9 additions and 10 deletions

7
src/main/java/se/su/dsv/scipro/project/panels/AcceptIdeaDialogPanel.java

@ -9,7 +9,6 @@ import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.time.Duration;
@ -66,7 +65,7 @@ public class AcceptIdeaDialogPanel extends Panel {
@Override
public void onSubmit(){
ideaService.partnerAcceptIdea(model, loggedInUser);
ideaService.partnerAcceptIdea(model.getObject(), loggedInUser);
getSession().info("You have accepted to be a part of the project: "+ model.getObject().getTitle());
}
};
@ -78,7 +77,7 @@ public class AcceptIdeaDialogPanel extends Panel {
@Override
public void onSubmit(){
ideaService.declineIdea(model);
ideaService.declineIdea(model.getObject());
getSession().info("You have declined to be a part of the project: "+ model.getObject().getTitle());
}
};
@ -112,7 +111,7 @@ public class AcceptIdeaDialogPanel extends Panel {
@Override
public void onSubmit() {
if(ideaService.acceptIdea(model, loggedInUser, partnerPanel.getStudentSet())){
if(ideaService.acceptIdea(model.getObject(), loggedInUser, partnerPanel.getStudentSet())){
getSession().info("You have successfully accepted this project idea");
} else {
getSession().error("Something went wrong while trying to accept the project idea");

4
src/main/java/se/su/dsv/scipro/project/panels/CompleteIdeaDialogPanel.java

@ -41,7 +41,7 @@ public class CompleteIdeaDialogPanel extends Panel {
@Override
public void onSubmit() {
ideaService.updateIdea(model);
ideaService.updateIdea(model.getObject());
getSession().info("Project idea updated");
}
};
@ -56,7 +56,7 @@ public class CompleteIdeaDialogPanel extends Panel {
@Override
public void onSubmit() {
ideaService.declineIdea(model);
ideaService.declineIdea(model.getObject());
getSession().info("Project idea participation cancelled");
}
};

2
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorEditIdeaPanel.java

@ -155,7 +155,7 @@ public class SupervisorEditIdeaPanel extends Panel {
target.addComponent(feedbackPanel);
try {
ideaService.saveSupervisorCreatedIdea(model, ideaCreator, studentsPanel.getStudentSet());
ideaService.saveSupervisorCreatedIdea(model.getObject(), ideaCreator, studentsPanel.getStudentSet());
setResponsePage(SupervisorProjectIdeaStartPage.class);
getSession().info("Idea successfully submitted");
} catch (Exception e) {

6
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorProjectIdeaOverviewPanel.java

@ -111,7 +111,7 @@ public class SupervisorProjectIdeaOverviewPanel extends Panel {
@Override
public boolean shouldBeVisible(IModel<SupervisorIdea> ideaModel) {
return ideaService.isIdeaEditable(ideaModel, supervisor);
return ideaService.isIdeaEditable(ideaModel.getObject(), supervisor);
}
};
columns[6] = new ClickableIconColumn<SupervisorIdea>(Model.of("Delete"), null, ImageIcon.ICON_DELETE) {
@ -119,12 +119,12 @@ public class SupervisorProjectIdeaOverviewPanel extends Panel {
@Override
protected void onClick(IModel<SupervisorIdea> ideaModel,
AjaxRequestTarget target) {
ideaService.deleteWaitingIdea(ideaModel);
ideaService.deleteWaitingIdea(ideaModel.getObject());
target.addComponent(getWMC());
}
@Override
public boolean shouldBeVisible(IModel<SupervisorIdea> ideaModel) {
return ideaService.isIdeaEditable(ideaModel, supervisor);
return ideaService.isIdeaEditable(ideaModel.getObject(), supervisor);
}
};