Issue-177: Suppress last name on patrol sheets (#186)

NomisNostab · Sep 22, 2024 · be495f4 · be495f4
2 parents b38fdbf + fdc3f2a
commit be495f4
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/Model/Members/MembersPageViewModel.cs b/Model/Members/MembersPageViewModel.cs
@@ -13,5 +13,6 @@ public class MembersPageViewModel
         [Display(Name = "Include Leaders")]
         public bool IncludeLeaders { get; set; } = false;
         public string GroupName { get; set; } = string.Empty;
+        public bool SuppressLastName { get; set; }
     }
 }
diff --git a/Services/ReportService.cs b/Services/ReportService.cs
@@ -537,7 +537,7 @@ public IWorkbook GeneratePatrolSheetsWorkbook(List<MemberListModel> sortedPatrol
             //Adding cell style.               
             IStyle headingStyle = workbook.Styles.Add("headingStyle");
             headingStyle.Font.Bold = true;
-            headingStyle.Font.Size = 40;
+            headingStyle.Font.Size = 30;
             headingStyle.HorizontalAlignment = ExcelHAlign.HAlignCenter;
             headingStyle.VerticalAlignment = ExcelVAlign.VAlignCenter;
             headingStyle.WrapText = true;

diff --git a/Topo/Controller/MembersController.cs b/Topo/Controller/MembersController.cs
@@ -17,7 +17,7 @@ public class MembersController : ComponentBase
         [Inject]
         public StorageService _storageService { get; set; }
 
-        [Inject] 
+        [Inject]
         IJSRuntime JS { get; set; }
 
         [Inject]
@@ -35,6 +35,7 @@ protected override async Task OnInitializedAsync()
 
             model.Units = _storageService.Units;
             model.GroupName = _storageService.GroupNameDisplay;
+            model.SuppressLastName = _storageService.SuppressLastName;
             if (!string.IsNullOrEmpty(_storageService.UnitId))
             {
                 await UnitChange(_storageService.UnitId);
@@ -55,7 +56,7 @@ internal async Task UnitChange(string unitId)
                 _storageService.UnitId = model.UnitId;
                 model.UnitName = _storageService.UnitName;
                 model.Members = new List<MemberListModel>();
-                return; 
+                return;
             }
             model.UnitId = unitId;
             _storageService.UnitId = model.UnitId;
@@ -151,7 +152,21 @@ private async Task<byte[]> PatrolSheet(OutputType outputType = OutputType.PDF)
             var groupName = _storageService.GroupName ?? "Group Name";
             var unitName = _storageService.UnitName ?? "Unit Name";
             var section = _storageService.Section;
-            var sortedMemberList = model.Members.Where(m => m.isAdultLeader == 0).OrderBy(m => m.patrol_name).ToList();
+            _storageService.SuppressLastName = model.SuppressLastName;
+            List<MemberListModel> sortedMemberList = new List<MemberListModel>();
+            foreach (var member in model.Members.Where(m => m.isAdultLeader == 0).OrderBy(m => m.patrol_name))
+            {
+                string lastName = _storageService.SuppressLastName ? member.last_name.Substring(0, 1).ToUpper() : member.last_name;
+                MemberListModel memberCopy = new MemberListModel
+                {
+                    patrol_name = member.patrol_name,
+                    first_name = member.first_name,
+                    last_name = lastName,
+                    isAdultLeader = member.isAdultLeader,
+                    patrol_duty = member.patrol_duty
+                };
+                sortedMemberList.Add(memberCopy);
+            }
             var serialisedSortedMemberList = JsonConvert.SerializeObject(sortedMemberList);
 
             var report = await _reportService.GetPatrolSheetsReport(groupName, section, unitName, outputType, serialisedSortedMemberList);

diff --git a/Topo/Pages/Members.razor b/Topo/Pages/Members.razor
@@ -102,6 +102,13 @@
             <div class="col-sm">
                 <button type="submit" name="button" @onclick="PatrolSheetPdfClick" class="btn btn-primary">Generate Patrol sheets (pdf)</button>
                 <button type="submit" name="button" @onclick="PatrolSheetXlsxClick" class="btn btn-success">Generate Patrol sheets (xlsx)</button>
+                <div class="form-check-inline">
+                    <InputCheckbox id="suppressLastName" class="form-check-input"
+                                   @bind-Value="model.SuppressLastName" />
+                    <label class="form-check-label" for="suppressLastName">
+                        Suppress Last Name
+                    </label>
+                </div>
             </div>
         </div>
     }