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

Ajustements

Browse source
This commit is contained in:
Yan Maniez 2020-02-22 00:59:48 +01:00
parent 0d81ea6799
commit 033f7ec94a
3 changed files with 74 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

76
AideDeJeu/AideDeJeu/ViewModels/StoreViewModel.cs
View file

@ -749,47 +749,61 @@ namespace AideDeJeu.ViewModels
modelBuilder.Entity<MonsterItem>().Property(i => i.Family).HasColumnName("Family"); modelBuilder.Entity<MonsterItem>().Property(i => i.Family).HasColumnName("Family");
modelBuilder.Entity<MonsterItems>().Property(i => i.Family).HasColumnName("Family"); modelBuilder.Entity<MonsterItems>().Property(i => i.Family).HasColumnName("Family");
modelBuilder.Entity<ClassEvolutionItem>().Property(i => i.Table).HasColumnName("Table");
modelBuilder.Entity<MagicItem>().Property(i => i.Rarity).HasColumnName("Rarity");
modelBuilder.Entity<MagicItem>().Property(i => i.Type).HasColumnName("Type");
modelBuilder.Entity<MagicItems>().Property(i => i.Family).HasColumnName("Family"); modelBuilder.Entity<MagicItems>().Property(i => i.Family).HasColumnName("Family");
modelBuilder.Entity<MagicItems>().Property(i => i.Types).HasColumnName("Types"); modelBuilder.Entity<SpellItem>().Property(i => i.Family).HasColumnName("Family");
modelBuilder.Entity<MonsterItem>().Property(i => i.ArmorClass).HasColumnName("ArmorClass"); modelBuilder.Entity<SpellItems>().Property(i => i.Family).HasColumnName("Family");
modelBuilder.Entity<MonsterItem>().Property(i => i.SavingThrows).HasColumnName("SavingThrows"); modelBuilder.Entity<EquipmentItems>().Property(i => i.Family).HasColumnName("Family");
modelBuilder.Entity<MonsterItem>().Property(i => i.Skills).HasColumnName("Skills");
modelBuilder.Entity<MonsterItem>().Property(i => i.Speed).HasColumnName("Speed"); modelBuilder.Entity<ClassEvolutionItem>().Property(i => i.Table).HasColumnName("Table");
modelBuilder.Entity<MonsterItem>().Property(i => i.Strength).HasColumnName("Strength");
modelBuilder.Entity<MonsterItem>().Property(i => i.Type).HasColumnName("Type");
modelBuilder.Entity<MonsterItems>().Property(i => i.Family).HasColumnName("Family");
modelBuilder.Entity<MonsterItems>().Property(i => i.Types).HasColumnName("Types");
modelBuilder.Entity<PersonalityDefectItem>().Property(i => i.Table).HasColumnName("Table"); modelBuilder.Entity<PersonalityDefectItem>().Property(i => i.Table).HasColumnName("Table");
modelBuilder.Entity<PersonalityIdealItem>().Property(i => i.Table).HasColumnName("Table"); modelBuilder.Entity<PersonalityIdealItem>().Property(i => i.Table).HasColumnName("Table");
modelBuilder.Entity<PersonalityLinkItem>().Property(i => i.Table).HasColumnName("Table"); modelBuilder.Entity<PersonalityLinkItem>().Property(i => i.Table).HasColumnName("Table");
modelBuilder.Entity<PersonalityTraitItem>().Property(i => i.Table).HasColumnName("Table"); modelBuilder.Entity<PersonalityTraitItem>().Property(i => i.Table).HasColumnName("Table");
modelBuilder.Entity<RaceItem>().Property(i => i.Alignment).HasColumnName("Alignment"); modelBuilder.Entity<BackgroundSpecialtyItem>().Property(i => i.Table).HasColumnName("Table");
modelBuilder.Entity<RaceItem>().Property(i => i.Languages).HasColumnName("Languages");
modelBuilder.Entity<RaceItem>().Property(i => i.Size).HasColumnName("Size"); modelBuilder.Entity<MagicItem>().Property(i => i.Type).HasColumnName("Type");
modelBuilder.Entity<RaceItem>().Property(i => i.Speed).HasColumnName("Speed"); modelBuilder.Entity<MonsterItem>().Property(i => i.Type).HasColumnName("Type");
modelBuilder.Entity<SpellItem>().Property(i => i.Family).HasColumnName("Family"); modelBuilder.Entity<EquipmentItem>().Property(i => i.Type).HasColumnName("Type");
modelBuilder.Entity<SpellItem>().Property(i => i.Type).HasColumnName("Type"); modelBuilder.Entity<SpellItem>().Property(i => i.Type).HasColumnName("Type");
modelBuilder.Entity<MagicItems>().Property(i => i.Types).HasColumnName("Types");
modelBuilder.Entity<MonsterItems>().Property(i => i.Types).HasColumnName("Types");
modelBuilder.Entity<EquipmentItems>().Property(i => i.Types).HasColumnName("Types");
modelBuilder.Entity<MagicItem>().Property(i => i.Rarity).HasColumnName("Rarity");
modelBuilder.Entity<EquipmentItem>().Property(i => i.Rarity).HasColumnName("Rarity");
modelBuilder.Entity<MonsterItem>().Property(i => i.ArmorClass).HasColumnName("ArmorClass");
modelBuilder.Entity<EquipmentItem>().Property(i => i.ArmorClass).HasColumnName("ArmorClass");
modelBuilder.Entity<MonsterItem>().Property(i => i.SavingThrows).HasColumnName("SavingThrows");
modelBuilder.Entity<ClassProficienciesItem>().Property(i => i.SavingThrows).HasColumnName("SavingThrows");
modelBuilder.Entity<MonsterItem>().Property(i => i.Skills).HasColumnName("Skills");
modelBuilder.Entity<ClassProficienciesItem>().Property(i => i.Skills).HasColumnName("Skills");
modelBuilder.Entity<EquipmentItem>().Property(i => i.Speed).HasColumnName("Speed");
modelBuilder.Entity<MonsterItem>().Property(i => i.Speed).HasColumnName("Speed");
modelBuilder.Entity<RaceItem>().Property(i => i.Speed).HasColumnName("Speed");
modelBuilder.Entity<MonsterItem>().Property(i => i.Strength).HasColumnName("Strength");
modelBuilder.Entity<EquipmentItem>().Property(i => i.Strength).HasColumnName("Strength");
modelBuilder.Entity<RaceItem>().Property(i => i.Alignment).HasColumnName("Alignment");
modelBuilder.Entity<MonsterItem>().Property(i => i.Alignment).HasColumnName("Alignment");
modelBuilder.Entity<RaceItem>().Property(i => i.Languages).HasColumnName("Languages");
modelBuilder.Entity<MonsterItem>().Property(i => i.Languages).HasColumnName("Languages");
modelBuilder.Entity<RaceItem>().Property(i => i.Size).HasColumnName("Size");
modelBuilder.Entity<MonsterItem>().Property(i => i.Size).HasColumnName("Size");
modelBuilder.Entity<SpellItem>().Property(i => i.Classes).HasColumnName("Classes"); modelBuilder.Entity<SpellItem>().Property(i => i.Classes).HasColumnName("Classes");
modelBuilder.Entity<SpellItems>().Property(i => i.Classes).HasColumnName("Classes"); modelBuilder.Entity<SpellItems>().Property(i => i.Classes).HasColumnName("Classes");
modelBuilder.Entity<SpellItems>().Property(i => i.Family).HasColumnName("Family");
modelBuilder.Entity<SpellItems>().Property(i => i.Sources).HasColumnName("Sources"); modelBuilder.Entity<SpellItems>().Property(i => i.Sources).HasColumnName("Sources");
modelBuilder.Entity<BackgroundSpecialtyItem>().Property(i => i.Table).HasColumnName("Table");
modelBuilder.Entity<ClassProficienciesItem>().Property(i => i.SavingThrows).HasColumnName("SavingThrows");
modelBuilder.Entity<ClassProficienciesItem>().Property(i => i.Skills).HasColumnName("Skills");
modelBuilder.Entity<EquipmentItem>().Property(i => i.ArmorClass).HasColumnName("ArmorClass");
modelBuilder.Entity<EquipmentItem>().Property(i => i.Rarity).HasColumnName("Rarity");
modelBuilder.Entity<EquipmentItem>().Property(i => i.Speed).HasColumnName("Speed");
modelBuilder.Entity<EquipmentItem>().Property(i => i.Strength).HasColumnName("Strength");
modelBuilder.Entity<EquipmentItem>().Property(i => i.Type).HasColumnName("Type");
modelBuilder.Entity<EquipmentItems>().Property(i => i.Family).HasColumnName("Family");
modelBuilder.Entity<EquipmentItems>().Property(i => i.Types).HasColumnName("Types");
modelBuilder.Entity<MonsterItem>().Property(i => i.Alignment).HasColumnName("Alignment");
modelBuilder.Entity<MonsterItem>().Property(i => i.Languages).HasColumnName("Languages");
modelBuilder.Entity<MonsterItem>().Property(i => i.Size).HasColumnName("Size");
modelBuilder.Entity<MonsterItems>().Property(i => i.Sources).HasColumnName("Sources"); modelBuilder.Entity<MonsterItems>().Property(i => i.Sources).HasColumnName("Sources");
modelBuilder.Entity<Item>().HasDiscriminator(i => i.ItemType); modelBuilder.Entity<Item>().HasDiscriminator(i => i.ItemType);
} }
} }

