From a23c25962b63b5381b4e142a07f1c7ba1a83699a Mon Sep 17 00:00:00 2001
From: Stefan Humpelstetter <shumpelstetter@gmail.com>
Date: Mon, 30 Oct 2023 08:01:08 +0000
Subject: [PATCH 1/6] push

---
 Models/Team.cs                 | 56 ++++++++++++++++++++++++++++++++++
 Models/TeamMember.cs           | 42 +++++++++++++++++++++++++
 Services/ITeamMemberService.cs | 17 +++++++++++
 3 files changed, 115 insertions(+)
 create mode 100644 Models/Team.cs
 create mode 100644 Models/TeamMember.cs
 create mode 100644 Services/ITeamMemberService.cs

diff --git a/Models/Team.cs b/Models/Team.cs
new file mode 100644
index 0000000..211f750
--- /dev/null
+++ b/Models/Team.cs
@@ -0,0 +1,56 @@
+using SQLite;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MauiApp1.Models
+{
+    internal class Team : INotifyPropertyChanged
+    {
+        [PrimaryKey, AutoIncrement]
+        public int id { get; set; }
+        private int maxSize;
+        public int MaxSize
+        {
+            get => maxSize;
+            set => SetField(ref maxSize, value);
+        }
+
+        private string skillsRequired;
+        public string SkillsRequired
+        {
+            get => skillsRequired;
+            set => SetField(ref skillsRequired, value);
+        }
+
+        private DateTime startDate;
+        public DateTime StartDate
+        {
+            get => startDate;
+            set => SetField(ref startDate, value);
+        }
+
+        private DateTime endDate;
+        public DateTime EndDate
+        {
+            get => endDate;
+            set => SetField(ref endDate, value);
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+        protected void OnPropertyChanged(string propertyName) =>
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+
+        protected bool SetField<T>(ref T field, T value, [CallerMemberName] string propertyName = "")
+        {
+            if (EqualityComparer<T>.Default.Equals(field, value)) return false;
+            field = value;
+            OnPropertyChanged(propertyName);
+            return true;
+        }
+    }
+}
diff --git a/Models/TeamMember.cs b/Models/TeamMember.cs
new file mode 100644
index 0000000..d8d2ae2
--- /dev/null
+++ b/Models/TeamMember.cs
@@ -0,0 +1,42 @@
+using SQLite;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MauiApp1.Models
+{
+    public class TeamMember : INotifyPropertyChanged
+    {
+        [PrimaryKey, AutoIncrement]
+        public int id { get; set; }
+        private string firstname;
+        public string Firstname
+        {
+            get => firstname;
+            set => SetField(ref firstname, value);
+        }
+
+        private string lastname;
+        public string Lastname
+        {
+            get => lastname;
+            set => SetField(ref lastname, value);
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+        protected void OnPropertyChanged(string propertyName) =>
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+
+        protected bool SetField<T>(ref T field, T value, [CallerMemberName] string propertyName = "")
+        {
+            if (EqualityComparer<T>.Default.Equals(field, value)) return false;
+            field = value;
+            OnPropertyChanged(propertyName);
+            return true;
+        }
+    }
+}
diff --git a/Services/ITeamMemberService.cs b/Services/ITeamMemberService.cs
new file mode 100644
index 0000000..1fc4b55
--- /dev/null
+++ b/Services/ITeamMemberService.cs
@@ -0,0 +1,17 @@
+using MauiApp1.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MauiApp1.Services
+{
+    public interface ITeamMemberService
+    {
+        Task<List<Equipment>> GetTeamMemberList();
+        Task<int> AddTeamMember(TeamMember teamMember);
+        Task<int> DeleteTeamMember(TeamMember teamMember);
+        Task<int> UpdateTeamMember(TeamMember teamMember);
+    }
+}
\ No newline at end of file

From 42ef38c253f69a1fbdb4cdccd93a7d1a8fefe835 Mon Sep 17 00:00:00 2001
From: Stefan Humpelstetter <shumpelstetter@gmail.com>
Date: Mon, 30 Oct 2023 08:05:53 +0000
Subject: [PATCH 2/6] yes

---
 Models/TeamMember.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Models/TeamMember.cs b/Models/TeamMember.cs
index d8d2ae2..e957439 100644
--- a/Models/TeamMember.cs
+++ b/Models/TeamMember.cs
@@ -27,6 +27,13 @@ public string Lastname
             set => SetField(ref lastname, value);
         }
 
+        private string email;
+        public string Email
+        {
+            get => email;
+            set => SetField(ref email, value);
+        }
+
         public event PropertyChangedEventHandler PropertyChanged;
         protected void OnPropertyChanged(string propertyName) =>
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));

