v1.52 (#136)

NomisNostab · Apr 5, 2024 · 74f5c39 · 74f5c39
2 parents c1723a5 + bad2fde
commit 74f5c39
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 14 deletions.
diff --git a/Model/Program/EventListModel.cs b/Model/Program/EventListModel.cs
@@ -11,16 +11,22 @@ public class EventListModel
 
         [Display(Name = "Date")]
         public DateTime StartDateTime { get; set; }
+        public string StartDateTimeDisplay { get; set; } = string.Empty;
         public DateTime EndDateTime { get; set; }
+        public string EndDateTimeDisplay { get; set; } = string.Empty;
+        public string DateDisplay => StartDateTime.Date == EndDateTime.Date
+            ? $"{StartDateTime:ddd d}"
+            : $"{StartDateTime:ddd d} - {EndDateTime:ddd d}";
+        public string StartFinishDisplay { get; set; } = string.Empty;
 
         [Display(Name = "Challenge Area")]
         public string ChallengeArea { get; set; } = string.Empty;
         public string EventDisplay { get; set; } = string.Empty;
 
         [Display(Name = "Date Time")]
         public string EventDate => StartDateTime.Date == EndDateTime.Date 
-            ? $"{StartDateTime.ToString("dd/MM/yy HH:mm")} - {EndDateTime.ToString("HH:mm")}"
-            : $"{StartDateTime.ToString("dd/MM/yy HH:mm")} - {EndDateTime.ToString("HH:mm")} +{EndDateTime.DayOfYear - StartDateTime.DayOfYear}";
+            ? $"{StartDateTime:dd/MM/yy HH:mm} - {EndDateTime:HH:mm}"
+            : $"{StartDateTime:dd/MM/yy HH:mm} - {EndDateTime:HH:mm} +{EndDateTime.DayOfYear - StartDateTime.DayOfYear}";
 
         public List<EventAttendance> attendees = new List<EventAttendance>();
 

diff --git a/Services/ReportService.cs b/Services/ReportService.cs
@@ -2372,21 +2372,19 @@ public IWorkbook GenerateTermProgramWorkbook(List<EventListModel> eventEntries,
                 }
                 rowNumber++;
                 columnNumber = 1;
-                sheet.Range[rowNumber, columnNumber].DateTime = eventEntry.StartDateTime;
+                sheet.Range[rowNumber, columnNumber].Text = eventEntry.StartDateTimeDisplay;
                 sheet.Range[rowNumber, columnNumber].BorderAround();
-                sheet.Range[rowNumber, columnNumber].NumberFormat = "dd/MM/yy HH:mm";
                 columnNumber++;
-                sheet.Range[rowNumber, columnNumber].DateTime = eventEntry.EndDateTime;
+                sheet.Range[rowNumber, columnNumber].Text = eventEntry.EndDateTimeDisplay;
                 sheet.Range[rowNumber, columnNumber].BorderAround();
-                sheet.Range[rowNumber, columnNumber].NumberFormat = "dd/MM/yy HH:mm";
                 columnNumber++;
-                sheet.Range[rowNumber, columnNumber].Text = FormatEventDate(eventEntry.StartDateTime, eventEntry.EndDateTime);
+                sheet.Range[rowNumber, columnNumber].Text = eventEntry.DateDisplay;
                 sheet.Range[rowNumber, columnNumber].BorderAround();
                 columnNumber++;
                 sheet.Range[rowNumber, columnNumber].Text = "";
                 sheet.Range[rowNumber, columnNumber].BorderAround();
                 columnNumber++;
-                sheet.Range[rowNumber, columnNumber].Text = FormatEventTime(eventEntry.StartDateTime, eventEntry.EndDateTime);
+                sheet.Range[rowNumber, columnNumber].Text = eventEntry.StartFinishDisplay;
                 sheet.Range[rowNumber, columnNumber].BorderAround();
                 columnNumber++;
                 sheet.Range[rowNumber, columnNumber].Text = eventEntry.Location;

diff --git a/Topo/Controller/ProgramController.cs b/Topo/Controller/ProgramController.cs
@@ -31,6 +31,11 @@ public class ProgramController : ComponentBase
         public ProgramPageViewModel model = new ProgramPageViewModel();
         private string groupCalendarId = string.Empty;
 
+        private JsonSerializerSettings _settings = new JsonSerializerSettings
+        {
+            DateParseHandling = DateParseHandling.None
+        };
+
         protected override async Task OnInitializedAsync()
         {
             if (!_storageService.IsAuthenticated)
@@ -157,7 +162,7 @@ private async Task<byte[]> TermProgramReport(OutputType outputType = OutputType.
             var unitName = _storageService.UnitName ?? "Unit Name";
             var section = _storageService.Section;
 
-            var serialisedTermProgramData = JsonConvert.SerializeObject(model.Events);
+            var serialisedTermProgramData = JsonConvert.SerializeObject(model.Events, _settings);
             var report = await _reportService.GetTermProgramReport(groupName, section, unitName, outputType, serialisedTermProgramData);
 
             return report;

diff --git a/Topo/Services/ProgramService.cs b/Topo/Services/ProgramService.cs
@@ -98,7 +98,12 @@ public async Task<List<EventListModel>> GetEventsForDates(DateTime fromDate, Dat
                         Id = eventResult.id,
                         EventName = eventResult.title,
                         StartDateTime = eventResult.start_datetime,
+                        StartDateTimeDisplay = eventResult.start_datetime.ToString("dd/MM/yy HH:mm"),
                         EndDateTime = eventResult.end_datetime,
+                        EndDateTimeDisplay = eventResult.end_datetime.ToString("dd/MM/yy HH:mm"),
+                        StartFinishDisplay = eventResult.start_datetime.Date == eventResult.end_datetime.Date
+                            ? $"{eventResult.start_datetime:h:mm tt} - {eventResult.end_datetime:h:mm tt}"
+                            : $"{eventResult.start_datetime:ddd h:mm tt} - {eventResult.end_datetime:ddd h:mm tt}",
                         ChallengeArea = myTI.ToTitleCase(eventResult.challenge_area.Replace("_", " ").Replace("personal ", "")),
                         EventStatus = myTI.ToTitleCase(eventResult.status),
                         IsUnitEvent = eventResult.invitee_type == "unit",

diff --git a/Topo/Services/ReportService.cs b/Topo/Services/ReportService.cs
@@ -294,7 +294,7 @@ private async Task<byte[]> CallReportGeneratorFunction(ReportGenerationRequest r
             string functionUrl = "https://qwhcdbhrempok4kpmk6utzavxq0zjzha.lambda-url.ap-southeast-2.on.aws/";
 #endif
             HttpRequestMessage httpRequest = new HttpRequestMessage(HttpMethod.Put, functionUrl);
-            var content = JsonConvert.SerializeObject(reportGenerationRequest);
+            var content = JsonConvert.SerializeObject(reportGenerationRequest, new JsonSerializerSettings { DateParseHandling = DateParseHandling.None});
             string message = $"Version: {_storageService.Version}; Date: {DateTime.Now.ToString("dd/MM/yyyy : HH:mm:ss")}; ReportGenerationRequestData: {reportGenerationRequest.ReportData}";
             _logger.LogInformation(message);
             httpRequest.Content = new StringContent(content, Encoding.UTF8, "application/json");

diff --git a/Topo/Services/StorageService.cs b/Topo/Services/StorageService.cs
@@ -117,6 +117,6 @@ public bool IsYouthMember
             }
         }
 
-        public string Version = "1.51";
+        public string Version = "1.52";
     }
 }
diff --git a/TopoReportFunction/Function.cs b/TopoReportFunction/Function.cs
@@ -27,6 +27,11 @@ public class Function
 {
     private ReportService reportService = new ReportService();
 
+    private JsonSerializerSettings _settings = new JsonSerializerSettings
+    {
+        DateParseHandling = DateParseHandling.None
+    };
+
     /// <summary>
     /// Returns a Member List Report in a base 64 string of the PDF or XLSX
     /// </summary>
@@ -45,7 +50,7 @@ public string FunctionHandler(APIGatewayProxyRequest request, ILambdaContext con
 
             var requestBody = request.Body;
             Console.WriteLine(requestBody);
-            var reportGenerationRequest = JsonConvert.DeserializeObject<ReportGenerationRequest>(requestBody);
+            var reportGenerationRequest = JsonConvert.DeserializeObject<ReportGenerationRequest>(requestBody, _settings);
             if (reportGenerationRequest != null)
             {
                 var workbook = reportService.CreateWorkbookWithSheets(1);
@@ -313,7 +318,7 @@ private IWorkbook GenerateApprovalsWorkbook(ReportGenerationRequest reportGenera
 
     private IWorkbook GenerateTermProgramWorkbook(ReportGenerationRequest reportGenerationRequest)
     {
-        var reportData = JsonConvert.DeserializeObject<List<EventListModel>>(reportGenerationRequest.ReportData);
+        var reportData = JsonConvert.DeserializeObject<List<EventListModel>>(reportGenerationRequest.ReportData, _settings);
         if (reportData != null)
         {
             var workbook = reportService.GenerateTermProgramWorkbook(reportData, reportGenerationRequest.GroupName, reportGenerationRequest.Section

diff --git a/TopoReportFunctionTest/Events.cs b/TopoReportFunctionTest/Events.cs