5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-10-31 23:45:39 +00:00
Code Issues Projects Releases Wiki Activity

Réactivation search text

Browse source
This commit is contained in:
Yan Maniez 2018-05-28 11:12:19 +02:00
parent ce2e964814
commit f324ea3f15
2 changed files with 22 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

125
AideDeJeu/AideDeJeu/ViewModels/FilterViewModel.cs
View file

@ -15,6 +15,19 @@ namespace AideDeJeu.ViewModels
public ICommand LoadItemsCommand { get; protected set; } public ICommand LoadItemsCommand { get; protected set; }
public abstract IEnumerable<Item> FilterItems(IEnumerable<Item> items); public abstract IEnumerable<Item> FilterItems(IEnumerable<Item> items);
public abstract IEnumerable<Filter> Filters { get; } public abstract IEnumerable<Filter> Filters { get; }
private string _SearchText = "";
public string SearchText
{
get
{
return _SearchText;
}
set
{
SetProperty(ref _SearchText, value);
//Main.LoadItemsCommand.Execute(null);
}
}
} }
@ -108,7 +121,8 @@ namespace AideDeJeu.ViewModels
spell.Type.ToLower().Contains(ecole.ToLower()) && spell.Type.ToLower().Contains(ecole.ToLower()) &&
spell.Source.Contains(source) && spell.Source.Contains(source) &&
spell.Source.Contains(classe) && spell.Source.Contains(classe) &&
spell.Type.Contains(rituel); spell.Type.Contains(rituel) &&
spell.NamePHB.ToLower().Contains(SearchText.ToLower());
}) })
.OrderBy(spell => spell.NamePHB) .OrderBy(spell => spell.NamePHB)
.ToList(); .ToList();
@ -124,112 +138,6 @@ namespace AideDeJeu.ViewModels
public abstract List<KeyValuePair<string, string>> Sources { get; } public abstract List<KeyValuePair<string, string>> Sources { get; }
private int _Classe = 0;
public int Classe
{
get
{
return _Classe;
}
set
{
if (_Classe != value)
{
SetProperty(ref _Classe, value);
LoadItemsCommand.Execute(null);
}
}
}
private int _NiveauMin = 0;
public int NiveauMin
{
get
{
return _NiveauMin;
}
set
{
if (_NiveauMin != value)
{
SetProperty(ref _NiveauMin, value);
if (_NiveauMax < _NiveauMin)
{
SetProperty(ref _NiveauMax, value, nameof(NiveauMax));
}
LoadItemsCommand.Execute(null);
}
}
}
private int _NiveauMax = 9;
public int NiveauMax
{
get
{
return _NiveauMax;
}
set
{
if (_NiveauMax != value)
{
SetProperty(ref _NiveauMax, value);
if (_NiveauMax < _NiveauMin)
{
SetProperty(ref _NiveauMin, value, nameof(NiveauMin));
}
LoadItemsCommand.Execute(null);
}
}
}
private int _Ecole = 0;
public int Ecole
{
get
{
return _Ecole;
}
set
{
if (_Ecole != value)
{
SetProperty(ref _Ecole, value);
LoadItemsCommand.Execute(null);
}
}
}
private int _Rituel = 0;
public int Rituel
{
get
{
return _Rituel;
}
set
{
if (_Rituel != value)
{
SetProperty(ref _Rituel, value);
LoadItemsCommand.Execute(null);
}
}
}
private int _Source = 1;
public int Source
{
get
{
return _Source;
}
set
{
if (_Source != value)
{
SetProperty(ref _Source, value);
LoadItemsCommand.Execute(null);
}
}
}
} }
public class VFSpellFilterViewModel : SpellFilterViewModel public class VFSpellFilterViewModel : SpellFilterViewModel
@ -446,7 +354,8 @@ namespace AideDeJeu.ViewModels
(string.IsNullOrEmpty(size) || monster.Size.Equals(size)) && (string.IsNullOrEmpty(size) || monster.Size.Equals(size)) &&
monster.Source.Contains(source) && monster.Source.Contains(source) &&
powerComparer.Compare(monster.Challenge, minPower) >= 0 && powerComparer.Compare(monster.Challenge, minPower) >= 0 &&
powerComparer.Compare(monster.Challenge, maxPower) <= 0; powerComparer.Compare(monster.Challenge, maxPower) <= 0 &&
monster.NamePHB.ToLower().Contains(SearchText.ToLower());
}) })
.OrderBy(monster => monster.NamePHB) .OrderBy(monster => monster.NamePHB)
.ToList(); .ToList();

6
AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs
View file

@ -130,7 +130,11 @@ namespace AideDeJeu.ViewModels
SwitchToVO = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.VF & ~ItemSourceType.HD) | ItemSourceType.VO); SwitchToVO = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.VF & ~ItemSourceType.HD) | ItemSourceType.VO);
SwitchToHD = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.VF & ~ItemSourceType.VO) | ItemSourceType.HD); SwitchToHD = new Command(() => ItemSourceType = (ItemSourceType & ~ItemSourceType.VF & ~ItemSourceType.VO) | ItemSourceType.HD);
//AboutCommand = new Command(async() => await navigator.GotoAboutPageAsync()); //AboutCommand = new Command(async() => await navigator.GotoAboutPageAsync());
//SearchCommand = new Command<string>((text) => GetItemsViewModel(ItemSourceType).SearchText = text); SearchCommand = new Command<string>((text) =>
{
GetFilterViewModel(ItemSourceType).SearchText = text;
GetItemsViewModel(ItemSourceType).ExecuteLoadItemsCommand();
});
} }
} }
} }