sync with master

api/controllers/usermanagement/SheriffController.cs

@@ -32,15 +32,17 @@ public class SheriffController : UserController
         private ShiftService ShiftService { get; }
         private DutyRosterService DutyRosterService { get; }
         private SheriffDbContext Db { get; }
+        private TrainingService TrainingService { get; }
 
         // ReSharper disable once InconsistentNaming
         private readonly long _uploadPhotoSizeLimitKB;
 
-        public SheriffController(SheriffService sheriffService, DutyRosterService dutyRosterService, ShiftService shiftService, UserService userUserService, IConfiguration configuration, SheriffDbContext db) : base(userUserService)
+        public SheriffController(SheriffService sheriffService, DutyRosterService dutyRosterService, ShiftService shiftService, UserService userUserService,TrainingService trainingService, IConfiguration configuration, SheriffDbContext db) : base(userUserService)
         {
             SheriffService = sheriffService;
             ShiftService = shiftService;
             DutyRosterService = dutyRosterService;
+            TrainingService = trainingService;
             Db = db;
             _uploadPhotoSizeLimitKB = Convert.ToInt32(configuration.GetNonEmptyValue("UploadPhotoSizeLimitKB"));
         }
@@ -155,6 +157,15 @@ public async Task<ActionResult<SheriffDto>> UploadPhoto(Guid? id, string badgeNu
             return Ok(sheriff.Adapt<SheriffDto>());
         }
 
+        [HttpPut]
+        [Route("updateExcused")]
+        [PermissionClaimAuthorize(perm: Permission.GenerateReports)]        
+        public async Task<ActionResult<SheriffDto>> UpdateExcused(Sheriff excusedSheriff)
+        {
+            var sheriff = await SheriffService.UpdateSheriffExcused(excusedSheriff);
+            return Ok(sheriff.Adapt<SheriffDto>());
+        }
+
         #endregion Sheriff
 
         #region SheriffAwayLocation
@@ -268,6 +279,28 @@ public async Task<ActionResult> RemoveSheriffLeave(int id, string expiryReason)
 
         #endregion SheriffLeave
 
+        #region SheriffTrainingReports
+
+        [HttpPost]
+        [Route("training/reports")]
+        [PermissionClaimAuthorize(perm: Permission.GenerateReports)]
+        public async Task<ActionResult<TrainingReportDto>> GetSheriffsTrainingReports(TrainingReportSearchDto trainingReportSearch)
+        {
+            var sheriffs = await TrainingService.GetSheriffsTrainingReports(trainingReportSearch);
+            return Ok(sheriffs.Adapt<List<TrainingReportDto>>());
+        }
+
+        [HttpGet]
+        [Route("training/adjust-expiry")]
+        [PermissionClaimAuthorize(perm: Permission.AdjustTrainingExpiry)]
+        public async Task<ActionResult> TrainingExpiryAdjustment()
+        {
+            await TrainingService.TrainingExpiryAdjustment();
+            return Ok(new { result = "success"});
+        }
+
+        #endregion SheriffTrainingReports
+
         #region SheriffTraining
 
         [HttpGet]

api/cronjobs/TrainingNotification.cs

@@ -39,10 +39,14 @@ public async void ProcessTrainings()
                 Logger.LogInformation(training.Sheriff.Email);
 
                 if(training.TrainingCertificationExpiry < noticeDate){
-                    var emailBody = GetEmailBody(training);
+
+                    bool rotatingTraining = TrainingService.IsRotatingTraining(training.TrainingType);
+                    var emailBody = rotatingTraining? GetEmailRotatingBody(training) : GetEmailEndOfYearBody(training);
+                    var emailTitle = rotatingTraining? "Training Expiry Notice" : "Training Requalification Notice"; 
+
                     var emailSent = await ChesEmailService.SendEmail(
                         emailBody,
-                        "Training Expiry Notice", 
+                        emailTitle, 
                         training.Sheriff.Email
                     );
                     if(emailSent)
@@ -52,17 +56,29 @@ public async void ProcessTrainings()
             Logger.LogInformation("CronJob Done");            
         }
 
-        public string GetEmailBody(SheriffTraining training)
+        public string GetEmailRotatingBody(SheriffTraining training)
         {
             var expiryDate = training.TrainingCertificationExpiry.Value.ToString("MMMM dd, yyyy");
             var emailBody = 
-                $"Dear {training.Sheriff.FirstName} {training.Sheriff.LastName}, \n"+
+                $"Dear {training.Sheriff.FirstName} {training.Sheriff.LastName}, \n\n"+
                 $"Your \'{training.TrainingType.Code}\' certification will expire on \'{expiryDate}\'. \n"+
                 "Please ensure your certification is renewed before this date.";
 
             return emailBody;
         }
 
+        public string GetEmailEndOfYearBody(SheriffTraining training)
+        {            
+            var expiryYear = training.TrainingCertificationExpiry.Value.AddDays(-1).AddYears(1).ToString("yyyy");
+            var emailBody = 
+                $"Dear {training.Sheriff.FirstName} {training.Sheriff.LastName}, \n\n"+
+                $"Your \'{training.TrainingType.Code}\' certification will require renewal for the calendar year \'{expiryYear}\'. \n"+
+                $"Please ensure you renew your certification between January 1st and December 31, {expiryYear}. \n\n" +
+                "It is recommended to schedule training early in the year to ensure end of year compliance.";
+
+            return emailBody;
+        }
+
         public Task Execute(IJobExecutionContext context)
         {   
             Logger.LogInformation("___Running CronJob___");

api/models/dto/AddLookupCodeDto.cs

@@ -11,6 +11,11 @@ public class AddLookupCodeDto
         public DateTimeOffset? EffectiveDate { get; set; }
         public DateTimeOffset? ExpiryDate { get; set; }
         public int? LocationId { get; set; }
+        public bool? Mandatory { get; set; }
+        public bool? Rotating { get; set; }
+        public int? ValidityPeriod { get; set; }
+        public string? Category { get; set; }
+        public int? AdvanceNotice { get; set; }
         public AddLookupSortOrderDto SortOrderForLocation { get; set; }
     }
 }

