Issue-45: Support multiple groups (#46)

NomisNostab · Jan 9, 2023 · e9b3519 · e9b3519
2 parents b90f198 + b9a6bc4
commit e9b3519
Show file tree

Hide file tree

Showing 39 changed files with 113 additions and 60 deletions.
diff --git a/Model/AdditionalAwards/AdditionalAwardsPageViewModel.cs b/Model/AdditionalAwards/AdditionalAwardsPageViewModel.cs
@@ -8,5 +8,6 @@ public class AdditionalAwardsPageViewModel
         public string UnitId { get; set; } = string.Empty;
         public string UnitName { get; set; } = string.Empty;
         public List<MemberListModel> Members { get; set; } = new List<MemberListModel>();
+        public string GroupName { get; set; } = string.Empty;
     }
 }
diff --git a/Model/Approvals/ApprovalsPageViewModel.cs b/Model/Approvals/ApprovalsPageViewModel.cs
@@ -13,5 +13,6 @@ public class ApprovalsPageViewModel
         public string DateErrorMessage { get; set; } = string.Empty;
         public bool ToBePresented { get; set; }
         public bool IsPresented { get; set; }
+        public string GroupName { get; set; } = string.Empty;
     }
 }
diff --git a/Model/Approvals/BackupRestorePageViewModel.cs b/Model/Approvals/BackupRestorePageViewModel.cs
@@ -10,5 +10,6 @@ public class BackupRestorePageViewModel
         public string SelectedUnitName { get; set; } = string.Empty;
         public Dictionary<string, string> Units { get; set; } = new Dictionary<string, string>();
         public IBrowserFile approvalsFile { get; set; }
+        public string GroupName { get; set; } = string.Empty;
     }
 }
diff --git a/Model/Index/IndexPageViewModel.cs b/Model/Index/IndexPageViewModel.cs
@@ -5,5 +5,8 @@ public class IndexPageViewModel
         public bool IsAuthenticated { get; set; }
         public string Email { get; set; } = string.Empty;
         public string FullName { get; set; } = string.Empty;
+        public string GroupId { get; set; } = string.Empty;
+        public Dictionary<string, string> Groups { get; set; } = new Dictionary<string, string>();
+
     }
 }
diff --git a/Model/Logbook/LogbookPageViewModel.cs b/Model/Logbook/LogbookPageViewModel.cs
@@ -9,5 +9,6 @@ public class LogbookPageViewModel
         public string UnitName { get; set; } = string.Empty;
         public List<MemberListModel> Members { get; set; } = new List<MemberListModel>();
         public bool IncludeLeaders { get; set; } = false;
+        public string GroupName { get; set; } = string.Empty;
     }
 }
diff --git a/Model/Login/GetProfilesResultModel.cs b/Model/Login/GetProfilesResultModel.cs
@@ -11,6 +11,8 @@ public class Profile
         public Member? member { get; set; }
         public Unit? unit { get; set; }
         public Group? group { get; set; }
+        public Branch? branch { get; set; }
+        public bool is_support_group { get; set; } = false;
     }
 
     public class Member
@@ -35,4 +37,11 @@ public class Group
         public string[]? roles { get; set; }
     }
 
+    public class Branch
+    {
+        public string? id { get; set; }
+        public string? name { get; set; }
+        public string[]? roles { get; set; }
+    }
+
 }
diff --git a/Model/Members/MembersPageViewModel.cs b/Model/Members/MembersPageViewModel.cs
@@ -12,5 +12,6 @@ public class MembersPageViewModel
         public List<MemberListModel>? Members { get; set; }
         [Display(Name = "Include Leaders")]
         public bool IncludeLeaders { get; set; } = false;
+        public string GroupName { get; set; } = string.Empty;
     }
 }
diff --git a/Model/Milestone/MilestonePageViewModel.cs b/Model/Milestone/MilestonePageViewModel.cs
@@ -10,5 +10,6 @@ public class MilestonePageViewModel
         [Required(ErrorMessage = "Select unit")] 
         public string UnitId { get; set; } = string.Empty;
         public string UnitName { get; set; } = string.Empty;
