DMC/scipro
7
0
Fork 0
Code Issues40 Pull Requests8 Actions Projects1 Releases Wiki Activity

Show the date the reviewer was requested

Browse Source
This commit is contained in:
Andreas Svanberg 2024-02-16 13:28:04 +01:00
parent 2738e938f7
commit b4b274cabd
2 changed files with 18 additions and 2 deletions
view/src/main/java/se/su/dsv/scipro/admin/pages
AdminAssignReviewerPage.htmlAdminAssignReviewerPage.java

11
view/src/main/java/se/su/dsv/scipro/admin/pages/AdminAssignReviewerPage.html

@ -18,8 +18,15 @@
<dt>Language</dt>
<dd wicket:id="language"></dd>
<dt>Thesis document</dt>
<dd wicket:id="rough_draft"></dd>
<wicket:enclosure>
<dt>Reviewer requested at</dt>
<dd wicket:id="requested_at"></dd>
</wicket:enclosure>
<wicket:enclosure>
<dt>Thesis document</dt>
<dd wicket:id="rough_draft"></dd>
</wicket:enclosure>
</dl>
</div>

9
view/src/main/java/se/su/dsv/scipro/admin/pages/AdminAssignReviewerPage.java

@ -15,6 +15,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.string.StringValueConversionException;
import se.su.dsv.scipro.components.AutoHidingListView;
import se.su.dsv.scipro.components.DateLabel;
import se.su.dsv.scipro.data.DetachableServiceModel;
import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.profile.UserLabel;
@ -23,6 +24,7 @@ import se.su.dsv.scipro.profile.UserProfileImage;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.ProjectService;
import se.su.dsv.scipro.repository.panels.ViewAttachmentPanel;
import se.su.dsv.scipro.reviewing.Decision;
import se.su.dsv.scipro.reviewing.ReviewPeriod;
import se.su.dsv.scipro.reviewing.ReviewerAssignmentService;
import se.su.dsv.scipro.reviewing.ReviewerCandidates;
@ -83,6 +85,13 @@ public class AdminAssignReviewerPage extends AbstractAdminProjectPage {
add(new UserLinkPanel("supervisor", projectModel.map(Project::getHeadSupervisor)));
add(new EnumLabel<>("language", projectModel.map(Project::getLanguage)));
add(new ViewAttachmentPanel("rough_draft", roughDraftApproval.map(RoughDraftApproval::getCurrentThesis).map(FileReference::getFileDescription)));
add(new DateLabel("requested_at", roughDraftApproval.map(RoughDraftApproval::getCurrentDecision).map(Decision::getRequested)) {
@Override
protected void onConfigure() {
super.onConfigure();
setVisible(getDefaultModelObject() != null);
}
});
}
}