From 8e6e7823bb686877398cd9ae58ad0761f60e205e Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Sat, 30 Jun 2018 19:05:16 +0200 Subject: [PATCH] Nettoyage --- .../AideDeJeu/Models/Cards/Converters.cs | 2 +- AideDeJeu/AideDeJeu/Models/Item.cs | 45 +++---------------- AideDeJeu/AideDeJeu/Tools/Comparers.cs | 2 +- .../AideDeJeu/Tools/MarkdownExtensions.cs | 10 ++--- .../AideDeJeu/ViewModels/FilterViewModel.cs | 8 ++-- .../ViewModels/MonsterDetailViewModel.cs | 2 +- .../ViewModels/SpellDetailViewModel.cs | 2 +- AideDeJeu/AideDeJeu/Views/MainPage.xaml | 2 +- .../AideDeJeu/Views/MonsterDetailPage.xaml | 2 +- .../AideDeJeu/Views/MonsterDetailPage.xaml.cs | 1 - .../AideDeJeu/Views/SpellDetailPage.xaml | 2 +- .../AideDeJeu/Views/SpellDetailPage.xaml.cs | 1 - .../Controllers/ValuesController.cs | 2 +- 13 files changed, 23 insertions(+), 58 deletions(-) diff --git a/AideDeJeu/AideDeJeu/Models/Cards/Converters.cs b/AideDeJeu/AideDeJeu/Models/Cards/Converters.cs index 63a61419..5d4691f5 100644 --- a/AideDeJeu/AideDeJeu/Models/Cards/Converters.cs +++ b/AideDeJeu/AideDeJeu/Models/Cards/Converters.cs @@ -114,7 +114,7 @@ namespace AideDeJeuLib.Cards var cardData = new CardData(); cardData.Count = 1; //cardData.Color = color; - cardData.Title = spell.NamePHB; + cardData.Title = spell.Name; cardData.TitleSize = "10"; cardData.Icon = "white-book-" + spell.Level; cardData.IconBack = "robe"; diff --git a/AideDeJeu/AideDeJeu/Models/Item.cs b/AideDeJeu/AideDeJeu/Models/Item.cs index efb16d9f..6c56b5a2 100644 --- a/AideDeJeu/AideDeJeu/Models/Item.cs +++ b/AideDeJeu/AideDeJeu/Models/Item.cs @@ -15,48 +15,17 @@ namespace AideDeJeuLib public class Item { - public string Id { get; set; } - public string IdVO { get; set; } - public string IdVF { get; set; } + public string Id + { + get + { + return AideDeJeu.Tools.Helpers.IdFromName(Name); + } + } public string Name { get; set; } public string NameVO { get; set; } - public string NamePHB { get; set; } public Properties Properties { get; set; } - public string Html { get; set; } - - public static IEnumerable NodeListToStringList(IEnumerable nodes) - { - if (nodes == null) return null; - var strings = new List(); - foreach (var node in nodes) - { - strings.Add(node.OuterXml); - } - return strings; - } - - public static XmlNode StringToNode(string str) - { - if (str == null) return null; - var doc = new XmlDocument(); - doc.LoadXml(str); - return doc.DocumentElement; - } - - //public static IEnumerable StringListToNodeList(IEnumerable strings) - //{ - // if (strings == null) return null; - // var nodes = new List(); - // foreach (var str in strings) - // { - // var doc = new HtmlDocument(); - // doc.LoadHtml(str); - // nodes.Add(doc.DocumentNode); - // } - // return nodes; - //} - } } diff --git a/AideDeJeu/AideDeJeu/Tools/Comparers.cs b/AideDeJeu/AideDeJeu/Tools/Comparers.cs index 9625cb7c..7aade813 100644 --- a/AideDeJeu/AideDeJeu/Tools/Comparers.cs +++ b/AideDeJeu/AideDeJeu/Tools/Comparers.cs @@ -11,7 +11,7 @@ namespace AideDeJeu.Tools { public override int Compare(Item x, Item y) { - return x.NamePHB.CompareTo(y.NamePHB); + return x.Name.CompareTo(y.Name); } } diff --git a/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs b/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs index fc5f0022..3d066a5a 100644 --- a/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs +++ b/AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs @@ -54,8 +54,7 @@ namespace AideDeJeu.Tools //yield return spell; } spell = new Spell(); - spell.Name = spell.NamePHB = headingBlock.Inline.ToMarkdownString(); - spell.Id = spell.IdVF = spell.IdVO = Tools.Helpers.IdFromName(spell.Name); + spell.Name = headingBlock.Inline.ToMarkdownString(); //Console.WriteLine(spell.Name); } } @@ -235,8 +234,7 @@ namespace AideDeJeu.Tools //yield return monster; } monster = new Monster(); - monster.Name = monster.NamePHB = headingBlock.Inline.ToMarkdownString(); - monster.Id = monster.IdVF = monster.IdVO = Tools.Helpers.IdFromName(monster.Name); + monster.Name = headingBlock.Inline.ToMarkdownString(); //Console.WriteLine(spell.Name); } if (headingBlock.HeaderChar == '#' && headingBlock.Level == 2) @@ -620,7 +618,7 @@ namespace AideDeJeu.Tools public static string ToMarkdownString(this Spell spell) { var md = string.Empty; - md += string.Format("# {0}\n", spell.NamePHB); + md += string.Format("# {0}\n", spell.Name); md += string.Format("- NameVO: [{0}]\n", spell.NameVO); md += string.Format("- CastingTime: {0}\n", spell.CastingTime); md += string.Format("- Components: {0}\n", spell.Components); @@ -667,7 +665,7 @@ namespace AideDeJeu.Tools public static string ToMarkdownString(this Monster monster) { var md = string.Empty; - md += string.Format("# {0}\n", monster.NamePHB?.Trim()); + md += string.Format("# {0}\n", monster.Name?.Trim()); md += string.Format("- NameVO: [{0}]\n", monster.NameVO?.Trim()); md += string.Format("- {0} {1}, {2}\n", monster.Size?.Trim(), monster.Type?.Trim(), monster.Alignment?.Trim()); if (monster.ArmorClass != null) md += string.Format("- **Armor Class** {0}\n", monster.ArmorClass?.Trim()); diff --git a/AideDeJeu/AideDeJeu/ViewModels/FilterViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/FilterViewModel.cs index 45e3ba93..3f8b7ff7 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/FilterViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/FilterViewModel.cs @@ -133,8 +133,8 @@ namespace AideDeJeu.ViewModels spell.Source.Contains(source) && spell.Source.Contains(classe) && spell.Rituel.Contains(rituel) && - Helpers.RemoveDiacritics(spell.NamePHB).ToLower().Contains(Helpers.RemoveDiacritics(SearchText ?? string.Empty).ToLower()); - }).OrderBy(spell => spell.NamePHB) + Helpers.RemoveDiacritics(spell.Name).ToLower().Contains(Helpers.RemoveDiacritics(SearchText ?? string.Empty).ToLower()); + }).OrderBy(spell => spell.Name) .AsEnumerable(); }, token); @@ -379,9 +379,9 @@ namespace AideDeJeu.ViewModels monster.Source.Contains(source) && powerComparer.Compare(monster.Challenge, minPower) >= 0 && powerComparer.Compare(monster.Challenge, maxPower) <= 0 && - Helpers.RemoveDiacritics(monster.NamePHB).ToLower().Contains(Helpers.RemoveDiacritics(SearchText ?? string.Empty).ToLower()); + Helpers.RemoveDiacritics(monster.Name).ToLower().Contains(Helpers.RemoveDiacritics(SearchText ?? string.Empty).ToLower()); }) - .OrderBy(monster => monster.NamePHB) + .OrderBy(monster => monster.Name) .AsEnumerable(); }, token); diff --git a/AideDeJeu/AideDeJeu/ViewModels/MonsterDetailViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/MonsterDetailViewModel.cs index 8ac83dc3..d2528515 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/MonsterDetailViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/MonsterDetailViewModel.cs @@ -202,7 +202,7 @@ namespace AideDeJeu.ViewModels public MonsterDetailViewModel(Monster item = null) { - Title = item?.NamePHB; + Title = item?.Name; Item = item; LoadItemCommand = new Command(async () => await ExecuteLoadItemCommand()); } diff --git a/AideDeJeu/AideDeJeu/ViewModels/SpellDetailViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/SpellDetailViewModel.cs index 98e0e1e2..fb5f4a8a 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/SpellDetailViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/SpellDetailViewModel.cs @@ -95,7 +95,7 @@ namespace AideDeJeu.ViewModels public SpellDetailViewModel(Spell item = null) { - Title = item?.NamePHB; + Title = item?.Name; Item = item; LoadItemCommand = new Command(async () => await ExecuteLoadItemCommand()); } diff --git a/AideDeJeu/AideDeJeu/Views/MainPage.xaml b/AideDeJeu/AideDeJeu/Views/MainPage.xaml index 43b99376..69d2fc4c 100644 --- a/AideDeJeu/AideDeJeu/Views/MainPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/MainPage.xaml @@ -47,7 +47,7 @@ - diff --git a/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml b/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml index 51e20a92..76a4a92d 100644 --- a/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/MonsterDetailPage.xaml @@ -19,7 +19,7 @@ -