+        public string GroupName { get; set; } = string.Empty;
     }
 }
diff --git a/Model/OAS/OASPageViewModel.cs b/Model/OAS/OASPageViewModel.cs
@@ -21,5 +21,6 @@ public class OASPageViewModel
         public bool BreakByPatrol { get; set; } = false;
         public string StagesErrorMessage { get; set; } = "";
         public bool FormatLikeTerrain { get; set; } = false;
+        public string GroupName { get; set; } = string.Empty;
     }
 }
diff --git a/Model/Program/ProgramPageViewModel.cs b/Model/Program/ProgramPageViewModel.cs
@@ -17,6 +17,7 @@ public class ProgramPageViewModel
         public DateTime CalendarSearchToDate { get; set; } = DateTime.Now;
         public string DateErrorMessage { get; set; } = "";
         public bool IncludeGroupEvents { get; set; } = true;
+        public string GroupName { get; set; } = string.Empty;
     }
 
 }
diff --git a/Model/SIA/SIAPageViewModel.cs b/Model/SIA/SIAPageViewModel.cs
@@ -10,5 +10,6 @@ public class SIAPageViewModel
         public string UnitId { get; set; } = string.Empty;
         public string UnitName { get; set; } = string.Empty;
         public List<MemberListModel> Members { get; set; } = new List<MemberListModel>();
+        public string GroupName { get; set; } = string.Empty;
     }
 }
diff --git a/Model/Wallchart/WallchartPageViewModel.cs b/Model/Wallchart/WallchartPageViewModel.cs
@@ -9,5 +9,6 @@ public class WallchartPageViewModel
         [Required(ErrorMessage = "Select unit")]
         public string UnitId { get; set; } = string.Empty;
         public string UnitName { get; set; } = string.Empty;
+        public string GroupName { get; set; } = string.Empty;
     }
 }
diff --git a/Topo/Controller/AdditionalAwardsController.cs b/Topo/Controller/AdditionalAwardsController.cs
@@ -35,6 +35,7 @@ protected override async Task OnInitializedAsync()
             if (!_storageService.IsAuthenticated)
                 NavigationManager.NavigateTo("index");
 
+            model.GroupName = _storageService.GroupNameDisplay;
             model.Units = _storageService.Units;
         }
 

diff --git a/Topo/Controller/ApprovalsBackupController.cs b/Topo/Controller/ApprovalsBackupController.cs
@@ -30,7 +30,7 @@ public class ApprovalsBackupController : ComponentBase
 
         public BackupRestorePageViewModel model = new BackupRestorePageViewModel();
 
-        protected override async Task OnInitializedAsync()
+        protected override void OnInitialized()
         {
             if (!_storageService.IsAuthenticated)
                 NavigationManager.NavigateTo("index");
@@ -43,6 +43,7 @@ protected override async Task OnInitializedAsync()
                     _storageService.UnitName = _storageService.Units.Where(u => u.Key == model.SelectedUnitId).FirstOrDefault().Value;
                 model.SelectedUnitName = _storageService.UnitName;
             }
+            model.GroupName = _storageService.GroupNameDisplay;
         }
 
         internal async Task UnitChange(ChangeEventArgs e)

diff --git a/Topo/Controller/ApprovalsController.cs b/Topo/Controller/ApprovalsController.cs
@@ -38,11 +38,12 @@ public class ApprovalsController : ComponentBase
         };
 
         public SfGrid<ApprovalsListModel> GridInstance { get; set; }
