feature: add vaccination data

Infrastructure/SciensanoCovidDownloader.cs

@@ -21,6 +21,9 @@ public async static Task<string> GetCovidData( Type sourceType )
  case nameof(SciensanoTestsModel):
  fileName = "COVID19BE_tests.json";
  break;
+ case nameof(SciensanoVaccinationModel):
+ fileName = "COVID19BE_VACC.json";
+ break;
  default:
  throw new Exception($"Invalid source type '{sourceType.Name}'");
  }

MainWindow.xaml

@@ -78,6 +78,20 @@
  </DataGrid.Columns>
  </DataGrid>
  </TabItem>
+ <TabItem Name="tabVaccinations" Header="Vaccinations">
+ <DataGrid x:Name="VaccinationsGrid" AutoGenerateColumns="False" IsReadOnly="True" SelectionUnit="CellOrRowHeader">
+ <DataGrid.ContextMenu>
+ <ContextMenu>
+ <MenuItem Command="Copy" />
+ </ContextMenu>
+ </DataGrid.ContextMenu>
+ <DataGrid.Columns>
+ <DataGridTextColumn Header="Brand" Binding="{Binding Brand}"/>
+ <DataGridTextColumn Header="Dose" Binding="{Binding Dose}"/>
+ <DataGridTextColumn Header="Count" Binding="{Binding Count, StringFormat=\{0:N0\}}"/>
+ </DataGrid.Columns>
+ </DataGrid>
+ </TabItem>
  </TabControl>
  </Grid>
  </DockPanel>

MainWindow.xaml.cs

@@ -57,7 +57,12 @@ private async void OpenFile_Click(object sender, RoutedEventArgs e)
  {
  dataGrid = HospitalisationGrid;
  targetType = typeof(HospitalisationModel);
- } 
+ }
+ else if (tabVaccinations.IsSelected)
+ {
+ dataGrid = VaccinationsGrid;
+ targetType = typeof(VaccinationModel);
+ }
 
  IList<ILocalModel> list;
  using (var stream = File.Open(openDialog.FileName, FileMode.Open))
@@ -92,6 +97,11 @@ private async void DownloadFile_Click(object sender, RoutedEventArgs e)
  dataGrid = HospitalisationGrid;
  sourceType = typeof(SciensanoHospitalisationModel);
  }
+ else if (tabVaccinations.IsSelected)
+ {
+ dataGrid = VaccinationsGrid;
+ sourceType = typeof(SciensanoVaccinationModel);
+ }
 
  var data = await SciensanoCovidDownloader.GetCovidData(sourceType);
  IList<ILocalModel> list;

Models/VaccinationModel.cs

@@ -0,0 +1,44 @@
+using Sciensano.CovidJson.Parser.SciensanoModels;
+using System;
+
+namespace Sciensano.CovidJson.Parser.Models
+{
+ public class VaccinationModel : ILocalModel
+ {
+ public VaccinationModel(SciensanoVaccinationModel model)
+ {
+ Date = model.Date ?? new DateTime();
+ Count = model.Count;
+ Brand = model.Brand;
+
+ switch(model.Dose)
+ {
+ case SciensanoModels.Dose.A:
+ Dose = Dose.First;
+ break;
+ case SciensanoModels.Dose.B:
+ Dose = Dose.Second;
+ break;
+ case SciensanoModels.Dose.C:
+ Dose = Dose.OnlyDose;
+ break;
+ default:
+ Dose = Dose.Unknown;
+ break;
+ }
+ }
+
+ public DateTime Date { get; set; }
+ public int Count { get; set; }
+ public Dose Dose { get; set; }
+ public string Brand { get; set; }
+ }
+
+ public enum Dose
+ {
+ Unknown = 0,
+ First,
+ Second,
+ OnlyDose
+ }
+}

Sciensano.CovidJson.Parser.csproj

@@ -87,6 +87,8 @@
  <Generator>MSBuild:Compile</Generator>
  <SubType>Designer</SubType>
  </ApplicationDefinition>
+ <Compile Include="Models\VaccinationModel.cs" />
+ <Compile Include="SciensanoModels\SciensanoVaccinationModel.cs" />
  <Compile Include="SciensanoParsers\BaseSciensanoParser.cs" />
  <Compile Include="SciensanoParsers\CasesParser.cs" />
  <Compile Include="SciensanoParsers\HospitalisationParser.cs" />
@@ -99,6 +101,7 @@
  <Compile Include="SciensanoModels\ISciensanoModel.cs" />
  <Compile Include="SciensanoModels\SciensanoCasesModel.cs" />
  <Compile Include="SciensanoModels\SciensanoTestsModel.cs" />
+ <Compile Include="SciensanoParsers\VaccinationParser.cs" />
  <Page Include="MainWindow.xaml">
  <Generator>MSBuild:Compile</Generator>
  <SubType>Designer</SubType>

SciensanoModels/SciensanoVaccinationModel.cs

@@ -0,0 +1,24 @@
+using System;
+
+namespace Sciensano.CovidJson.Parser.SciensanoModels
+{
+ //{"DATE":"2020-12-28","REGION":"Brussels","AGEGROUP":"25-34","SEX":"F","BRAND":"Pfizer-BioNTech","DOSE":"A","COUNT":1}
+ public class SciensanoVaccinationModel : IDatedSciensanoModel
+ {
+ public DateTime? Date { get; set; }
+ public string Region { get; set; }
+ public string AgeGroup { get; set; }
+ public string Sex { get; set; }
+ public string Brand { get; set; }
+ public Dose Dose { get; set; }
+ public int Count { get; set; }
+ }
+
+ public enum Dose
+ {
+ Unknown,
+ A,
+ B,
+ C
+ }
+}

SciensanoParsers/VaccinationParser.cs

@@ -0,0 +1,39 @@
+using Sciensano.CovidJson.Parser.Models;
+using Sciensano.CovidJson.Parser.SciensanoModels;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Sciensano.CovidJson.Parser.SciensanoParsers
+{
+ public class VaccinationParser : BaseSciensanoParser<VaccinationModel, SciensanoVaccinationModel>
+ {
+ public override Task<List<ILocalModel>> ParseAsync(Stream stream)
+ {
+ var list = new List<VaccinationModel>();
+ var jsonmodels = ParseJson(stream);
+
+ var doses = jsonmodels.Select(m => new { m.Dose, m.Brand }).Distinct();
+
+ foreach(var dose in doses)
+ {
+ var model = new VaccinationModel(jsonmodels.First(m => m.Brand == dose.Brand && m.Dose == dose.Dose))
+ {
+ Date = DateTime.Now,
+ Count = jsonmodels.Where(m => m.Brand == dose.Brand && m.Dose == dose.Dose).Sum(m => m.Count)
+ };
+
+ if(model.Dose == Models.Dose.First)
+ {
+ model.Count -= jsonmodels.Where(m => m.Brand == dose.Brand && m.Dose == SciensanoModels.Dose.B).Sum(m => m.Count);
+ }
+
+ list.Add(model);
+ }
+
+ return Task.FromResult(list.Cast<ILocalModel>().ToList());
+ }
+ }
+}