diff options
26 files changed, 12 insertions, 9 deletions
diff --git a/public/cover/Chroniques des vampires.jpg b/public/cover/Chroniques des vampires.jpg Binary files differnew file mode 100644 index 0000000..c6b28ba --- /dev/null +++ b/public/cover/Chroniques des vampires.jpg diff --git a/public/cover/De la Part du diable.jpg b/public/cover/De la Part du diable.jpg Binary files differnew file mode 100644 index 0000000..ea26080 --- /dev/null +++ b/public/cover/De la Part du diable.jpg diff --git a/public/cover/Dragon Ball Z.jpg b/public/cover/Dragon Ball Z.jpg Binary files differnew file mode 100644 index 0000000..df064ef --- /dev/null +++ b/public/cover/Dragon Ball Z.jpg diff --git a/public/cover/Dragon Ball.jpg b/public/cover/Dragon Ball.jpg Binary files differnew file mode 100644 index 0000000..c987328 --- /dev/null +++ b/public/cover/Dragon Ball.jpg diff --git a/public/cover/Délit de fuite.jpg b/public/cover/Délit de fuite.jpg Binary files differnew file mode 100644 index 0000000..1f26734 --- /dev/null +++ b/public/cover/Délit de fuite.jpg diff --git a/public/cover/Espions de famille.jpg b/public/cover/Espions de famille.jpg Binary files differnew file mode 100644 index 0000000..5c4f69b --- /dev/null +++ b/public/cover/Espions de famille.jpg diff --git a/public/cover/Fairy Tail.jpg b/public/cover/Fairy Tail.jpg Binary files differnew file mode 100644 index 0000000..2bdc9a2 --- /dev/null +++ b/public/cover/Fairy Tail.jpg diff --git a/public/cover/Freak City.jpg b/public/cover/Freak City.jpg Binary files differnew file mode 100644 index 0000000..685fbce --- /dev/null +++ b/public/cover/Freak City.jpg diff --git a/public/cover/Histoire du garçon qui courait après son chien qui courait après sa balle.jpg b/public/cover/Histoire du garçon qui courait après son chien qui courait après sa balle.jpg Binary files differnew file mode 100644 index 0000000..ee7615b --- /dev/null +++ b/public/cover/Histoire du garçon qui courait après son chien qui courait après sa balle.jpg diff --git a/public/cover/Invisible.jpg b/public/cover/Invisible.jpg Binary files differnew file mode 100644 index 0000000..15d5e68 --- /dev/null +++ b/public/cover/Invisible.jpg diff --git a/public/cover/Kodhja.jpg b/public/cover/Kodhja.jpg Binary files differnew file mode 100644 index 0000000..d893a60 --- /dev/null +++ b/public/cover/Kodhja.jpg diff --git a/public/cover/La Déferlante.jpg b/public/cover/La Déferlante.jpg Binary files differnew file mode 100644 index 0000000..7be8d42 --- /dev/null +++ b/public/cover/La Déferlante.jpg diff --git a/public/cover/La Folle rencontre de Flora et Max.jpg b/public/cover/La Folle rencontre de Flora et Max.jpg Binary files differnew file mode 100644 index 0000000..721118d --- /dev/null +++ b/public/cover/La Folle rencontre de Flora et Max.jpg diff --git a/public/cover/Le Combat d’hiver.jpg b/public/cover/Le Combat d’hiver.jpg Binary files differnew file mode 100644 index 0000000..d59f586 --- /dev/null +++ b/public/cover/Le Combat d’hiver.jpg diff --git a/public/cover/Le Guide junior.jpg b/public/cover/Le Guide junior.jpg Binary files differnew file mode 100644 index 0000000..5d569f8 --- /dev/null +++ b/public/cover/Le Guide junior.jpg diff --git a/public/cover/Le Horla, d’après l’œuvre de G. de Maupassant.jpg b/public/cover/Le Horla, d’après l’œuvre de G. de Maupassant.jpg Binary files differnew file mode 100644 index 0000000..4e3d4bb --- /dev/null +++ b/public/cover/Le Horla, d’après l’œuvre de G. de Maupassant.jpg diff --git a/public/cover/Le Jour où j’ai rencontré un ange.jpg b/public/cover/Le Jour où j’ai rencontré un ange.jpg Binary files differnew file mode 100644 index 0000000..ebbfdce --- /dev/null +++ b/public/cover/Le Jour où j’ai rencontré un ange.jpg diff --git a/public/cover/Le Journal malgré lui de Henry K. LARSEN.jpg b/public/cover/Le Journal malgré lui de Henry K. LARSEN.jpg Binary files differnew file mode 100644 index 0000000..14b40ee --- /dev/null +++ b/public/cover/Le Journal malgré lui de Henry K. LARSEN.jpg diff --git a/public/cover/Les Enfants de la baleine.jpg b/public/cover/Les Enfants de la baleine.jpg Binary files differnew file mode 100644 index 0000000..a444d4b --- /dev/null +++ b/public/cover/Les Enfants de la baleine.jpg diff --git a/public/cover/Les Larmes de l’assassin.jpg b/public/cover/Les Larmes de l’assassin.jpg Binary files differnew file mode 100644 index 0000000..651a6fb --- /dev/null +++ b/public/cover/Les Larmes de l’assassin.jpg diff --git a/public/cover/L’Insigne d’argent.jpg b/public/cover/L’Insigne d’argent.jpg Binary files differnew file mode 100644 index 0000000..5a9ebc9 --- /dev/null +++ b/public/cover/L’Insigne d’argent.jpg diff --git a/src/main/scala/reading/Books.scala b/src/main/scala/reading/Books.scala index 4049720..b86a008 100644 --- a/src/main/scala/reading/Books.scala +++ b/src/main/scala/reading/Books.scala @@ -1332,6 +1332,7 @@ object Books { programs = Seq(Autrui), level = Facile ), + Book( title = "Ma mère, le crabe et moi", author = "Anne PERCIN", @@ -1353,6 +1354,7 @@ object Books { programs = Seq(Autrui), level = Moyen ), + Book( title = "Le Jour où j’ai rencontré un ange", author = "Brigitte MINNE", @@ -1594,6 +1596,7 @@ object Books { programs = Seq(Valeurs), level = Facile ), + Book( title = "Mots rumeurs, mots cutter", author = "Charlotte BOUSQUET, Stéphanie RUBINI", @@ -1943,7 +1946,7 @@ object Books { ), Book( - title = "Le Combat d'hiver", + title = "Le Combat d’hiver", author = "JC MOURLEVAT", year = "2006", period = None, @@ -1954,7 +1957,7 @@ object Books { ), Book( - title = "Les Larmes de l'assassin", + title = "Les Larmes de l’assassin", author = "Anne-Laure BONDOUX", year = "2003", period = None, diff --git a/src/main/scala/reading/component/index/Menu.scala b/src/main/scala/reading/component/index/Menu.scala index 6a9bcef..9645f5a 100644 --- a/src/main/scala/reading/component/index/Menu.scala +++ b/src/main/scala/reading/component/index/Menu.scala @@ -28,8 +28,8 @@ object Menu { case None => group(books, filters, "Classe", Grade.values.map(Filter.apply(_))) case Some(grade) => group(books, filters, grade.name, Program.values.map(Filter.apply(_)), Some(grade)) }, - group(books, filters, "Theme", Theme.values.map(Filter.apply(_))), - group(books, filters, "Genre", Genre.values.map(Filter.apply(_))), + group(books, filters, "Theme", Theme.values.sorted.map(Filter.apply(_))), + group(books, filters, "Genre", Genre.values.sorted.map(Filter.apply(_))), group(books, filters, "Niveau", Level.values.map(Filter.apply(_))), group(books, filters, "Période", Period.values.map(Filter.apply(_))) ), diff --git a/src/main/scala/reading/models/Genre.scala b/src/main/scala/reading/models/Genre.scala index 4006815..83233ae 100644 --- a/src/main/scala/reading/models/Genre.scala +++ b/src/main/scala/reading/models/Genre.scala @@ -28,7 +28,7 @@ sealed trait Genre extends EnumEntry with Ordered[Genre] { } object Genre extends Enum[Genre] { - val values = findValues.sorted + val values = findValues case object JournalIntime extends Genre case object RomanHistorique extends Genre diff --git a/src/main/scala/reading/models/Period.scala b/src/main/scala/reading/models/Period.scala index a962217..00e9427 100644 --- a/src/main/scala/reading/models/Period.scala +++ b/src/main/scala/reading/models/Period.scala @@ -5,8 +5,8 @@ import enumeratum._ sealed trait Period extends EnumEntry with Ordered[Period] { import Period._ - def compare(that: Period) = - Compare.format(this.prettyPrint).compare(Compare.format(that.prettyPrint)) + def compare(that: Period): Int = + values.indexOf(that) - values.indexOf(this) def prettyPrint(): String = this match { case Antiquite => "Antiquité" @@ -24,7 +24,7 @@ sealed trait Period extends EnumEntry with Ordered[Period] { } object Period extends Enum[Period] { - val values = findValues.sorted + val values = findValues case object Antiquite extends Period case object MA extends Period diff --git a/src/main/scala/reading/models/Theme.scala b/src/main/scala/reading/models/Theme.scala index 61186a9..2544525 100644 --- a/src/main/scala/reading/models/Theme.scala +++ b/src/main/scala/reading/models/Theme.scala @@ -89,7 +89,7 @@ sealed trait Theme extends EnumEntry with Ordered[Theme] { } object Theme extends Enum[Theme] { - val values = findValues.sorted + val values = findValues case object Adolescence extends Theme case object Americain extends Theme |