-        protected override async Task OnInitializedAsync()
+        protected override void OnInitialized()
         {
             if (!_storageService.IsAuthenticated)
                 NavigationManager.NavigateTo("index");
 
+            model.GroupName = _storageService.GroupNameDisplay;
             model.Units = _storageService.Units;
             model.ApprovalSearchFromDate = DateTime.Now.AddMonths(-2);
             model.ApprovalSearchToDate = DateTime.Now;

diff --git a/Topo/Controller/IndexController.cs b/Topo/Controller/IndexController.cs
@@ -1,6 +1,7 @@
 using Topo.Model.Index;
 using Topo.Services;
 using Microsoft.AspNetCore.Components;
+using System.Reflection;
 
 namespace Topo.Controller
 {
@@ -11,10 +12,21 @@ public class IndexController : ComponentBase
 
         public IndexPageViewModel indexPageViewModel = new IndexPageViewModel();
 
-        protected override async Task OnInitializedAsync()
+        protected override void OnInitialized()
         {
             indexPageViewModel.IsAuthenticated = _storageService.IsAuthenticated;
             indexPageViewModel.FullName = _storageService.MemberName ?? "";
+            indexPageViewModel.Groups = _storageService.Groups;
+            indexPageViewModel.GroupId = _storageService.GroupId ?? "";
         }
+
+        internal void GroupChange(ChangeEventArgs e)
+        {
+            var groupId = e.Value?.ToString() ?? "";
+            _storageService.GroupId = groupId;
+            _storageService.GroupName = _storageService.Groups.Where(u => u.Key == groupId).FirstOrDefault().Value;
+            indexPageViewModel.GroupId = groupId;
+        }
+
     }
 }
diff --git a/Topo/Controller/LogbookController.cs b/Topo/Controller/LogbookController.cs
@@ -30,11 +30,12 @@ public class LogbookController : ComponentBase
 
         public LogbookPageViewModel model = new LogbookPageViewModel();
 
-        protected override async Task OnInitializedAsync()
+        protected override void OnInitialized()
         {
             if (!_storageService.IsAuthenticated)
                 NavigationManager.NavigateTo("index");
 
+            model.GroupName = _storageService.GroupNameDisplay;
             model.Units = _storageService.Units;
         }
 

diff --git a/Topo/Controller/LoginController.cs b/Topo/Controller/LoginController.cs
@@ -29,7 +29,9 @@ internal async Task LogInClick ()
                     _storageService.MemberName = _storageService.GetProfilesResult.profiles[0].member?.name ?? "";
                     _storageService.GroupName = _storageService.GetProfilesResult.profiles[0].group?.name ?? "";
                 }
-                _storageService.Units = _loginService.GetUnits();
+                _storageService.Groups = _loginService.GetGroups();
+                _storageService.GroupId = _storageService.Groups.Count == 1 ? _storageService.Groups.FirstOrDefault().Key : "";
+                _storageService.GroupName = _storageService.Groups.Count == 1 ? _storageService.Groups.FirstOrDefault().Value : "";
 
                 NavigationManager.NavigateTo("index");
             }

diff --git a/Topo/Controller/MembersController.cs b/Topo/Controller/MembersController.cs
@@ -27,12 +27,13 @@ public class MembersController : ComponentBase
 
         public MembersPageViewModel model = new MembersPageViewModel();
 
-        protected override async Task OnInitializedAsync()
+        protected override void OnInitialized()
         {
             if (!_storageService.IsAuthenticated)
                 NavigationManager.NavigateTo("index");
 
             model.Units = _storageService.Units;
+            model.GroupName = _storageService.GroupNameDisplay;
         }
 
         internal async Task UnitChange(ChangeEventArgs e)
