ajout 3

4 files changed, 466 insertions, 11 deletions

diff --git a/src/main/scala/reading/Books.scala b/src/main/scala/reading/Books.scala
index 8d8cb8a..283d177 100644
--- a/src/main/scala/reading/Books.scala
+++ b/src/main/scala/reading/Books.scala
@@ -62,7 +62,7 @@ object Books {
       year = "2012",
       period = Some(Contemporain),
       genres = Seq(),
-      themes = Seq(Amitie, Rivalite),
+      themes = Seq(Amitie, Conflit),
       programs = Seq(),
       level = Moyen
     ),
@@ -929,6 +929,429 @@ object Books {
       themes = Seq(Famille, Amitie, Aventure),
       programs = Seq(),
       level = Moyen
+    ),
+
+    Book(
+      title = "La Vie compliquée de Léa OLIVIER",
+      author = "Catherine GIRARD AUDET",
+      year = "2013-2016",
+      parts = 9,
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Amitie, Amour, Adolescence),
+      programs = Seq(),
+      level = Moyen
+    ),
+
+    Book(
+      title = "La Trilogie de Bartimeus",
+      author = "Jonathan STROUD",
+      year = "2003-2006",
+      parts = 3,
+      period = None,
+      genres = Seq(Fantasy),
+      themes = Seq(Histoire, Magie),
+      programs = Seq(),
+      level = Difficile
+    ),
+
+    Book(
+      title = "Risk",
+      author = "Fleur FERRIS",
+      year = "2016",
+      period = None,
+      genres = Seq(),
+      themes = Seq(Amitie, Internet, Enquete),
+      programs = Seq(),
+      level = Moyen
+    ),
+
+    Book(
+      title = "L’Apprenti d’Araluen",
+      author = "John FLANAGAN",
+      year = "2014-2016",
+      parts = 12,
+      period = None,
+      genres = Seq(Fantasy),
+      themes = Seq(Conflit, Initiation),
+      programs = Seq(),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Titeuf",
+      author = "ZEP",
+      year = "2000-2015",
+      parts = 14,
+      period = None,
+      genres = Seq(BD),
+      themes = Seq(Amitie, Famille, Ecole),
+      programs = Seq(),
+      level = Facile
+    ),
+
+    Book(
+      title = "Cabot Caboche",
+      author = "Daniel PENNAC",
+      year = "1989",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Amitie, Animal),
+      programs = Seq(),
+      level = Facile
+    ),
+
+    Book(
+      title = "La Mécanique du coeur",
+      author = "Mathias MALZIEU",
+      year = "2009",
+      period = Some(Siecle19),
+      genres = Seq(),
+      themes = Seq(Amour),
+      programs = Seq(DireAmour),
+      level = Facile
+    ),
+
+    Book(
+      title = "Mathias MALZIEU",
+      author = "Maintenant qu’il fait tout le temps nuit sur toi",
+      year = "2006",
+      period = None,
+      genres = Seq(),
+      themes = Seq(Deuil, Famille),
+      programs = Seq(),
+      level = Facile
+    ),
+
+    Book(
+      title = "Le plus petit baiser jamais recensé",
+      author = "Mathias MALZIEU",
+      year = "2014",
+      period = None,
+      genres = Seq(),
+      themes = Seq(Amour, Enquete),
+      programs = Seq(),
+      level = Facile
+    ),
+
+    Book(
+      title = "Journal d’un vampire en pyjama",
+      author = "Mathias MALZIEU",
+      year = "2016",
+      period = None,
+      genres = Seq(JournalIntime),
+      themes = Seq(Maladie, Mort),
+      programs = Seq(),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Le Donjon de NAHEULBEUK",
+      author = "John LANG et POINSOT Marion",
+      year = "2011-2016",
+      period = None,
+      genres = Seq(Fantasy, BD),
+      themes = Seq(Aventure, Humour),
+      programs = Seq(),
+      level = Facile
+    ),
+
+    Book(
+      title = "Bichon",
+      author = "David GILSON",
+      year = "2013-2015",
+      period = None,
+      genres = Seq(BD),
+      themes = Seq(Humour, Ecole, Amitie, Famille, Amour, Homosexualite),
+      programs = Seq(),
+      level = Facile
+    ),
+
+    Book(
+      title = "Tild : mage à louer",
+      author = "MAXA’",
+      year = "2016",
+      period = None,
+      genres = Seq(Fantasy, BD),
+      themes = Seq(Magie),
+      programs = Seq(),
+      level = Facile
+    ),
+
+    Book(
+      title = "Seuls",
+      author = "Bruno GAZZOTTI et Fabien VEHLMANN",
+      year = "2006-2016",
+      period = None,
+      genres = Seq(Fantastique, BD),
+      themes = Seq(Enquete, Aventure, Enfants),
+      programs = Seq(),
+      level = Facile
+    ),
+
+    Book(
+      title = "Caïus",
+      author = "Henry WINTERFELD",
+      year = "2014",
+      parts = 2,
+      period = Some(Antiquite),
+      genres = Seq(),
+      themes = Seq(Enquete, Enfants),
+      programs = Seq(),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Cédric",
+      author = "Raoul CAUVIN et LAUDEC",
+      year = "1989-2016",
+      parts = 30,
+      period = None,
+      genres = Seq(BD),
+      themes = Seq(Enfants, Humour, Famille, Amour),
+      programs = Seq(),
+      level = Facile
+    ),
+
+    Book(
+      title = "Les Inséparables",
+      author = "Colas GUTMAN",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Conflit, Enfants, Famille),
+      programs = Seq(Resister),
+      level = Facile
+    ),
+
+    Book(
+      title = "La Rentrée du Petit Nicolas : les histoires inédites du Petit Nicolas 3",
+      author = "SEMPE et GOSCINNY",
+      year = "xxx",
+      period = None,
+      genres = Seq(),
+      themes = Seq(Enfants, Amitie, Humour),
+      programs = Seq(Resister),
+      level = Facile
+    ),
+
+    Book(
+      title = "Un Drôle d’ange gardien",
+      author = "Denis-Pierre FILIPPI, Sandrine REVEL",
+      year = "xxx",
+      period = None,
+      genres = Seq(BD),
+      themes = Seq(Enfants, Amour),
+      programs = Seq(),
+      level = Facile
+    ),
+
+    Book(
+      title = "Louisette la taupe – L’heure du Grimm",
+      author = "Bruno HEITZ",
+      year = "xxx",
+      period = None,
+      genres = Seq(),
+      themes = Seq(Animal, Litterature, Reecriture),
+      programs = Seq(Resister),
+      level = Facile
+    ),
+
+    Book(
+      title = "Histoire du chien qui avait une ombre d’enfant",
+      author = "Hervé WALBECQ",
+      year = "xxx",
+      period = None,
+      genres = Seq(),
+      themes = Seq(Poetique),
+      programs = Seq(CreationPoetique),
+      level = Facile
+    ),
+
+    Book(
+      title = "Etincelles",
+      author = "Daniel LACOTTE et Lola ROIG",
+      year = "xxx",
+      period = None,
+      genres = Seq(),
+      themes = Seq(Nature, Poetique),
+      programs = Seq(CreationPoetique),
+      level = Facile
+    ),
+
+    Book(
+      title = "Quand la nuit voit le jour",
+      author = "Marie-Josée CHRISTIEN",
+      year = "2009-2016",
+      period = None,
+      genres = Seq(),
+      themes = Seq(Nature, Poetique),
+      programs = Seq(CreationPoetique),
+      level = Facile
+    ),
+
+    Book(
+      title = "L’Homme à l’oreille coupée",
+      author = "Jean-Claude MOURLEVAT",
+      year = "xxx",
+      period = None,
+      genres = Seq(),
+      themes = Seq(Aventure, Folie),
+      programs = Seq(RecitAventure),
+      level = Facile
+    ),
+
+    Book(
+      title = "Les Mauvaises notes",
+      author = "Claire JULLIARD",
+      year = "xxx",
+      period = None,
+      genres = Seq(),
+      themes = Seq(Adolescence, Aventure, Amitie, Famille, Conflit),
+      programs = Seq(RecitAventure),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Le renard de Morlange",
+      author = "Alain SURGET",
+      year = "xxx",
+      period = Some(MA),
+      genres = Seq(),
+      themes = Seq(Animal, Metamorphose),
+      programs = Seq(Monstre),
+      level = Facile
+    ),
+
+    Book(
+      title = "Blanche Neige et Grise Pluie",
+      author = "Grégoire SOLOTAREFF, NADJA",
+      year = "xxx",
+      period = None,
+      genres = Seq(),
+      themes = Seq(Humour, Litterature, Reecriture),
+      programs = Seq(Monstre),
+      level = Facile
+    ),
+
+    Book(
+      title = "C’était mon oncle !",
+      author = "Yves GREVET",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Famille, Exclusion, Poetique),
+      programs = Seq(Monstre),
+      level = Facile
+    ),
+
+    Book(
+      title = "Un Monde sauvage",
+      author = "Xavier-Laurent PETIT",
+      year = "xxx",
+      period = None,
+      genres = Seq(),
+      themes = Seq(Nature, Animal, Amitie, Amour, Famille),
+      programs = Seq(HommeEtNature),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Décollage immédiat",
+      author = "Fabien CLAVEL",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(Thriller),
+      themes = Seq(Adolescence, Aventure, Famille),
+      programs = Seq(VoyageEtAventure, RecitAventure),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Céleste, ma planète",
+      author = "Thimothée DE FOMBELLE, Julie RICOSSE",
+      year = "xxx",
+      period = Some(Futur),
+      genres = Seq(),
+      themes = Seq(Ecole, Nature, Amour),
+      programs = Seq(UniversNouveaux),
+      level = Facile
+    ),
+
+    Book(
+      title = "Le Tour des vents",
+      author = "Michèle BAYAR",
+      year = "xxx",
+      period = Some(Renaissance),
+      genres = Seq(RomanHistorique),
+      themes = Seq(Aventure),
+      programs = Seq(Heros),
+      level = Facile
+    ),
+
+    Book(
+      title = "Bjorn le Morphir",
+      author = "Thomas LAVACHERY",
+      year = "xxx",
+      period = Some(MA),
+      genres = Seq(BD, Fantasy, RomanAventure),
+      themes = Seq(Combat, Initiation),
+      programs = Seq(Heros),
+      level = Facile
+    ),
+
+    Book(
+      title = "Cinq histoires d’amour et de chevalerie",
+      author = "Isabelle PERIER et NADEL",
+      year = "xxx",
+      period = Some(MA),
+      genres = Seq(),
+      themes = Seq(Amour, Chevalerie),
+      programs = Seq(Heros),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Un Ours dans la bergerie",
+      author = "Simon QUITTERIE",
+      year = "xxx",
+      period = None,
+      genres = Seq(),
+      themes = Seq(Animal, Amitie, Nature, Famille),
+      programs = Seq(Autrui),
+      level = Facile
+    ),
+
+    Book(
+      title = "Isis, 13 ans, 1,60 m, 82 kilos",
+      author = "Sophie RIGAL-GOULARD",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(RomanEpistolaire),
+      themes = Seq(Discrimination, Laideur, Adolescence, Famille, Ecole),
+      programs = Seq(Autrui),
+      level = Facile
+    ),
+    Book(
+      title = "Ma mère, le crabe et moi",
+      author = "Anne PERCIN",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Adolescence, Internet, Famille, Maladie),
+      programs = Seq(Autrui),
+      level = Facile
+    ),
+
+    Book(
+      title = "Simple",
+      author = "Marie-Aude MURAIL",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Handicap, Humour, Famille),
+      programs = Seq(Autrui),
+      level = Moyen
     )
   )
 }