From f9c814f203b299e3bac7b7a22356560f736aec14 Mon Sep 17 00:00:00 2001
From: Stefan Humpelstetter <shumpelstetter@gmail.com>
Date: Mon, 30 Oct 2023 08:24:14 +0000
Subject: [PATCH 3/6] push

---
 Services/TeamMemberService.cs | 52 +++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 Services/TeamMemberService.cs

diff --git a/Services/TeamMemberService.cs b/Services/TeamMemberService.cs
new file mode 100644
index 0000000..3999c96
--- /dev/null
+++ b/Services/TeamMemberService.cs
@@ -0,0 +1,52 @@
+using MauiApp1.Data;
+using MauiApp1.Models;
+using SQLite;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MauiApp1.Services
+{
+    public class TeamMemberService : ITeamMemberService
+    {
+        private SQLiteAsyncConnection _dbConn;
+        /*! <summary>
+        Method that initiates connection to database. Will create the OrderStatus table if connected.
+        </summary> */
+        private async Task SetUpDb()
+        {
+            if (_dbConn != null)
+                return;
+
+
+            _dbConn = new SQLiteAsyncConnection(DatabaseSettings.DBPath, DatabaseSettings.Flags);
+            await _dbConn.CreateTableAsync<OrderStatus>();
+        }
+
+        public async Task<int> AddTeamMember(TeamMember teamMember)
+        {
+            await SetUpDb();
+            return await _dbConn.InsertAsync(teamMember);
+        }
+
+        public async Task<int> DeleteTeamMember(TeamMember teamMember)
+        {
+            await SetUpDb();
+            return await _dbConn.DeleteAsync(teamMember);
+        }
+
+        public async Task<List<TeamMember>> GetTeamMemberList()
+        {
+            await SetUpDb();
+            return await _dbConn.Table<TeamMember>().ToListAsync();
+        }
+
+        public async Task<int> UpdateTeamMember(TeamMember teamMember)
+        {
+            await SetUpDb();
+            return await _dbConn.UpdateAsync(teamMember);
+        }
+    }
+}

From 5785040c1fb139b55b52371bb51f8a8a91b90f63 Mon Sep 17 00:00:00 2001
From: herrone <egretfulherron@gmail.com>
Date: Mon, 30 Oct 2023 08:33:14 +0000
Subject: [PATCH 4/6] Added xaml for TeamMembers

---
 Views/TeamMember.xaml       |  28 ++++++++++
 Views/TeamMember.xaml.cs    | 100 ++++++++++++++++++++++++++++++++++++
 Views/VolunteerPage.xaml    |  28 ++++++++++
 Views/VolunteerPage.xaml.cs |  80 +++++++++++++++++++++++++++++
 4 files changed, 236 insertions(+)
 create mode 100644 Views/TeamMember.xaml
 create mode 100644 Views/TeamMember.xaml.cs
 create mode 100644 Views/VolunteerPage.xaml
 create mode 100644 Views/VolunteerPage.xaml.cs