@@ -71,12 +72,12 @@ private async Task<byte[]> PatrolList(bool includeLeaders, OutputType outputType
             var unitName = _storageService.UnitName ?? "Unit Name";
             var section = _storageService.Section;
 
-            model.Members = await _membersService.GetMembersAsync(model.UnitId);
+            var allMembers = await _membersService.GetMembersAsync(model.UnitId);
             var sortedPatrolList = new List<MemberListModel>();
             if (includeLeaders)
-                sortedPatrolList = model.Members.OrderBy(m => m.patrol_name).ToList();
+                sortedPatrolList = allMembers.OrderBy(m => m.patrol_name).ToList();
             else
-                sortedPatrolList = model.Members.Where(m => m.isAdultLeader == 0).OrderBy(m => m.patrol_name).ToList();
+                sortedPatrolList = allMembers.Where(m => m.isAdultLeader == 0).OrderBy(m => m.patrol_name).ToList();
             var serialisedSortedMemberList = JsonConvert.SerializeObject(sortedPatrolList);
 
             var report = await _reportService.GetPatrolListReport(groupName, section, unitName, outputType, serialisedSortedMemberList, includeLeaders);

diff --git a/Topo/Controller/MilestoneController.cs b/Topo/Controller/MilestoneController.cs
@@ -30,11 +30,12 @@ public class MilestoneController : ComponentBase
 
         public MilestonePageViewModel model = new MilestonePageViewModel();
 
-        protected override async Task OnInitializedAsync()
+        protected override void OnInitialized()
         {
             if (!_storageService.IsAuthenticated)
                 NavigationManager.NavigateTo("index");
 
+            model.GroupName = _storageService.GroupNameDisplay;
             model.Units = _storageService.Units;
         }
 

diff --git a/Topo/Controller/OasController.cs b/Topo/Controller/OasController.cs
@@ -44,8 +44,8 @@ protected override async Task OnInitializedAsync()
             if (!_storageService.IsAuthenticated)
                 NavigationManager.NavigateTo("index");
 
+            model.GroupName = _storageService.GroupNameDisplay;
             model.Units = _storageService.Units;
-
             model.Stages = await _oasService.GetOASStagesList();
         }
 

diff --git a/Topo/Controller/ProgramController.cs b/Topo/Controller/ProgramController.cs
@@ -36,12 +36,13 @@ protected override async Task OnInitializedAsync()
             if (!_storageService.IsAuthenticated)
                 NavigationManager.NavigateTo("index");
 
-            model.Calendars = await _programService.GetCalendars();
+            model.GroupName = _storageService.GroupNameDisplay;
+            await _programService.GetCalendars();
+            model.Calendars = _storageService.Units;
             model.CalendarSearchFromDate = DateTime.Now;
             model.CalendarSearchToDate = DateTime.Now.AddMonths(4);
             model.DateErrorMessage = "";
-            var groupCalendars = await _programService.GetGroupCalendar();
-            groupCalendarId = groupCalendars.FirstOrDefault().Key;
+            groupCalendarId = _storageService.GroupId ?? "";
         }
 
         internal void CalendarChange(ChangeEventArgs e)

diff --git a/Topo/Controller/SIAController.cs b/Topo/Controller/SIAController.cs
@@ -29,11 +29,12 @@ public class SIAController : ComponentBase
 
         public SIAPageViewModel model = new SIAPageViewModel();
 
-        protected override async Task OnInitializedAsync()
+        protected override void OnInitialized()
         {
             if (!_storageService.IsAuthenticated)
                 NavigationManager.NavigateTo("index");
 
+            model.GroupName = _storageService.GroupNameDisplay;
             model.Units = _storageService.Units;
         }
 

diff --git a/Topo/Controller/WallchartController.cs b/Topo/Controller/WallchartController.cs
@@ -29,11 +29,12 @@ public class WallchartController : ComponentBase
 
         public WallchartPageViewModel model = new WallchartPageViewModel();
 
-        protected override async Task OnInitializedAsync()
+        protected override void OnInitialized()
         {
             if (!_storageService.IsAuthenticated)
                 NavigationManager.NavigateTo("index");
 
+            model.GroupName = _storageService.GroupNameDisplay;
             model.Units = _storageService.Units;
         }
 

diff --git a/Topo/Pages/AdditionalAwards.razor b/Topo/Pages/AdditionalAwards.razor
@@ -6,7 +6,7 @@
 <EditForm Model="@model">
 
     <div class="mt-3 mb-3 row">
-        <h2>Additional Awards</h2>
+        <h2>Additional Awards @model.GroupName</h2>
     </div>
 
     <div class="form-group mb-3 row">

