DMC/scipro
7
0
Fork 0
Code Issues35 Pull Requests5 Actions Projects1 Releases Wiki Activity

Alert the opponent that they need to an improved report on the final seminar page

Browse Source
This commit is contained in:
Andreas Svanberg 2025-02-11 15:36:45 +01:00
parent 236f6a0ad3
commit 3be41635b1
2 changed files with 17 additions and 0 deletions
view/src/main/java/se/su/dsv/scipro/finalseminar
SeminarOppositionReportPanel.htmlSeminarOppositionReportPanel.java

4
view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanel.html

@ -9,6 +9,10 @@
<wicket:container wicket:id="newReport"/>
<span wicket:id="oppositionReportLabel"></span> <span wicket:id="noOppositionReportYet"></span>
<a href="#" wicket:id="oppositionReportLink">Fill out opposition report</a>
<div class="alert alert-info mt-1" wicket:id="improvements_requested">
The supervisor has requested improvements to your opposition report.
Click the link above to see detailed comments from the supervisor and to make the requested changes.
</div>
<span wicket:id="downloadPdfPanel"></span><br />
<wicket:enclosure child="downloadAttachment">
Report attachment: <span wicket:id="downloadAttachment"></span>

13
view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanel.java

@ -70,6 +70,19 @@ public class SeminarOppositionReportPanel extends GenericPanel<FinalSeminarOppos
wmc.add(getDeleteOpponentReportLink(model));
wmc.add(getDeleteOppositionReportLink(model));
wmc.add(
new WebMarkupContainer("improvements_requested") {
@Override
protected void onConfigure() {
super.onConfigure();
FinalSeminarOpposition opp = model.getObject();
boolean notGraded = opp.getGrade() == null;
boolean improvementsRequested = opp.getImprovementsRequestedAt() != null;
setVisible(isOpponentAndNotSubmitted(opp) && notGraded && improvementsRequested);
}
}
);
}
private Component getNewReportContainer(ViewAttachmentPanel oldReport) {