diff --git a/Documents/Diagramme/MLD.plantuml b/Documents/Diagramme/BDD/MLD.plantuml
similarity index 100%
rename from Documents/Diagramme/MLD.plantuml
rename to Documents/Diagramme/BDD/MLD.plantuml
diff --git a/Documents/Diagramme/Annalyse/Besoins/DiagrammeCasUtilisationFitWeb.drawio b/Documents/Diagramme/CasUtilisations/DiagrammeCasUtilisationFitWeb.drawio
similarity index 100%
rename from Documents/Diagramme/Annalyse/Besoins/DiagrammeCasUtilisationFitWeb.drawio
rename to Documents/Diagramme/CasUtilisations/DiagrammeCasUtilisationFitWeb.drawio
diff --git a/Documents/Diagramme/ClassDiagram.puml b/Documents/Diagramme/DiagrammeDeClasses/ClassDiagram.puml
similarity index 100%
rename from Documents/Diagramme/ClassDiagram.puml
rename to Documents/Diagramme/DiagrammeDeClasses/ClassDiagram.puml
diff --git a/Documents/Diagramme/DiagrammeClasses.mdj b/Documents/Diagramme/DiagrammeDeClasses/DiagrammeClasses.mdj
similarity index 99%
rename from Documents/Diagramme/DiagrammeClasses.mdj
rename to Documents/Diagramme/DiagrammeDeClasses/DiagrammeClasses.mdj
index b6fb8b59..c5438911 100644
--- a/Documents/Diagramme/DiagrammeClasses.mdj
+++ b/Documents/Diagramme/DiagrammeDeClasses/DiagrammeClasses.mdj
@@ -2555,7 +2555,7 @@
"top": 3201,
"width": 185.3388671875,
"height": 13,
- "text": "-autoPause: bool",
+ "text": "-pause: bool",
"horizontalAlignment": 0
}
],
@@ -13434,7 +13434,7 @@
"_parent": {
"$ref": "AAAAAAGLpCJOKOeiXS4="
},
- "name": "autoPause",
+ "name": "pause",
"visibility": "private",
"type": "bool"
}
diff --git a/Documents/Diagramme/DiagrammeDeClasses/README_issue028.md b/Documents/Diagramme/DiagrammeDeClasses/README_issue028.md
new file mode 100644
index 00000000..b79294b6
--- /dev/null
+++ b/Documents/Diagramme/DiagrammeDeClasses/README_issue028.md
@@ -0,0 +1,107 @@
+[retour au README.md](../../../README.md)
+[Retour aux Documents](../../README_DOCUMENTS.md)
+
+```plantuml.server
+@startuml issue028_DiagrammeDeClasses
+class Activite {
+ -idActivite:int
+ -type:String
+ -date:Date
+ -heureDebut:Date
+ -heureFin:Date
+ -effortRessenti:int
+ -variability:float
+ -variance:float
+ -standardDeviation:float
+ -average:float
+ -maximum:int
+ -minimum:int
+ -avrTemperature:float
+ -hasAutoPause:boolean
+ +getIdActivite():int
+ +getType():String
+ +getDate():Date
+ +getHeureDebut():Date
+ +getHeureFin():Date
+ +getEffortRessenti():int
+ +getVariability():float
+ +getVariance():float
+ +getStandardDeviation():float
+ +getAverage():float
+ +getMaximum():int
+ +getMinimum():int
+ +getAvrTemperature():float
+ +setType(type:String):void
+ +setEffortRessenti(effortRessenti:int):void
+ +__toString():String
+}
+class Role {
+ -id:int
+}
+class Athlete {
+ +getActivities():array
+ +addActivity(myActivity:Activity):boolean
+}
+class User {
+ -id:int
+ -username:String
+ -nom:String
+ -prenom:String
+ -email:String
+ -motDePasse:String
+ -sexe:String
+ -taille:float
+ -poids:float
+ -dateNaissance:Date
+ +getId():int
+ +setId(id:int):void
+ +getUsername():String
+ +setUsername(username:String):void
+ +getNom():String
+ +setNom(nom:String):void
+ +getPrenom():String
+ +setPrenom(prenom:String):void
+ +getEmail():String
+ +setEmail(email:String):void
+ +getMotDePasse():String
+ +setMotDePasse(motDePasse:String):void
+ +getSexe():String
+ +setSexe(sexe:String):void
+ +getTaille():float
+ +setTaille(taille:float):void
+ +getPoids():float
+ +setPoids(poids:float):void
+ +getDateNaissance():Date
+ +setDateNaissance(dateNaissance:Date):void
+ +getRole():Role
+ +setRole(role:Role):void
+ +isValidPassword(password:String):boolean
+ +__toString():String
+}
+class AthleteManager {
+ +getActivities():array
+}
+class ActivityManager {
+ +saveFitFileToJSON(monFichierFit:object):boolean
+ +uploadFile(type:string, effortRessenti:int, file_path_or_data:string|resource, options:array):boolean
+}
+class DataManager {
+}
+class UserManager {
+ +login(loginUser:string, passwordUser:string):boolean
+ +register(loginUser:string, passwordUser:string, data:array):boolean
+ +deconnecter():boolean
+}
+
+User -> Role: role
+Athlete -|> Role
+DataManager -> UserManager: -userMgr
+DataManager -> AthleteManager: -athleteMgr
+DataManager -> ActivityManager: -activityMgr
+UserManager -> AuthService: -authService
+UserManager -> User: -currentUser
+ActivityManager -> AuthService: -authService
+Athlete -> Activite: listActivite
+AthleteManager -> AuthService: -authService
+@enduml
+```
\ No newline at end of file
diff --git a/Documents/Diagramme/README_DIAGRAMMES.md b/Documents/Diagramme/README_DIAGRAMMES.md
new file mode 100644
index 00000000..c9a04ff8
--- /dev/null
+++ b/Documents/Diagramme/README_DIAGRAMMES.md
@@ -0,0 +1,16 @@
+[retour au README.md](../../README.md)
+[Retour aux Documents](../README_DOCUMENTS.md)
+
+# Diagrammes nécéssaires à notre projet
+
+## Diagrammes de classes
+- [issue028 - Importation de fichiers .fit](Diagramme/DiagrammeDeClasses/README_issue028.md)
+
+## Diagrammes de séquence
+- [issue025 - Importation de fichiers .fit]()
+
+## Diagrammes de cas d'utilisation
+- [issue026 - Importation de fichiers .fit]()
+
+## Base de Données
+-
\ No newline at end of file
diff --git a/Documents/ComparaisonGANTT.png b/Documents/Gestion/GANTT/ComparaisonGANTT.png
similarity index 100%
rename from Documents/ComparaisonGANTT.png
rename to Documents/Gestion/GANTT/ComparaisonGANTT.png
diff --git a/Documents/CompraraisonGANTT.xlsx b/Documents/Gestion/GANTT/CompraraisonGANTT.xlsx
similarity index 100%
rename from Documents/CompraraisonGANTT.xlsx
rename to Documents/Gestion/GANTT/CompraraisonGANTT.xlsx
diff --git a/Documents/Gantt Antoine David Paul Kevin Antoine.mpp b/Documents/Gestion/GANTT/Gantt.mpp
similarity index 100%
rename from Documents/Gantt Antoine David Paul Kevin Antoine.mpp
rename to Documents/Gestion/GANTT/Gantt.mpp
diff --git a/Documents/Gantt Antoine David Paul Kevin Antoine.pdf b/Documents/Gestion/GANTT/Gantt.pdf
similarity index 100%
rename from Documents/Gantt Antoine David Paul Kevin Antoine.pdf
rename to Documents/Gestion/GANTT/Gantt.pdf
diff --git a/Documents/Gestion/GANTT/README_GANTT.md b/Documents/Gestion/GANTT/README_GANTT.md
new file mode 100644
index 00000000..4f5460e0
--- /dev/null
+++ b/Documents/Gestion/GANTT/README_GANTT.md
@@ -0,0 +1,13 @@
+[retour au README.md](../../../README.md)
+[Retour aux Documents](../../README_DOCUMENTS.md)
+[Retour à la Gestion](../README_GESTION.md)
+
+# GANTT
+## Comparaison GANTT
+- [Comparaison GANTT - Excel](CompraraisonGANTT.xlsx)
+
+
+
+## Gestion de projet - MSProject
+- [Gestion de projet - MSProject](Gantt.mpp)
+- [GANTT - PDF](Gantt.pdf)
\ No newline at end of file
diff --git a/Documents/Gestion/PERT temps.xlsx b/Documents/Gestion/PERT/PERT.xlsx
similarity index 100%
rename from Documents/Gestion/PERT temps.xlsx
rename to Documents/Gestion/PERT/PERT.xlsx
diff --git a/Documents/PERT1.png b/Documents/Gestion/PERT/PERT1.png
similarity index 100%
rename from Documents/PERT1.png
rename to Documents/Gestion/PERT/PERT1.png
diff --git a/Documents/PERT2.png b/Documents/Gestion/PERT/PERT2.png
similarity index 100%
rename from Documents/PERT2.png
rename to Documents/Gestion/PERT/PERT2.png
diff --git a/Documents/Gestion/PERT/README_PERT.md b/Documents/Gestion/PERT/README_PERT.md
new file mode 100644
index 00000000..ddc8e348
--- /dev/null
+++ b/Documents/Gestion/PERT/README_PERT.md
@@ -0,0 +1,10 @@
+[retour au README.md](../../../README.md)
+[Retour aux Documents](../../README_DOCUMENTS.md)
+[Retour à la Gestion](../README_GESTION.md)
+
+## PERT
+- [PERT - Excel](PERT.xlsx)
+
+### PERT - Image
+
+
\ No newline at end of file
diff --git a/Documents/Gestion/README_GESTION.md b/Documents/Gestion/README_GESTION.md
new file mode 100644
index 00000000..6497de0f
--- /dev/null
+++ b/Documents/Gestion/README_GESTION.md
@@ -0,0 +1,10 @@
+[retour au README.md](../../README.md)
+[Retour aux Documents](../README_DOCUMENTS.md)
+
+# Gestion de projet
+
+## PERT
+- [PERT](PERT/README_PERT.md)
+
+## GANTT
+- [GANTT](GANTT/README_GANTT.md)
diff --git a/Documents/Persona/Elsa Justin.pdf b/Documents/Personnas/ElsaJustin.pdf
similarity index 100%
rename from Documents/Persona/Elsa Justin.pdf
rename to Documents/Personnas/ElsaJustin.pdf
diff --git a/Documents/Persona/Ethan Hulist.pdf b/Documents/Personnas/EthanHulist.pdf
similarity index 100%
rename from Documents/Persona/Ethan Hulist.pdf
rename to Documents/Personnas/EthanHulist.pdf
diff --git a/Documents/Persona/Jules Gerdoli.pdf b/Documents/Personnas/JulesGerdoli.pdf
similarity index 100%
rename from Documents/Persona/Jules Gerdoli.pdf
rename to Documents/Personnas/JulesGerdoli.pdf
diff --git a/Documents/Personnas/README_PERSONNAS.md b/Documents/Personnas/README_PERSONNAS.md
new file mode 100644
index 00000000..a7292b29
--- /dev/null
+++ b/Documents/Personnas/README_PERSONNAS.md
@@ -0,0 +1,8 @@
+[retour au README.md](../../README.md)
+[Retour aux Documents](../README_DOCUMENTS.md)
+
+
+# Personas
+- [Personas Elsa Justin - PDF](ElsaJustin.pdf)
+- [Personas Ethan Hulist - PDF](EthanHulist.pdf)
+- [Personas Jules Gerdoli - PDF](JulesGerdoli.pdf)
\ No newline at end of file
diff --git a/Documents/README_DOCUMENTS.md b/Documents/README_DOCUMENTS.md
new file mode 100644
index 00000000..80bdd98c
--- /dev/null
+++ b/Documents/README_DOCUMENTS.md
@@ -0,0 +1,11 @@
+[README.md](../README.md)
+## SOMMAIRE
+# Diagrammes
+- [Diagrammes](Diagramme/README_DIAGRAMMES.md)
+
+# Personnas
+- [Personnas](Personnas/README_PERSONNAS.md)
+
+
+# Gestion de projet
+- [Gestion de projet](Gestion/README_GESTION.md)
diff --git a/README.md b/README.md
index 757289c8..62581ff0 100755
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ Le projet HeartTrack, avec son application HeartTrack, vise à offrir une soluti
## Répartition du Git
-[**Sources**](Sources/README_SOURCES.md) : **Code de l'application**
+[**Sources**](Sources/) : **Code de l'application**
[**Documents**](Documents/README_DOCUMENTS.md) : **Documentation de l'application**
diff --git a/Sources/src/console/Console.php b/Sources/src/console/Console.php
index 29baaf25..d766471d 100755
--- a/Sources/src/console/Console.php
+++ b/Sources/src/console/Console.php
@@ -232,23 +232,6 @@ function registerUser(DataManager $model)
}
}
-//function displayProfileMenu()
-//{
-// clearScreen();
-// echo "\n--- Profil ---\n";
-// echo "1. Informations de l'utilisateur\n";
-// echo "2. Historique d'activité\n";
-// echo "Voir les statistiques de condition physique Général";
-// echo "3. Liste d'amis\n";
-// echo "4. Paramètres de confidentialité et visibilité\n";
-// echo "5. Ajouter un fichier\n";
-// // Importer des données (FIT/GPX/TCX)/Manuel
-// // Synchroniser l'appareil de fréquence cardiaque
-// // Synchroniser l'app mobile
-// echo "0. Retour au menu principal\n";
-// echo "Choisissez une option: ";
-//}
-
function profileMenu(DataManager $model)
{
do {
diff --git a/Sources/src/data/model/Athlete.php b/Sources/src/data/model/Athlete.php
index dd67f502..35168c5a 100644
--- a/Sources/src/data/model/Athlete.php
+++ b/Sources/src/data/model/Athlete.php
@@ -51,15 +51,6 @@ class Athlete extends Role {
return $this->statsList;
}
- /**
- * Obtient la liste des activités de l'athlète.
- *
- * @return array|null La liste des activités de l'athlète, ou null si aucune.
- */
- public function getActivite(): ?array {
- return $this->activityList;
- }
-
/**
* Obtient la liste des sources de données de l'athlète.
*