api/models/dto/TrainingReportDto.cs

@@ -0,0 +1,16 @@
+using System;
+
+namespace SS.Api.models.dto
+{
+    public class TrainingReportDto
+    {
+        public string name { get; set; }
+        public string trainingType { get; set; }
+        public DateTimeOffset? end { get; set; }
+        public DateTimeOffset? expiryDate { get; set; }
+        public bool excluded { get; set; }
+        public Guid sheriffId { get; set; }
+        public string status { get; set; }
+        public string _rowVariant { get; set; }
+    }
+}

api/models/dto/TrainingReportSearchDto.cs

@@ -0,0 +1,14 @@
+using System;
+
+
+namespace SS.Api.models.dto
+{
+    public class TrainingReportSearchDto
+    {
+        public int? regionId { get; set; }
+        public int? locationId { get; set; }
+        public int? reportSubtypeId { get; set; }
+        public DateTimeOffset? startDate { get; set; }
+        public DateTimeOffset? endDate { get; set; }        
+    }
+}

api/models/dto/generated/LookupCodeDto.g.cs

@@ -19,6 +19,7 @@ public partial class LookupCodeDto
         public int ValidityPeriod { get; set; }
         public string Category { get; set; }
         public int AdvanceNotice { get; set; }
+        public bool Rotating { get; set; }
         public uint ConcurrencyToken { get; set; }
         public LookupSortOrderDto SortOrderForLocation { get; set; }
     }

api/models/dto/generated/SheriffDto.g.cs

@@ -16,6 +16,7 @@ public partial class SheriffDto
         public List<SheriffTrainingDto> Training { get; set; }
         public string PhotoUrl { get; set; }
         public DateTimeOffset LastPhotoUpdate { get; set; }
+        public bool Excused { get; set; }
         public Guid Id { get; set; }
         public bool IsEnabled { get; set; }
         public string FirstName { get; set; }

api/models/types/TrainingStatus.cs

@@ -0,0 +1,8 @@
+namespace SS.Api.models.types
+{
+    public class TrainingStatus
+    {
+        public string status;
+        public string rowType;
+    }
+}

api/models/types/TrainingStatusTypes.cs

@@ -0,0 +1,10 @@
+namespace SS.Api.models.types
+{
+    public static class TrainingStatusTypes
+    {
+        public static readonly string danger = "Not Taken";
+        public static readonly string alert = "Expired";
+        public static readonly string warning = "Requalification";   
+        public static readonly string notify = "Notified";
+    }
+}

api/services/ManageTypesService.cs

@@ -139,6 +139,26 @@ public async Task<List<LookupCode>> GetAll(LookupTypes? codeType, int? locationI
             return lookupCodes;
         }
 
+        public async Task<List<LookupCode>> GetAllForReports(int? id, LookupTypes? codeType, int? locationId, bool? mandatory, bool showExpired = false)
+        {
+            var lookupCodes = await Db.LookupCode.AsNoTracking()
+                .Include(lc => lc.SortOrder.Where(so => so.LocationId == locationId))
+                .Where(lc =>
+                    (id == null || lc.Id == id) &&
+                    (codeType == null || lc.Type == codeType) &&
+                    (locationId == null || lc.LocationId == null || lc.LocationId == locationId) &&
+                    (mandatory == null || lc.Mandatory == mandatory) &&
+                    (showExpired || lc.ExpiryDate == null))
+                .OrderBy(a => (int)a.Type)
+                .ThenBy(a => a.SortOrder.FirstOrDefault().SortOrder)
+                .ThenBy(a => a.Id)
+                .ToListAsync();
+
+            lookupCodes.ForEach(lc => lc.SortOrderForLocation = lc.SortOrder.FirstOrDefault());
+
+            return lookupCodes;
+        }
+
         public async Task<LookupCode> Find(int id) => await Db.LookupCode.AsNoTracking().FirstOrDefaultAsync(lc => lc.Id == id);
 
         public async Task<LookupCode> Expire(int id)

api/services/usermanagement/SheriffService.cs

@@ -164,6 +164,15 @@ public async Task<Sheriff> UpdateSheriffPhoto(Guid? id, string badgeNumber, byte
             return savedSheriff;
         }
 
+        public async Task<Sheriff> UpdateSheriffExcused(Sheriff sheriff)
+        {
+            var savedSheriff = await Db.Sheriff.FindAsync(sheriff.Id);
+            savedSheriff.ThrowBusinessExceptionIfNull($"No {nameof(Sheriff)} with Id: {sheriff.Id}");
+            savedSheriff.Excused = sheriff.Excused;            
+            await Db.SaveChangesAsync();
+            return savedSheriff;
+        }
+
         public async Task UpdateSheriffHomeLocation(Guid id, int locationId)
         {
             var savedSheriff = await Db.Sheriff.FindAsync(id);