Issue-177: Suppress last name on milestone, oas and wallchart (#185)

NomisNostab · Sep 22, 2024 · 8f280fc · 8f280fc
2 parents 1554828 + b8ed142
commit 8f280fc
Show file tree

Hide file tree

Showing 15 changed files with 84 additions and 8 deletions.
diff --git a/Model/Milestone/MilestonePageViewModel.cs b/Model/Milestone/MilestonePageViewModel.cs
@@ -11,5 +11,6 @@ public class MilestonePageViewModel
         public string UnitId { get; set; } = string.Empty;
         public string UnitName { get; set; } = string.Empty;
         public string GroupName { get; set; } = string.Empty;
+        public bool SuppressLastName { get; set; }
     }
 }
diff --git a/Model/OAS/OASPageViewModel.cs b/Model/OAS/OASPageViewModel.cs
@@ -24,6 +24,7 @@ public class OASPageViewModel
         public string GroupName { get; set; } = string.Empty;
         public bool UseCore { get; set; } = false;
         public bool[] CoreStages {  get; set; } = new bool[9];
+        public bool SuppressLastName { get; set; }
     }
 
 }
diff --git a/Model/Wallchart/WallchartPageViewModel.cs b/Model/Wallchart/WallchartPageViewModel.cs
@@ -12,5 +12,7 @@ public class WallchartPageViewModel
         public string GroupName { get; set; } = string.Empty;
         public string ErrorMessage { get; set; } = string.Empty;
         public bool BreakByPatrol { get; set; }
+
+        public bool SuppressLastName { get; set; }
     }
 }
