Version 1.50 (#125)

NomisNostab · Feb 17, 2024 · 57f6abb · 57f6abb
2 parents cd18bc9 + c8d3f97
commit 57f6abb
Show file tree

Hide file tree

Showing 19 changed files with 864 additions and 395 deletions.
diff --git a/Model/Milestone/GetMilestoneResultModel.cs b/Model/Milestone/GetMilestoneResultModel.cs
@@ -25,28 +25,12 @@ public class MilestoneResult
 
     public class Event_Count
     {
-        public Participant participant { get; set; } = new Participant();
-        public Assistant assistant { get; set; } = new Assistant();
-        public Leader leader { get; set; } = new Leader();
+        public PALEventCount participant { get; set; } = new PALEventCount();
+        public PALEventCount assistant { get; set; } = new PALEventCount();
+        public PALEventCount leader { get; set; } = new PALEventCount();
     }
 
-    public class Participant
-    {
-        public float community { get; set; }
-        public float outdoors { get; set; }
-        public float creative { get; set; }
-        public float personal_growth { get; set; }
-    }
-
-    public class Assistant
-    {
-        public float community { get; set; }
-        public float outdoors { get; set; }
-        public float creative { get; set; }
-        public float personal_growth { get; set; }
-    }
-
-    public class Leader
+    public class PALEventCount
     {
         public float community { get; set; }
         public float outdoors { get; set; }

diff --git a/Model/Wallchart/WallchartItemModel.cs b/Model/Wallchart/WallchartItemModel.cs
@@ -3,6 +3,7 @@
     public class WallchartItemModel
     {
         public string MemberName { get; set; } = string.Empty;
+        public string MemberPatrol { get; set; } = string.Empty;
         public DateTime? IntroToScouting { get; set; }
         public DateTime? IntroToSection { get; set; }
         public int Milestone1Community { get; set; }

diff --git a/Model/Wallchart/WallchartPageViewModel.cs b/Model/Wallchart/WallchartPageViewModel.cs
@@ -10,5 +10,7 @@ public class WallchartPageViewModel
         public string UnitId { get; set; } = string.Empty;
         public string UnitName { get; set; } = string.Empty;
         public string GroupName { get; set; } = string.Empty;
+        public string ErrorMessage { get; set; } = string.Empty;
+        public bool BreakByPatrol { get; set; }
     }
 }
diff --git a/Services/ReportService.cs b/Services/ReportService.cs
diff --git a/Topo/Controller/LogoutController.cs b/Topo/Controller/LogoutController.cs
@@ -11,7 +11,7 @@ public class LogoutController : ComponentBase
 
         [Inject]
         public NavigationManager NavigationManager { get; set; }
-        protected override async Task OnInitializedAsync()
+        protected override void OnInitialized()
         {
             _storageService.Logout();
             NavigationManager.NavigateTo("index");

diff --git a/Topo/Controller/MilestoneController.cs b/Topo/Controller/MilestoneController.cs
@@ -38,6 +38,7 @@ protected override void OnInitialized()
             model.GroupName = _storageService.GroupNameDisplay;
             model.Units = _storageService.Units;
             model.UnitId = _storageService.UnitId;
+            model.UnitName = _storageService.UnitName;
         }
 
         internal async Task UnitChange(ChangeEventArgs e)

diff --git a/Topo/Controller/OasController.cs b/Topo/Controller/OasController.cs
@@ -47,12 +47,21 @@ protected override async Task OnInitializedAsync()
             model.GroupName = _storageService.GroupNameDisplay;
             model.Units = _storageService.Units;
             model.Stages = await _oasService.GetOASStagesList();
-            model.UnitId = _storageService.UnitId;
+            if (!string.IsNullOrEmpty(_storageService.UnitId))
+            {
+                await UnitChange(_storageService.UnitId);
+            }
+
         }
 
         internal async Task UnitChange(ChangeEventArgs e)
         {
             var unitId = e.Value?.ToString() ?? "";
+            await UnitChange(unitId);
+        }
+
+        internal async Task UnitChange(string unitId)
+        {
             model.UnitId = unitId;
             _storageService.UnitId = model.UnitId;
             if (_storageService.Units != null)

diff --git a/Topo/Controller/WallchartController.cs b/Topo/Controller/WallchartController.cs
@@ -4,6 +4,7 @@
 using Topo.Model.Wallchart;
 using Topo.Model.ReportGeneration;
 using Topo.Services;
+using System.Reflection;
 
 namespace Topo.Controller
 {
@@ -37,6 +38,7 @@ protected override void OnInitialized()
             model.GroupName = _storageService.GroupNameDisplay;
             model.Units = _storageService.Units;
             model.UnitId = _storageService.UnitId;
+            model.UnitName = _storageService.UnitName;
         }
 
         internal async Task UnitChange(ChangeEventArgs e)
@@ -55,6 +57,11 @@ internal async Task WallchartReportPdfClick()
                 return;
 
             byte[] report = await WallchartReport(OutputType.PDF);
+            if (report.Length == 0)
+            {
+                model.ErrorMessage = "Group life request took too long. Please try Group Life for unit in Terrain first.";
+                return;
+            }
             var fileName = $"Wallchart_{model.UnitName.Replace(' ', '_')}.pdf";
 
             // Send the data to JS to actually download the file
@@ -67,6 +74,11 @@ internal async Task WallchartReportXlsxClick()
                 return;
 
             byte[] report = await WallchartReport(OutputType.Excel);
+            if (report.Length == 0)
+            {
+                model.ErrorMessage = "Group life request took too long. Please try Group Life for unit in Terrain first.";
+                return;
+            }
             var fileName = $"Wallchart_{model.UnitName.Replace(' ', '_')}.xlsx";
 
             // Send the data to JS to actually download the file
@@ -75,15 +87,20 @@ internal async Task WallchartReportXlsxClick()
 
         private async Task<byte[]> WallchartReport(OutputType outputType = OutputType.PDF)
         {
+            model.ErrorMessage = "";
             var wallchartItems = await _wallchartService.GetWallchartItems(model.UnitId);
+            if (wallchartItems.Count == 0)
+            {
+                return new byte[0];
+            }
 
             var groupName = _storageService.GroupName ?? "";
             var unitName = _storageService.UnitName ?? "";
             var section = _storageService.Section;
 
             var serialisedWallchartItems = JsonConvert.SerializeObject(wallchartItems);
 
-            var report = await _reportService.GetWallchartReport(groupName, section, unitName, outputType, serialisedWallchartItems);
+            var report = await _reportService.GetWallchartReport(groupName, section, unitName, outputType, serialisedWallchartItems, model.BreakByPatrol);
             return report;
         }
 

diff --git a/Topo/DisplaySpinnerAutomaticallyHttpMessageHandler.cs b/Topo/DisplaySpinnerAutomaticallyHttpMessageHandler.cs
@@ -11,11 +11,19 @@ public DisplaySpinnerAutomaticallyHttpMessageHandler(SpinnerService spinnerServi
         }
         protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
-            _spinnerService.Show();
-            //  await Task.Delay(1000);
-            var response = await base.SendAsync(request, cancellationToken);
-            _spinnerService.Hide();
-            return response;
+            try
+            {
+                _spinnerService.Show();
+                //  await Task.Delay(1000);
+                var response = await base.SendAsync(request, cancellationToken);
+                _spinnerService.Hide();
+                return response;
+            }
+            catch (Exception ex)
+            {
+                _spinnerService.Hide();
+                throw;
+            }
         }
     }
 }
