diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.html b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.html index dfbda44988..b67dc4bcbb 100644 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.html +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.html @@ -4,6 +4,7 @@ <wicket:panel> <strong>Current thesis:</strong> <span wicket:id="currentThesis">[thesis.pdf (2014-08-08)]</span><br> <strong>Status:</strong> <span wicket:id="currentStatus">[Undecided]</span> <br> + <strong>Deadline:</strong> <span wicket:id="deadline">[Undecided]</span> <br> <strong>Supervisor comment:</strong> <span wicket:id="currentDecision.comment">[Undecided]</span> <br> <wicket:enclosure> <strong>Reason:</strong> <span wicket:id="currentReason">[I need more time]</span><br> diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.java b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.java index 00ba26aa74..6781c946d9 100644 --- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.java @@ -28,6 +28,7 @@ public class FinalSeminarApprovalProcessPanel extends GenericPanel<ReviewerAppro ) ); add(new EnumLabel<>("currentStatus", process.map(ReviewerApproval::getCurrentStatus))); + add(new DateLabel("deadline", process.map(ReviewerApproval::getCurrentDeadline))); add( new MultiLineLabel( "currentDecision.comment", diff --git a/view/src/test/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanelTest.java b/view/src/test/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanelTest.java index 35269ebf7a..753f2db147 100644 --- a/view/src/test/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanelTest.java +++ b/view/src/test/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanelTest.java @@ -10,6 +10,7 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import se.su.dsv.scipro.SciProTest; +import se.su.dsv.scipro.components.DateLabel; import se.su.dsv.scipro.file.FileDescription; import se.su.dsv.scipro.file.FileReference; import se.su.dsv.scipro.project.Project; @@ -44,6 +45,12 @@ public class FinalSeminarApprovalProcessPanelTest extends SciProTest { tester.assertModelValue(path(panel, "currentStatus"), finalSeminarApproval.getCurrentStatus()); } + @Test + public void shows_deadline() { + tester.assertComponent(path(panel, "deadline"), DateLabel.class); + tester.assertModelValue(path(panel, "deadline"), finalSeminarApproval.getCurrentDeadline()); + } + @Test public void shows_current_reason_if_a_decision_has_been_made() { startPanelWithApprovedFinalSeminar();