diff --git a/Services/ReportService.cs b/Services/ReportService.cs
@@ -1111,7 +1111,16 @@ private void GenerateOASWorksheetBodyLikeTerrain(IWorksheet sheet, IList<IGroupi
             foreach (var groupedAnswer in groupedAnswers.OrderBy(ga => ga.Key))
             {
                 columnNumber++;
-                sheet.Range[rowNumber, columnNumber].Text = groupedAnswer.Key;
+                string memberName;
+                if (groupedAnswer.Key.Contains('|'))
+                {
+                    memberName = groupedAnswer.Key.Split("|")[0];
+                }
+                else
+                {
+                    memberName = groupedAnswer.Key;
+                }
+                sheet.Range[rowNumber, columnNumber].Text = memberName;
                 sheet.Range[rowNumber, columnNumber].BorderAround();
                 sheet.Range[rowNumber, columnNumber].CellStyle.Font.Bold = true;
                 sheet.Range[rowNumber, columnNumber].CellStyle.Rotation = 90;
@@ -1199,7 +1208,16 @@ private void GenerateOASWorksheetBodyOriginal(IWorksheet sheet, IList<IGrouping<
             foreach (var groupedAnswer in groupedAnswers.OrderBy(ga => ga.Key))
             {
                 columnNumber++;
-                sheet.Range[rowNumber, columnNumber].Text = groupedAnswer.Key;
+                string memberName;
+                if (groupedAnswer.Key.Contains('|'))
+                {
+                    memberName = groupedAnswer.Key.Split("|")[0];
+                }
+                else
+                {
+                    memberName = groupedAnswer.Key;
+                }
+                sheet.Range[rowNumber, columnNumber].Text = memberName;
                 sheet.Range[rowNumber, columnNumber].BorderAround();
                 sheet.Range[rowNumber, columnNumber].CellStyle.Font.Bold = true;
 
@@ -1272,7 +1290,7 @@ public IWorkbook GenerateOASWorksheetWorkbook(List<OASWorksheetAnswers> workshee
                 sheet.SetRowHeight(rowNumber, 25);
 
                 rowNumber++;
-                IList<IGrouping<string, OASWorksheetAnswers>> groupedAnswers = templatAnswerGroup.GroupBy(x => x.MemberName).ToList();
+                IList<IGrouping<string, OASWorksheetAnswers>> groupedAnswers = templatAnswerGroup.GroupBy(x => x.MemberName + "|" + x.MemberId).ToList();
 
                 if (formatLikeTerrain)
                     GenerateOASWorksheetBodyLikeTerrain(sheet, groupedAnswers, ref rowNumber, ref columnNumber);

diff --git a/Topo/Controller/MilestoneController.cs b/Topo/Controller/MilestoneController.cs
@@ -39,6 +39,7 @@ protected override void OnInitialized()
             model.UnitName = _storageService.UnitName;
             model.GroupName = _storageService.GroupNameDisplay;
             model.Units = _storageService.Units;
+            model.SuppressLastName = _storageService.SuppressLastName;
         }
 
         internal async Task UnitChange(ChangeEventArgs e)
@@ -75,6 +76,7 @@ internal async Task MilestoneReportXlsxClick()
 
         private async Task<byte[]> MilestoneReport(OutputType outputType = OutputType.PDF)
         {
+            _storageService.SuppressLastName = model.SuppressLastName;
             var milestoneSummaries = await _milestoneService.GetMilestoneSummaries(model.UnitId);
 
             var groupName = _storageService.GroupName ?? "";

diff --git a/Topo/Controller/OasController.cs b/Topo/Controller/OasController.cs
@@ -49,6 +49,7 @@ protected override async Task OnInitializedAsync()
             model.GroupName = _storageService.GroupNameDisplay;
             model.Units = _storageService.Units;
             model.Stages = await _oasService.GetOASStagesList();
+            model.SuppressLastName = _storageService.SuppressLastName;
             if (!string.IsNullOrEmpty(_storageService.UnitId))
             {
                 await UnitChange(_storageService.UnitId);
@@ -94,6 +95,7 @@ internal async Task OASWorksheetXlsxClick()
 
         private async Task<byte[]> OASWorksheet(OutputType outputType = OutputType.PDF)
         {
+            _storageService.SuppressLastName = model.SuppressLastName;
             var sortedAnswers = new List<OASWorksheetAnswers>();
             foreach (var selectedStageTemplate in model.SelectedStages)
             {

diff --git a/Topo/Controller/WallchartController.cs b/Topo/Controller/WallchartController.cs
@@ -43,6 +43,7 @@ protected override void OnInitialized()
 
             model.GroupName = _storageService.GroupNameDisplay;
             model.Units = _storageService.Units;
+            model.SuppressLastName = _storageService.SuppressLastName;
         }
 
         internal async Task UnitChange(ChangeEventArgs e)
@@ -90,6 +91,7 @@ internal async Task WallchartReportXlsxClick()
         private async Task<byte[]> WallchartReport(OutputType outputType = OutputType.PDF)
         {
             model.ErrorMessage = "";
+            _storageService.SuppressLastName = model.SuppressLastName;
             var wallchartItems = await _wallchartService.GetWallchartItems(model.UnitId);
             if (wallchartItems.Count == 0)
             {

diff --git a/Topo/Pages/Milestone.razor b/Topo/Pages/Milestone.razor
@@ -27,6 +27,18 @@
         </div>
     </div>
 
+    <div class="mt-3 mb-3 row">
+        <div class="col-sm-3">
+            <InputCheckbox id="suppressLastName" class="form-check-input"
+                           @bind-Value="model.SuppressLastName" />
+            <label class="form-check-label" for="suppressLastName">
+                Suppress Last Name
+            </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="MilestoneReportPdfClick" class="btn btn-primary">Milestone Report (pdf)</button>

diff --git a/Topo/Pages/OAS.razor b/Topo/Pages/OAS.razor
@@ -183,6 +183,11 @@
             </label>
         </div>
         <div class="col-sm-3">
+            <InputCheckbox id="suppressLastName" class="form-check-input"
+                           @bind-Value="model.SuppressLastName" />
+            <label class="form-check-label" for="suppressLastName">
+                Suppress Last Name
+            </label>
         </div>
     </div>
 

diff --git a/Topo/Pages/Wallchart.razor b/Topo/Pages/Wallchart.razor
@@ -35,7 +35,14 @@
                 Break by Patrol
             </label>
         </div>
-        <div class="col-sm-9">
+        <div class="col-sm-3">
+            <InputCheckbox id="suppressLastName" class="form-check-input"
+                           @bind-Value="model.SuppressLastName" />
+            <label class="form-check-label" for="suppressLastName">
+                Suppress Last Name
+            </label>
+        </div>
+        <div class="col-sm-6">
         </div>
     </div>
 

diff --git a/Topo/Services/MembersService.cs b/Topo/Services/MembersService.cs
@@ -8,6 +8,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 Task<string> GetMemberLastName(string unitId, string memberId);
     }
 
     public class MembersService : IMembersService
@@ -88,6 +89,25 @@ public async Task<MemberListModel> GetMember(string unitId, string memberId)
             return member ?? new MemberListModel();
         }
 
+        public async Task<string> GetMemberLastName(string unitId, string memberId)
+        {
+            var members = await GetMembersAsync(unitId);
+            var member = members.Where(m => m.id == memberId).FirstOrDefault();
+            if (member == null || string.IsNullOrEmpty(member.last_name))
+            {
+                return "";
+            }
+            if (_storageService.SuppressLastName)
+            {
+                var lastName = member.last_name.Substring(0, 1).ToUpper();
+                return lastName;
+            }
+            else
+            {
+                return member.last_name;
+            }
+        }
+
         private string GetAgeFromBirthdate(string dateOfBirth)
         {
             var birthday = DateTime.ParseExact(dateOfBirth, "yyyy-MM-dd", CultureInfo.InvariantCulture); // Date in AU format

diff --git a/Topo/Services/MilestoneService.cs b/Topo/Services/MilestoneService.cs
@@ -81,7 +81,7 @@ public async Task<List<MilestoneSummaryListModel>> GetMilestoneSummaries(string
                 unitMilestoneSummary.Add(
                     new MilestoneSummaryListModel
                     {
-                        memberName = $"{member.first_name} {member.last_name}",
+                        memberName = $"{member.first_name} {_membersService.GetMemberLastName(selectedUnitId, member.id).Result}",
                         currentLevel = currentLevel,
                         percentComplete = percentComplete,
                         milestone1ParticipateCommunity = milestone1Skipped ? 0 : (milestone1Awarded ? 6 : (int)milestone1.event_count.participant.community),

diff --git a/Topo/Services/OASService.cs b/Topo/Services/OASService.cs
@@ -204,7 +204,7 @@ private async Task<List<OASWorksheetAnswers>> GenerateOASWorksheetAnswers(string
                         InputTitleSortIndex = item.InputGroupSort,
                         InputSortIndex = item.Id,
                         MemberId = member.id,
-                        MemberName = $"{member.first_name} {member.last_name}",
+                        MemberName = $"{member.first_name} {_membersService.GetMemberLastName(selectedUnitId, member.id).Result}",
                         MemberPatrol = member.patrol_name,
                         MemberAnswer = "",
                         Answered = false,

diff --git a/Topo/Services/StorageService.cs b/Topo/Services/StorageService.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System.Data.SqlTypes;
+using System.Reflection;
 using Topo.Model.AdditionalAwards;
 using Topo.Model.Login;
 using Topo.Model.Members;
@@ -14,6 +15,7 @@ public class StorageService
         private bool _isAuthenticated;
         private bool _isYouthMember;
         private string _unitId = string.Empty;
+
         public bool IsAuthenticated
         {
             get { return _isAuthenticated; }
@@ -123,6 +125,8 @@ public bool IsYouthMember
             }
         }
 
+        public bool SuppressLastName { get; set; }
+
         public string Version = "1.60";
     }
 }
diff --git a/Topo/Services/WallchartService.cs b/Topo/Services/WallchartService.cs
@@ -142,7 +142,7 @@ public async Task<List<WallchartItemModel>> GetWallchartItems(string selectedUni
                 }
                 wallchartItem.OASStageProgressions = oasResults.results.Where(o => o.status == "awarded" && o.section == _storageService.Section).Count();
                 // Member
-                wallchartItem.MemberName = $"{member.first_name} {member.last_name}";
+                wallchartItem.MemberName = $"{member.first_name} {_membersService.GetMemberLastName(selectedUnitId, member.id).Result}";
                 wallchartItem.MemberPatrol = member.patrol_name;
                 wallchartItem.IntroToScouting = await GetIntroToScouting(member.id);
                 wallchartItem.IntroToSection = await GetIntroToSection(member.id);