From 281b9660eb0dbcf6954b088e48ed7825910a552f Mon Sep 17 00:00:00 2001
From: megsup <megansu2000@gmail.com>
Date: Thu, 4 Jan 2024 23:03:30 +1100
Subject: [PATCH 1/3] ResearcherView - searchBar

---
 Controller/ResearcherController.cs            |   8 ++++++--
 ..._Assignment.csproj.AssemblyReference.cache | Bin 9045 -> 9803 bytes
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Controller/ResearcherController.cs b/Controller/ResearcherController.cs
index 304f1fb..a3fe240 100644
--- a/Controller/ResearcherController.cs
+++ b/Controller/ResearcherController.cs
@@ -126,11 +126,15 @@ public static List<Researcher> FilterBy(JOBLEVEL level)
         public static List<Researcher> FilterByName(string name, ObservableCollection<Researcher> researchers)
         {
             var filteredResearchers = from researcher in researchers
+                                      where string.Equals(researcher.FullName(), name, StringComparison.OrdinalIgnoreCase)
+                                      select researcher;
+
+            return filteredResearchers.ToList();
+            /*var filteredResearchers = from researcher in researchers
                                from  res in researcher.FullName() // nested LINQ as there is a list within a list
                                where researcher.Equals(name)
                                select res;
-
-            return (List<Researcher>)filteredResearchers.ToList();
+            return (List<Researcher>)filteredResearchers.ToList();*/
             //return allResearchers.Where(r => r.givenName.Contains(name) || r.familyName.Contains(name)).ToList();
         }
 
diff --git a/obj/Debug/RAP_Assignment.csproj.AssemblyReference.cache b/obj/Debug/RAP_Assignment.csproj.AssemblyReference.cache
index e448e550843a2a3d3a1d5e7887305237e5e1a550..c29c7c92f9715684621aaa262fc89c06d8db5c1a 100644
GIT binary patch
delta 371
zcmccWcG`!7jZv6^fq^k`@<o}@jj@xN7#SzOWeNb2azgGvvQgXzNFHbQ0Fpc`u|RU7
zC`e>IO9&(5Bvz0@Usiu0Ig=GAF!>cLNJ*lCH;@#R3I&q)*n)s$zMSZ0Cw5^OCdPE2
zMKM|~MTzB^dFgs7IXR4sK>Hc4e|>&)(p3(SQ@F}Z^bGWj4U7#f85naw$|tX2<xwWA
zwiKk+!Z|-LEi=8eD6u3nKTppyuec;JCx@`+T##l1RLulkmj%+K?VFgFn4X%OnpZ;5
F8USe@Y2p9?

delta 110
zcmX@@bJdN5jggOmfq^k`@<PGTjj@xNCSMR`nf!yvb8-rY=j4?lZj<jYJ5N?-iJIKV
z;t7_!#Ns<ynbmi439HZKBdmd7F+UNG$r*CIlX+D+CR?#tPA=v3nVcXOFj<=2ck((p
Kq0M#d!ZHBn&m)`w


From 1971055f155811a6583098109d5eb0ab1a80b194 Mon Sep 17 00:00:00 2001
From: megsup <megansu2000@gmail.com>
Date: Fri, 5 Jan 2024 01:37:10 +1100
Subject: [PATCH 2/3] SortByYear and FilterByYear edits

---
 CumulativeView.xaml.cs |  4 +++
 ResearcherView.xaml    |  9 +++---
 ResearcherView.xaml.cs | 62 +++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/CumulativeView.xaml.cs b/CumulativeView.xaml.cs
index 8dac61b..e039de0 100644
--- a/CumulativeView.xaml.cs
+++ b/CumulativeView.xaml.cs
@@ -24,5 +24,9 @@ public CumulativeView()
         {
             InitializeComponent();
         }
+
+        //load the data from the database for cumulative view
+        //GetPublicationsForResearcher()
+        
     }
 }
