diff --git a/psychorientation/psychorientation/InterfaceClasse.Designer.cs b/psychorientation/psychorientation/InterfaceClasse.Designer.cs
index 7b222fffd97773da4875c253e509abe33bd3a967..0d4346fe52b8718a2ddfed60b2572d883ec4c7e2 100644
--- a/psychorientation/psychorientation/InterfaceClasse.Designer.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.Designer.cs
@@ -40,9 +40,13 @@
this.pnlListeEleve = new System.Windows.Forms.Panel();
this.lblListeEleve = new System.Windows.Forms.Label();
this.imgListPerso = new System.Windows.Forms.ImageList(this.components);
+ this.pnlChoix = new System.Windows.Forms.Panel();
+ this.lblNotation = new System.Windows.Forms.Label();
+ this.lblCours = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pb_action_suivante)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pb_sortir)).BeginInit();
this.pnlListeEleve.SuspendLayout();
+ this.pnlChoix.SuspendLayout();
this.SuspendLayout();
//
// pb_action_suivante
@@ -161,6 +165,33 @@
this.imgListPerso.Images.SetKeyName(4, "prof1.png");
this.imgListPerso.Images.SetKeyName(5, "prof2.png");
//
+ // pnlChoix
+ //
+ this.pnlChoix.Controls.Add(this.lblCours);
+ this.pnlChoix.Controls.Add(this.lblNotation);
+ this.pnlChoix.Location = new System.Drawing.Point(1107, 99);
+ this.pnlChoix.Name = "pnlChoix";
+ this.pnlChoix.Size = new System.Drawing.Size(189, 528);
+ this.pnlChoix.TabIndex = 8;
+ //
+ // lblNotation
+ //
+ this.lblNotation.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F);
+ this.lblNotation.Location = new System.Drawing.Point(13, 87);
+ this.lblNotation.Name = "lblNotation";
+ this.lblNotation.Size = new System.Drawing.Size(164, 59);
+ this.lblNotation.TabIndex = 0;
+ this.lblNotation.Text = "Type de notation visant à aider les eleves de competence :";
+ //
+ // lblCours
+ //
+ this.lblCours.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F);
+ this.lblCours.Location = new System.Drawing.Point(13, 282);
+ this.lblCours.Name = "lblCours";
+ this.lblCours.Size = new System.Drawing.Size(164, 59);
+ this.lblCours.TabIndex = 1;
+ this.lblCours.Text = "Type de cours visant à aider les eleves de competence :";
+ //
// InterfaceClasse
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -169,6 +200,7 @@
this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ClientSize = new System.Drawing.Size(1357, 783);
+ this.Controls.Add(this.pnlChoix);
this.Controls.Add(this.lblEffort);
this.Controls.Add(this.lblCompetence);
this.Controls.Add(this.lblMoyenne);
@@ -189,6 +221,7 @@
((System.ComponentModel.ISupportInitialize)(this.pb_sortir)).EndInit();
this.pnlListeEleve.ResumeLayout(false);
this.pnlListeEleve.PerformLayout();
+ this.pnlChoix.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -208,6 +241,9 @@
private System.Windows.Forms.Panel pnlListeEleve;
private System.Windows.Forms.Label lblListeEleve;
private System.Windows.Forms.ImageList imgListPerso;
+ private System.Windows.Forms.Panel pnlChoix;
+ private System.Windows.Forms.Label lblNotation;
+ private System.Windows.Forms.Label lblCours;
}
}
diff --git a/psychorientation/psychorientation/InterfaceClasse.cs b/psychorientation/psychorientation/InterfaceClasse.cs
index d993a4845e9b75b780ab0550bb75c3298870f6db..14875b0564b06405bc5cf77f76d9948ee27daf53 100644
--- a/psychorientation/psychorientation/InterfaceClasse.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.cs
@@ -20,7 +20,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 coursText = "Type de cours visant à aider les eleves de competence : ";
+
+ private double valCours = 5.0;
+ private double valNotation = 5.0;
+
public InterfaceClasse()
{
InitializeComponent();
@@ -46,6 +52,22 @@ namespace psychorientation
y += 220;
}
+
+ TrackBar tbNota = new TrackBar();
+ tbNota.Location = new System.Drawing.Point(0, 10 + lblNotation.Location.Y+lblNotation.Size.Height);
+ tbNota.Size = new System.Drawing.Size(184, 45);
+ tbNota.Value = 5;
+ tbNota.Scroll += new System.EventHandler(tbNota_Scroll);
+ pnlChoix.Controls.Add(tbNota);
+ lblNotation.Text = notaText + tbNota.Value.ToString();
+
+ TrackBar tbCours = new TrackBar();
+ tbCours.Location = new System.Drawing.Point(0, 10 + lblCours.Location.Y + lblCours.Size.Height);
+ tbCours.Size = new System.Drawing.Size(184, 45);
+ tbCours.Value = 5;
+ tbCours.Scroll += new System.EventHandler(tbCours_Scroll);
+ pnlChoix.Controls.Add(tbCours);
+ lblCours.Text = coursText + tbCours.Value.ToString();
Message mAccueil = new Message("Bonjour apprenti prof, vous allez apprendre à éduquer des joueurs !! ", "Début", TypeMessage.INFORMATION);
mAccueil.ShowDialog();
@@ -106,7 +128,7 @@ namespace psychorientation
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);
+ /*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();
@@ -115,8 +137,15 @@ namespace psychorientation
{
el.Progression(mControle.getReponseDouble);
el.AjouterNote("Controle " + lblClasse.Text + " " + lblDate.Text);
+ }*/
+
+ foreach (Eleve el in gestEleve.GetListeEleves())
+ {
+ el.Progression(valCours);
+ el.AjouterNote("Controle " + lblClasse.Text + " " + lblDate.Text);
}
+
lblEffort.Text = "Effort de la classe : " + Math.Round(gestEleve.GetEffortClasse(), 1).ToString();
lblCompetence.Text = "Competence de la classe : " + Math.Round(gestEleve.GetCompetenceClasse(), 1).ToString();
lblMoyenne.Text = "Moyenne de la classe : " + Math.Round(gestEleve.GetMoyenneClasse(), 1).ToString();
@@ -192,5 +221,19 @@ namespace psychorientation
Close();
}
}
+
+ private void tbNota_Scroll(object sender, EventArgs e)
+ {
+ TrackBar tbNota = (TrackBar)sender;
+ valNotation = (double)tbNota.Value;
+ lblNotation.Text = notaText + valNotation.ToString();
+ }
+
+ private void tbCours_Scroll(object sender, EventArgs e)
+ {
+ TrackBar tbCours = (TrackBar)sender;
+ valCours = (double)tbCours.Value;
+ lblCours.Text = coursText + valCours.ToString();
+ }
}
}
diff --git a/psychorientation/psychorientation/InterfaceClasse.resx b/psychorientation/psychorientation/InterfaceClasse.resx
index aa1ac0caca54cf8d848079e14d215124c436f653..6febe6b18328453c57f4d6b9ba0dd1ff7c3b25e7 100644
--- a/psychorientation/psychorientation/InterfaceClasse.resx
+++ b/psychorientation/psychorientation/InterfaceClasse.resx
@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM
- mgEAAk1TRnQBSQFMAgEBBgEAAQgBAAEIAQAByAEAAcgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ mgEAAk1TRnQBSQFMAgEBBgEAARgBAAEYAQAByAEAAcgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABIAEDAgABkAEBAgABAQEAAQgGAAHiAQQXAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEA
AcAB3AHAAQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEA
A0IBAAM5AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIA
diff --git a/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs b/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
index 9943aa6ee6cd7faf9e1845c29110a7bccd28cf49..2b75f2a06e7acbacd2598b80250bd18b74b40c35 100644
--- a/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
+++ b/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
@@ -100,6 +100,7 @@
//
this.panel1.BackColor = System.Drawing.Color.Silver;
this.panel1.Controls.Add(this.pnlEffort);
+ this.panel1.Controls.Add(this.lblEffort);
this.panel1.Location = new System.Drawing.Point(96, 95);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(139, 26);
@@ -137,7 +138,7 @@
// lblEffort
//
this.lblEffort.AutoSize = true;
- this.lblEffort.Location = new System.Drawing.Point(49, 109);
+ 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;
@@ -177,7 +178,6 @@
this.Controls.Add(this.lblMoyenne);
this.Controls.Add(this.label4);
this.Controls.Add(this.lblCompetence);
- this.Controls.Add(this.lblEffort);
this.Controls.Add(this.panel2);
this.Controls.Add(this.panel1);
this.Controls.Add(this.lblClasse);
@@ -186,10 +186,11 @@
this.Controls.Add(this.label1);
this.Controls.Add(this.lblEleve);
this.Name = "InterfaceInfoEleve";
- this.Size = new System.Drawing.Size(246, 216);
+ this.Size = new System.Drawing.Size(239, 216);
this.Load += new System.EventHandler(this.InterfaceInfoEleve_Load);
this.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
this.panel2.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();