diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.html b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.html index f0d3c04f34..d849423176 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.html +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.html @@ -30,6 +30,17 @@ </div> </div> + <wicket:enclosure> + <div class="alert alert-info"> + <p> + You've requested improvements to the opposition report with the below comment. + If they do not make the requested improvements in time, they will get an automatic failing grade. + The system will notify you when they've submitted a new report. + </p> + <span wicket:id="improvements_requested"></span> + </div> + </wicket:enclosure> + <div class="mb-3"> <label>Points:</label> <select class="form-select" wicket:id="points"></select> diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.java index f3bf6a0e50..57c47e9fc1 100644 --- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.java @@ -249,6 +249,19 @@ public class SeminarOppositionPanel extends Panel { } ); + IModel<String> improvementComment = finalSeminarOpposition.map( + FinalSeminarOpposition::getSupervisorCommentForImprovements + ); + add( + new Label("improvements_requested", improvementComment) { + @Override + protected void onConfigure() { + super.onConfigure(); + setVisible(!getDefaultModelObjectAsString().isBlank()); + } + } + ); + FormComponent<OppositionCriteria.Point> pointsField = new DropDownChoice<>( POINTS, pointsModel,