2934 Add cancel link to the "approve" state

This commit is contained in:
Andreas Svanberg 2023-10-11 12:17:49 +02:00
parent bbba2c3dc2
commit 8821c94d49
2 changed files with 16 additions and 2 deletions
view/src/main
java/se/su/dsv/scipro/reviewer
resources/se/su/dsv/scipro/reviewer

@ -120,6 +120,8 @@ public class RoughDraftApprovalDecisionPage extends ReviewerPage {
private final TextArea<String> feedback;
private final FileUploadField attachment;
private final WebMarkupContainer decisionButtons;
private final WebMarkupContainer gradeAndApprove;
public DecisionForm(String id, IModel<ReviewerApproval> reviewerApproval) {
super(id, reviewerApproval);
@ -130,7 +132,7 @@ public class RoughDraftApprovalDecisionPage extends ReviewerPage {
attachment = new FileUploadField("attachment");
add(attachment);
WebMarkupContainer decisionButtons = new WebMarkupContainer("decision_buttons");
decisionButtons = new WebMarkupContainer("decision_buttons");
decisionButtons.setOutputMarkupPlaceholderTag(true);
add(decisionButtons);
@ -144,7 +146,7 @@ public class RoughDraftApprovalDecisionPage extends ReviewerPage {
}
});
WebMarkupContainer gradeAndApprove = new ApproveAndGrade("approve_and_grade");
gradeAndApprove = new ApproveAndGrade("approve_and_grade");
gradeAndApprove.setVisible(false);
gradeAndApprove.setOutputMarkupPlaceholderTag(true);
add(gradeAndApprove);
@ -221,6 +223,15 @@ public class RoughDraftApprovalDecisionPage extends ReviewerPage {
WicketFileUpload.ofOptional(attachment.getFileUpload()));
}
});
add(new AjaxLink<>("cancel") {
@Override
public void onClick(AjaxRequestTarget target) {
gradeAndApprove.setVisible(false);
target.add(gradeAndApprove);
decisionButtons.setVisible(true);
target.add(decisionButtons);
}
});
}
private void reportGrade(User author, Project project) {

@ -49,6 +49,9 @@
<button type="submit" class="btn btn-success btn-sm" wicket:id="approve">
Approve
</button>
<a wicket:id="cancel" class="btn btn-link btn-sm">
Cancel
</a>
</div>
</form>
</div>