diff --git a/Controller/ResearcherController.cs b/Controller/ResearcherController.cs index 304f1fb..74368fc 100644 --- a/Controller/ResearcherController.cs +++ b/Controller/ResearcherController.cs @@ -105,13 +105,13 @@ public static List FilterByLevel(string EmploymentLevel, ObservableC tempResearcherList = new List(filtered); } else - { - var filtered = from Researcher researcher in researchers - where researcher.level == LEVEL.E - select researcher; - tempResearcherList = new List(filtered); + { + var filtered = from Researcher researcher in researchers + where researcher.level == LEVEL.E + select researcher; + tempResearcherList = new List(filtered); } - + return tempResearcherList; } @@ -126,11 +126,15 @@ public static List FilterBy(JOBLEVEL level) public static List FilterByName(string name, ObservableCollection 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)filteredResearchers.ToList(); + return (List)filteredResearchers.ToList();*/ //return allResearchers.Where(r => r.givenName.Contains(name) || r.familyName.Contains(name)).ToList(); } 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/ResearcherListView.xaml b/ResearcherListView.xaml index 2887719..64f7d79 100644 --- a/ResearcherListView.xaml +++ b/ResearcherListView.xaml @@ -17,13 +17,13 @@ - - - - - - - + + + + + + + diff --git a/ResearcherView.xaml b/ResearcherView.xaml index 18da430..6c4b904 100644 --- a/ResearcherView.xaml +++ b/ResearcherView.xaml @@ -35,7 +35,7 @@