diff --git a/psychorientation/psychorientation/InterfaceClasse.Designer.cs b/psychorientation/psychorientation/InterfaceClasse.Designer.cs
index 0d4346fe52b8718a2ddfed60b2572d883ec4c7e2..ef944760d1a04c33b9fc2d8181e972d5a0ee283f 100644
--- a/psychorientation/psychorientation/InterfaceClasse.Designer.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.Designer.cs
@@ -137,7 +137,7 @@
// pnlListeEleve
//
this.pnlListeEleve.AutoScroll = true;
- this.pnlListeEleve.BackColor = System.Drawing.Color.White;
+ this.pnlListeEleve.BackColor = System.Drawing.Color.Transparent;
this.pnlListeEleve.Controls.Add(this.lblListeEleve);
this.pnlListeEleve.Location = new System.Drawing.Point(0, -1);
this.pnlListeEleve.Name = "pnlListeEleve";
diff --git a/psychorientation/psychorientation/InterfaceClasse.resx b/psychorientation/psychorientation/InterfaceClasse.resx
index 6febe6b18328453c57f4d6b9ba0dd1ff7c3b25e7..15ed6c6f44a4cff2f6d924af02f13f371366187a 100644
--- a/psychorientation/psychorientation/InterfaceClasse.resx
+++ b/psychorientation/psychorientation/InterfaceClasse.resx
@@ -125,7 +125,11 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM
+<<<<<<< HEAD
mgEAAk1TRnQBSQFMAgEBBgEAARgBAAEYAQAByAEAAcgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+=======
+ mgEAAk1TRnQBSQFMAgEBBgEAARABAAEQAQAByAEAAcgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+>>>>>>> 6288e2b461ea7b62faf41aaee952dfec1f9c83a1
AwABIAEDAgABkAEBAgABAQEAAQgGAAHiAQQXAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEA
AcAB3AHAAQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEA
A0IBAAM5AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIA
diff --git a/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs b/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
index 2b75f2a06e7acbacd2598b80250bd18b74b40c35..b8516f099f0897de9060192d078cf71b8148e01d 100644
--- a/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
+++ b/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
@@ -100,19 +100,23 @@
//
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(139, 26);
+ this.panel1.Size = new System.Drawing.Size(92, 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, 5);
+ this.pnlEffort.Location = new System.Drawing.Point(3, 4);
this.pnlEffort.Name = "pnlEffort";
- this.pnlEffort.Size = new System.Drawing.Size(133, 18);
+ this.pnlEffort.Size = new System.Drawing.Size(84, 18);
this.pnlEffort.TabIndex = 6;
this.pnlEffort.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
@@ -120,9 +124,9 @@
//
this.panel2.BackColor = System.Drawing.Color.Silver;
this.panel2.Controls.Add(this.pnlCompetence);
- this.panel2.Location = new System.Drawing.Point(96, 150);
+ this.panel2.Location = new System.Drawing.Point(110, 150);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(139, 26);
+ this.panel2.Size = new System.Drawing.Size(92, 26);
this.panel2.TabIndex = 6;
this.panel2.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
@@ -131,7 +135,7 @@
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(125, 18);
+ this.pnlCompetence.Size = new System.Drawing.Size(58, 18);
this.pnlCompetence.TabIndex = 7;
this.pnlCompetence.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
@@ -175,6 +179,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.White;
this.Controls.Add(this.lblMoyenne);
this.Controls.Add(this.label4);
this.Controls.Add(this.lblCompetence);
@@ -186,7 +191,11 @@
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);
diff --git a/psychorientation/psychorientation/InterfaceInfoEleve.cs b/psychorientation/psychorientation/InterfaceInfoEleve.cs
index 8bae87db802da582f6a079b5c16973e5c3f99d0d..4c774c4fdcf0300c3160a1258894452e4e6cf129 100644
--- a/psychorientation/psychorientation/InterfaceInfoEleve.cs
+++ b/psychorientation/psychorientation/InterfaceInfoEleve.cs
@@ -52,7 +52,7 @@ namespace psychorientation
private void MajPanel(Panel p, double valeur)
{
int val = (int)valeur;
- p.Size = new Size(val * 133 / 10, p.Height);
+ p.Size = new Size(val * 84 / 10, p.Height);
}
private void InterfaceInfoEleve_Click(object sender, EventArgs e)
diff --git a/psychorientation/psychorientation/eleve.cs b/psychorientation/psychorientation/eleve.cs
index de0016e4e4867bcb501c2912a59bc9b3a075b431..ce8c559515a0ae5fcf295ab2fde38a65fc7220f4 100644
--- a/psychorientation/psychorientation/eleve.cs
+++ b/psychorientation/psychorientation/eleve.cs
@@ -107,16 +107,15 @@ namespace psychorientation
public void Progression(double typeEducation)
{
double t_competence = competence;
- this.competence += (this.effort - typeEducation) * (1 - (competence * 0.1)) * (1.0 / 12);
+ this.competence += this.effort * 0.1 * (1 - (t_competence * 0.1)) * (1.0 / 12);
if (competence < 0) { competence = 0; }
else if (competence > 10) { competence = 10; }
if (t_competence != typeEducation)
- this.effort += Math.Min(Math.Max(((1 / Math.Abs(t_competence - typeEducation)) - (1.0 / 3)) * 3, -1), 1) * 0.5;
+ this.effort += Math.Min(Math.Max(((1 / Math.Abs(t_competence - typeEducation)) - (1.0 / 3)) * 3, -1), 1) * 1;
else
this.effort += 0.5;
-
if (effort < 0) { effort = 0; }
else if (effort > 10) { effort = 10; }
}
@@ -126,11 +125,11 @@ namespace psychorientation
{
double note = CalculerNote();
-
- double note_convenable = 10 + (competence - 5)*2;
+ double note_convenable = 10 + (competence - 5);
+ /*
if (effort > 5)
{
- if (note > note_convenable)
+ if (note >= note_convenable)
{
effort += 0.25 * (1 - (competence * 0.1));
}
@@ -141,7 +140,7 @@ namespace psychorientation
}
else
{
- if (note > note_convenable)
+ if (note >= note_convenable)
{
effort -= 0.25;
}
@@ -149,18 +148,23 @@ namespace psychorientation
{
if (competence > 5)
{
- effort += 1;
+ effort += 0.25;
}
else
{
- effort -= 0.5;
+ effort -= 0.25;
}
}
+ }*/
+ /*
+ if (note_convenable <= note)
+ {
+ this.effort -= 0.5*this.competence*0.3;
}
if (effort < 0) { effort = 0; }
else if (effort > 10) { effort = 10; }
-
+ */
Note n = new Note(nom, note, this.competence, this.effort);
this.listeNotes.Add(n);
}