diff --git a/psychorientation/psychorientation/InterfaceClasse.cs b/psychorientation/psychorientation/InterfaceClasse.cs
index 14875b0564b06405bc5cf77f76d9948ee27daf53..80439c60de9147791380ea29d060fb693c25ae90 100644
--- a/psychorientation/psychorientation/InterfaceClasse.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.cs
@@ -21,11 +21,13 @@ namespace psychorientation
private int[] positionElevex = { 322, 571, 698, 951, 322, 571, 698, 951 };
private int[] positionElevey = { 398, 398, 398, 398, 505, 505, 505, 505 };
- private string notaText = "Type de notation visant à aider les eleves de competence : ";
+ private string notaText = "Notation suivant les coefficients : ";
private string coursText = "Type de cours visant à aider les eleves de competence : ";
private double valCours = 5.0;
- private double valNotation = 5.0;
+ private double valNotation = 10.0;
+ private Label lblValEffort = new Label();
+ private Label lblValCompetence = new Label();
public InterfaceClasse()
{
@@ -54,12 +56,22 @@ namespace psychorientation
TrackBar tbNota = new TrackBar();
- tbNota.Location = new System.Drawing.Point(0, 10 + lblNotation.Location.Y+lblNotation.Size.Height);
+ tbNota.Location = new System.Drawing.Point(0, lblNotation.Location.Y+lblNotation.Size.Height);
tbNota.Size = new System.Drawing.Size(184, 45);
- tbNota.Value = 5;
+ tbNota.Maximum = 20;
+ tbNota.Value = 10;
tbNota.Scroll += new System.EventHandler(tbNota_Scroll);
pnlChoix.Controls.Add(tbNota);
- lblNotation.Text = notaText + tbNota.Value.ToString();
+ lblNotation.Text = notaText;
+
+ lblValEffort.Tag = "Effort : ";
+ lblValCompetence.Tag = "Compétence : ";
+ lblValEffort.Location = new Point(130, 5 + tbNota.Location.Y + tbNota.Size.Height);
+ lblValCompetence.Location = new Point(1, 5 + tbNota.Location.Y + tbNota.Size.Height);
+ lblValEffort.Text = lblValEffort.Tag + ( (20- tbNota.Value) / 10.0).ToString();
+ lblValCompetence.Text = lblValCompetence.Tag + (tbNota.Value / 10.0).ToString();
+ pnlChoix.Controls.Add(lblValEffort);
+ pnlChoix.Controls.Add(lblValCompetence);
TrackBar tbCours = new TrackBar();
tbCours.Location = new System.Drawing.Point(0, 10 + lblCours.Location.Y + lblCours.Size.Height);
@@ -121,23 +133,6 @@ namespace psychorientation
private void Pb_action_suivante_Click(object sender, EventArgs e)
{
// Traite les actions à effectuer avant de passer au mois suivant.
- /*
- if (false)
- {
- // Lance l'interface appropriee.
- return;
- }*/
-
- /*Message mControle = new Message("C'est la fin du mois, veuillez choisir le niveau de compétence du public cible de votre enseignement.", "Cours", TypeMessage.NOTATION);
-
- mControle.ShowDialog();
-
-
- foreach(Eleve el in gestEleve.GetListeEleves())
- {
- el.Progression(mControle.getReponseDouble);
- el.AjouterNote("Controle " + lblClasse.Text + " " + lblDate.Text);
- }*/
foreach (Eleve el in gestEleve.GetListeEleves())
{
@@ -226,7 +221,9 @@ namespace psychorientation
{
TrackBar tbNota = (TrackBar)sender;
valNotation = (double)tbNota.Value;
- lblNotation.Text = notaText + valNotation.ToString();
+
+ lblValEffort.Text = lblValEffort.Tag + ( (20 - valNotation) / 10.0).ToString();
+ lblValCompetence.Text = lblValCompetence.Tag + (valNotation / 10.0).ToString();
}
private void tbCours_Scroll(object sender, EventArgs e)
diff --git a/psychorientation/psychorientation/InterfaceClasse.resx b/psychorientation/psychorientation/InterfaceClasse.resx
index 15ed6c6f44a4cff2f6d924af02f13f371366187a..284655c8d7a50c5808a86b366ce5bc82bcf7b8cd 100644
--- a/psychorientation/psychorientation/InterfaceClasse.resx
+++ b/psychorientation/psychorientation/InterfaceClasse.resx
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
- <!--
- Microsoft ResX Schema
-
+ <!--
+ 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
+
+ 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>
@@ -26,36 +26,36 @@
<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
+
+ 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
+
+ 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
+
+ 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
+
+ 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
+ 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
+ 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
+ value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
@@ -125,11 +125,8 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM
-<<<<<<< HEAD
- mgEAAk1TRnQBSQFMAgEBBgEAARgBAAEYAQAByAEAAcgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
-=======
+
mgEAAk1TRnQBSQFMAgEBBgEAARABAAEQAQAByAEAAcgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
->>>>>>> 6288e2b461ea7b62faf41aaee952dfec1f9c83a1
AwABIAEDAgABkAEBAgABAQEAAQgGAAHiAQQXAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEA
AcAB3AHAAQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEA
A0IBAAM5AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIA
@@ -8873,4 +8870,4 @@
vVBvxOHiQa896v8HT8lffb465hIAAAAASUVORK5CYII=
</value>
</data>
-</root>
\ No newline at end of file
+</root>
diff --git a/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs b/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
index b8516f099f0897de9060192d078cf71b8148e01d..746532a3a4a8a9fc1798ff174124047c3a3dd0d5 100644
--- a/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
+++ b/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
@@ -35,9 +35,9 @@
this.lblClasse = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.pnlEffort = new System.Windows.Forms.Panel();
+ this.lblEffort = new System.Windows.Forms.Label();
this.panel2 = new System.Windows.Forms.Panel();
this.pnlCompetence = new System.Windows.Forms.Panel();
- this.lblEffort = new System.Windows.Forms.Label();
this.lblCompetence = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.lblMoyenne = new System.Windows.Forms.Label();
@@ -100,12 +100,8 @@
//
this.panel1.BackColor = System.Drawing.Color.Silver;
this.panel1.Controls.Add(this.pnlEffort);
-<<<<<<< HEAD
this.panel1.Controls.Add(this.lblEffort);
- this.panel1.Location = new System.Drawing.Point(96, 95);
-=======
this.panel1.Location = new System.Drawing.Point(110, 95);
->>>>>>> 6288e2b461ea7b62faf41aaee952dfec1f9c83a1
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(92, 26);
this.panel1.TabIndex = 5;
@@ -120,6 +116,14 @@
this.pnlEffort.TabIndex = 6;
this.pnlEffort.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
+ // lblEffort
+ //
+ this.lblEffort.AutoSize = true;
+ this.lblEffort.Location = new System.Drawing.Point(3, 5);
+ this.lblEffort.Name = "lblEffort";
+ this.lblEffort.Size = new System.Drawing.Size(0, 13);
+ this.lblEffort.TabIndex = 7;
+ //
// panel2
//
this.panel2.BackColor = System.Drawing.Color.Silver;
@@ -139,14 +143,6 @@
this.pnlCompetence.TabIndex = 7;
this.pnlCompetence.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
- // lblEffort
- //
- this.lblEffort.AutoSize = true;
- this.lblEffort.Location = new System.Drawing.Point(3, 5);
- this.lblEffort.Name = "lblEffort";
- this.lblEffort.Size = new System.Drawing.Size(0, 13);
- this.lblEffort.TabIndex = 7;
- //
// lblCompetence
//
this.lblCompetence.AutoSize = true;
@@ -191,11 +187,7 @@
this.Controls.Add(this.label1);
this.Controls.Add(this.lblEleve);
this.Name = "InterfaceInfoEleve";
-<<<<<<< HEAD
- this.Size = new System.Drawing.Size(239, 216);
-=======
this.Size = new System.Drawing.Size(216, 216);
->>>>>>> 6288e2b461ea7b62faf41aaee952dfec1f9c83a1
this.Load += new System.EventHandler(this.InterfaceInfoEleve_Load);
this.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
this.panel1.ResumeLayout(false);