From 4796f3b9f24de969e0fb2cdb73a9bfdb83fb1bf7 Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Fri, 18 May 2018 21:44:03 +0200 Subject: [PATCH] Filtre par taille des monstres --- AideDeJeu/AideDeJeu/Services/ItemDatabaseHelper.cs | 4 +--- AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/AideDeJeu/AideDeJeu/Services/ItemDatabaseHelper.cs b/AideDeJeu/AideDeJeu/Services/ItemDatabaseHelper.cs index 9399d367..cafc061b 100644 --- a/AideDeJeu/AideDeJeu/Services/ItemDatabaseHelper.cs +++ b/AideDeJeu/AideDeJeu/Services/ItemDatabaseHelper.cs @@ -23,7 +23,6 @@ namespace AideDeJeu.Services { using (var context = await CreateContextAsync().ConfigureAwait(false)) { - //We use OrderByDescending because Posts are generally displayed from most recent to oldest return await context.Spells .AsNoTracking() .Where(spell => @@ -56,12 +55,11 @@ namespace AideDeJeu.Services { using (var context = await CreateContextAsync().ConfigureAwait(false)) { - //We use OrderByDescending because Posts are generally displayed from most recent to oldest return await context.Monsters .AsNoTracking() .Where(monster => monster.Type.Contains(type) && - //("[" + monster.Size.Trim().ToUpper() + "]").Contains("[" + size.ToUpper() + "]") && + (string.IsNullOrEmpty(size) || monster.Size.Equals(size)) && monster.Source.Contains(source) ) //.OrderByDescending(monster => monster.Id) diff --git a/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs index f90a24da..c6f8349f 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs @@ -152,7 +152,7 @@ namespace AideDeJeu.ViewModels } } } - private int _MaxPower = 18; + private int _MaxPower = 28; public int MaxPower { get