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

enum label for approval steps

Browse Source
This commit is contained in:
Emil Siverhall 2014-05-08 09:23:49 +02:00
parent 34ef72f1eb
commit 03af12d860
3 changed files with 11 additions and 6 deletions

2
view/src/main/java/se/su/dsv/scipro/reviewer/FinalSeminarApprovalDecisionPage.html

@ -5,7 +5,7 @@
<div class="well well-sm" wicket:id="projectHeader"></div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-6">
<h4>Final seminar approval</h4>
<h4><span wicket:id="title"></span></h4>
<div wicket:id="details"></div>
<form wicket:id="decision">
<div wicket:id="feedbackPanel"></div>

12
view/src/main/java/se/su/dsv/scipro/reviewer/FinalSeminarApprovalDecisionPage.java

@ -1,6 +1,7 @@
package se.su.dsv.scipro.reviewer;
import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.html.basic.EnumLabel;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
@ -30,14 +31,15 @@ public class FinalSeminarApprovalDecisionPage extends AbstractSupervisorPage imp
@Inject
private ReviewerDecisionService reviewerDecisionService;
public FinalSeminarApprovalDecisionPage(final IModel<ReviewerApproval> finalSeminarApproval) {
setDefaultModel(finalSeminarApproval);
public FinalSeminarApprovalDecisionPage(final IModel<ReviewerApproval> approval) {
setDefaultModel(approval);
IModel<Project> project = new PropertyModel<>(finalSeminarApproval, "project");
IModel<Project> project = new PropertyModel<>(approval, "project");
add(new ProjectHeaderPanel("projectHeader", project));
add(new ViewForumThreadPanel("communication", getThread(project)));
add(new FinalSeminarApprovalProcessPanel("details", finalSeminarApproval));
add(new DecisionForm("decision", finalSeminarApproval));
add(new FinalSeminarApprovalProcessPanel("details", approval));
add(new DecisionForm("decision", approval));
add(new EnumLabel<>("title", new PropertyModel<ReviewerApproval.Step>(approval, "step")));
}
private LoadableDetachableModel<ReviewerThread> getThread(final IModel<Project> project) {

3
view/src/main/java/se/su/dsv/scipro/wicket-package.utf8.properties

@ -88,5 +88,8 @@ PeerEvent.REQUEST_EXPIRED = Peer request was not selected for peer review within
MileStoneEvent.MILESTONE_CONFIRMED = Milestone confirmed.
MileStoneEvent.MILESTONE_REVOKED = Milestone revoked.
Step.ROUGH_DRAFT_APPROVAL = Rough draft approval
Step.FINAL_SEMINAR_APPROVAL = Final seminar approval