diff --git a/Views/TeamMember.xaml b/Views/TeamMember.xaml
new file mode 100644
index 0000000..6395056
--- /dev/null
+++ b/Views/TeamMember.xaml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="MauiApp1.Views.RolesPage"
+             Title="Role Page">
+    <VerticalStackLayout Spacing="10" Margin="5">
+        <Editor x:Name="txe_role"
+                Placeholder="Add a Role"
+                HeightRequest="100" />
+
+        <Grid ColumnDefinitions="*,*" ColumnSpacing="4">
+            <Button Text="Save"
+                    Clicked="SaveButton_Clicked" />
+
+            <Button Grid.Column="1"
+                    Text="Delete"
+                    Clicked="DeleteButton_Clicked" />
+        </Grid>
+
+        <ListView x:Name="ltv_roles" Background="white" ItemSelected="ltv_roles_ItemSelected">
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <TextCell TextColor="Black" Text="{Binding Name}"/>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/Views/TeamMember.xaml.cs b/Views/TeamMember.xaml.cs
new file mode 100644
index 0000000..e370e7e
--- /dev/null
+++ b/Views/TeamMember.xaml.cs
@@ -0,0 +1,100 @@
+using MauiApp1.Models;
+using MauiApp1.Services;
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+
+/*! The RolesPage class allows for the basic functions 
+ *  implemented in the RoleService class to be used within
+ *  the UI
+ */
+
+namespace MauiApp1.Views;
+
+public partial class RolesPage : ContentPage
+{
+    Role selectedRole = null;
+    IRoleService roleService;
+    ObservableCollection<Role> roles = new ObservableCollection<Role>();
+
+    //! public initialisation of components
+    public RolesPage()
+	{
+        InitializeComponent();
+        this.BindingContext = this;
+        this.roleService = new RoleService();
+
+        Task.Run(async () => await LoadRoles());
+        txe_role.Text = "";
+    }
+
+    //! Task to load roles into a variable
+    private async Task LoadRoles()
+    {
+        roles = new ObservableCollection<Role>(await roleService.GetRoleList());
+        ltv_roles.ItemsSource = roles;
+    }
+
+    /*!
+    * Detect save button being clicked
+    * @param sender (Object) the sender object created by the event
+    * @param e (EventArgs) the arguments passed into the event
+    */
+    private void SaveButton_Clicked(object sender, EventArgs e)
+    {
+        if (String.IsNullOrEmpty(txe_role.Text)) return;
+
+        if (selectedRole == null)
+        {
+            var role = new Role() { Name = txe_role.Text };
+            roleService.AddRole(role);
+            roles.Add(role);
+        }
+        else
+        {
+            selectedRole.Name = txe_role.Text;
+            roleService.UpdateRole(selectedRole);
+            var role = roles.FirstOrDefault(x => x.ID == selectedRole.ID);
+            role.Name = txe_role.Text;
+        }
+
+        selectedRole = null;
+        ltv_roles.SelectedItem = null;
+        txe_role.Text = "";
+
+    }
+
+    /*!
+    * Detect delete button being clicked
+    * @param sender (Object) the sender object created by the event
+    * @param e (EventArgs) the arguments passed into the event
+    */
+    private async void DeleteButton_Clicked(object sender, EventArgs e)
+    {
+        if (ltv_roles.SelectedItem == null)
+        {
+            await DisplayAlert("No Role Selected", "Select the role you want to delete from the list", "OK");
+            return;
+        }
+
+        await roleService.DeleteRole(selectedRole);
+        roles.Remove(selectedRole);
+
+        ltv_roles.SelectedItem = null;
+        txe_role.Text = "";
+    }
+
+    /*!
+    * Detect all items selected in list view
+    * @param sender (Object) the sender object created by the event
+    * @param e (SelectedItemChangedEventArgs) the arguments passed into the event
+    */
+    private void ltv_roles_ItemSelected(object sender, SelectedItemChangedEventArgs e)
+    {
+        selectedRole = e.SelectedItem as Role;
+        if (selectedRole == null) return;
+
+        txe_role.Text = selectedRole.Name;
+    }
+}
\ No newline at end of file
diff --git a/Views/VolunteerPage.xaml b/Views/VolunteerPage.xaml
new file mode 100644
index 0000000..de6ed3a
--- /dev/null
+++ b/Views/VolunteerPage.xaml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="MauiApp1.Views.VolunteerPage"
+             Title="VolunteerPage">
+    <VerticalStackLayout Spacing="10" Margin="5">
+        <Editor x:Name="txe_volunteer"
+                Placeholder="Add a Volunteer"
+                HeightRequest="100" />
+
+        <Grid ColumnDefinitions="*,*" ColumnSpacing="4">
+            <Button Text="Save"
+                    Clicked="SaveButton_Clicked" />
+
+            <Button Grid.Column="1"
+                    Text="Delete"
+                    Clicked="DeleteButton_Clicked" />
+        </Grid>
+
+        <ListView x:Name="ltv_volunteers" Background="white" ItemSelected="ltv_volunteers_ItemSelected">
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <TextCell TextColor="Black" Text="{Binding Name}"/>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/Views/VolunteerPage.xaml.cs b/Views/VolunteerPage.xaml.cs
new file mode 100644
index 0000000..e345317
--- /dev/null
+++ b/Views/VolunteerPage.xaml.cs
@@ -0,0 +1,80 @@
+using MauiApp1.Models;
+using MauiApp1.Services;
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+
+
+namespace MauiApp1.Views
+{
+    public partial class VolunteerPage : ContentPage
+    {
+        Volunteer selectedVolunteer = null;
+        IVolunteerService volunteerService;
+        ObservableCollection<Volunteer> volunteers = new ObservableCollection<Volunteer>();
+
+        public VolunteerPage()
+        {
+            InitializeComponent();
+            this.BindingContext = this;
+            this.volunteerService = new VolunteerService();
+
+            Task.Run(async () => await LoadVolunteers());
+            txe_volunteer.Text = "";
+        }
+
+        private async Task LoadVolunteers()
+        {
+            volunteers = new ObservableCollection<Volunteer>(await volunteerService.GetVolunteerList());
+            ltv_volunteers.ItemsSource = volunteers;
+        }
+
+        private void SaveButton_Clicked(object sender, EventArgs e)
+        {
+            if (String.IsNullOrEmpty(txe_volunteer.Text)) return;
+
+            if (selectedVolunteer == null)
+            {
+                var volunteer = new Volunteer() { Name = txe_volunteer.Text };
+                volunteerService.AddVolunteer(volunteer);
+                volunteers.Add(volunteer);
+            }
+            else
+            {
+                selectedVolunteer.Name = txe_volunteer.Text;
+                volunteerService.UpdateVolunteer(selectedVolunteer);
+                var volunteer = volunteers.FirstOrDefault(x => x.ID == selectedVolunteer.ID);
+                volunteer.Name = txe_volunteer.Text;
+            }
+
+            selectedVolunteer = null;
+            ltv_volunteers.SelectedItem = null;
+            txe_volunteer.Text = "";
+
+        }
+
+        private async void DeleteButton_Clicked(object sender, EventArgs e)
+        {
+            if (ltv_volunteers.SelectedItem == null)
+            {
+                await DisplayAlert("No Volunteer Selected", "Select the volunteer you want to delete from the list", "OK");
+                return;
+            }
+
+            await volunteerService.DeleteVolunteer(selectedVolunteer);
+            volunteers.Remove(selectedVolunteer);
+
+            ltv_volunteers.SelectedItem = null;
+            txe_volunteer.Text = "";
+        }
+
+        private void ltv_volunteers_ItemSelected(object sender, SelectedItemChangedEventArgs e)
+        {
+            selectedVolunteer = e.SelectedItem as Volunteer;
+            if (selectedVolunteer == null) return;
+
+            txe_volunteer.Text = selectedVolunteer.Name;
+        }
+    }
+}

