Allow supervisors to request improvements from final seminar opponents #78

Merged
niat8586 merged 41 commits from opponent-completion into develop 2025-03-05 10:05:38 +01:00
4 changed files with 14 additions and 0 deletions
Showing only changes of commit 093dd11c29 - Show all commits

View File

@ -11,6 +11,7 @@ import se.su.dsv.scipro.finalseminar.FinalSeminarCreatedEvent;
import se.su.dsv.scipro.finalseminar.FinalSeminarDeletedEvent; import se.su.dsv.scipro.finalseminar.FinalSeminarDeletedEvent;
import se.su.dsv.scipro.finalseminar.FinalSeminarThesisDeletedEvent; import se.su.dsv.scipro.finalseminar.FinalSeminarThesisDeletedEvent;
import se.su.dsv.scipro.finalseminar.FinalSeminarThesisUploadedEvent; import se.su.dsv.scipro.finalseminar.FinalSeminarThesisUploadedEvent;
import se.su.dsv.scipro.finalseminar.OppositionApprovedEvent;
import se.su.dsv.scipro.finalseminar.OppositionFailedEvent; import se.su.dsv.scipro.finalseminar.OppositionFailedEvent;
import se.su.dsv.scipro.finalseminar.OppositionReportImprovementsRequestedEvent; import se.su.dsv.scipro.finalseminar.OppositionReportImprovementsRequestedEvent;
import se.su.dsv.scipro.finalseminar.ParticipationFailedEvent; import se.su.dsv.scipro.finalseminar.ParticipationFailedEvent;
@ -170,6 +171,15 @@ public class Notifications {
); );
} }
@Subscribe
public void oppositionApproved(OppositionApprovedEvent event) {
notificationController.notifySeminar(
event.getFinalSeminar(),
SeminarEvent.Event.OPPOSITION_APPROVED,
new NotificationSource()
);
}
@Subscribe @Subscribe
public void oppositionReportImprovementsRequested(OppositionReportImprovementsRequestedEvent event) { public void oppositionReportImprovementsRequested(OppositionReportImprovementsRequestedEvent event) {
Member recipient = new Member(event.opposition().getUser(), Member.Type.OPPONENT); Member recipient = new Member(event.opposition().getUser(), Member.Type.OPPONENT);

View File

@ -28,6 +28,7 @@ public class SeminarEvent extends NotificationEvent {
CANCELLED, CANCELLED,
OPPOSITION_REPORT_SUBMITTED, OPPOSITION_REPORT_SUBMITTED,
OPPOSITION_REPORT_IMPROVEMENTS_REQUESTED, OPPOSITION_REPORT_IMPROVEMENTS_REQUESTED,
OPPOSITION_APPROVED,
} }
@Basic @Basic

View File

@ -146,6 +146,8 @@ FINAL_SEMINAR.OPPOSITION_REPORT_IMPROVEMENTS_REQUESTED.title = Opposition report
FINAL_SEMINAR.OPPOSITION_REPORT_IMPROVEMENTS_REQUESTED.body = The supervisor has deemed that the opposition report submitted \ FINAL_SEMINAR.OPPOSITION_REPORT_IMPROVEMENTS_REQUESTED.body = The supervisor has deemed that the opposition report submitted \
does not meet the minimum requirements and has requested improvements. Please log into SciPro and submit a new \ does not meet the minimum requirements and has requested improvements. Please log into SciPro and submit a new \
opposition report. Their comments can be seen below:\n\n{0} opposition report. Their comments can be seen below:\n\n{0}
FINAL_SEMINAR.OPPOSITION_APPROVED.title = Opposition approved
FINAL_SEMINAR.OPPOSITION_APPROVED.body = Your opposition report has been approved by the final seminar supervisor.
FINAL_SEMINAR.compilationSuffix = , project: {0} FINAL_SEMINAR.compilationSuffix = , project: {0}
PEER.REVIEW_COMPLETED.title = Peer review completed PEER.REVIEW_COMPLETED.title = Peer review completed

View File

@ -85,6 +85,7 @@ SeminarEvent.THESIS_UPLOAD_REMIND = Authors reminded to upload final seminar the
SeminarEvent.CANCELLED = Final seminar cancelled. SeminarEvent.CANCELLED = Final seminar cancelled.
SeminarEvent.OPPOSITION_REPORT_SUBMITTED = Opposition report submitted. SeminarEvent.OPPOSITION_REPORT_SUBMITTED = Opposition report submitted.
SeminarEvent.OPPOSITION_REPORT_IMPROVEMENTS_REQUESTED = Opposition report improvements requested. SeminarEvent.OPPOSITION_REPORT_IMPROVEMENTS_REQUESTED = Opposition report improvements requested.
SeminarEvent.OPPOSITION_APPROVED = Opposition approved.
IdeaEvent.STATUS_CHANGE = Idea status changed. IdeaEvent.STATUS_CHANGE = Idea status changed.
IdeaEvent.PARTNER_ACCEPT = Partner (author) accepted partnering idea. IdeaEvent.PARTNER_ACCEPT = Partner (author) accepted partnering idea.