diff --git a/src/main/scala/reading/models/Genre.scala b/src/main/scala/reading/models/Genre.scala
index db08d24..0e0e812 100644
--- a/src/main/scala/reading/models/Genre.scala
+++ b/src/main/scala/reading/models/Genre.scala
@@ -21,6 +21,8 @@ sealed trait Genre extends EnumEntry with Ordered[Genre] {
     case RomanAventure => "roman d'aventure"
     case Comique => "comique"
     case Dystopie => "dystopie"
+    case Thriller => "thriller"
+    case RomanEpistolaire => "roman épistolaire"
   }
 }
 
@@ -37,5 +39,7 @@ object Genre extends Enum[Genre] {
   case object BD extends Genre
   case object RomanAventure extends Genre
   case object Comique extends Genre
+  case object Thriller extends Genre
   case object Dystopie extends Genre
+  case object RomanEpistolaire extends Genre
 }
diff --git a/src/main/scala/reading/models/Period.scala b/src/main/scala/reading/models/Period.scala
index f16bde3..3003468 100644
--- a/src/main/scala/reading/models/Period.scala
+++ b/src/main/scala/reading/models/Period.scala
@@ -6,20 +6,28 @@ sealed trait Period extends EnumEntry {
   import Period._
 
   def prettyPrint(): String = this match {
+    case Antiquite => "Antiquité"
+    case MA => "Moyen âge"
+    case Renaissance => "Renaissance"
     case Louis14 => "Louis XIV"
     case Siecle19 => "19ème siècle"
     case Siecle20 => "20ème siècle"
     case Annees50 => "années 50"
     case Contemporain => "contemporain"
+    case Futur => "Futur"
   }
 }
 
 object Period extends Enum[Period] {
   val values = findValues
 
+  case object Antiquite extends Period
+  case object MA extends Period
+  case object Renaissance extends Period
   case object Louis14 extends Period
   case object Siecle19 extends Period
   case object Siecle20 extends Period
   case object Annees50 extends Period
   case object Contemporain extends Period
+  case object Futur extends Period
 }
