diff --git a/psychorientation/images/icones/sortir.png b/psychorientation/images/icones/sortir.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b2233b63eb4c58ee1dc4b4ca05ff8483f694b47
Binary files /dev/null and b/psychorientation/images/icones/sortir.png differ
diff --git a/psychorientation/psychorientation/GestionnaireEleve.cs b/psychorientation/psychorientation/GestionnaireEleve.cs
index 0b9e1cfd62cc0099d718cc6a4b452e537dfc1e0b..9ee450348c4cd42c0d90ae0f581707843b071de5 100644
--- a/psychorientation/psychorientation/GestionnaireEleve.cs
+++ b/psychorientation/psychorientation/GestionnaireEleve.cs
@@ -8,79 +8,77 @@ namespace psychorientation
{
public class GestionnaireEleve
{
- private List<Eleve> listEleve = new List<Eleve>();
+ private List<Eleve> listeEleves = new List<Eleve>();
- public GestionnaireEleve()
- {
- }
+ public GestionnaireEleve() {}
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 +87,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/InterfaceClasse.Designer.cs b/psychorientation/psychorientation/InterfaceClasse.Designer.cs
index 32b648a11f5e8df1fc224ac66f2efb33477d7e3a..a678efea2bc9a05f0db489e5eb2fc21ad8d32bc2 100644
--- a/psychorientation/psychorientation/InterfaceClasse.Designer.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.Designer.cs
@@ -31,8 +31,10 @@
this.pb_action_suivante = new System.Windows.Forms.PictureBox();
this.pb_liste_eleves = new System.Windows.Forms.PictureBox();
this.lbl_date = new System.Windows.Forms.Label();
+ this.pb_sortir = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.pb_action_suivante)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pb_liste_eleves)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.pb_sortir)).BeginInit();
this.SuspendLayout();
//
// pb_action_suivante
@@ -50,6 +52,8 @@
//
// pb_liste_eleves
//
+ this.pb_liste_eleves.BackgroundImage = global::psychorientation.Properties.Resources.grp;
+ this.pb_liste_eleves.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.pb_liste_eleves.Location = new System.Drawing.Point(12, 12);
this.pb_liste_eleves.Name = "pb_liste_eleves";
this.pb_liste_eleves.Size = new System.Drawing.Size(100, 100);
@@ -68,6 +72,17 @@
this.lbl_date.TabIndex = 2;
this.lbl_date.Text = "Chargement...";
//
+ // pb_sortir
+ //
+ this.pb_sortir.BackgroundImage = global::psychorientation.Properties.Resources.sortir;
+ this.pb_sortir.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.pb_sortir.Location = new System.Drawing.Point(1283, -1);
+ this.pb_sortir.Name = "pb_sortir";
+ this.pb_sortir.Size = new System.Drawing.Size(75, 75);
+ this.pb_sortir.TabIndex = 3;
+ this.pb_sortir.TabStop = false;
+ this.pb_sortir.Click += new System.EventHandler(this.Pb_sortir_Click);
+ //
// InterfaceClasse
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -76,6 +91,7 @@
this.BackgroundImage = global::psychorientation.Properties.Resources.salleV1;
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ClientSize = new System.Drawing.Size(1357, 783);
+ this.Controls.Add(this.pb_sortir);
this.Controls.Add(this.lbl_date);
this.Controls.Add(this.pb_liste_eleves);
this.Controls.Add(this.pb_action_suivante);
@@ -90,6 +106,7 @@
this.SizeChanged += new System.EventHandler(this.InterfaceClasse_SizeChanged);
((System.ComponentModel.ISupportInitialize)(this.pb_action_suivante)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pb_liste_eleves)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.pb_sortir)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -100,6 +117,7 @@
private System.Windows.Forms.PictureBox pb_action_suivante;
private System.Windows.Forms.PictureBox pb_liste_eleves;
private System.Windows.Forms.Label lbl_date;
+ private System.Windows.Forms.PictureBox pb_sortir;
}
}
diff --git a/psychorientation/psychorientation/InterfaceClasse.cs b/psychorientation/psychorientation/InterfaceClasse.cs
index 245588fa525c59390383fa43092bc7b2e3d7d8ca..d28b2e6054fbe55ba630b9ee47289c08239cad7f 100644
--- a/psychorientation/psychorientation/InterfaceClasse.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.cs
@@ -74,8 +74,20 @@ namespace psychorientation
private void InterfaceClasse_SizeChanged(object sender, EventArgs e)
{
- PictureBox pb = pb_action_suivante;
- pb.Location = new Point(Size.Width - pb.Width - 32, Size.Height - pb.Height - 32);
+ PictureBox pb1 = pb_action_suivante;
+ pb1.Location = new Point(Size.Width - pb1.Width - 32, Size.Height - pb1.Height - 32);
+
+ PictureBox pb2 = pb_sortir;
+ pb2.Location = new Point(Size.Width - pb2.Width, 0);
+ }
+
+ private void Pb_sortir_Click(object sender, EventArgs e)
+ {
+ if (MessageBox.Show("Souhaitez-vous quitter le jeu ?\nVous perdrez alors votre progression dans la partie en cours.",
+ "Confirmation de fermeture", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == System.Windows.Forms.DialogResult.Yes)
+ {
+ Close();
+ }
}
}
}
diff --git a/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs b/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs
new file mode 100755
index 0000000000000000000000000000000000000000..2eb7f24e15a96cfb6385ea6e5ce90b3f8ee336f3
--- /dev/null
+++ b/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs
@@ -0,0 +1,212 @@
+namespace psychorientation
+{
+ partial class InterfaceInfoCompletEleve
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.lblNomEleve = new System.Windows.Forms.Label();
+ this.lblClasse = new System.Windows.Forms.Label();
+ this.lblEffort = new System.Windows.Forms.Label();
+ this.lblCompetence = new System.Windows.Forms.Label();
+ this.lblMoyenne = new System.Windows.Forms.Label();
+ this.lblNiveau = new System.Windows.Forms.Label();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.pnlEffort = new System.Windows.Forms.Panel();
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.pnlCompetence = new System.Windows.Forms.Panel();
+ this.lblMoyenneNote = new System.Windows.Forms.Label();
+ this.pcbEleve = new System.Windows.Forms.PictureBox();
+ this.pnlNote = new System.Windows.Forms.Panel();
+ this.panel1.SuspendLayout();
+ this.panel2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pcbEleve)).BeginInit();
+ this.SuspendLayout();
+ //
+ // lblNomEleve
+ //
+ this.lblNomEleve.AutoSize = true;
+ this.lblNomEleve.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F);
+ this.lblNomEleve.Location = new System.Drawing.Point(253, 14);
+ this.lblNomEleve.Name = "lblNomEleve";
+ this.lblNomEleve.Size = new System.Drawing.Size(118, 24);
+ this.lblNomEleve.TabIndex = 0;
+ this.lblNomEleve.Text = "lblNomEleve";
+ //
+ // lblClasse
+ //
+ this.lblClasse.AutoSize = true;
+ this.lblClasse.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F);
+ this.lblClasse.Location = new System.Drawing.Point(254, 71);
+ this.lblClasse.Name = "lblClasse";
+ this.lblClasse.Size = new System.Drawing.Size(70, 18);
+ this.lblClasse.TabIndex = 2;
+ this.lblClasse.Text = "Classe : ";
+ //
+ // lblEffort
+ //
+ this.lblEffort.AutoSize = true;
+ this.lblEffort.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
+ this.lblEffort.Location = new System.Drawing.Point(254, 126);
+ this.lblEffort.Name = "lblEffort";
+ this.lblEffort.Size = new System.Drawing.Size(44, 15);
+ this.lblEffort.TabIndex = 3;
+ this.lblEffort.Text = "Effort : ";
+ //
+ // lblCompetence
+ //
+ this.lblCompetence.AutoSize = true;
+ this.lblCompetence.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
+ this.lblCompetence.Location = new System.Drawing.Point(212, 160);
+ this.lblCompetence.Name = "lblCompetence";
+ this.lblCompetence.Size = new System.Drawing.Size(86, 15);
+ this.lblCompetence.TabIndex = 4;
+ this.lblCompetence.Text = "Compétence : ";
+ //
+ // lblMoyenne
+ //
+ this.lblMoyenne.AutoSize = true;
+ this.lblMoyenne.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
+ this.lblMoyenne.Location = new System.Drawing.Point(186, 195);
+ this.lblMoyenne.Name = "lblMoyenne";
+ this.lblMoyenne.Size = new System.Drawing.Size(112, 15);
+ this.lblMoyenne.TabIndex = 10;
+ this.lblMoyenne.Text = "Moyenne général : ";
+ //
+ // lblNiveau
+ //
+ this.lblNiveau.AutoSize = true;
+ this.lblNiveau.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F);
+ this.lblNiveau.Location = new System.Drawing.Point(330, 71);
+ this.lblNiveau.Name = "lblNiveau";
+ this.lblNiveau.Size = new System.Drawing.Size(67, 18);
+ this.lblNiveau.TabIndex = 11;
+ this.lblNiveau.Text = "lblNiveau";
+ this.lblNiveau.Click += new System.EventHandler(this.Label1_Click);
+ //
+ // panel1
+ //
+ this.panel1.BackColor = System.Drawing.Color.Silver;
+ this.panel1.Controls.Add(this.pnlEffort);
+ this.panel1.Location = new System.Drawing.Point(320, 121);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(139, 26);
+ this.panel1.TabIndex = 12;
+ //
+ // pnlEffort
+ //
+ this.pnlEffort.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
+ this.pnlEffort.Location = new System.Drawing.Point(3, 5);
+ this.pnlEffort.Name = "pnlEffort";
+ this.pnlEffort.Size = new System.Drawing.Size(133, 18);
+ this.pnlEffort.TabIndex = 6;
+ //
+ // panel2
+ //
+ this.panel2.BackColor = System.Drawing.Color.Silver;
+ this.panel2.Controls.Add(this.pnlCompetence);
+ this.panel2.Location = new System.Drawing.Point(320, 156);
+ this.panel2.Name = "panel2";
+ this.panel2.Size = new System.Drawing.Size(139, 26);
+ this.panel2.TabIndex = 13;
+ //
+ // pnlCompetence
+ //
+ this.pnlCompetence.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
+ this.pnlCompetence.Location = new System.Drawing.Point(3, 4);
+ this.pnlCompetence.Name = "pnlCompetence";
+ this.pnlCompetence.Size = new System.Drawing.Size(133, 18);
+ this.pnlCompetence.TabIndex = 7;
+ //
+ // lblMoyenneNote
+ //
+ this.lblMoyenneNote.AutoSize = true;
+ this.lblMoyenneNote.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
+ this.lblMoyenneNote.Location = new System.Drawing.Point(317, 195);
+ this.lblMoyenneNote.Name = "lblMoyenneNote";
+ this.lblMoyenneNote.Size = new System.Drawing.Size(97, 15);
+ this.lblMoyenneNote.TabIndex = 14;
+ this.lblMoyenneNote.Text = "lblMoyenneNote";
+ //
+ // pcbEleve
+ //
+ this.pcbEleve.Location = new System.Drawing.Point(32, 24);
+ this.pcbEleve.Name = "pcbEleve";
+ this.pcbEleve.Size = new System.Drawing.Size(109, 97);
+ this.pcbEleve.TabIndex = 15;
+ this.pcbEleve.TabStop = false;
+ //
+ // pnlNote
+ //
+ this.pnlNote.Location = new System.Drawing.Point(98, 243);
+ this.pnlNote.Name = "pnlNote";
+ this.pnlNote.Size = new System.Drawing.Size(391, 134);
+ this.pnlNote.TabIndex = 16;
+ //
+ // InterfaceInfoCompletEleve
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(579, 408);
+ this.Controls.Add(this.pnlNote);
+ this.Controls.Add(this.pcbEleve);
+ this.Controls.Add(this.lblMoyenneNote);
+ this.Controls.Add(this.panel2);
+ this.Controls.Add(this.panel1);
+ this.Controls.Add(this.lblNiveau);
+ this.Controls.Add(this.lblMoyenne);
+ this.Controls.Add(this.lblCompetence);
+ this.Controls.Add(this.lblEffort);
+ this.Controls.Add(this.lblClasse);
+ this.Controls.Add(this.lblNomEleve);
+ this.Name = "InterfaceInfoCompletEleve";
+ this.Text = "InterfaceInfoCompletEleve";
+ this.Load += new System.EventHandler(this.InterfaceInfoCompletEleve_Load);
+ this.panel1.ResumeLayout(false);
+ this.panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pcbEleve)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label lblNomEleve;
+ private System.Windows.Forms.Label lblClasse;
+ private System.Windows.Forms.Label lblEffort;
+ private System.Windows.Forms.Label lblCompetence;
+ private System.Windows.Forms.Label lblMoyenne;
+ private System.Windows.Forms.Label lblNiveau;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Panel pnlEffort;
+ private System.Windows.Forms.Panel panel2;
+ private System.Windows.Forms.Panel pnlCompetence;
+ private System.Windows.Forms.Label lblMoyenneNote;
+ private System.Windows.Forms.PictureBox pcbEleve;
+ private System.Windows.Forms.Panel pnlNote;
+ }
+}
\ No newline at end of file
diff --git a/psychorientation/psychorientation/InterfaceInfoCompletEleve.cs b/psychorientation/psychorientation/InterfaceInfoCompletEleve.cs
new file mode 100755
index 0000000000000000000000000000000000000000..8338f6989301d330f99a406c850994c28c9fc034
--- /dev/null
+++ b/psychorientation/psychorientation/InterfaceInfoCompletEleve.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace psychorientation
+{
+ public partial class InterfaceInfoCompletEleve : Form
+ {
+ Eleve eleve;
+ public InterfaceInfoCompletEleve()
+ {
+ InitializeComponent();
+ }
+
+ private void Label1_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void InterfaceInfoCompletEleve_Load(object sender, EventArgs e)
+ {
+
+ }
+
+
+ public void setParam(Eleve el)
+ {
+ this.eleve = el;
+ actualiser();
+ }
+
+ private void actualiser()
+ {
+ Libelle lib = new Libelle();
+ string nom = "Eleve n°" + eleve.GetId();
+ this.Text = nom;
+ lblNomEleve.Text = nom;
+ lblNiveau.Text = lib.Niveau(eleve.GetClasse());
+ double moyenne = eleve.GetMoyenne();
+ if (moyenne == -1)
+ {
+ lblMoyenneNote.Text = "Pas encore d'évaluation";
+ }
+ else
+ {
+ lblMoyenneNote.Text = eleve.GetMoyenne().ToString() + "/20";
+ }
+
+ MajPanel(pnlCompetence, eleve.GetCompetence());
+ MajPanel(pnlEffort, eleve.GetEffort());
+ }
+ private void MajPanel(Panel p, double valeur)
+ {
+ int val = (int)valeur;
+ p.Size = new Size(val * 133 / 10, p.Height);
+ }
+ }
+}
diff --git a/psychorientation/psychorientation/InterfaceInfoCompletEleve.resx b/psychorientation/psychorientation/InterfaceInfoCompletEleve.resx
new file mode 100755
index 0000000000000000000000000000000000000000..1af7de150c99c12dd67a509fe57c10d63e4eeb04
--- /dev/null
+++ b/psychorientation/psychorientation/InterfaceInfoCompletEleve.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs b/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
index af44eda00b0de5304fc7e13474e01c52aa5cf557..f15db69b7cd9ace1cb1e75367053fc571fa6e999 100644
--- a/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
+++ b/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
@@ -49,73 +49,81 @@
//
this.lblEleve.AutoSize = true;
this.lblEleve.Font = new System.Drawing.Font("Microsoft Sans Serif", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lblEleve.Location = new System.Drawing.Point(107, 18);
+ this.lblEleve.Location = new System.Drawing.Point(77, 16);
this.lblEleve.Name = "lblEleve";
this.lblEleve.Size = new System.Drawing.Size(99, 33);
this.lblEleve.TabIndex = 0;
this.lblEleve.Text = "label1";
+ this.lblEleve.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(60, 96);
+ this.label1.Location = new System.Drawing.Point(41, 71);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(50, 13);
this.label1.TabIndex = 1;
this.label1.Text = "Classe : ";
+ this.label1.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(69, 136);
+ this.label2.Location = new System.Drawing.Point(41, 105);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(41, 13);
this.label2.TabIndex = 2;
this.label2.Text = "Effort : ";
+ this.label2.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(34, 177);
+ this.label3.Location = new System.Drawing.Point(15, 150);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(76, 13);
this.label3.TabIndex = 3;
this.label3.Text = "Compétence : ";
+ this.label3.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// lblClasse
//
this.lblClasse.AutoSize = true;
- this.lblClasse.Location = new System.Drawing.Point(116, 96);
+ this.lblClasse.Location = new System.Drawing.Point(97, 71);
this.lblClasse.Name = "lblClasse";
this.lblClasse.Size = new System.Drawing.Size(35, 13);
this.lblClasse.TabIndex = 4;
this.lblClasse.Text = "label4";
+ this.lblClasse.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.Silver;
this.panel1.Controls.Add(this.pnlEffort);
- this.panel1.Location = new System.Drawing.Point(116, 131);
+ this.panel1.Location = new System.Drawing.Point(97, 100);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(139, 26);
this.panel1.TabIndex = 5;
+ this.panel1.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// pnlEffort
//
this.pnlEffort.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
- this.pnlEffort.Location = new System.Drawing.Point(3, 4);
+ this.pnlEffort.Location = new System.Drawing.Point(3, 5);
this.pnlEffort.Name = "pnlEffort";
this.pnlEffort.Size = new System.Drawing.Size(133, 18);
this.pnlEffort.TabIndex = 6;
+ this.pnlEffort.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// panel2
//
this.panel2.BackColor = System.Drawing.Color.Silver;
this.panel2.Controls.Add(this.pnlCompetence);
- this.panel2.Location = new System.Drawing.Point(116, 173);
+ this.panel2.Location = new System.Drawing.Point(97, 146);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(139, 26);
this.panel2.TabIndex = 6;
+ this.panel2.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// pnlCompetence
//
@@ -124,6 +132,7 @@
this.pnlCompetence.Name = "pnlCompetence";
this.pnlCompetence.Size = new System.Drawing.Size(125, 18);
this.pnlCompetence.TabIndex = 7;
+ this.pnlCompetence.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// lblEffort
//
@@ -144,20 +153,22 @@
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(12, 215);
+ this.label4.Location = new System.Drawing.Point(12, 189);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(98, 13);
this.label4.TabIndex = 9;
this.label4.Text = "Moyenne général : ";
+ this.label4.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// lblMoyenne
//
this.lblMoyenne.AutoSize = true;
- this.lblMoyenne.Location = new System.Drawing.Point(116, 215);
+ this.lblMoyenne.Location = new System.Drawing.Point(113, 189);
this.lblMoyenne.Name = "lblMoyenne";
this.lblMoyenne.Size = new System.Drawing.Size(35, 13);
this.lblMoyenne.TabIndex = 10;
this.lblMoyenne.Text = "label5";
+ this.lblMoyenne.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// InterfaceInfoEleve
//
@@ -175,8 +186,9 @@
this.Controls.Add(this.label1);
this.Controls.Add(this.lblEleve);
this.Name = "InterfaceInfoEleve";
- this.Size = new System.Drawing.Size(479, 247);
+ this.Size = new System.Drawing.Size(246, 216);
this.Load += new System.EventHandler(this.InterfaceInfoEleve_Load);
+ this.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
this.panel1.ResumeLayout(false);
this.panel2.ResumeLayout(false);
this.ResumeLayout(false);
diff --git a/psychorientation/psychorientation/InterfaceInfoEleve.cs b/psychorientation/psychorientation/InterfaceInfoEleve.cs
index c8c93df4799a5acbfa020ebf88a4c036c8a6ba43..80c58fe08949cc9194abfca92bcb834b735599ec 100644
--- a/psychorientation/psychorientation/InterfaceInfoEleve.cs
+++ b/psychorientation/psychorientation/InterfaceInfoEleve.cs
@@ -13,7 +13,6 @@ namespace psychorientation
public partial class InterfaceInfoEleve : UserControl
{
Eleve eleve;
- List<string> listClasse;
public InterfaceInfoEleve()
{
InitializeComponent();
@@ -21,39 +20,46 @@ namespace psychorientation
private void InterfaceInfoEleve_Load(object sender, EventArgs e)
{
-
+
}
- public void setParam(Eleve el, List<string> listClasse)
+ public void setParam(Eleve el)
{
this.eleve = el;
- this.listClasse = listClasse;
actualiser();
}
private void actualiser()
{
- lblEleve.Text = "Eleve n°"+eleve.getId();
- lblClasse.Text = listClasse[eleve.getClasse()];
- lblEffort.Text = eleve.getEffort().ToString();
- lblCompetence.Text = eleve.getCompetence().ToString();
- double moyenne = eleve.getMoyenne();
+ Libelle lib = new Libelle();
+ lblEleve.Text = "Eleve n°" + eleve.GetId();
+ lblClasse.Text = lib.Niveau(eleve.GetClasse());
+ lblEffort.Text = eleve.GetEffort().ToString();
+ lblCompetence.Text = eleve.GetCompetence().ToString();
+ double moyenne = eleve.GetMoyenne();
if (moyenne == -1)
{
lblMoyenne.Text="Pas encore d'évaluation";
}
else
{
- lblMoyenne.Text = eleve.getMoyenne().ToString()+"/20";
+ lblMoyenne.Text = eleve.GetMoyenne().ToString()+"/20";
}
- MajPanel(pnlCompetence,eleve.getCompetence());
- MajPanel(pnlEffort, eleve.getEffort());
+ MajPanel(pnlCompetence,eleve.GetCompetence());
+ MajPanel(pnlEffort, eleve.GetEffort());
}
private void MajPanel(Panel p, double valeur)
{
int val = (int)valeur;
p.Size = new Size(val * 133 / 10, p.Height);
}
+
+ private void InterfaceInfoEleve_Click(object sender, EventArgs e)
+ {
+ InterfaceInfoCompletEleve iice = new InterfaceInfoCompletEleve();
+ iice.setParam(this.eleve);
+ iice.Show();
+ }
}
}
diff --git a/psychorientation/psychorientation/ListeEleve.Designer.cs b/psychorientation/psychorientation/ListeEleve.Designer.cs
new file mode 100755
index 0000000000000000000000000000000000000000..a8026c6df024cea9a89c4a2ec2190c48601e50fc
--- /dev/null
+++ b/psychorientation/psychorientation/ListeEleve.Designer.cs
@@ -0,0 +1,73 @@
+namespace psychorientation
+{
+ partial class ListeEleve
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.lblListeEleve = new System.Windows.Forms.Label();
+ this.pnlListeEleve = new System.Windows.Forms.Panel();
+ this.SuspendLayout();
+ //
+ // lblListeEleve
+ //
+ this.lblListeEleve.AutoSize = true;
+ this.lblListeEleve.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F);
+ this.lblListeEleve.Location = new System.Drawing.Point(23, 9);
+ this.lblListeEleve.Name = "lblListeEleve";
+ this.lblListeEleve.Size = new System.Drawing.Size(258, 24);
+ this.lblListeEleve.TabIndex = 0;
+ this.lblListeEleve.Text = "Liste des élèves de la classe :";
+ //
+ // pnlListeEleve
+ //
+ this.pnlListeEleve.AutoScroll = true;
+ this.pnlListeEleve.Location = new System.Drawing.Point(13, 47);
+ this.pnlListeEleve.Name = "pnlListeEleve";
+ this.pnlListeEleve.Size = new System.Drawing.Size(277, 400);
+ this.pnlListeEleve.TabIndex = 1;
+ //
+ // ListeEleve
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(304, 458);
+ this.Controls.Add(this.pnlListeEleve);
+ this.Controls.Add(this.lblListeEleve);
+ this.Name = "ListeEleve";
+ this.Text = "ListeEleve";
+ this.Load += new System.EventHandler(this.ListeEleve_Load);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label lblListeEleve;
+ private System.Windows.Forms.Panel pnlListeEleve;
+ }
+}
\ No newline at end of file
diff --git a/psychorientation/psychorientation/ListeEleve.cs b/psychorientation/psychorientation/ListeEleve.cs
new file mode 100755
index 0000000000000000000000000000000000000000..465ead13b13d4933763de799c40c7c4d8e52ad5a
--- /dev/null
+++ b/psychorientation/psychorientation/ListeEleve.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace psychorientation
+{
+ public partial class ListeEleve : Form
+ {
+ public ListeEleve()
+ {
+ InitializeComponent();
+ }
+
+
+ private void ListeEleve_Load(object sender, EventArgs e)
+ {
+ GestionnaireEleve gestEleve = new GestionnaireEleve();
+ Libelle lib = new Libelle();
+
+ // TEST
+ //Eleve e1 = new Eleve(4);
+ //Eleve e2 = new Eleve(5);
+ //gestEleve.AjouterEleve(e1);
+ //gestEleve.AjouterEleve(e2);
+
+ List<Eleve> listEleve = gestEleve.GetListeEleves();
+ int y = 0;
+ foreach ( Eleve eleve in listEleve)
+ {
+ InterfaceInfoEleve ii = new InterfaceInfoEleve();
+ ii.setParam(eleve);
+ ii.Location = new Point(10, y);
+ pnlListeEleve.Controls.Add(ii);
+ y += 220;
+ }
+ }
+ }
+}
diff --git a/psychorientation/psychorientation/ListeEleve.resx b/psychorientation/psychorientation/ListeEleve.resx
new file mode 100755
index 0000000000000000000000000000000000000000..1af7de150c99c12dd67a509fe57c10d63e4eeb04
--- /dev/null
+++ b/psychorientation/psychorientation/ListeEleve.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/psychorientation/psychorientation/Properties/Resources.Designer.cs b/psychorientation/psychorientation/Properties/Resources.Designer.cs
index c94656df38b45e13beac46c0cfa28eb826f96cf2..a04152587e908985e31938f1c3a9b9cde52df467 100644
--- a/psychorientation/psychorientation/Properties/Resources.Designer.cs
+++ b/psychorientation/psychorientation/Properties/Resources.Designer.cs
@@ -60,6 +60,16 @@ namespace psychorientation.Properties {
}
}
+ /// <summary>
+ /// Recherche une ressource localisée de type System.Drawing.Bitmap.
+ /// </summary>
+ internal static System.Drawing.Bitmap grp {
+ get {
+ object obj = ResourceManager.GetObject("grp", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// Recherche une ressource localisée de type System.Drawing.Bitmap.
/// </summary>
@@ -79,5 +89,15 @@ namespace psychorientation.Properties {
return ((System.Drawing.Bitmap)(obj));
}
}
+
+ /// <summary>
+ /// Recherche une ressource localisée de type System.Drawing.Bitmap.
+ /// </summary>
+ internal static System.Drawing.Bitmap sortir {
+ get {
+ object obj = ResourceManager.GetObject("sortir", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
}
}
diff --git a/psychorientation/psychorientation/Properties/Resources.resx b/psychorientation/psychorientation/Properties/Resources.resx
index 883a18036ccf14c67d61d71fd433abd4156f5d52..87a04524cdbf7332379794748a0153df6071d0cb 100644
--- a/psychorientation/psychorientation/Properties/Resources.resx
+++ b/psychorientation/psychorientation/Properties/Resources.resx
@@ -121,7 +121,13 @@
<data name="passer" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\passer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="sortir" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\sortir.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="salleV1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\salleV1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="grp" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\grp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/psychorientation/psychorientation/Resources/grp.png b/psychorientation/psychorientation/Resources/grp.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd6d0533f2c74c149a5c3dc55d7becf3e2cf8c38
Binary files /dev/null and b/psychorientation/psychorientation/Resources/grp.png differ
diff --git a/psychorientation/psychorientation/Resources/sortir.png b/psychorientation/psychorientation/Resources/sortir.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b2233b63eb4c58ee1dc4b4ca05ff8483f694b47
Binary files /dev/null and b/psychorientation/psychorientation/Resources/sortir.png differ
diff --git a/psychorientation/psychorientation/eleve.cs b/psychorientation/psychorientation/eleve.cs
index 645785708b8726e6423adabcac46916662715d6d..11b003456097a9ed081df10eb1e791fb23960688 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()
{
@@ -86,26 +86,32 @@ namespace psychorientation
return this.appreciation;
}
-
-
public double GetMoyenne()
{
- double res = -1;
- if (this.listNote.Count > 0)
+ if (this.listeNotes.Count == 0) {return -1;}
+ double res = 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 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);
- this.listNote.Add(n);
+ Note n = new Note(nom, CalculerNote(), this.competence, this.effort);
+ this.listeNotes.Add(n);
}
private double CalculerNote()
diff --git a/psychorientation/psychorientation/psychorientation.csproj b/psychorientation/psychorientation/psychorientation.csproj
index 8d3f5a0db11a75f366f6ae579d0c6599ba1a39fc..5edca88c3a8d707f7899e14782e37f67bf4b4398 100644
--- a/psychorientation/psychorientation/psychorientation.csproj
+++ b/psychorientation/psychorientation/psychorientation.csproj
@@ -57,6 +57,18 @@
<Compile Include="InterfaceClasse.Designer.cs">
<DependentUpon>InterfaceClasse.cs</DependentUpon>
</Compile>
+ <Compile Include="InterfaceInfoCompletEleve.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="InterfaceInfoCompletEleve.Designer.cs">
+ <DependentUpon>InterfaceInfoCompletEleve.cs</DependentUpon>
+ </Compile>
+ <Compile Include="ListeEleve.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="ListeEleve.Designer.cs">
+ <DependentUpon>ListeEleve.cs</DependentUpon>
+ </Compile>
<Compile Include="GestionnaireEleve.cs" />
<Compile Include="InterfaceInfoEleve.cs">
<SubType>UserControl</SubType>
@@ -77,6 +89,12 @@
<EmbeddedResource Include="InterfaceClasse.resx">
<DependentUpon>InterfaceClasse.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="InterfaceInfoCompletEleve.resx">
+ <DependentUpon>InterfaceInfoCompletEleve.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="ListeEleve.resx">
+ <DependentUpon>ListeEleve.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="InterfaceInfoEleve.resx">
<DependentUpon>InterfaceInfoEleve.cs</DependentUpon>
</EmbeddedResource>
@@ -113,5 +131,8 @@
<ItemGroup>
<None Include="Resources\salleV1.png" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="Resources\sortir.png" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file