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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Wayne Westmoreland 2024-03-18 14:49:12 +01:00
commit 8fb22115cb
3 changed files with 7 additions and 2 deletions
view/src/main
java/se/su/dsv/scipro/admin/pages
AdminAssignReviewerPage.htmlAdminAssignReviewerPage.java
webapp/css
scipro_m.css

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

@ -98,7 +98,7 @@
<p>
These reviewers have not met their review quota, but their research areas does not match the project's.
</p>
<div class="card bg-warning bg-opacity-50 mb-3" wicket:id="wrong_research_area">
<div class="card bg-su-primary text-white mb-3" wicket:id="wrong_research_area">
<wicket:container wicket:id="details"/>
</div>
</wicket:enclosure>

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

@ -17,6 +17,7 @@ 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.data.enums.DateStyle;
import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.profile.UserLabel;
import se.su.dsv.scipro.profile.UserLinkPanel;
@ -91,7 +92,7 @@ public class AdminAssignReviewerPage extends AbstractAdminProjectPage {
}
});
add(new ViewAttachmentPanel("rough_draft", roughDraftApproval.map(RoughDraftApproval::getCurrentThesis).map(FileReference::getFileDescription)));
add(new DateLabel("requested_at", roughDraftApproval.map(RoughDraftApproval::getCurrentDecision).map(Decision::getRequested)) {
add(new DateLabel("requested_at", roughDraftApproval.map(RoughDraftApproval::getCurrentDecision).map(Decision::getRequested), DateStyle.DATETIME) {
@Override
protected void onConfigure() {
super.onConfigure();

4
view/src/main/webapp/css/scipro_m.css

@ -593,4 +593,8 @@ th.wicket_orderUp, th.sorting_asc {
/* fix clockpicker positioning in Bootstrap 5.3.x */
.clockpicker-popover {
position: absolute;
}
.bg-su-primary {
background-color: #002f5f;
}