diff --git a/ResearcherView.xaml b/ResearcherView.xaml
index 18da430..5bb8753 100644
--- a/ResearcherView.xaml
+++ b/ResearcherView.xaml
@@ -35,7 +35,7 @@
         <TextBox x:Name="Performance_by_funding_received" HorizontalAlignment="Left" Margin="191,234,0,0" TextWrapping="Wrap" Text="Performance by funding received" VerticalAlignment="Top" Width="238" Height="18" IsReadOnly="True"/>
         <TextBox x:Name="___Title_" HorizontalAlignment="Center" Margin="0,10,0,0" TextWrapping="Wrap" Text="RESEARCHER DETAILS" VerticalAlignment="Top" Width="128" Height="20" TextDecorations="Underline" IsReadOnly="True"/>
         <Button x:Name="Count" Content="View Cumulative Count:
-                " HorizontalAlignment="Left" Margin="618,29,0,0" VerticalAlignment="Top" Width="143" Height="29" Click="Button_Click"/>
+                " HorizontalAlignment="Left" Margin="618,29,0,0" VerticalAlignment="Top" Width="143" Height="29" Click="CumulativeViewButton_Click"/>
         <TextBox HorizontalAlignment="Left" Margin="190,270,0,0" TextWrapping="Wrap" Text="Supervisions:" VerticalAlignment="Top" Width="239" TextDecorations="Underline" Background="#4C1E1E1E"/>
         <ListView x:Name="Supervisions" d:ItemsSource="{d:SampleData ItemCount=5}" Height="NaN" Margin="190,293,372,492" Width="NaN" Grid.RowSpan="2" Background="#4C1E1E1E" >
             <ListView.View>
@@ -49,12 +49,13 @@
         <Rectangle HorizontalAlignment="Left" Height="453" Margin="309,86,0,0" Grid.Row="1" Stroke="Black" VerticalAlignment="Top" Width="606"/>
         <TextBox x:Name="Degree" HorizontalAlignment="Left" Margin="191,28,0,0" Grid.Row="1" TextWrapping="Wrap" Text="Degree" VerticalAlignment="Top" Width="238" IsReadOnly="True"/>
         <TextBox x:Name="Supervisor" HorizontalAlignment="Left" Margin="191,45,0,0" Grid.Row="1" TextWrapping="Wrap" Text="Supervisor" VerticalAlignment="Top" Width="238" IsReadOnly="True"/>
-        <TextBox HorizontalAlignment="Left" Margin="23,105,0,0" Grid.Row="1" TextWrapping="Wrap" Text="Sort publication" VerticalAlignment="Top" Width="120" TextDecorations="Underline" IsReadOnly="True" MouseDown="SortPublicationListBox_MouseDown"/>
+        <TextBox x:Name="SortPublication" HorizontalAlignment="Left" Margin="23,105,0,0" Grid.Row="1" TextWrapping="Wrap" Text="Sort publications" VerticalAlignment="Top" Width="120" TextDecorations="Underline" IsReadOnly="True"/>
+        <Button Content="Click to sort" Click="SortPublicationsButton_Click" HorizontalAlignment="Left" Margin="163,104,0,0" VerticalAlignment="Top" Grid.Row="1"/>
         <TextBox HorizontalAlignment="Left" Margin="336,105,0,0" Grid.Row="1" TextWrapping="Wrap" Text="Publications:" VerticalAlignment="Top" Width="120" TextDecorations="Underline" IsReadOnly="True"/>
         <TextBox HorizontalAlignment="Left" Margin="23,141,0,0" Grid.Row="1" TextWrapping="Wrap" Text="Filter by year (earliest to latest):" VerticalAlignment="Top" Width="120" IsReadOnly="True"/>
-        <TextBox HorizontalAlignment="Left" Margin="23,199,0,0" Grid.Row="1" TextWrapping="Wrap" Text="Start Year" VerticalAlignment="Top" Width="72" Height="26" Background="#FF646464" TextChanged="TextBox_TextChanged_4"/>
+        <TextBox x:Name="StartYearTextBox" HorizontalAlignment="Left" Margin="23,199,0,0" Grid.Row="1" TextWrapping="Wrap" Text="Start Year" VerticalAlignment="Top" Width="72" Height="26" Background="#FF646464" TextChanged="StartYearTextBox_TextChanged"/>
         <TextBox HorizontalAlignment="Left" Margin="102,203,0,0" Grid.Row="1" TextWrapping="Wrap" Text="-" VerticalAlignment="Top" Width="20"/>