From 57c7c8f2db4bed8ba256f15765c510781af8b510 Mon Sep 17 00:00:00 2001
From: herrone <egretfulherron@gmail.com>
Date: Mon, 30 Oct 2023 09:01:53 +0000
Subject: [PATCH 5/6] Added in functionality for team member

---
 MauiProgram.cs                 |  1 +
 Services/ITeamMemberService.cs |  2 +-
 Views/TeamMember.xaml          | 16 +++---
 Views/TeamMember.xaml.cs       | 93 +++++++++++++++++++---------------
 Views/VolunteerPage.xaml       | 28 ----------
 Views/VolunteerPage.xaml.cs    | 80 -----------------------------
 6 files changed, 63 insertions(+), 157 deletions(-)
 delete mode 100644 Views/VolunteerPage.xaml
 delete mode 100644 Views/VolunteerPage.xaml.cs

diff --git a/MauiProgram.cs b/MauiProgram.cs
index 91ff758..607b6a7 100644
--- a/MauiProgram.cs
+++ b/MauiProgram.cs
@@ -31,6 +31,7 @@ public static MauiApp CreateMauiApp()
         builder.Services.AddSingleton<OperationalTeamStatusService>();
         builder.Services.AddSingleton<IRotaService, RotaService>();
         builder.Services.AddSingleton<IOrderStatusService, OrderStatusService>();
+        builder.Services.AddSingleton<ITeamMemberService, TeamMemberService>();
 
         return builder.Build();
     }
