4 files changed, 80 insertions, 24 deletions

diff --git a/src/main/scala/reading/models/Genre.scala b/src/main/scala/reading/models/Genre.scala
index 0e0e812..b5fc6c4 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 Uchronie => "uchronie"
+    case Manga => "manga"
     case Thriller => "thriller"
     case RomanEpistolaire => "roman épistolaire"
   }
@@ -41,5 +43,7 @@ object Genre extends Enum[Genre] {
   case object Comique extends Genre
   case object Thriller extends Genre
   case object Dystopie extends Genre
+  case object Uchronie extends Genre
+  case object Manga 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 3003468..90d6015 100644
--- a/src/main/scala/reading/models/Period.scala
+++ b/src/main/scala/reading/models/Period.scala
@@ -9,7 +9,9 @@ sealed trait Period extends EnumEntry {
     case Antiquite => "Antiquité"
     case MA => "Moyen âge"
     case Renaissance => "Renaissance"
+    case Lumieres => "Lumières"
     case Louis14 => "Louis XIV"
+    case Siecle18 => "18ème siècle"
     case Siecle19 => "19ème siècle"
     case Siecle20 => "20ème siècle"
     case Annees50 => "années 50"
@@ -24,7 +26,9 @@ object Period extends Enum[Period] {
   case object Antiquite extends Period
   case object MA extends Period
   case object Renaissance extends Period
+  case object Lumieres extends Period
   case object Louis14 extends Period
+  case object Siecle18 extends Period
   case object Siecle19 extends Period
   case object Siecle20 extends Period
   case object Annees50 extends Period
diff --git a/src/main/scala/reading/models/Program.scala b/src/main/scala/reading/models/Program.scala
index 17385b4..1859db3 100644
--- a/src/main/scala/reading/models/Program.scala
+++ b/src/main/scala/reading/models/Program.scala
@@ -22,12 +22,12 @@ sealed trait Program extends EnumEntry with Ordered[Program] {
     case HommeEtNature => "L'être humain est-il maître de la nature ?"
 
     case DireAmour => "Dire l'amour"
-    case IndividuEtSociete => "Individu et société : confrontations de valeur ?"
-    case FictionEtReel => "La fiction pour interroger le réel"
+    case Valeurs => "Individu et société : confrontations de valeurs ?"
+    case Reel => "La fiction pour interroger le réel"
     case Informer => "Informer, s'informer, déformer ?"
     case Ville => "La ville, lieu de tous les possibles ?"
 
-    case RaconterRepresenter => "Se raconter, se représenter"
+    case SeRaconter => "Se raconter, se représenter"
     case TraversSociete => "Dénoncer les travers de la société"
     case VisionsPoetiques => "Visions poétiques du monde"
     case AgirCite => "Agir dans la cité : individu et pouvoir"
@@ -50,12 +50,12 @@ object Program extends Enum[Program] {
   case object HommeEtNature extends Program
 
   case object DireAmour extends Program
-  case object IndividuEtSociete extends Program
-  case object FictionEtReel extends Program
+  case object Valeurs extends Program
+  case object Reel extends Program
   case object Informer extends Program
   case object Ville extends Program
 
-  case object RaconterRepresenter extends Program
+  case object SeRaconter extends Program
   case object TraversSociete extends Program
   case object VisionsPoetiques extends Program
   case object AgirCite extends Program
@@ -67,8 +67,8 @@ object Program extends Enum[Program] {
     program match {
       case Monstre | RecitAventure | CreationPoetique | Resister => Sixieme
       case VoyageEtAventure | Autrui | UniversNouveaux | Heros | HommeEtNature => Cinquieme
-      case DireAmour | IndividuEtSociete | FictionEtReel | Informer | Ville => Quatrieme
-      case RaconterRepresenter | TraversSociete | VisionsPoetiques | AgirCite | ProgresReveScientifique => Troisieme
+      case DireAmour | Valeurs | Reel | Informer | Ville => Quatrieme
+      case SeRaconter | TraversSociete | VisionsPoetiques | AgirCite | ProgresReveScientifique => Troisieme
     }
   }
 }
diff --git a/src/main/scala/reading/models/Theme.scala b/src/main/scala/reading/models/Theme.scala
index 56fffce..116bff8 100644
--- a/src/main/scala/reading/models/Theme.scala
+++ b/src/main/scala/reading/models/Theme.scala
@@ -11,57 +11,81 @@ sealed trait Theme extends EnumEntry with Ordered[Theme] {
 
   def prettyPrint(): String = this match {
     case Amitie => "amitié"
+    case Angoisse => "angoisse"
     case Adolescence => "adolescence"
     case Americain => "américain"
     case Amour => "amour"
     case Animal => "animal"
+    case Apprentissage => "apprentissage"
     case Aventure => "aventure"
     case Beaute => "beaute"
     case Chevalerie => "chevalerie"
+    case Conflit => "conflit"
+    case Crime => "crime"
     case Discrimination => "discrimination"
+    case Dictature => "dictature"
     case Ecole => "école"
     case Enquete => "enquête"
     case Enfants => "enfants"
     case Emancipation => "émancipation"
     case Espionnage => "espionnage"
     case Folie => "folie"
+    case College => "collège"
     case Complot => "complot"
     case Combat => "combat"
     case Cour => "cour"
+    case Danse => "danse"
     case Deuil => "deuil"
+    case Difference => "différence"
     case Dragon => "dragon"
+    case Eugenisme => "eugénisme"
     case Exclusion => "exclusion"
     case Famille => "famille"
+    case Fantome => "fantôme"
     case Fratrie => "fratrie"
+    case Genetique => "génétique"
     case Guerre => "guerre"
     case Handicap => "handicap"
+    case Harcelement => "harcelement"
     case Histoire => "histoire"
     case Homosexualite => "Homosexualité"
     case Humour => "humour"
     case Initiation => "initiation"
     case Internet => "internet"
     case JeuVideo => "jeu vidéo"
+    case Justice => "justice"
     case Laideur => "laideur"
     case Litterature => "littérature"
+    case Maladie => "maladie"
     case Malediction => "malédiction"
+    case Manipulation => "manipulation"
     case Magie => "magie"
+    case Marginalite => "marginalite"
+    case Mensonge => "mensonge"
     case Metamorphose => "metamorphose"
+    case Metissage => "metissage"
+    case Migration => "migration"
     case Mort => "mort"
+    case Musique => "musique"
     case Mythologie => "mythologie"
     case Nature => "nature"
     case Parents => "parents"
+    case Pauvrete => "pauvrete"
     case Peur => "peur"
     case Pirate => "pirate"
     case Poetique => "poétique"
+    case Racisme => "racisme"
     case Reecriture => "réécriture"
-    case Conflit => "conflit"
     case Robot => "robot"
+    case Secret => "secret"
     case SegregationRaciale => "ségrégation raciale"
+    case Sentiment => "sexualité"
+    case Sexualite => "sexualité"
+    case Suicide => "suicide"
+    case Vampire => "vampire"
     case VieNocturne => "vie nocturne"
+    case Violence => "violence"
     case Voyage => "voyage"
-    case Animaux => "animaux"
-    case College => "collège"
-    case Maladie => "maladie"
   }
 }
 
@@ -72,15 +96,28 @@ object Theme extends Enum[Theme] {
   case object Americain extends Theme
   case object Amitie extends Theme
   case object Amour extends Theme
+  case object Angoisse extends Theme
   case object Animal extends Theme
+  case object Apprentissage extends Theme
   case object Aventure extends Theme
   case object Beaute extends Theme
+  case object Chevalerie extends Theme
+  case object Crime extends Theme
+  case object Danse extends Theme
+  case object Deuil extends Theme
+  case object Difference extends Theme
+  case object Discrimination extends Theme
+  case object Dictature extends Theme
   case object Ecole extends Theme
   case object Emancipation extends Theme
   case object Enfants extends Theme
   case object Enquete extends Theme
   case object Espionnage extends Theme
+  case object Eugenisme extends Theme
+  case object Exclusion extends Theme
+  case object Fantome extends Theme
   case object Folie extends Theme
+  case object College extends Theme
   case object Combat extends Theme
   case object Complot extends Theme
   case object Conflit extends Theme
@@ -88,36 +125,47 @@ object Theme extends Enum[Theme] {
   case object Dragon extends Theme
   case object Famille extends Theme
   case object Fratrie extends Theme
+  case object Genetique extends Theme
   case object Guerre extends Theme
+  case object Handicap extends Theme
+  case object Harcelement extends Theme
   case object Histoire extends Theme
   case object Homosexualite extends Theme
   case object Humour extends Theme
   case object Initiation extends Theme
+  case object Internet extends Theme
   case object JeuVideo extends Theme
+  case object Justice extends Theme
   case object Laideur extends Theme
   case object Litterature extends Theme
+  case object Maladie extends Theme
   case object Malediction extends Theme
+  case object Manipulation extends Theme
   case object Magie extends Theme
+  case object Marginalite extends Theme
+  case object Mensonge extends Theme
+  case object Metamorphose extends Theme
+  case object Metissage extends Theme
+  case object Migration extends Theme
+  case object Mort extends Theme
+  case object Musique extends Theme
   case object Mythologie extends Theme
   case object Nature extends Theme
   case object Parents extends Theme
+  case object Pauvrete extends Theme
   case object Peur extends Theme
   case object Pirate extends Theme
   case object Poetique extends Theme
+  case object Racisme extends Theme
+  case object Reecriture extends Theme
   case object Robot extends Theme
+  case object Secret extends Theme
   case object SegregationRaciale extends Theme
+  case object Sentiment extends Theme
+  case object Sexualite extends Theme
+  case object Suicide extends Theme
+  case object Vampire extends Theme
   case object VieNocturne extends Theme
+  case object Violence 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
 }