-        <TextBox HorizontalAlignment="Left" Margin="127,199,0,0" Grid.Row="1" TextWrapping="Wrap" Text="End Year" VerticalAlignment="Top" Width="72" Height="26" Background="#FF646464"/>
+        <TextBox x:Name="EndYearTextBox" HorizontalAlignment="Left" Margin="127,199,0,0" Grid.Row="1" TextWrapping="Wrap" Text="End Year" VerticalAlignment="Top" Width="72" Height="26" Background="#FF646464" TextChanged="EndYearTextBox_TextChanged"/>
         <ListView x:Name="PublicationListBox" Grid.Row="1" d:ItemsSource="{d:SampleData ItemCount=6}" Margin="336,138,58,26" Height="NaN" Width="NaN" SelectionChanged="ListView_SelectionChanged">
             <ListView.View>
                 <GridView>
diff --git a/ResearcherView.xaml.cs b/ResearcherView.xaml.cs
index bf0bba0..d2f250b 100644
--- a/ResearcherView.xaml.cs
+++ b/ResearcherView.xaml.cs
@@ -69,9 +69,13 @@ private void TextBox_TextChanged_4(object sender, TextChangedEventArgs e)
 
         }
 
-        private void Button_Click(object sender, RoutedEventArgs e)
+        private void CumulativeViewButton_Click(object sender, RoutedEventArgs e)
         {
+            // Create an instance of the CumulativeView window
+            CumulativeView cumulativeView = new CumulativeView();
 
+            // Show the CumulativeView window
+            cumulativeView.Show();
         }
 
         /*private void SortPublicationTextBox_MouseDown(object sender, MouseButtonEventArgs e)
@@ -80,6 +84,62 @@ private void Button_Click(object sender, RoutedEventArgs e)
             SortByYear();
         }*/
 
+        //Filter publications by year
+
+        private void StartYearTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            FilterPublicationsByYearRange();
+        }
+
+        private void EndYearTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            FilterPublicationsByYearRange();
+        }
+
+        private void FilterPublicationsByYearRange()
+        {
+            // Check if both start and end year text boxes have valid values
+            if (int.TryParse(StartYearTextBox.Text, out int startYear) && int.TryParse(EndYearTextBox.Text, out int endYear))
+            {
+                // Filter publications based on the year range
+                int researcherId = 1; //?
+                var filteredPublications = PublicationsController.FilterByYearRange(researcherId, startYear, endYear);
+
+                // Update the items in the PublicationListBox
+                PublicationListBox.ItemsSource = filteredPublications;
+            }
+        }
+
+        //Sort publications by year
+        private void SortPublicationsButton_Click(object sender, RoutedEventArgs e)
+        {
+            // Assuming you have a collection of publications as the item source of PublicationListBox
+            List<Publication> publications = (List<Publication>)PublicationListBox.ItemsSource;
+
+            // Check if there are publications to sort
+            if (publications != null && publications.Count > 0)
+            {
+                // Determine the sort order (ascending or descending) based on a condition
+                //bool ascendingOrder = /* true or false */;
+
+                // Sort the publications using your existing function
+                //publications = SortByYear(researcherId, ascendingOrder);
+
+                // Update the ListBox with the sorted publications
+                PublicationListBox.ItemsSource = publications;
+            }
+
+            /*if (publications != null)
+            {
+                // Sort publications by year and title
+                publications = publications.OrderBy(p => p.year).ThenBy(p => p.title).ToList();
+
+                // Update the item source of PublicationListBox
+                PublicationListBox.ItemsSource = publications;
+            }*/
+
+        }
+
         private void ListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (PublicationListBox.SelectedItem != null)