diff --git a/Services/ITeamMemberService.cs b/Services/ITeamMemberService.cs
index 1fc4b55..d336f7d 100644
--- a/Services/ITeamMemberService.cs
+++ b/Services/ITeamMemberService.cs
@@ -9,7 +9,7 @@ namespace MauiApp1.Services
 {
     public interface ITeamMemberService
     {
-        Task<List<Equipment>> GetTeamMemberList();
+        Task<List<TeamMember>> GetTeamMemberList();
         Task<int> AddTeamMember(TeamMember teamMember);
         Task<int> DeleteTeamMember(TeamMember teamMember);
         Task<int> UpdateTeamMember(TeamMember teamMember);
diff --git a/Views/TeamMember.xaml b/Views/TeamMember.xaml
index 6395056..bd67738 100644
--- a/Views/TeamMember.xaml
+++ b/Views/TeamMember.xaml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="MauiApp1.Views.RolesPage"
-             Title="Role Page">
+             x:Class="MauiApp1.Views.TeamMembersPage"
+             Title="TeamMember Page">
     <VerticalStackLayout Spacing="10" Margin="5">
-        <Editor x:Name="txe_role"
-                Placeholder="Add a Role"
-                HeightRequest="100" />
+        <Editor x:Name="txe_teamMemberFirstName" Placeholder="First Name" />
+        <Editor x:Name="txe_teamMemberLastName" Placeholder="Last Name" />
+        <Editor x:Name="txe_teamMemberEmail" Placeholder="Email" />
+
 
         <Grid ColumnDefinitions="*,*" ColumnSpacing="4">
             <Button Text="Save"
@@ -17,10 +18,11 @@
                     Clicked="DeleteButton_Clicked" />
         </Grid>
 
-        <ListView x:Name="ltv_roles" Background="white" ItemSelected="ltv_roles_ItemSelected">
+        <ListView x:Name="ltv_teamMembers" Background="white" ItemSelected="ltv_teamMembers_ItemSelected">
             <ListView.ItemTemplate>
                 <DataTemplate>
-                    <TextCell TextColor="Black" Text="{Binding Name}"/>
+                    <Label Text="{Binding FirstName}" TextColor="Black" FontAttributes="Bold" />
+                    <Label Text="{Binding LastName + ' - ' + Email}" TextColor="Gray" />
                 </DataTemplate>
             </ListView.ItemTemplate>
         </ListView>
diff --git a/Views/TeamMember.xaml.cs b/Views/TeamMember.xaml.cs
index e370e7e..2deb482 100644
--- a/Views/TeamMember.xaml.cs
+++ b/Views/TeamMember.xaml.cs
@@ -5,35 +5,35 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-/*! The RolesPage class allows for the basic functions 
- *  implemented in the RoleService class to be used within
+/*! The TeamMembersPage class allows for the basic functions 
+ *  implemented in the TeamMemberService class to be used within
  *  the UI
  */
 
 namespace MauiApp1.Views;
 
-public partial class RolesPage : ContentPage
+public partial class TeamMembersPage : ContentPage
 {
-    Role selectedRole = null;
-    IRoleService roleService;
-    ObservableCollection<Role> roles = new ObservableCollection<Role>();
+    TeamMember selectedTeamMember = null;
+    ITeamMemberService teamMemberService;
+    ObservableCollection<TeamMember> teamMembers = new ObservableCollection<TeamMember>();
 
     //! public initialisation of components
-    public RolesPage()
-	{
+    public TeamMembersPage()
+    {
         InitializeComponent();
         this.BindingContext = this;
-        this.roleService = new RoleService();
+        this.teamMemberService = new TeamMemberService();
 
-        Task.Run(async () => await LoadRoles());
-        txe_role.Text = "";
+        Task.Run(async () => await LoadTeamMembers());
     }
 
-    //! Task to load roles into a variable
-    private async Task LoadRoles()
+
+    //! Task to load teamMembers into a variable
+    private async Task LoadTeamMembers()
     {
-        roles = new ObservableCollection<Role>(await roleService.GetRoleList());
-        ltv_roles.ItemsSource = roles;
+        teamMembers = new ObservableCollection<TeamMember>(await teamMemberService.GetTeamMemberList());
+        ltv_teamMembers.ItemsSource = teamMembers;
     }
 
     /*!
@@ -43,28 +43,29 @@ private async Task LoadRoles()
     */
     private void SaveButton_Clicked(object sender, EventArgs e)
     {
-        if (String.IsNullOrEmpty(txe_role.Text)) return;
+        string firstName = txe_teamMemberFirstName.Text;
+        string lastName = txe_teamMemberLastName.Text;
+        string email = txe_teamMemberEmail.Text;
 
-        if (selectedRole == null)
-        {
-            var role = new Role() { Name = txe_role.Text };
-            roleService.AddRole(role);
-            roles.Add(role);
-        }
-        else
+        if (string.IsNullOrEmpty(firstName) || string.IsNullOrEmpty(lastName) || string.IsNullOrEmpty(email)) return;
+
+        var teamMember = new TeamMember()
         {
-            selectedRole.Name = txe_role.Text;
-            roleService.UpdateRole(selectedRole);
-            var role = roles.FirstOrDefault(x => x.ID == selectedRole.ID);
-            role.Name = txe_role.Text;
-        }
+            Firstname = firstName,
+            Lastname = lastName,
+            Email = email
+        };
 
-        selectedRole = null;
-        ltv_roles.SelectedItem = null;
-        txe_role.Text = "";
+        teamMemberService.AddTeamMember(teamMember);
+        teamMembers.Add(teamMember);
 
+        // Clear input fields
+        txe_teamMemberFirstName.Text = "";
+        txe_teamMemberLastName.Text = "";
+        txe_teamMemberEmail.Text = "";
     }
 
+
     /*!
     * Detect delete button being clicked
     * @param sender (Object) the sender object created by the event
@@ -72,29 +73,39 @@ private void SaveButton_Clicked(object sender, EventArgs e)
     */
     private async void DeleteButton_Clicked(object sender, EventArgs e)
     {
-        if (ltv_roles.SelectedItem == null)
+        if (ltv_teamMembers.SelectedItem == null)
         {
-            await DisplayAlert("No Role Selected", "Select the role you want to delete from the list", "OK");
+            await DisplayAlert("No TeamMember Selected", "Select the teamMember you want to delete from the list", "OK");
             return;
         }
 
-        await roleService.DeleteRole(selectedRole);
-        roles.Remove(selectedRole);
+        TeamMember selectedTeamMember = (TeamMember)ltv_teamMembers.SelectedItem;
+
+        await teamMemberService.DeleteTeamMember(selectedTeamMember);
+        teamMembers.Remove(selectedTeamMember);
+
+        // Clear input fields
+        txe_teamMemberFirstName.Text = "";
+        txe_teamMemberLastName.Text = "";
+        txe_teamMemberEmail.Text = "";
 
-        ltv_roles.SelectedItem = null;
-        txe_role.Text = "";
+        ltv_teamMembers.SelectedItem = null;
     }
 
+
     /*!
     * Detect all items selected in list view
     * @param sender (Object) the sender object created by the event
     * @param e (SelectedItemChangedEventArgs) the arguments passed into the event
     */
-    private void ltv_roles_ItemSelected(object sender, SelectedItemChangedEventArgs e)
+    private void ltv_teamMembers_ItemSelected(object sender, SelectedItemChangedEventArgs e)
     {
-        selectedRole = e.SelectedItem as Role;
-        if (selectedRole == null) return;
+        TeamMember selectedTeamMember = e.SelectedItem as TeamMember;
+        if (selectedTeamMember == null) return;
 
-        txe_role.Text = selectedRole.Name;
+        txe_teamMemberFirstName.Text = selectedTeamMember.Firstname;
+        txe_teamMemberLastName.Text = selectedTeamMember.Lastname;
+        txe_teamMemberEmail.Text = selectedTeamMember.Email;
     }
+
 }
\ No newline at end of file
diff --git a/Views/VolunteerPage.xaml b/Views/VolunteerPage.xaml
deleted file mode 100644
index de6ed3a..0000000
--- a/Views/VolunteerPage.xaml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="MauiApp1.Views.VolunteerPage"
-             Title="VolunteerPage">
-    <VerticalStackLayout Spacing="10" Margin="5">
-        <Editor x:Name="txe_volunteer"
-                Placeholder="Add a Volunteer"
-                HeightRequest="100" />
-
-        <Grid ColumnDefinitions="*,*" ColumnSpacing="4">
-            <Button Text="Save"
-                    Clicked="SaveButton_Clicked" />
-
-            <Button Grid.Column="1"
-                    Text="Delete"
-                    Clicked="DeleteButton_Clicked" />
-        </Grid>
-
-        <ListView x:Name="ltv_volunteers" Background="white" ItemSelected="ltv_volunteers_ItemSelected">
-            <ListView.ItemTemplate>
-                <DataTemplate>
-                    <TextCell TextColor="Black" Text="{Binding Name}"/>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
-    </VerticalStackLayout>
-</ContentPage>
\ No newline at end of file
diff --git a/Views/VolunteerPage.xaml.cs b/Views/VolunteerPage.xaml.cs
deleted file mode 100644
index e345317..0000000
--- a/Views/VolunteerPage.xaml.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using MauiApp1.Models;
-using MauiApp1.Services;
-using System;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Threading.Tasks;
-
-
-namespace MauiApp1.Views
-{
-    public partial class VolunteerPage : ContentPage
-    {
-        Volunteer selectedVolunteer = null;
-        IVolunteerService volunteerService;
-        ObservableCollection<Volunteer> volunteers = new ObservableCollection<Volunteer>();
-
-        public VolunteerPage()
-        {
-            InitializeComponent();
-            this.BindingContext = this;
-            this.volunteerService = new VolunteerService();
-
-            Task.Run(async () => await LoadVolunteers());
-            txe_volunteer.Text = "";
-        }
-
-        private async Task LoadVolunteers()
-        {
-            volunteers = new ObservableCollection<Volunteer>(await volunteerService.GetVolunteerList());
-            ltv_volunteers.ItemsSource = volunteers;
-        }
-
-        private void SaveButton_Clicked(object sender, EventArgs e)
-        {
-            if (String.IsNullOrEmpty(txe_volunteer.Text)) return;
-
-            if (selectedVolunteer == null)
-            {
-                var volunteer = new Volunteer() { Name = txe_volunteer.Text };
-                volunteerService.AddVolunteer(volunteer);
-                volunteers.Add(volunteer);
-            }
-            else
-            {
-                selectedVolunteer.Name = txe_volunteer.Text;
-                volunteerService.UpdateVolunteer(selectedVolunteer);
-                var volunteer = volunteers.FirstOrDefault(x => x.ID == selectedVolunteer.ID);
-                volunteer.Name = txe_volunteer.Text;
-            }
-
-            selectedVolunteer = null;
-            ltv_volunteers.SelectedItem = null;
-            txe_volunteer.Text = "";
-
-        }
-
-        private async void DeleteButton_Clicked(object sender, EventArgs e)
-        {
-            if (ltv_volunteers.SelectedItem == null)
-            {
-                await DisplayAlert("No Volunteer Selected", "Select the volunteer you want to delete from the list", "OK");
-                return;
-            }
-
-            await volunteerService.DeleteVolunteer(selectedVolunteer);
-            volunteers.Remove(selectedVolunteer);
-
-            ltv_volunteers.SelectedItem = null;
-            txe_volunteer.Text = "";
-        }
-
-        private void ltv_volunteers_ItemSelected(object sender, SelectedItemChangedEventArgs e)
-        {
-            selectedVolunteer = e.SelectedItem as Volunteer;
-            if (selectedVolunteer == null) return;
-
-            txe_volunteer.Text = selectedVolunteer.Name;
-        }
-    }
-}

From 3aef98fac40e17d1d4177e239268c2b044706d3b Mon Sep 17 00:00:00 2001
From: herrone <egretfulherron@gmail.com>
Date: Mon, 30 Oct 2023 10:14:02 +0000
Subject: [PATCH 6/6] Added in tests and functionality for filtering

---
 Tests/TeamMembersPageTests.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 Tests/TeamMembersPageTests.cs

diff --git a/Tests/TeamMembersPageTests.cs b/Tests/TeamMembersPageTests.cs
new file mode 100644
index 0000000..50f3790
--- /dev/null
+++ b/Tests/TeamMembersPageTests.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MauiApp1.Tests
+{
+    internal class TeamMembersPageTests
+    {
+    }
+}