21
aidedejeu_flutter/lib/database.dart
View file

@ -40,8 +40,11 @@ Future<Database> getDatabaseInstance() async {
Future<Item> getItemWithId(String id) async { Future<Item> getItemWithId(String id) async {
print("getItemWithId " + id); print("getItemWithId " + id);
final db = await database; final db = await database;
var response = await db var response = await db.query(
.query("Items", where: "Id = ? OR RootId = ?", whereArgs: [id, id]); "Items",
where: "Id = ? OR RootId = ?",
whereArgs: [id, id]
);
if (response.isEmpty) { if (response.isEmpty) {
print("Id not found"); print("Id not found");
} }
@ -54,16 +57,18 @@ Future<Item> loadChildrenItems(Item item) async {
String itemType = String itemType =
item.ItemType.substring(0, item.ItemType.length - 1); item.ItemType.substring(0, item.ItemType.length - 1);
String family = ""; String family = "";
if (item is MonsterItems) { if (item is FilteredItems) {
family = (item as MonsterItems)?.Family ?? ""; family = (item as FilteredItems)?.Family ?? "";
} }
final db = await database; final db = await database;
var response = await db var response = await db.query(
.query("Items", where: "ItemType = ? AND Family = ?", "Items",
where: "ItemType = ? AND Family = ?",
whereArgs: [itemType, family], whereArgs: [itemType, family],
orderBy: "NormalizedName"); orderBy: "NormalizedName"
);
if (response.isEmpty) { if (response.isEmpty) {
print("Id not found"); print("Children not found");
} }
item.Children = response.isNotEmpty item.Children = response.isNotEmpty
? itemsFromMapList(response) ? itemsFromMapList(response)

18
aidedejeu_flutter/lib/models/items.dart
View file

@ -103,8 +103,23 @@ class MonsterItem extends Item {
} }
} }
class MonsterItems extends Item { class Items extends Item {
Items.fromMap(Map<String, dynamic> map)
: super.fromMap(map) {
}
}
class FilteredItems extends Items {
String Family; String Family;
FilteredItems.fromMap(Map<String, dynamic> map)
: super.fromMap(map) {
this.Family = map["Family"];
}
}
class MonsterItems extends FilteredItems {
String Type; String Type;
String Size; String Size;
String Alignment; String Alignment;
@ -132,7 +147,6 @@ class MonsterItems extends Item {
MonsterItems.fromMap(Map<String, dynamic> map) MonsterItems.fromMap(Map<String, dynamic> map)
: super.fromMap(map) { : super.fromMap(map) {
this.Family = map["Family"];
this.Type = map["Type"]; this.Type = map["Type"];
this.Size = map["Size"]; this.Size = map["Size"];
this.Alignment = map["Alignment"]; this.Alignment = map["Alignment"];