From 8bb73ed0ebfd047080ff9158a1c8ac0f5aa715ac Mon Sep 17 00:00:00 2001
From: megsup <megansu2000@gmail.com>
Date: Fri, 5 Jan 2024 09:15:28 +1100
Subject: [PATCH 3/3] PublicationList - draft

---
 Controller/ResearcherController.cs | 12 ++++++------
 ResearcherListView.xaml            | 14 +++++++-------
 ResearcherView.xaml                | 11 +++++------
 ResearcherView.xaml.cs             | 10 ++++++++++
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/Controller/ResearcherController.cs b/Controller/ResearcherController.cs
index a3fe240..74368fc 100644
--- a/Controller/ResearcherController.cs
+++ b/Controller/ResearcherController.cs
@@ -105,13 +105,13 @@ public static List<Researcher> FilterByLevel(string EmploymentLevel, ObservableC
                 tempResearcherList = new List<Researcher>(filtered);
             }
             else
-            { 
-                    var filtered = from Researcher researcher in researchers
-                                   where researcher.level == LEVEL.E
-                                   select researcher;
-                    tempResearcherList = new List<Researcher>(filtered);
+            {
+                var filtered = from Researcher researcher in researchers
+                               where researcher.level == LEVEL.E
+                               select researcher;
+                tempResearcherList = new List<Researcher>(filtered);
             }
-            
+
             return tempResearcherList;
         }
 
diff --git a/ResearcherListView.xaml b/ResearcherListView.xaml
index 2887719..64f7d79 100644
--- a/ResearcherListView.xaml
+++ b/ResearcherListView.xaml
@@ -17,13 +17,13 @@
             <StackPanel Orientation="Vertical">
                 <TextBox Text="LevelFilter:" FontWeight="Bold" TextChanged="TextBox_TextChanged" IsReadOnly="true"/>
                 <ComboBox x:Name="FilterLevelComboBox" SelectionChanged="FilterLevelComboBox_SelectionChanged">
-                    <ComboBoxItem Content="A"/>
-                    <ComboBoxItem Content="B"/>
-                    <ComboBoxItem Content="C"/>
-                    <ComboBoxItem Content="D"/>
-                    <ComboBoxItem Content="E"/>
-                    <ComboBoxItem Content="Student"/>
-                    <ComboBoxItem Content="All"/>
+                    <ComboBoxItem Content="Level A"/>
+                    <ComboBoxItem Content="Level B"/>
+                    <ComboBoxItem Content="Level C"/>
+                    <ComboBoxItem Content="Level D"/>
+                    <ComboBoxItem Content="Level E"/>
+                    <ComboBoxItem Content="Student Only"/>
+                    <ComboBoxItem Content="Show All Researchers"/>
                 </ComboBox>
             </StackPanel>
             <StackPanel Orientation="Horizontal" RenderTransformOrigin="0.497,3.977" Height="43" Width="475">
diff --git a/ResearcherView.xaml b/ResearcherView.xaml
index 5bb8753..6c4b904 100644
--- a/ResearcherView.xaml
+++ b/ResearcherView.xaml
@@ -49,18 +49,17 @@
         <Rectangle HorizontalAlignment="Left" Height="453" Margin="309,86,0,0" Grid.Row="1" Stroke="Black" VerticalAlignment="Top" Width="606"/>
         <TextBox x:Name="Degree" HorizontalAlignment="Left" Margin="191,28,0,0" Grid.Row="1" TextWrapping="Wrap" Text="Degree" VerticalAlignment="Top" Width="238" IsReadOnly="True"/>
         <TextBox x:Name="Supervisor" HorizontalAlignment="Left" Margin="191,45,0,0" Grid.Row="1" TextWrapping="Wrap" Text="Supervisor" VerticalAlignment="Top" Width="238" IsReadOnly="True"/>