diff --git a/Topo/Pages/Approvals.razor b/Topo/Pages/Approvals.razor
@@ -7,7 +7,7 @@
 <EditForm Model="@model">
 
     <div class="mt-3 mb-3 row">
-        <h2>Approvals</h2>
+        <h2>Approvals @model.GroupName</h2>
     </div>
 
     <div class="form-group mb-3 row">

diff --git a/Topo/Pages/ApprovalsBackupResstore.razor b/Topo/Pages/ApprovalsBackupResstore.razor
@@ -6,7 +6,7 @@
 <EditForm Model="@model">
     <DataAnnotationsValidator />
     <div class="mt-3 mb-3 row">
-        <h2>Approvals Backup Restore</h2>
+        <h2>Approvals Backup Restore @model.GroupName</h2>
     </div>
 
     <div class="form-group mb-3 row">

diff --git a/Topo/Pages/Index.razor b/Topo/Pages/Index.razor
@@ -16,6 +16,20 @@ else
     <div class="mt-3 mb-3 row">
         <h2>Welcome @indexPageViewModel.FullName</h2>
     </div>
+    <div class="mb-3 row">
+        <label for="unit" class="col-sm-2 col-form-label">
+            Select Group to access:
+        </label>
+        <div class="col-sm-3">
+            <select id="unit" class="form-select" value="@indexPageViewModel.GroupId" @onchange="GroupChange">
+                <option value="">Select group</option>
+                @foreach (var group in indexPageViewModel.Groups)
+                {
+                    <option value="@group.Key">@group.Value</option>
+                }
+            </select>
+        </div>
+    </div>
     <div class="mb-3 row">
         <p>
             Use Members to see the members of your units, print patrol lists and patrol corner sheets.

diff --git a/Topo/Pages/Logbook.razor b/Topo/Pages/Logbook.razor
@@ -5,7 +5,7 @@
 
 <EditForm Model="@model">
     <div class="mt-3 mb-3 row">
-        <h2>Logbook</h2>
+        <h2>Logbook @model.GroupName</h2>
     </div>
 
     <div class="form-group mb-3 row">

diff --git a/Topo/Pages/Members.razor b/Topo/Pages/Members.razor
@@ -6,7 +6,7 @@
 <EditForm Model="@model">
 
     <div class="mt-3 mb-3 row">
-        <h2>Members</h2>
+        <h2>Members @model.GroupName</h2>
     </div>
 
     <div class="form-group mb-3 row">

diff --git a/Topo/Pages/Milestone.razor b/Topo/Pages/Milestone.razor
@@ -6,7 +6,7 @@
 <EditForm Model="@model">
     <DataAnnotationsValidator />
     <div class="mt-3 mb-3 row">
-        <h2>Milestone</h2>
+        <h2>Milestone @model.GroupName</h2>
     </div>
 
     <div class="form-group mb-3 row">

diff --git a/Topo/Pages/OAS.razor b/Topo/Pages/OAS.razor
@@ -6,7 +6,7 @@
 <EditForm Model="@model">
     <DataAnnotationsValidator />
     <div class="mt-3 mb-3 row">
-        <h2>Outdoor Adventure Skills</h2>
+        <h2>Outdoor Adventure Skills @model.GroupName</h2>
     </div>
 
     <div class="form-group mb-3 row">

diff --git a/Topo/Pages/Program.razor b/Topo/Pages/Program.razor
@@ -6,7 +6,7 @@
 <EditForm Model="@model" >
     <DataAnnotationsValidator />
     <div class="mt-3 mb-3 row">
-        <h2>Program</h2>
+        <h2>Program @model.GroupName</h2>
     </div>
 
     <div class="form-group mb-3 row">

diff --git a/Topo/Pages/SIA.razor b/Topo/Pages/SIA.razor
@@ -6,7 +6,7 @@
 <EditForm Model="@model">
 
     <div class="mt-3 mb-3 row">
-        <h2>Special Interest Areas</h2>
+        <h2>Special Interest Areas @model.GroupName</h2>
     </div>
 
     <div class="form-group mb-3 row">