aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoris2017-02-04 23:23:33 +0000
committerJoris2017-02-04 23:23:33 +0000
commit9b69e3412b24be907dfb535312bb406ff3961498 (patch)
tree9ac9cfbea5399d91960cadd00bf799d0f0a0d53a
parentd21daf008458aea2ae77bbbd5d7a0513990c4cfa (diff)
parent1dde0d75da0684783e4bbd78293223f9c580bce3 (diff)
Merge branch 'add-books' into 'master'
dernier ajout See merge request !4
-rw-r--r--public/cover/Blanche Neige et Grise Pluie.jpgbin98328 -> 0 bytes
-rw-r--r--public/cover/De la Part du diable.jpgbin29457 -> 0 bytes
-rw-r--r--public/cover/La Tour des vents.jpgbin185516 -> 0 bytes
-rw-r--r--public/cover/Le Retour de Martin GUERRE.jpgbin27343 -> 0 bytes
-rw-r--r--public/cover/Le Voyage de Samson.jpgbin122943 -> 0 bytes
-rw-r--r--public/cover/Louisette la taupe – L’heure du Grimm.jpgbin38104 -> 0 bytes
-rw-r--r--public/cover/Tu ne sais rien de l’amour.jpgbin66276 -> 0 bytes
-rw-r--r--public/cover/Un Ours dans la bergerie.jpgbin75893 -> 0 bytes
-rw-r--r--public/cover/Étincelles.jpgbin40790 -> 0 bytes
-rw-r--r--src/main/scala/reading/Books.scala360
-rw-r--r--src/main/scala/reading/models/Genre.scala4
-rw-r--r--src/main/scala/reading/models/Program.scala6
-rw-r--r--src/main/scala/reading/models/Theme.scala32
13 files changed, 239 insertions, 163 deletions
diff --git a/public/cover/Blanche Neige et Grise Pluie.jpg b/public/cover/Blanche Neige et Grise Pluie.jpg
deleted file mode 100644
index 7c7b4ee..0000000
--- a/public/cover/Blanche Neige et Grise Pluie.jpg
+++ /dev/null
Binary files differ
diff --git a/public/cover/De la Part du diable.jpg b/public/cover/De la Part du diable.jpg
deleted file mode 100644
index ea26080..0000000
--- a/public/cover/De la Part du diable.jpg
+++ /dev/null
Binary files differ
diff --git a/public/cover/La Tour des vents.jpg b/public/cover/La Tour des vents.jpg
deleted file mode 100644
index 5d95dfc..0000000
--- a/public/cover/La Tour des vents.jpg
+++ /dev/null
Binary files differ
diff --git a/public/cover/Le Retour de Martin GUERRE.jpg b/public/cover/Le Retour de Martin GUERRE.jpg
deleted file mode 100644
index 2e76f1b..0000000
--- a/public/cover/Le Retour de Martin GUERRE.jpg
+++ /dev/null
Binary files differ
diff --git a/public/cover/Le Voyage de Samson.jpg b/public/cover/Le Voyage de Samson.jpg
deleted file mode 100644
index 21ba83c..0000000
--- a/public/cover/Le Voyage de Samson.jpg
+++ /dev/null
Binary files differ
diff --git a/public/cover/Louisette la taupe – L’heure du Grimm.jpg b/public/cover/Louisette la taupe – L’heure du Grimm.jpg
deleted file mode 100644
index 4bf0ff6..0000000
--- a/public/cover/Louisette la taupe – L’heure du Grimm.jpg
+++ /dev/null
Binary files differ
diff --git a/public/cover/Tu ne sais rien de l’amour.jpg b/public/cover/Tu ne sais rien de l’amour.jpg
deleted file mode 100644
index c4bc5e4..0000000
--- a/public/cover/Tu ne sais rien de l’amour.jpg
+++ /dev/null
Binary files differ
diff --git a/public/cover/Un Ours dans la bergerie.jpg b/public/cover/Un Ours dans la bergerie.jpg
deleted file mode 100644
index 069a1fc..0000000
--- a/public/cover/Un Ours dans la bergerie.jpg
+++ /dev/null
Binary files differ
diff --git a/public/cover/Étincelles.jpg b/public/cover/Étincelles.jpg
deleted file mode 100644
index 6c1327d..0000000
--- a/public/cover/Étincelles.jpg
+++ /dev/null
Binary files differ
diff --git a/src/main/scala/reading/Books.scala b/src/main/scala/reading/Books.scala
index 0c40f79..fd48eac 100644
--- a/src/main/scala/reading/Books.scala
+++ b/src/main/scala/reading/Books.scala
@@ -1116,7 +1116,7 @@ object Books {
Book(
title = "Les Inséparables",
author = "Colas GUTMAN",
- year = "xxx",
+ year = "2007",
period = Some(Contemporain),
genres = Seq(),
themes = Seq(Conflit, Enfants, Famille),
@@ -1127,7 +1127,7 @@ object Books {
Book(
title = "La Rentrée du Petit Nicolas : les histoires inédites du Petit Nicolas 3",
author = "SEMPE et GOSCINNY",
- year = "xxx",
+ year = "2008",
period = None,
genres = Seq(),
themes = Seq(Enfants, Amitie, Humour),
@@ -1138,7 +1138,8 @@ object Books {
Book(
title = "Un Drôle d’ange gardien",
author = "Denis-Pierre FILIPPI, Sandrine REVEL",
- year = "xxx",
+ year = "1995-2008",
+ parts = 7,
period = None,
genres = Seq(BD),
themes = Seq(Enfants, Amour),
@@ -1147,20 +1148,9 @@ object Books {
),
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",
+ year = "2015",
period = None,
genres = Seq(),
themes = Seq(Poetique),
@@ -1169,20 +1159,9 @@ object Books {
),
Book(
- title = "Étincelles",
- 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",
+ year = "2015",
period = None,
genres = Seq(),
themes = Seq(Nature, Poetique),
@@ -1193,7 +1172,7 @@ object Books {
Book(
title = "L’Homme à l’oreille coupée",
author = "Jean-Claude MOURLEVAT",
- year = "xxx",
+ year = "2003",
period = None,
genres = Seq(),
themes = Seq(Aventure, Folie),
@@ -1204,7 +1183,7 @@ object Books {
Book(
title = "Les Mauvaises notes",
author = "Claire JULLIARD",
- year = "xxx",
+ year = "1997",
period = None,
genres = Seq(),
themes = Seq(Adolescence, Aventure, Amitie, Famille, Conflit),
@@ -1215,7 +1194,7 @@ object Books {
Book(
title = "Le Renard de Morlange",
author = "Alain SURGET",
- year = "xxx",
+ year = "1995",
period = Some(MA),
genres = Seq(),
themes = Seq(Animal, Metamorphose),
@@ -1224,20 +1203,9 @@ object Books {
),
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",
+ year = "2006",
period = Some(Contemporain),
genres = Seq(),
themes = Seq(Famille, Exclusion, Poetique),
@@ -1248,7 +1216,7 @@ object Books {
Book(
title = "Un Monde sauvage",
author = "Xavier-Laurent PETIT",
- year = "xxx",
+ year = "2015",
period = None,
genres = Seq(),
themes = Seq(Nature, Animal, Amitie, Amour, Famille),
@@ -1259,7 +1227,7 @@ object Books {
Book(
title = "Décollage immédiat",
author = "Fabien CLAVEL",
- year = "xxx",
+ year = "2012",
period = Some(Contemporain),
genres = Seq(Thriller),
themes = Seq(Adolescence, Aventure, Famille),
@@ -1270,7 +1238,7 @@ object Books {
Book(
title = "Céleste, ma planète",
author = "Thimothée DE FOMBELLE, Julie RICOSSE",
- year = "xxx",
+ year = "2009",
period = Some(Futur),
genres = Seq(),
themes = Seq(Ecole, Nature, Amour),
@@ -1279,20 +1247,9 @@ object Books {
),
Book(
- title = "La 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",
+ year = "2004",
period = Some(MA),
genres = Seq(BD, Fantasy, RomanAventure),
themes = Seq(Combat, Initiation),
@@ -1303,7 +1260,7 @@ object Books {
Book(
title = "Cinq histoires d’amour et de chevalerie",
author = "Isabelle PERIER et NADEL",
- year = "xxx",
+ year = "2012",
period = Some(MA),
genres = Seq(),
themes = Seq(Amour, Chevalerie),
@@ -1312,22 +1269,11 @@ object Books {
),
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",
+ year = "2016",
period = Some(Contemporain),
- genres = Seq(RomanEpistolaire),
+ genres = Seq(Epistolaire),
themes = Seq(Discrimination, Laideur, Adolescence, Famille, Ecole),
programs = Seq(Autrui),
level = Facile
@@ -1336,7 +1282,7 @@ object Books {
Book(
title = "Ma mère, le crabe et moi",
author = "Anne PERCIN",
- year = "xxx",
+ year = "2015",
period = Some(Contemporain),
genres = Seq(),
themes = Seq(Adolescence, Internet, Famille, Maladie),
@@ -1347,7 +1293,7 @@ object Books {
Book(
title = "Simple",
author = "Marie-Aude MURAIL",
- year = "xxx",
+ year = "2004",
period = Some(Contemporain),
genres = Seq(),
themes = Seq(Handicap, Humour, Famille),
@@ -1358,7 +1304,7 @@ object Books {
Book(
title = "Le Jour où j’ai rencontré un ange",
author = "Brigitte MINNE",
- year = "xxx",
+ year = "2007",
period = Some(Contemporain),
genres = Seq(),
themes = Seq(Adolescence, Deuil, Handicap),
@@ -1369,7 +1315,7 @@ object Books {
Book(
title = "Délit de fuite",
author = "Christophe LEON",
- year = "xxx",
+ year = "2011",
period = Some(Contemporain),
genres = Seq(),
themes = Seq(Adolescence, Famille, Crime, Justice),
@@ -1380,7 +1326,8 @@ object Books {
Book(
title = "Espions de famille",
author = "Thierry GAUDIN et Romain RONZEAU",
- year = "xxx",
+ year = "2012-2017",
+ parts = 5,
period = Some(Contemporain),
genres = Seq(BD),
themes = Seq(Adolescence, Famille, Espionnage),
@@ -1389,20 +1336,9 @@ object Books {
),
Book(
- title = "Le Voyage de Samson",
- author = "Annette MIERSWA",
- year = "xxx",
- period = Some(Contemporain),
- genres = Seq(),
- themes = Seq(Animal, Deuil, Famille),
- programs = Seq(Autrui),
- level = Moyen
- ),
-
- Book(
title = "Histoire du garçon qui courait après son chien qui courait après sa balle",
author = "Hervé GIRAUD",
- year = "xxx",
+ year = "2016",
period = Some(Contemporain),
genres = Seq(),
themes = Seq(Deuil, Maladie, Animal, Famille, Mort),
@@ -1413,7 +1349,7 @@ object Books {
Book(
title = "À Copier 100 fois",
author = "Antoine DOLE",
- year = "xxx",
+ year = "2013",
period = Some(Contemporain),
genres = Seq(),
themes = Seq(Difference, Exclusion, Famille, Violence, Ecole),
@@ -1424,7 +1360,7 @@ object Books {
Book(
title = "Après la vague",
author = "Orianne CHARPENTIER",
- year = "xxx",
+ year = "2014",
period = Some(Contemporain),
genres = Seq(),
themes = Seq(Adolescence, Deuil, Famille, Mort),
@@ -1433,20 +1369,9 @@ object Books {
),
Book(
- title = "Le Retour de Martin GUERRE",
- author = "JC CARRIERE, Daniel VIGNE",
- year = "xxx",
- period = Some(Contemporain),
- genres = Seq(),
- themes = Seq(Guerre, Famille),
- programs = Seq(Autrui),
- level = Facile
- ),
-
- Book(
title = "Robin des graffs",
author = "Muriel ZÜRCHER",
- year = "xxx",
+ year = "2016",
period = Some(Contemporain),
genres = Seq(Policier),
themes = Seq(Marginalite, Amitie),
@@ -1457,7 +1382,7 @@ object Books {
Book(
title = "Maestro !",
author = "Xavier-Laurent PETIT",
- year = "xxx",
+ year = "2005",
period = Some(Contemporain),
genres = Seq(),
themes = Seq(Pauvrete, Famille, Violence, Dictature, Enfants, Musique),
@@ -1468,7 +1393,7 @@ object Books {
Book(
title = "Le Horla, d’après l’œuvre de G. de Maupassant",
author = "Guillaume SOREL",
- year = "xxx",
+ year = "2014",
period = Some(Siecle19),
genres = Seq(BD, Fantastique),
themes = Seq(Folie),
@@ -1479,7 +1404,7 @@ object Books {
Book(
title = "Le Passage du diable",
author = "Anne FINE",
- year = "xxx",
+ year = "2014",
period = Some(Siecle19),
genres = Seq(Fantastique),
themes = Seq(Angoisse, Famille, Mensonge),
@@ -1490,9 +1415,9 @@ object Books {
Book(
title = "La Folle rencontre de Flora et Max",
author = "Martin PAGE, Coline PIERRE",
- year = "xxx",
+ year = "2015",
period = Some(Contemporain),
- genres = Seq(RomanEpistolaire),
+ genres = Seq(Epistolaire),
themes = Seq(Amitie, Apprentissage, Exclusion),
programs = Seq(Valeurs),
level = Facile
@@ -1501,7 +1426,7 @@ object Books {
Book(
title = "L’Insigne d’argent",
author = "Korneï TCHOUKOVSKI",
- year = "xxx",
+ year = "2015",
period = Some(Siecle19),
genres = Seq(),
themes = Seq(Exclusion, Discrimination, Ecole),
@@ -1512,29 +1437,18 @@ object Books {
Book(
title = "Mon Cher VOLTAIRE",
author = "Jean RENE",
- year = "xxx",
+ year = "2015",
period = Some(Lumieres),
- genres = Seq(RomanEpistolaire),
+ genres = Seq(Epistolaire),
themes = Seq(Litterature),
programs = Seq(Valeurs),
level = Facile
),
Book(
- title = "Tu ne sais rien de l’amour",
- author = "Mikaël OLLIVIER",
- year = "xxx",
- period = Some(Contemporain),
- genres = Seq(),
- themes = Seq(Amour, Famille, Maladie, Mort, Sexualite),
- programs = Seq(Valeurs),
- level = Moyen
- ),
-
- Book(
title = "Maïté Coiffure",
author = "Marie-Aude MURAIL",
- year = "xxx",
+ year = "2004",
period = Some(Contemporain),
genres = Seq(),
themes = Seq(Adolescence, Ecole, Famille, Conflit),
@@ -1545,7 +1459,7 @@ object Books {
Book(
title = "Sauveur et fils",
author = "Marie-Aude MURAIL",
- year = "xxx",
+ year = "2016",
period = Some(Contemporain),
genres = Seq(),
themes = Seq(Deuil, Famille, Metissage),
@@ -1556,7 +1470,7 @@ object Books {
Book(
title = "Le Singe de Hartlepool",
author = "Jérémie MOREAU, Wilfrid LUPANO",
- year = "xxx",
+ year = "2014",
period = Some(Siecle19),
genres = Seq(BD),
themes = Seq(Animal, Discrimination, Violence, Racisme),
@@ -1567,7 +1481,7 @@ object Books {
Book(
title = "Refuges",
author = "Annelise HEURTIER",
- year = "xxx",
+ year = "2015",
period = Some(Contemporain),
genres = Seq(),
themes = Seq(Deuil, Migration, Famille, Adolescence),
@@ -1578,7 +1492,7 @@ object Books {
Book(
title = "Tout revivre",
author = "Mélody GORNET",
- year = "xxx",
+ year = "2015",
period = Some(Contemporain),
genres = Seq(),
themes = Seq(Adolescence, Famille, Mort, Deuil, Violence, Ecole),
@@ -1589,7 +1503,7 @@ object Books {
Book(
title = "Une Preuve d’amour",
author = "Valentine GOBY",
- year = "xxx",
+ year = "2013",
period = Some(Contemporain),
genres = Seq(),
themes = Seq(Amour, Famille, Migration, Amitie, Litterature),
@@ -1600,7 +1514,7 @@ object Books {
Book(
title = "Mots rumeurs, mots cutter",
author = "Charlotte BOUSQUET, Stéphanie RUBINI",
- year = "xxx",
+ year = "2014",
period = Some(Contemporain),
genres = Seq(BD),
themes = Seq(Adolescence, Internet, Amitie, Harcelement),
@@ -1611,7 +1525,7 @@ object Books {
Book(
title = "Invisible",
author = "Charlotte BOUSQUET, Stéphanie RUBINI",
- year = "xxx",
+ year = "2015",
period = Some(Contemporain),
genres = Seq(BD),
themes = Seq(Adolescence, Amour, Suicide, Ecole, Laideur, Discrimination),
@@ -1620,20 +1534,9 @@ object Books {
),
Book(
- title = "De la Part du diable",
- author = "Aina BASSO",
- year = "xxx",
- period = Some(Lumieres),
- genres = Seq(),
- themes = Seq(Justice),
- programs = Seq(Valeurs),
- level = Moyen
- ),
-
- Book(
title = "Tabou",
author = "Frank ANDRIAT",
- year = "xxx",
+ year = "2003",
period = Some(Contemporain),
genres = Seq(),
themes = Seq(Adolescence, Suicide, Homosexualite, Ecole, Discrimination),
@@ -1644,7 +1547,7 @@ object Books {
Book(
title = "Avant l’ouragan",
author = "Jewell PARKER RHODES",
- year = "xxx",
+ year = "2015",
period = Some(Contemporain),
genres = Seq(Fantastique),
themes = Seq(Adolescence, Deuil),
@@ -1655,7 +1558,7 @@ object Books {
Book(
title = "Kodhja",
author = "Thomas SCOTTO, Régis LEJONC",
- year = "xxx",
+ year = "2015",
period = Some(Contemporain),
genres = Seq(BD),
themes = Seq(Enfants, Initiation),
@@ -1666,7 +1569,7 @@ object Books {
Book(
title = "Les Ailes de la Sylphide",
author = "Pascale MARET",
- year = "xxx",
+ year = "2013",
period = Some(Contemporain),
genres = Seq(Fantastique),
themes = Seq(Adolescence, Violence, Danse),
@@ -2041,8 +1944,8 @@ object Books {
year = "2013",
period = Some(Contemporain),
genres = Seq(),
- themes = Seq(Dictature, Guerre, Eugenisme),
- programs = Seq(AgirCite),
+ themes = Seq(Dictature, Guerre, Eugenisme, Nazisme),
+ programs = Seq(Agir),
level = Difficile
),
@@ -2123,6 +2026,171 @@ object Books {
themes = Seq(Adolescence, Amour, Famille, Mort, Amitie, Violence),
programs = Seq(),
level = Difficile
+ ),
+ Book(
+ title = "Ma Vie ne sait pas nager",
+ author = "Elaine TURGEON",
+ year = "2006",
+ period = Some(Contemporain),
+ genres = Seq(Epistolaire),
+ themes = Seq(Adolescence, Suicide, Mort, Deuil),
+ programs = Seq(SeRaconter),
+ level = Facile
+ ),
+
+ Book(
+ title = "Moi, René TARDI, prisonnier de guerre au Stalag IIB",
+ author = "TARDI",
+ year = "2012-2014",
+ parts = 2,
+ period = Some(Siecle20),
+ genres = Seq(BD),
+ themes = Seq(Nazisme, Guerre, Violence, Mort),
+ programs = Seq(SeRaconter),
+ level = Facile
+ ),
+
+ Book(
+ title = "Trop tôt",
+ author = "Jo WITEK",
+ year = "2015",
+ period = Some(Contemporain),
+ genres = Seq(),
+ themes = Seq(Adolescence, Sexualite, Apprentissage, Sentiment),
+ programs = Seq(SeRaconter),
+ level = Facile
+ ),
+
+ Book(
+ title = "Je suis un phénomène",
+ author = "Elisabeth ATKINSON",
+ year = "2010",
+ period = Some(Contemporain),
+ genres = Seq(),
+ themes = Seq(Adolescence, Amitie, Famille, Discrimination),
+ programs = Seq(SeRaconter),
+ level = Moyen
+ ),
+
+ Book(
+ title = "Instinct",
+ author = "Vincent VILLEMINOT",
+ year = "2011",
+ period = Some(Contemporain),
+ genres = Seq(Fantastique),
+ themes = Seq(Adolescence, Metamorphose, Famille),
+ programs = Seq(SeRaconter),
+ level = Moyen
+ ),
+
+ Book(
+ title = "L’Empire des auras",
+ author = "Nadia COSTE",
+ year = "2016",
+ period = Some(Contemporain),
+ genres = Seq(),
+ themes = Seq(Adolescence, Dictature, Manipulation, SegregationRaciale, Amour),
+ programs = Seq(TraversSociete),
+ level = Moyen
+ ),
+
+ Book(
+ title = "Quand j’étais soldate",
+ author = "Valérie ZENATTI",
+ year = "2002",
+ period = Some(Contemporain),
+ genres = Seq(JournalIntime),
+ themes = Seq(Adolescence, Guerre),
+ programs = Seq(Agir),
+ level = Moyen
+ ),
+
+ Book(
+ title = "La Colline des potences",
+ author = "Dorothy M. JOHNSON",
+ year = "2015",
+ period = Some(Siecle19),
+ genres = Seq(),
+ themes = Seq(Americain),
+ programs = Seq(Agir),
+ level = Moyen
+ ),
+
+ Book(
+ title = "Qui se souvient de Paula ?",
+ author = "Romain SLOCOMBE",
+ year = "2008",
+ period = Some(Siecle20),
+ genres = Seq(),
+ themes = Seq(Guerre, Nazisme),
+ programs = Seq(Agir),
+ level = Moyen
+ ),
+
+ Book(
+ title = "La Guerre des mercredis",
+ author = "Gary D. SCHMIDT",
+ year = "2016",
+ period = Some(Contemporain),
+ genres = Seq(),
+ themes = Seq(Adolescence, Ecole, Litterature),
+ programs = Seq(Agir),
+ level = Moyen
+ ),
+
+ Book(
+ title = "La Fée de VERDUN",
+ author = "Philippe NESSMANN",
+ year = "2016",
+ period = Some(Siecle20),
+ genres = Seq(),
+ themes = Seq(Guerre, Femme, Art),
+ programs = Seq(Agir),
+ level = Facile
+ ),
+
+ Book(
+ title = "Voyage à PITCHIPOÏ",
+ author = "JC MOSCOVICI",
+ year = "1995",
+ period = Some(Siecle20),
+ genres = Seq(),
+ themes = Seq(Guerre, Nazisme, Discrimination, Famille),
+ programs = Seq(Agir),
+ level = Facile
+ ),
+
+ Book(
+ title = "Le Ring de la mort",
+ author = "Jean-Jacques GREIF",
+ year = "1998",
+ period = Some(Siecle20),
+ genres = Seq(),
+ themes = Seq(Guerre, Mort, Discrimination, Sport),
+ programs = Seq(Agir),
+ level = Moyen
+ ),
+
+ Book(
+ title = "Le Garçon en pyjama rayé",
+ author = "John BOYNE",
+ year = "2006",
+ period = Some(Siecle20),
+ genres = Seq(),
+ themes = Seq(Guerre, Amitie, Discrimination, Nazisme),
+ programs = Seq(Agir),
+ level = Moyen
+ ),
+
+ Book(
+ title = "Emmett TILL, derniers jours d'une courte vie",
+ author = "Arnaud FLOC'H",
+ year = "2015",
+ period = Some(Siecle20),
+ genres = Seq(BD),
+ themes = Seq(Violence, Racisme, Discrimination),
+ programs = Seq(Agir),
+ level = Facile
)
)
}
diff --git a/src/main/scala/reading/models/Genre.scala b/src/main/scala/reading/models/Genre.scala
index 83233ae..8c2a90f 100644
--- a/src/main/scala/reading/models/Genre.scala
+++ b/src/main/scala/reading/models/Genre.scala
@@ -23,7 +23,7 @@ sealed trait Genre extends EnumEntry with Ordered[Genre] {
case Uchronie => "uchronie"
case Manga => "manga"
case Thriller => "thriller"
- case RomanEpistolaire => "roman épistolaire"
+ case Epistolaire => "Epistolaire"
}
}
@@ -44,5 +44,5 @@ object Genre extends Enum[Genre] {
case object Dystopie extends Genre
case object Uchronie extends Genre
case object Manga extends Genre
- case object RomanEpistolaire extends Genre
+ case object Epistolaire extends Genre
}
diff --git a/src/main/scala/reading/models/Program.scala b/src/main/scala/reading/models/Program.scala
index 1859db3..d33d23a 100644
--- a/src/main/scala/reading/models/Program.scala
+++ b/src/main/scala/reading/models/Program.scala
@@ -30,7 +30,7 @@ sealed trait Program extends EnumEntry with Ordered[Program] {
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"
+ case Agir => "Agir dans la cité : individu et pouvoir"
case ProgresReveScientifique => "Progrès et rêves scientifiques"
}
}
@@ -58,7 +58,7 @@ object Program extends Enum[Program] {
case object SeRaconter extends Program
case object TraversSociete extends Program
case object VisionsPoetiques extends Program
- case object AgirCite extends Program
+ case object Agir extends Program
case object ProgresReveScientifique extends Program
def grade(program: Program): Grade = {
@@ -68,7 +68,7 @@ object Program extends Enum[Program] {
case Monstre | RecitAventure | CreationPoetique | Resister => Sixieme
case VoyageEtAventure | Autrui | UniversNouveaux | Heros | HommeEtNature => Cinquieme
case DireAmour | Valeurs | Reel | Informer | Ville => Quatrieme
- case SeRaconter | TraversSociete | VisionsPoetiques | AgirCite | ProgresReveScientifique => Troisieme
+ case SeRaconter | TraversSociete | VisionsPoetiques | Agir | ProgresReveScientifique => Troisieme
}
}
}
diff --git a/src/main/scala/reading/models/Theme.scala b/src/main/scala/reading/models/Theme.scala
index 2544525..632b678 100644
--- a/src/main/scala/reading/models/Theme.scala
+++ b/src/main/scala/reading/models/Theme.scala
@@ -16,31 +16,33 @@ sealed trait Theme extends EnumEntry with Ordered[Theme] {
case Amour => "amour"
case Animal => "animal"
case Apprentissage => "apprentissage"
+ case Art => "art"
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 Conflit => "conflit"
case Cour => "cour"
+ case Crime => "crime"
case Danse => "danse"
case Deuil => "deuil"
+ case Dictature => "dictature"
case Difference => "différence"
+ case Discrimination => "discrimination"
case Dragon => "dragon"
+ case Ecole => "école"
+ case Enquete => "enquête"
+ case Emancipation => "émancipation"
+ case Enfants => "enfants"
+ case Espionnage => "espionnage"
case Eugenisme => "eugénisme"
case Exclusion => "exclusion"
case Famille => "famille"
case Fantome => "fantôme"
+ case Femme => "femme"
+ case Folie => "folie"
case Fratrie => "fratrie"
case Genetique => "génétique"
case Guerre => "guerre"
@@ -55,10 +57,10 @@ sealed trait Theme extends EnumEntry with Ordered[Theme] {
case Justice => "justice"
case Laideur => "laideur"
case Litterature => "littérature"
+ case Magie => "magie"
case Maladie => "maladie"
case Malediction => "malédiction"
case Manipulation => "manipulation"
- case Magie => "magie"
case Marginalite => "marginalite"
case Mensonge => "mensonge"
case Metamorphose => "metamorphose"
@@ -68,6 +70,7 @@ sealed trait Theme extends EnumEntry with Ordered[Theme] {
case Musique => "musique"
case Mythologie => "mythologie"
case Nature => "nature"
+ case Nazisme => "nazisme"
case Parents => "parents"
case Pauvrete => "pauvrete"
case Peur => "peur"
@@ -78,8 +81,9 @@ sealed trait Theme extends EnumEntry with Ordered[Theme] {
case Robot => "robot"
case Secret => "secret"
case SegregationRaciale => "ségrégation raciale"
- case Sentiment => "sexualité"
+ case Sentiment => "sentiment"
case Sexualite => "sexualité"
+ case Sport => "sport"
case Suicide => "suicide"
case Vampire => "vampire"
case VieNocturne => "vie nocturne"
@@ -98,6 +102,7 @@ object Theme extends Enum[Theme] {
case object Angoisse extends Theme
case object Animal extends Theme
case object Apprentissage extends Theme
+ case object Art extends Theme
case object Aventure extends Theme
case object Beaute extends Theme
case object Chevalerie extends Theme
@@ -115,6 +120,7 @@ object Theme extends Enum[Theme] {
case object Eugenisme extends Theme
case object Exclusion extends Theme
case object Fantome extends Theme
+ case object Femme extends Theme
case object Folie extends Theme
case object College extends Theme
case object Combat extends Theme
@@ -150,6 +156,7 @@ object Theme extends Enum[Theme] {
case object Musique extends Theme
case object Mythologie extends Theme
case object Nature extends Theme
+ case object Nazisme extends Theme
case object Parents extends Theme
case object Pauvrete extends Theme
case object Peur extends Theme
@@ -162,6 +169,7 @@ object Theme extends Enum[Theme] {
case object SegregationRaciale extends Theme
case object Sentiment extends Theme
case object Sexualite extends Theme
+ case object Sport extends Theme
case object Suicide extends Theme
case object Vampire extends Theme
case object VieNocturne extends Theme