Dear colleague,
You have been requested to review the self-assessment, {collaboratorNotification?.CompetencyAssessmentName}, by {collaboratorNotification?.InvitedByName} ({centreName}).
Click here to review the self-assessment. Click the Review self-assessment button to submit your review and, if appropriate, sign-off the self-assessment.
{signOffRequired}
You will need to be registered on the Digital Learning Solutions platform to view the self-assessment.
" - }; - emailService.SendEmail(new Email(emailSubjectLine, builder, collaboratorNotification.UserEmail, collaboratorNotification.InvitedByEmail)); - } + public string GetFrameworkUrl(int frameworkId, string tab) { var frameworkUrl = GetDLSUriBuilder(); frameworkUrl.Path += $"Framework/{frameworkId}/{tab}/"; return frameworkUrl.Uri.ToString(); } - public string GetCompetencyAssessmentUrl(int selfAssessmentID, string actionName, int? id = null) - { - var competencyAssessmentUrl = GetDLSUriBuilder(); - - competencyAssessmentUrl.Path += id != null - ? $"CompetencyAssessments/{selfAssessmentID}/{id}/{actionName}" - : $"CompetencyAssessments/{selfAssessmentID}/{actionName}"; - return competencyAssessmentUrl.Uri.ToString(); - } + public string GetCurrentActivitiesUrl() { var dlsUrlBuilder = GetDLSUriBuilder(); @@ -234,39 +205,6 @@ public void SendReviewOutcomeNotification(int reviewId, int centreId) }; emailService.SendEmail(new Email(emailSubjectLine, builder, outcomeNotification.OwnerEmail, outcomeNotification.UserEmail)); } - public void SendCompetencyAssessmentsReviewOutcomeNotification(int reviewId, int centreId) - { - string centreName = GetCentreName(centreId); - var outcomeNotification = competencyAssessmentService.GetSelfAssessmentReviewNotification(reviewId); - if (outcomeNotification == null) - { - throw new NotificationDataException($"No record found when trying to fetch review outcome Data. reviewId: {reviewId}"); - } - var competencyAssessmentUrl = GetCompetencyAssessmentUrl(outcomeNotification.SelfAssessmentID, "PublishReview"); - string emailSubjectLine = $"Competency Assessment Review Outcome - {(outcomeNotification.SignedOff ? "Approved" : "Rejected")} - Digital Learning Solutions"; - string approvalStatus = outcomeNotification.ReviewerFirstName + (outcomeNotification.SignedOff ? " approved the competency assessment for publishing." : " did not approve the competency assessment for publishing."); - string commentsText = outcomeNotification.ReviewerFirstName + (outcomeNotification.Comment != null ? " left the following review comment: " + outcomeNotification.Comment : " did not leave a review comment."); - string commentsHtml = "" + outcomeNotification.ReviewerFirstName + (outcomeNotification.Comment != null ? " left the following review comment:
" + outcomeNotification.Comment + "
Dear {outcomeNotification.OwnerFirstName},
-Your competency assessment, {outcomeNotification.SelfAssessmentName}, has been reviewed by {reviewerFullName} ({centreName}).
-{approvalStatus}
- {commentsHtml} -Click here to view the full review status for the competency assessment. Once all of the required reviewers have approved the competency assessment, you may publish it.
-You will need to login to the Digital Learning Solutions platform to access the competency assessment.
- ", - }; - emailService.SendEmail(new Email(emailSubjectLine, builder, outcomeNotification.OwnerEmail, outcomeNotification.UserEmail)); - } - public void SendSupervisorDelegateInvite(int supervisorDelegateId, int adminId, int centreId) { diff --git a/DigitalLearningSolutions.Web/Services/SelfAssessmentNotificationService.cs b/DigitalLearningSolutions.Web/Services/SelfAssessmentNotificationService.cs index c235893c37..fefe3b03ad 100644 --- a/DigitalLearningSolutions.Web/Services/SelfAssessmentNotificationService.cs +++ b/DigitalLearningSolutions.Web/Services/SelfAssessmentNotificationService.cs @@ -10,6 +10,8 @@ public interface ISelfAssessmentNotificationService { void SendCompetencyAssessmentCollaboratorInvite(int id, int invitedByAdminId); + void SendReviewRequestForSelfAssessment(int id, int invitedByAdminId, bool required, bool reminder, int centreId); + void SendSelfAssessmentsReviewOutcomeNotification(int reviewId, int centreId); } public class SelfAssessmentNotificationService : ISelfAssessmentNotificationService @@ -18,15 +20,19 @@ public class SelfAssessmentNotificationService : ISelfAssessmentNotificationServ private readonly IConfigDataService configDataService; private readonly IEmailService emailService; private readonly ICompetencyAssessmentService competencyAssessmentService; + private readonly ICentresDataService centresDataService; + public SelfAssessmentNotificationService( ICompetencyAssessmentService competencyAssessmentService, IConfigDataService configDataService, - IEmailService emailService + IEmailService emailService, + ICentresDataService centresDataService ) { this.competencyAssessmentService = competencyAssessmentService; this.configDataService = configDataService; this.emailService = emailService; + this.centresDataService = centresDataService; } public void SendCompetencyAssessmentCollaboratorInvite(int id, int invitedByAdminId) { @@ -37,7 +43,7 @@ public void SendCompetencyAssessmentCollaboratorInvite(int id, int invitedByAdmi } var competencyAssessmentUrl = GetCompetencyAssessmentkUrl(collaboratorNotification.SelfAssessmentID, "Manage"); - string emailSubjectLine = $"Competency assessment {collaboratorNotification.CompetencyAssessmentRole} Invitation - Digital Learning Solutions"; + string emailSubjectLine = $"Self-assessment {collaboratorNotification.CompetencyAssessmentRole} Invitation - Digital Learning Solutions"; var builder = new BodyBuilder { @@ -52,7 +58,68 @@ public void SendCompetencyAssessmentCollaboratorInvite(int id, int invitedByAdmi }; emailService.SendEmail(new Email(emailSubjectLine, builder, collaboratorNotification.UserEmail, collaboratorNotification.InvitedByEmail)); } + public void SendReviewRequestForSelfAssessment(int id, int invitedByAdminId, bool required, bool reminder, int centreId) + { + string centreName = GetCentreName(centreId); + var collaboratorNotification = this.competencyAssessmentService.GetCollaboratorNotification(id, invitedByAdminId); + if (collaboratorNotification == null) + { + throw new NotificationDataException($"No record found when trying to fetch collaboratorNotification Data. id: {id}, invitedByAdminId: {invitedByAdminId}"); + } + var competencyAssessmentUrl = GetSelfAssessmentUrl(collaboratorNotification.SelfAssessmentID, "Review", collaboratorNotification.SelfAssessmentReviewID); + string emailSubjectLine = (reminder ? " REMINDER: " : "") + "Self-assessment Review Request - Digital Learning Solutions"; + string signOffRequired = required ? "You are required to sign-off this self-assessment before it can be published." : "You are not required to sign-off this self-assessment before it is published."; + var builder = new BodyBuilder + { + TextBody = $@"Dear colleague, + You have been requested to review the self-assessment, {collaboratorNotification?.CompetencyAssessmentName}, by {collaboratorNotification?.InvitedByName} ({collaboratorNotification?.InvitedByEmail}) ({centreName}). + To review the self-assessment, visit this url: {competencyAssessmentUrl}. Click the Review self-assessment button to submit your review and, if appropriate, sign-off the self-assessment. {signOffRequired}. You will need to be registered on the Digital Learning Solutions platform to review the self-assessment.", + HtmlBody = $@"Dear colleague,
You have been requested to review the self-assessment, {collaboratorNotification?.CompetencyAssessmentName}, by {collaboratorNotification?.InvitedByName} ({centreName}).
Click here to review the self-assessment. Click the Review self-assessment button to submit your review and, if appropriate, sign-off the self-assessment.
{signOffRequired}
You will need to be registered on the Digital Learning Solutions platform to view the self-assessment.
" + }; + emailService.SendEmail(new Email(emailSubjectLine, builder, collaboratorNotification.UserEmail, collaboratorNotification.InvitedByEmail)); + } + public void SendSelfAssessmentsReviewOutcomeNotification(int reviewId, int centreId) + { + string centreName = GetCentreName(centreId); + var outcomeNotification = this.competencyAssessmentService.GetSelfAssessmentReviewNotification(reviewId); + if (outcomeNotification == null) + { + throw new NotificationDataException($"No record found when trying to fetch review outcome Data. reviewId: {reviewId}"); + } + var competencyAssessmentUrl = GetSelfAssessmentUrl(outcomeNotification.SelfAssessmentID, "PublishReview"); + string emailSubjectLine = $"Self-assessment Review Outcome - {(outcomeNotification.SignedOff ? "Approved" : "Rejected")} - Digital Learning Solutions"; + string approvalStatus = outcomeNotification.ReviewerFirstName + (outcomeNotification.SignedOff ? " approved the self-assessment for publishing." : " did not approve the self-assessment for publishing."); + string commentsText = outcomeNotification.ReviewerFirstName + (outcomeNotification.Comment != null ? " left the following review comment: " + outcomeNotification.Comment : " did not leave a review comment."); + string commentsHtml = "" + outcomeNotification.ReviewerFirstName + (outcomeNotification.Comment != null ? " left the following review comment:
" + outcomeNotification.Comment + "
Dear {outcomeNotification.OwnerFirstName},
+Your self-assessment, {outcomeNotification.SelfAssessmentName}, has been reviewed by {reviewerFullName} ({centreName}).
+{approvalStatus}
+ {commentsHtml} +Click here to view the full review status for the self-assessment. Once all of the required reviewers have approved the self-assessment, you may publish it.
+You will need to login to the Digital Learning Solutions platform to access the self-assessment.
+ ", + }; + emailService.SendEmail(new Email(emailSubjectLine, builder, outcomeNotification.OwnerEmail, outcomeNotification.UserEmail)); + } + public string GetSelfAssessmentUrl(int selfAssessmentID, string actionName, int? id = null) + { + var selfAssessmentUrl = GetDLSUriBuilder(); + + selfAssessmentUrl.Path += id != null + ? $"Self-Assessment/{selfAssessmentID}/{id}/{actionName}" + : $"Self-Assessment/{selfAssessmentID}/{actionName}"; + return selfAssessmentUrl.Uri.ToString(); + } public string GetCompetencyAssessmentkUrl(int competencyAssessmentID, string tab) { var competencyAssessmentUrl = GetDLSUriBuilder(); @@ -65,6 +132,9 @@ public UriBuilder GetDLSUriBuilder() throw new ConfigValueMissingException(configDataService.GetConfigValueMissingExceptionMessage("AppBaseUrl")); return new UriBuilder(trackingSystemBaseUrl); } - + public string GetCentreName(int centreId) + { + return centresDataService.GetCentreName(centreId); + } } } diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml index 607499f026..1666c23e6a 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml @@ -11,15 +11,7 @@ @section NavMenuItems {