From 4f8a37a6b9b7d2ec486c7cc0d8c2a41fe7740bc8 Mon Sep 17 00:00:00 2001
From: Yan Maniez <nioux59@outlook.com>
Date: Thu, 27 Feb 2020 23:30:22 +0100
Subject: [PATCH] BETWEEN

---
 aidedejeu_flutter/lib/database.dart         | 3 +++
 aidedejeu_flutter/lib/models/items.dart     | 4 ++--
 aidedejeu_flutter/lib/widgets/homepage.dart | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/aidedejeu_flutter/lib/database.dart b/aidedejeu_flutter/lib/database.dart
index 5ccaa85c..e2358824 100644
--- a/aidedejeu_flutter/lib/database.dart
+++ b/aidedejeu_flutter/lib/database.dart
@@ -67,6 +67,9 @@ Future<Item> loadChildrenItems(Item item, List<Filter> filters) async {
         if(filter.selectedValues.isNotEmpty) {
           whereFilter = " AND (${filter.name} LIKE '%" + filter.selectedValues.join("%' OR ${filter.name} LIKE '%") + "%')";
         }
+        if(filter.rangeValues != null && (filter.rangeValues.start > 0 || filter.rangeValues.end < filter.values.length - 1) ) {
+          whereFilter = " AND ([${filter.name}] BETWEEN '${filter.values[filter.rangeValues.start.round()]}' AND '${filter.values[filter.rangeValues.end.round()]}')";
+        }
       });
     }
     print(whereFilter);
diff --git a/aidedejeu_flutter/lib/models/items.dart b/aidedejeu_flutter/lib/models/items.dart
index b600dce8..8891ac60 100644
--- a/aidedejeu_flutter/lib/models/items.dart
+++ b/aidedejeu_flutter/lib/models/items.dart
@@ -147,8 +147,8 @@ class MonsterItems extends FilteredItems {
   MonsterItems.fromMap(Map<String, dynamic> map)
       : super.fromMap(map) {
     this.types = Filter(name: "Type", type: FilterType.Choices, values: map["Types"].toString().split("|"));
-    this.challenges = Filter(name: "Dangerosité", type: FilterType.Range, values: map["Challenges"].toString().split("|"));
-    this.sizes = Filter(name: "Taille", type: FilterType.Range, values: map["Sizes"].toString().split("|"));;
+    this.challenges = Filter(name: "Challenge", type: FilterType.Range, values: map["Challenges"].toString().split("|"));
+    this.sizes = Filter(name: "Size", type: FilterType.Range, values: map["Sizes"].toString().split("|"));;
     this.sources = Filter(name: "Source", type: FilterType.Choices, values: map["Sources"].toString().split("|"));
     this.terrains = Filter(name: "Terrain", type: FilterType.Choices, values: map["Terrains"].toString().split("|"));
   }
diff --git a/aidedejeu_flutter/lib/widgets/homepage.dart b/aidedejeu_flutter/lib/widgets/homepage.dart
index c347aaa3..3afea880 100644
--- a/aidedejeu_flutter/lib/widgets/homepage.dart
+++ b/aidedejeu_flutter/lib/widgets/homepage.dart
@@ -174,6 +174,12 @@ class _MyHomePageState extends State<MyHomePage> {
           setState(() {
             filter.rangeValues = values;
           });
+          loadChildrenItems(item, filters).then((value) => {
+            setState(() {
+              this.item = item;
+              this.filters = filters;
+            })
+          });
         });
   }