diff --git a/psychorientation/psychorientation/GestionnaireEleve.cs b/psychorientation/psychorientation/GestionnaireEleve.cs index 0b9e1cfd62cc0099d718cc6a4b452e537dfc1e0b..03278a415efe3e3f4d491709165ac321b8c77f2e 100644 --- a/psychorientation/psychorientation/GestionnaireEleve.cs +++ b/psychorientation/psychorientation/GestionnaireEleve.cs @@ -8,7 +8,7 @@ namespace psychorientation { public class GestionnaireEleve { - private List<Eleve> listEleve = new List<Eleve>(); + private List<Eleve> listeEleves = new List<Eleve>(); public GestionnaireEleve() { @@ -16,71 +16,71 @@ namespace psychorientation public void AjouterEleve(Eleve e) { - this.listEleve.Add(e); + this.listeEleves.Add(e); } public void SupprimerEleve(Eleve e) { - this.listEleve.Remove(e); + this.listeEleves.Remove(e); } public void SupprimerEleve(int indice) { - this.listEleve.RemoveAt(indice); + this.listeEleves.RemoveAt(indice); } - public List<Eleve> GetListEleve() + public List<Eleve> GetlisteEleves() { - return this.listEleve; + return this.listeEleves; } public Eleve GetEleve(int indice) { - return this.listEleve[indice]; + return this.listeEleves[indice]; } public double GetMoyenneClasse() { double res = -1; - if (this.listEleve.Count > 0) + if (this.listeEleves.Count > 0) { - foreach (Eleve el in this.listEleve) + foreach (Eleve el in this.listeEleves) { res += el.GetMoyenne(); } } - return res / this.listEleve.Count; + return res / this.listeEleves.Count; } public double GetCompetenceClasse() { double res = -1; - if (this.listEleve.Count > 0) + if (this.listeEleves.Count > 0) { - foreach (Eleve el in this.listEleve) + foreach (Eleve el in this.listeEleves) { res += el.GetCompetence(); } } - return res / this.listEleve.Count; + return res / this.listeEleves.Count; } public double GetEffortClasse() { double res = -1; - if (this.listEleve.Count > 0) + if (this.listeEleves.Count > 0) { - foreach (Eleve el in this.listEleve) + foreach (Eleve el in this.listeEleves) { res += el.GetEffort(); } } - return res / this.listEleve.Count; + return res / this.listeEleves.Count; } public void FaireControle(string nom) { - foreach (Eleve e in this.listEleve) + foreach (Eleve e in this.listeEleves) { e.AjouterNote(nom); } @@ -89,14 +89,14 @@ namespace psychorientation public double GetAppreciationClasse() { double res = -1; - if (this.listEleve.Count > 0) + if (this.listeEleves.Count > 0) { - foreach (Eleve el in this.listEleve) + foreach (Eleve el in this.listeEleves) { res += el.GetAppreciation(); } } - return res / this.listEleve.Count; + return res / this.listeEleves.Count; } } diff --git a/psychorientation/psychorientation/eleve.cs b/psychorientation/psychorientation/eleve.cs index 645785708b8726e6423adabcac46916662715d6d..c4bd38f1954c26014743558a179374ba44051636 100644 --- a/psychorientation/psychorientation/eleve.cs +++ b/psychorientation/psychorientation/eleve.cs @@ -13,7 +13,7 @@ namespace psychorientation private double effort = 0; private int orientation = 0; private int id; - private List<Note> listNote = new List<Note>(); + private List<Note> listeNotes = new List<Note>(); private double appreciation; public Eleve(int id) @@ -60,9 +60,9 @@ namespace psychorientation { return this.competence; } - public List<Note> GetListNote() + public List<Note> GetlisteNotes() { - return this.listNote; + return this.listeNotes; } public int GetId() { @@ -91,21 +91,21 @@ namespace psychorientation public double GetMoyenne() { double res = -1; - if (this.listNote.Count > 0) + if (this.listeNotes.Count > 0) { - foreach(Note n in listNote) + foreach(Note n in listeNotes) { res += n.getNote(); } } - return res/ this.listNote.Count; + return res/ this.listeNotes.Count; } public void AjouterNote(string nom) { Note n = new Note(nom,CalculerNote() , this.competence, this.effort); - this.listNote.Add(n); + this.listeNotes.Add(n); } private double CalculerNote()