diff --git a/psychorientation/images/perso/personnage1.png b/psychorientation/images/perso/personnage1.png new file mode 100644 index 0000000000000000000000000000000000000000..86fe3a119de5219ae86b1ac784616328721c9e13 Binary files /dev/null and b/psychorientation/images/perso/personnage1.png differ diff --git a/psychorientation/images/perso/personnage2.png b/psychorientation/images/perso/personnage2.png new file mode 100644 index 0000000000000000000000000000000000000000..3958c6af57d86b8f7cb862cbde7ac661f0318118 Binary files /dev/null and b/psychorientation/images/perso/personnage2.png differ diff --git a/psychorientation/images/perso/personnage3.png b/psychorientation/images/perso/personnage3.png new file mode 100644 index 0000000000000000000000000000000000000000..dc8dc785edce4ea33d0cc6924779a38266fe85d1 Binary files /dev/null and b/psychorientation/images/perso/personnage3.png differ diff --git a/psychorientation/images/perso/personnage4.png b/psychorientation/images/perso/personnage4.png new file mode 100644 index 0000000000000000000000000000000000000000..54809410e133d2cb3d3d99b2dd704d302a6e062e Binary files /dev/null and b/psychorientation/images/perso/personnage4.png differ diff --git a/psychorientation/images/salle/salleV1.png b/psychorientation/images/salle/salleV1.png new file mode 100644 index 0000000000000000000000000000000000000000..36d783c845a3c54b111afdff6ec804edabeb8c84 Binary files /dev/null and b/psychorientation/images/salle/salleV1.png differ diff --git a/psychorientation/images/table/bureau.png b/psychorientation/images/table/bureau.png new file mode 100644 index 0000000000000000000000000000000000000000..54f8933ff3e1ab1352aca736d9efd61d617e2545 Binary files /dev/null and b/psychorientation/images/table/bureau.png differ diff --git a/psychorientation/images/table/tableBleue.png b/psychorientation/images/table/tableBleue.png new file mode 100644 index 0000000000000000000000000000000000000000..483a754cc8fadb4234009d001a7e3054f5580c6c Binary files /dev/null and b/psychorientation/images/table/tableBleue.png differ diff --git a/psychorientation/images/table/tableJaune.png b/psychorientation/images/table/tableJaune.png new file mode 100644 index 0000000000000000000000000000000000000000..24c1aa80cfc7e63f2946aaa175e6b79defd462d6 Binary files /dev/null and b/psychorientation/images/table/tableJaune.png differ diff --git a/psychorientation/images/table/tableRose.png b/psychorientation/images/table/tableRose.png new file mode 100644 index 0000000000000000000000000000000000000000..62f78e2d91db66691bef7f78d71afc7cd555de33 Binary files /dev/null and b/psychorientation/images/table/tableRose.png differ diff --git a/psychorientation/images/table/tableRouge.png b/psychorientation/images/table/tableRouge.png new file mode 100644 index 0000000000000000000000000000000000000000..41c73cb89118d3f69717a8b6d1f9ceea9fd04bf8 Binary files /dev/null and b/psychorientation/images/table/tableRouge.png differ diff --git a/psychorientation/images/table/tableVerte.png b/psychorientation/images/table/tableVerte.png new file mode 100644 index 0000000000000000000000000000000000000000..be87ec1e0141b2364305c4ed43bdc81a3ab506cd Binary files /dev/null and b/psychorientation/images/table/tableVerte.png differ diff --git a/psychorientation/images/table/tableViolette.png b/psychorientation/images/table/tableViolette.png new file mode 100644 index 0000000000000000000000000000000000000000..9447a8eca3fd87f5faccdbed1096645ee2365d95 Binary files /dev/null and b/psychorientation/images/table/tableViolette.png differ diff --git a/psychorientation/psychorientation/Form1.Designer.cs b/psychorientation/psychorientation/Form1.Designer.cs deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/psychorientation/psychorientation/Form1.cs b/psychorientation/psychorientation/Form1.cs deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/psychorientation/psychorientation/GestionnaireEleve.cs b/psychorientation/psychorientation/GestionnaireEleve.cs new file mode 100644 index 0000000000000000000000000000000000000000..d4aa6b2131d525fecac83b35a07cfe1a8ae2f843 --- /dev/null +++ b/psychorientation/psychorientation/GestionnaireEleve.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace psychorientation +{ + public class GestionnaireEleve + { + private List<Eleve> listEleve = new List<Eleve>(); + + public GestionnaireEleve() + { + } + + public void ajouterEleve(Eleve e) + { + this.listEleve.Add(e); + } + + public void supprimerEleve(Eleve e) + { + this.listEleve.Remove(e); + } + + public void supprimerEleve(int indice) + { + this.listEleve.RemoveAt(indice); + } + + public List<Eleve> getListEleve() + { + return this.listEleve; + } + + public Eleve getEleve(int indice) + { + return this.listEleve[indice]; + } + + } +} diff --git a/psychorientation/psychorientation/Note.cs b/psychorientation/psychorientation/Note.cs new file mode 100644 index 0000000000000000000000000000000000000000..f8363bb657d2d0a50f2abecc398d00d23a80cc6c --- /dev/null +++ b/psychorientation/psychorientation/Note.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace psychorientation +{ + public class Note + { + private string nom; + private double note; + private double competence; + private double effort; + + public Note(string nom, double note, double competence, double effort) + { + this.nom = nom; + this.note = note; + this.competence = competence; + this.effort = effort; + } + + public string getNom() + { + return this.nom; + } + + public double getNote() + { + return this.note; + } + + public double getCompetence() + { + return this.competence; + } + + public double getEffort() + { + return this.effort; + } + } +} diff --git a/psychorientation/psychorientation/eleve.cs b/psychorientation/psychorientation/eleve.cs index 0a027cb0c68c77c422753669db65d5c76088bc8d..48bea3e130e648f353bf2ab0919d295967c6a179 100644 --- a/psychorientation/psychorientation/eleve.cs +++ b/psychorientation/psychorientation/eleve.cs @@ -13,6 +13,7 @@ namespace psychorientation private double effort = 0; private int orientation = 0; private int id; + private List<Note> listNote = new List<Note>(); public Eleve(int id) @@ -53,10 +54,16 @@ namespace psychorientation this.competence = competence; } + + public double getCompetence() { return this.competence; } + public List<Note> getListNote() + { + return this.listNote; + } public int getId() { return this.id; @@ -73,5 +80,15 @@ namespace psychorientation { return this.effort; } + + + + + + public void ajouterNote(string nom, double note) + { + Note n = new Note(nom, note, this.competence, this.effort); + this.listNote.Add(n); + } } } diff --git a/psychorientation/psychorientation/psychorientation.csproj b/psychorientation/psychorientation/psychorientation.csproj index 37e02a3b97a5d8ac7a38711d54e163ad7f506ff3..767381f087b341998523d997794855a9b22c2bad 100644 --- a/psychorientation/psychorientation/psychorientation.csproj +++ b/psychorientation/psychorientation/psychorientation.csproj @@ -57,6 +57,7 @@ <Compile Include="InterfaceClasse.Designer.cs"> <DependentUpon>InterfaceClasse.cs</DependentUpon> </Compile> + <Compile Include="GestionnaireEleve.cs" /> <Compile Include="InterfaceInfoEleve.cs"> <SubType>UserControl</SubType> </Compile> @@ -69,6 +70,7 @@ <Compile Include="Message.Designer.cs"> <DependentUpon>Message.cs</DependentUpon> </Compile> + <Compile Include="Note.cs" /> <Compile Include="Program.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <EmbeddedResource Include="InterfaceClasse.resx">