- Added ability to import barchart file from Histogram page.

- Reduced number of elements inside the histogram CellTemplates.
- Experimenting with Task Async Patterns for better performance
- Small fixes

Author: ptr-cs

eBirdDataVisualizer.Core/Models/MonthData.cs

@@ -34,10 +34,10 @@ public ICollection<double> SampleSizes
         get; set;
     }
 
-    public string Q1String => $"{Month} Q1: {SampleSizes.ElementAt(0)}";
-    public string Q2String => $"{Month} Q2: {SampleSizes.ElementAt(1)}";
-    public string Q3String => $"{Month} Q3: {SampleSizes.ElementAt(2)}";
-    public string Q4String => $"{Month} Q4: {SampleSizes.ElementAt(3)}";
+    public string Q1String => (SampleSizes.Count > 0) ? $"{Month} Q1: {SampleSizes.ElementAt(0)}" : $"{Month} Q1";
+    public string Q2String => (SampleSizes.Count > 1) ? $"{Month} Q2: {SampleSizes.ElementAt(1)}" : $"{Month} Q2";
+    public string Q3String => (SampleSizes.Count > 2) ? $"{Month} Q3: {SampleSizes.ElementAt(2)}" : $"{Month} Q3";
+    public string Q4String => (SampleSizes.Count > 3) ? $"{Month} Q4: {SampleSizes.ElementAt(3)}" : $"{Month} Q4";
 
     public string Q1Tag => $"{Month}Q1";
     public string Q2Tag => $"{Month}Q2";

eBirdDataVisualizer.Core/Services/BirdDataService.cs

@@ -270,15 +270,15 @@ public async Task<bool> ParseData(string data)
         return importResult;
     }
 
-    public async Task ParseMetadata(string name)
+    public async Task ParseMetadata(string filename)
     {
         var yearStart = 0;
         var yearEnd = 0;
         var monthStart = Models.Month.January;
         var monthEnd = Models.Month.January;
-        var location = name.Split("__").First().Split('_').Last();
-        var timeInfo = name.Split("__").Last().Split("barchart.txt").First().Split('_').Where(x => x != String.Empty);
-        if (timeInfo.Count() == 4)
+        var location = filename.Split("__").First().Split('_').Last();
+        var timeInfo = filename.Split("__").Last().Split('_').Where(x => x != String.Empty);
+        if (timeInfo.Count() >= 4)
         {
             try
             {
@@ -291,7 +291,7 @@ public async Task ParseMetadata(string name)
         }
 
         Metadata.Rows.Clear();
-        Metadata.Rows.Add(name, location, yearStart, yearEnd, monthStart, monthEnd);
+        Metadata.Rows.Add(filename, location, yearStart, yearEnd, monthStart, monthEnd);
         await Task.CompletedTask;
         return;
     }

eBirdDataVisualizer/ViewModels/DataGridViewModel.cs

@@ -13,6 +13,7 @@
 using eBirdDataVisualizer.Core.Services;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Data;
+using static System.Net.WebRequestMethods;
 
 namespace eBirdDataVisualizer.ViewModels;
 
@@ -346,6 +347,11 @@ public ICommand ToggleDataGridBarChartMode
         get;
     }
 
+    public ICommand ImportFile
+    {
+        get;
+    }
+
     private static CollectionViewSource groupedItems;
 
     public bool MonthsAllVisible()
@@ -505,6 +511,18 @@ public DataGridViewModel(IBirdDataService birdDataService)
             DataGridBarChartMode = param;
             //ShowProgress = false;
         });
+
+        ImportFile = new RelayCommand(async () =>
+        {
+            ShowProgress = true;
+            var mvm = App.GetService<MainViewModel>();
+            var importResult = await mvm.spawnFilePicker();
+            if (importResult.Value == true)
+            {
+                LoadData();
+            }
+            ShowProgress = false;
+        });
     }
 
     private bool showProgress = false;
@@ -539,6 +557,11 @@ public string CachedGroupQuery
     public bool IsGroupedByCommonName => (CachedGroupQuery == nameof(KeySelectorCommonName)) ? true : false;
 
     public async void OnNavigatedTo(object parameter)
+    {
+        LoadData();
+    }
+
+    public async void LoadData()
     {
         BirdsCollection.Clear();
 
@@ -551,7 +574,7 @@ public async void OnNavigatedTo(object parameter)
         BirdsCollectionViewSource = new CollectionViewSource() { Source = BirdsCollection };
         ItemsSource = BirdsCollectionViewSource.View;
 
-        MonthsCollection.Clear();
+        MonthsCollection = new ObservableCollection<MonthData>();
 
         var monthData = await _birdDataService.GetMonthDataAsync();
 
@@ -604,19 +627,6 @@ public CollectionViewSource SortData(string sortBy, bool ascending)
             return collectionViewSource;
         }
 
-        //if (CachedGroupQuery != string.Empty)
-        //{
-        //    switch (CachedGroupQuery)
-        //    {
-        //        case nameof(KeySelectorGenus):
-        //            return GroupDataByGenus();
-        //        case nameof(KeySelectorCommonName):
-        //            return GroupDataByCommonName();
-        //        default:
-        //            break;
-        //    }
-        //}
-
         if (ascending)
             collectionViewSource.Source = new ObservableCollection<Bird>(BirdsCollection.OrderBy(bird => propertyInfo.GetValue(bird, null)));
         else

eBirdDataVisualizer/ViewModels/MainViewModel.cs

@@ -51,7 +51,7 @@ public async void LoadSampleData()
         var file = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/sample_US-HI__1900_2022_1_12_barchart.txt"));
         if (file is not null)
         {
-            parseFileMetadata(file);
+            await _birdDataService.ParseMetadata(file.Name);
             var text = System.IO.File.ReadAllText(file.Path);
             await _birdDataService.ParseData(text);
         }
@@ -74,12 +74,7 @@ public MainViewModel(IBirdDataService birdDataService)
         });
     }
 
-    public void parseFileMetadata(StorageFile file)
-    {
-        _birdDataService.ParseMetadata(file.Name);
-    }
-
-    public async Task spawnFilePicker()
+    public async Task<bool?> spawnFilePicker()
     {
         FileOpenPicker fileOpenPicker = new();
         fileOpenPicker.FileTypeFilter.Add("*");
@@ -89,15 +84,19 @@ public async Task spawnFilePicker()
 
         var file = await fileOpenPicker.PickSingleFileAsync();
 
+        bool? result = false;
+
         if (file is not null)
         {
             var importResult = false;
             try
             {
-                parseFileMetadata(file);
+                await _birdDataService.ParseMetadata(file.Name);
 
                 var text = await Windows.Storage.FileIO.ReadTextAsync(file);
                 importResult = await _birdDataService.ParseData(text);
+                result = importResult;
+
                 if (importResult)
                     ImportResultText = $"{file.Name} successfully imported!";
                 else
@@ -116,5 +115,6 @@ public async Task spawnFilePicker()
 
             ShowImportResult = true;
         }
+        return result;
     }
 }