DMC/scipro
7
0
Fork 0
Code Issues 27 Pull Requests 4 Actions Projects 1 Wiki Activity

Deadline visible in "Rough draft approval" page #106

Merged
ansv7779 merged 7 commits from rough-draft-approval-deadline into develop 2025-02-12 11:07:55 +01:00
Conversation 3 Commits 7 Files Changed 6 +9
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6ca6c63743 - Show all commits

1
view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.html
View File

@ -4,6 +4,7 @@
<wicket:panel> <wicket:panel>
<strong>Current thesis:</strong> <span wicket:id="currentThesis">[thesis.pdf (2014-08-08)]</span><br> <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>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> <strong>Supervisor comment:</strong> <span wicket:id="currentDecision.comment">[Undecided]</span> <br>
<wicket:enclosure> <wicket:enclosure>
<strong>Reason:</strong> <span wicket:id="currentReason">[I need more time]</span><br> <strong>Reason:</strong> <span wicket:id="currentReason">[I need more time]</span><br>

1
view/src/main/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanel.java
View File

@ -28,6 +28,7 @@ public class FinalSeminarApprovalProcessPanel extends GenericPanel<ReviewerAppro
) )
); );
add(new EnumLabel<>("currentStatus", process.map(ReviewerApproval::getCurrentStatus))); add(new EnumLabel<>("currentStatus", process.map(ReviewerApproval::getCurrentStatus)));
add(new DateLabel("deadline", process.map(ReviewerApproval::getCurrentDeadline)));
add( add(
new MultiLineLabel( new MultiLineLabel(
"currentDecision.comment", "currentDecision.comment",

7
view/src/test/java/se/su/dsv/scipro/supervisor/panels/FinalSeminarApprovalProcessPanelTest.java
View File

@ -10,6 +10,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import se.su.dsv.scipro.SciProTest; 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.FileDescription;
import se.su.dsv.scipro.file.FileReference; import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.project.Project;
@ -44,6 +45,12 @@ public class FinalSeminarApprovalProcessPanelTest extends SciProTest {
tester.assertModelValue(path(panel, "currentStatus"), finalSeminarApproval.getCurrentStatus()); 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 @Test
public void shows_current_reason_if_a_decision_has_been_made() { public void shows_current_reason_if_a_decision_has_been_made() {
startPanelWithApprovedFinalSeminar(); startPanelWithApprovedFinalSeminar();