From 028a1c971c9c1b43cc6a2340ac87aded2bc26175 Mon Sep 17 00:00:00 2001 From: Renaud BEURET Date: Thu, 21 Mar 2024 08:11:43 +0100 Subject: [PATCH 1/3] [ADD] StubScientifique --- .../fr/iut/sciencequest/stub/StubScientifique.kt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 android/app/src/main/java/fr/iut/sciencequest/stub/StubScientifique.kt diff --git a/android/app/src/main/java/fr/iut/sciencequest/stub/StubScientifique.kt b/android/app/src/main/java/fr/iut/sciencequest/stub/StubScientifique.kt new file mode 100644 index 0000000..2c58e3d --- /dev/null +++ b/android/app/src/main/java/fr/iut/sciencequest/stub/StubScientifique.kt @@ -0,0 +1,16 @@ +package fr.iut.sciencequest.stub + +import fr.iut.sciencequest.model.dto.ScientifiqueDTO + +object StubScientifique1: ScientifiqueDTO ( + id = 1, + descriptif = "description", + nom = "Jean", + prenom = "Jean", + photo = "photo", + sexe = 'H', + difficulteId = 1, + thematiqueId = 1, + ratioTrouve = 0f +) +{} \ No newline at end of file From 9968d3cc2e86854ff59353d26a6a5671ceddc160 Mon Sep 17 00:00:00 2001 From: Renaud BEURET Date: Thu, 21 Mar 2024 08:12:25 +0100 Subject: [PATCH 2/3] =?UTF-8?q?[FIX]=20Type=20des=20dtos=20pour=20qu'objet?= =?UTF-8?q?=20en=20h=C3=A9rite=20dans=20le=20stub?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/fr/iut/sciencequest/model/dto/DifficulteDTO.kt | 2 +- .../main/java/fr/iut/sciencequest/model/dto/ScientifiqueDTO.kt | 2 +- .../main/java/fr/iut/sciencequest/model/dto/ThematiqueDTO.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/dto/DifficulteDTO.kt b/android/app/src/main/java/fr/iut/sciencequest/model/dto/DifficulteDTO.kt index fd3231e..29a9db8 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/model/dto/DifficulteDTO.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/model/dto/DifficulteDTO.kt @@ -3,7 +3,7 @@ package fr.iut.sciencequest.model.dto import kotlinx.serialization.Serializable @Serializable -data class DifficulteDTO ( +class DifficulteDTO ( val id: Int, val libelle: String ) \ No newline at end of file diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/dto/ScientifiqueDTO.kt b/android/app/src/main/java/fr/iut/sciencequest/model/dto/ScientifiqueDTO.kt index 10ca167..b757a5c 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/model/dto/ScientifiqueDTO.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/model/dto/ScientifiqueDTO.kt @@ -4,7 +4,7 @@ import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @Serializable -data class ScientifiqueDTO ( +open class ScientifiqueDTO ( val id: Int, val nom: String, val prenom: String, diff --git a/android/app/src/main/java/fr/iut/sciencequest/model/dto/ThematiqueDTO.kt b/android/app/src/main/java/fr/iut/sciencequest/model/dto/ThematiqueDTO.kt index a1deae5..f41e9ff 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/model/dto/ThematiqueDTO.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/model/dto/ThematiqueDTO.kt @@ -3,7 +3,7 @@ package fr.iut.sciencequest.model.dto import kotlinx.serialization.Serializable @Serializable -data class ThematiqueDTO ( +class ThematiqueDTO ( val id: Int, val libelle: String ) \ No newline at end of file From ce7675f5aea17f4af60bb7b8595bdc9139c36b66 Mon Sep 17 00:00:00 2001 From: Renaud BEURET Date: Thu, 21 Mar 2024 08:22:10 +0100 Subject: [PATCH 3/3] [ADD] Stub liste scientifique --- .../iut/sciencequest/stub/StubScientifique.kt | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/android/app/src/main/java/fr/iut/sciencequest/stub/StubScientifique.kt b/android/app/src/main/java/fr/iut/sciencequest/stub/StubScientifique.kt index 2c58e3d..12d8a65 100644 --- a/android/app/src/main/java/fr/iut/sciencequest/stub/StubScientifique.kt +++ b/android/app/src/main/java/fr/iut/sciencequest/stub/StubScientifique.kt @@ -1,6 +1,7 @@ package fr.iut.sciencequest.stub import fr.iut.sciencequest.model.dto.ScientifiqueDTO +import fr.iut.sciencequest.model.metier.Scientifique object StubScientifique1: ScientifiqueDTO ( id = 1, @@ -13,4 +14,22 @@ object StubScientifique1: ScientifiqueDTO ( thematiqueId = 1, ratioTrouve = 0f ) -{} \ No newline at end of file + +object StubScientifique2: ScientifiqueDTO ( + id = 2, + descriptif = "autre description", + nom = "Jean2", + prenom = "Jean2", + photo = "photo2", + sexe = 'F', + difficulteId = 1, + thematiqueId = 1, + ratioTrouve = 0f +) + +fun getScientifiqueListeStub(): List{ + val liste = ArrayList() + liste.add(StubScientifique2) + liste.add(StubScientifique1) + return liste +} \ No newline at end of file