diff --git a/src/main/scala/reading/models/Theme.scala b/src/main/scala/reading/models/Theme.scala
index 5905d49..56fffce 100644
--- a/src/main/scala/reading/models/Theme.scala
+++ b/src/main/scala/reading/models/Theme.scala
@@ -11,12 +11,14 @@ sealed trait Theme extends EnumEntry with Ordered[Theme] {
 
   def prettyPrint(): String = this match {
     case Amitie => "amitié"
-    case Aventure => "aventure"
+    case Adolescence => "adolescence"
     case Americain => "américain"
     case Amour => "amour"
     case Animal => "animal"
-    case Adolescence => "adolescence"
+    case Aventure => "aventure"
     case Beaute => "beaute"
+    case Chevalerie => "chevalerie"
+    case Discrimination => "discrimination"
     case Ecole => "école"
     case Enquete => "enquête"
     case Enfants => "enfants"
@@ -26,25 +28,33 @@ sealed trait Theme extends EnumEntry with Ordered[Theme] {
     case Complot => "complot"
     case Combat => "combat"
     case Cour => "cour"
+    case Deuil => "deuil"
     case Dragon => "dragon"
+    case Exclusion => "exclusion"
     case Famille => "famille"
     case Fratrie => "fratrie"
     case Guerre => "guerre"
+    case Handicap => "handicap"
     case Histoire => "histoire"
+    case Homosexualite => "Homosexualité"
     case Humour => "humour"
     case Initiation => "initiation"
+    case Internet => "internet"
     case JeuVideo => "jeu vidéo"
     case Laideur => "laideur"
     case Litterature => "littérature"
     case Malediction => "malédiction"
     case Magie => "magie"
+    case Metamorphose => "metamorphose"
+    case Mort => "mort"
     case Mythologie => "mythologie"
     case Nature => "nature"
     case Parents => "parents"
     case Peur => "peur"
     case Pirate => "pirate"
     case Poetique => "poétique"
-    case Rivalite => "rivalité"
+    case Reecriture => "réécriture"
+    case Conflit => "conflit"
     case Robot => "robot"
     case SegregationRaciale => "ségrégation raciale"
     case VieNocturne => "vie nocturne"
@@ -58,27 +68,29 @@ sealed trait Theme extends EnumEntry with Ordered[Theme] {
 object Theme extends Enum[Theme] {
   val values = findValues
 
-  case object Amitie extends Theme
-  case object Aventure extends Theme
+  case object Adolescence extends Theme
   case object Americain extends Theme
+  case object Amitie extends Theme
   case object Amour extends Theme
   case object Animal extends Theme
-  case object Adolescence extends Theme
+  case object Aventure extends Theme
   case object Beaute extends Theme
   case object Ecole extends Theme
-  case object Enquete extends Theme
-  case object Enfants extends Theme
   case object Emancipation extends Theme
+  case object Enfants extends Theme
+  case object Enquete extends Theme
   case object Espionnage extends Theme
   case object Folie extends Theme
-  case object Complot extends Theme
   case object Combat extends Theme
+  case object Complot extends Theme
+  case object Conflit extends Theme
   case object Cour extends Theme
   case object Dragon extends Theme
   case object Famille extends Theme
   case object Fratrie extends Theme
   case object Guerre extends Theme
   case object Histoire extends Theme
+  case object Homosexualite extends Theme
   case object Humour extends Theme
   case object Initiation extends Theme
   case object JeuVideo extends Theme
@@ -92,12 +104,20 @@ object Theme extends Enum[Theme] {
   case object Peur extends Theme
   case object Pirate extends Theme
   case object Poetique extends Theme
-  case object Rivalite extends Theme
   case object Robot extends Theme
   case object SegregationRaciale extends Theme
   case object VieNocturne extends Theme
   case object Voyage extends Theme
   case object Animaux extends Theme
   case object College extends Theme
+  case object Deuil extends Theme
+  case object Internet extends Theme
+  case object Mort extends Theme
+  case object Reecriture extends Theme
+  case object Metamorphose extends Theme
+  case object Exclusion extends Theme
+  case object Chevalerie extends Theme
+  case object Discrimination extends Theme
+  case object Handicap extends Theme
   case object Maladie extends Theme
 }