diff --git a/psychorientation/psychorientation/GestionnaireEleve.cs b/psychorientation/psychorientation/GestionnaireEleve.cs index fad4253bdfac549d54dd103668c469a00038cbf4..9ee450348c4cd42c0d90ae0f581707843b071de5 100644 --- a/psychorientation/psychorientation/GestionnaireEleve.cs +++ b/psychorientation/psychorientation/GestionnaireEleve.cs @@ -27,7 +27,7 @@ namespace psychorientation this.listeEleves.RemoveAt(indice); } - public List<Eleve> GetlisteEleves() + public List<Eleve> GetListeEleves() { return this.listeEleves; } diff --git a/psychorientation/psychorientation/ListeEleve.cs b/psychorientation/psychorientation/ListeEleve.cs index d7bc218ef415567537e7e0f16fc61f061009624a..c9d7fec3aeb2a2f17a784bba54462dd6a0b4dbe4 100755 --- a/psychorientation/psychorientation/ListeEleve.cs +++ b/psychorientation/psychorientation/ListeEleve.cs @@ -28,7 +28,7 @@ namespace psychorientation gestEleve.AjouterEleve(el1); gestEleve.AjouterEleve(el2); - List<Eleve> listEleve = gestEleve.GetListEleve(); + List<Eleve> listEleve = gestEleve.GetListeEleves(); int y = 0; foreach ( Eleve eleve in listEleve) { diff --git a/psychorientation/psychorientation/eleve.cs b/psychorientation/psychorientation/eleve.cs index 74a855fc5f7eb2199a0c31b586c396b15d7a24ac..11b003456097a9ed081df10eb1e791fb23960688 100644 --- a/psychorientation/psychorientation/eleve.cs +++ b/psychorientation/psychorientation/eleve.cs @@ -102,6 +102,12 @@ namespace psychorientation + public void Progression(double typeEducation) + { + this.competence += (this.effort - typeEducation) / competence * 2; + this.effort += (this.effort - typeEducation) / competence * 2; + } + public void AjouterNote(string nom) { Note n = new Note(nom, CalculerNote(), this.competence, this.effort);