diff --git a/Topo/Pages/Wallchart.razor b/Topo/Pages/Wallchart.razor
@@ -27,11 +27,27 @@
         </div>
     </div>
 
+    <div class="mt-3 mb-3 row">
+        <div class="col-sm-3">
+            <InputCheckbox id="breakByPatrol" class="form-check-input"
+                           @bind-Value="model.BreakByPatrol" />
+            <label class="form-check-label" for="breakByPatrol">
+                Break by Patrol
+            </label>
+        </div>
+        <div class="col-sm-9">
+        </div>
+    </div>
+
     <div class="mt-3 mb-3 row">
         <div class="col-sm">
             <button type="submit" name="button" @onclick="WallchartReportPdfClick" class="btn btn-primary">Wallchart (pdf)</button>
             <button type="submit" name="button" @onclick="WallchartReportXlsxClick" class="btn btn-success">Wallchart (xlsx)</button>
         </div>
     </div>
 
+    <div class="mt-3 mb-3 row">
+        <label class="col-form-label validation-message">@model.ErrorMessage</label>
+    </div>
+
 </EditForm>
diff --git a/Topo/Services/MembersService.cs b/Topo/Services/MembersService.cs
@@ -7,6 +7,7 @@ public interface IMembersService
     {
         public Task<List<MemberListModel>> GetMembersAsync(string unitId);
         public void ClearMemberCache(string unitId);
+        public Task<MemberListModel> GetMember(string unitId, string memberId);
     }
 
     public class MembersService : IMembersService
@@ -80,6 +81,13 @@ public async Task<List<MemberListModel>> GetMembersAsync(string unitId)
             return memberList;
         }
 
+        public async Task<MemberListModel> GetMember(string unitId, string memberId)
+        {
+            var members = await GetMembersAsync(unitId);
+            var member = members.Where(m => m.id == memberId).FirstOrDefault();
+            return member ?? new MemberListModel();
+        }
+
         private string GetAgeFromBirthdate(string dateOfBirth)
         {
             var birthday = DateTime.ParseExact(dateOfBirth, "yyyy-MM-dd", CultureInfo.InvariantCulture); // Date in AU format