-        <TextBox x:Name="SortPublication" HorizontalAlignment="Left" Margin="23,105,0,0" Grid.Row="1" TextWrapping="Wrap" Text="Sort publications" VerticalAlignment="Top" Width="120" TextDecorations="Underline" IsReadOnly="True"/>
-        <Button Content="Click to sort" Click="SortPublicationsButton_Click" HorizontalAlignment="Left" Margin="163,104,0,0" VerticalAlignment="Top" Grid.Row="1"/>
+        <TextBox HorizontalAlignment="Left" Margin="23,105,0,0" Grid.Row="1" TextWrapping="Wrap" Text="Sort publication" VerticalAlignment="Top" Width="120" TextDecorations="Underline" IsReadOnly="True" />
         <TextBox HorizontalAlignment="Left" Margin="336,105,0,0" Grid.Row="1" TextWrapping="Wrap" Text="Publications:" VerticalAlignment="Top" Width="120" TextDecorations="Underline" IsReadOnly="True"/>
         <TextBox HorizontalAlignment="Left" Margin="23,141,0,0" Grid.Row="1" TextWrapping="Wrap" Text="Filter by year (earliest to latest):" VerticalAlignment="Top" Width="120" IsReadOnly="True"/>
         <TextBox x:Name="StartYearTextBox" HorizontalAlignment="Left" Margin="23,199,0,0" Grid.Row="1" TextWrapping="Wrap" Text="Start Year" VerticalAlignment="Top" Width="72" Height="26" Background="#FF646464" TextChanged="StartYearTextBox_TextChanged"/>
         <TextBox HorizontalAlignment="Left" Margin="102,203,0,0" Grid.Row="1" TextWrapping="Wrap" Text="-" VerticalAlignment="Top" Width="20"/>
-        <TextBox x:Name="EndYearTextBox" HorizontalAlignment="Left" Margin="127,199,0,0" Grid.Row="1" TextWrapping="Wrap" Text="End Year" VerticalAlignment="Top" Width="72" Height="26" Background="#FF646464" TextChanged="EndYearTextBox_TextChanged"/>
-        <ListView x:Name="PublicationListBox" Grid.Row="1" d:ItemsSource="{d:SampleData ItemCount=6}" Margin="336,138,58,26" Height="NaN" Width="NaN" SelectionChanged="ListView_SelectionChanged">
+        <TextBox HorizontalAlignment="Left" Margin="127,199,0,0" Grid.Row="1" TextWrapping="Wrap" Text="End Year" VerticalAlignment="Top" Width="72" Height="26" Background="#FF646464"/>
+        <ListView x:Name="PublicationListBox" Grid.Row="1" d:ItemsSource="{Binding Publications}" SelectedItem="{Binding selectedPublications}" Margin="336,138,58,26" Height="NaN" Width="NaN" SelectionChanged="ListView_SelectionChanged">
             <ListView.View>
                 <GridView>
-                    <GridViewColumn Header="Year" DisplayMemberBinding="{Binding Year}" Width="50"/>
-                    <GridViewColumn Header="Title" DisplayMemberBinding="{Binding Title}" Width="300"/>
+                    <GridViewColumn Header="Year" DisplayMemberBinding="{Binding Path = Year}" Width="50"/>
+                    <GridViewColumn Header="Title" DisplayMemberBinding="{Binding Path = Title}" Width="300"/>
                 </GridView>
             </ListView.View>
         </ListView>
diff --git a/ResearcherView.xaml.cs b/ResearcherView.xaml.cs
index d2f250b..d0b9efa 100644
--- a/ResearcherView.xaml.cs
+++ b/ResearcherView.xaml.cs
@@ -55,6 +55,16 @@ public ResearcherView(Researcher r)
                 Performance_by_funding_received.AppendText("Performance by Funding: " + s.PerformanceByFunding());
 
             }
+            //Set the publications list box to the publications of the researcher
+            /*List<Publication> publications = EnRDBAdapter.FetchBasicPublicationsDetails(p, id);
+
+            foreach (Publication p in publications)
+            {
+                Console.WriteLine(p.year + " " + p.title);
+            }
+           
+            PublicationListBox.ItemsSource = publications;
+            */
         }