Skip to content
Snippets Groups Projects
Commit 3f7b585b authored by Antoine Félix's avatar Antoine Félix
Browse files

Fusion avec la branche principale.

parents 8d6c97d1 fb7120f8
Branches
No related merge requests found
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InterfaceClasse)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InterfaceClasse));
this.pb_action_suivante = new System.Windows.Forms.PictureBox(); this.pb_action_suivante = new System.Windows.Forms.PictureBox();
this.lblDate = new System.Windows.Forms.Label(); this.lblDate = new System.Windows.Forms.Label();
...@@ -38,6 +39,7 @@ ...@@ -38,6 +39,7 @@
this.lblEffort = new System.Windows.Forms.Label(); this.lblEffort = new System.Windows.Forms.Label();
this.pnlListeEleve = new System.Windows.Forms.Panel(); this.pnlListeEleve = new System.Windows.Forms.Panel();
this.lblListeEleve = new System.Windows.Forms.Label(); this.lblListeEleve = new System.Windows.Forms.Label();
this.imgListPerso = new System.Windows.Forms.ImageList(this.components);
((System.ComponentModel.ISupportInitialize)(this.pb_action_suivante)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pb_action_suivante)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pb_sortir)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pb_sortir)).BeginInit();
this.pnlListeEleve.SuspendLayout(); this.pnlListeEleve.SuspendLayout();
...@@ -148,6 +150,17 @@ ...@@ -148,6 +150,17 @@
this.lblListeEleve.TabIndex = 0; this.lblListeEleve.TabIndex = 0;
this.lblListeEleve.Text = "Liste des élèves :"; this.lblListeEleve.Text = "Liste des élèves :";
// //
// imgListPerso
//
this.imgListPerso.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imgListPerso.ImageStream")));
this.imgListPerso.TransparentColor = System.Drawing.Color.Transparent;
this.imgListPerso.Images.SetKeyName(0, "personnage1.png");
this.imgListPerso.Images.SetKeyName(1, "personnage2.png");
this.imgListPerso.Images.SetKeyName(2, "personnage3.png");
this.imgListPerso.Images.SetKeyName(3, "personnage4.png");
this.imgListPerso.Images.SetKeyName(4, "prof1.png");
this.imgListPerso.Images.SetKeyName(5, "prof2.png");
//
// InterfaceClasse // InterfaceClasse
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
...@@ -194,7 +207,7 @@ ...@@ -194,7 +207,7 @@
private System.Windows.Forms.Panel pnlListeEleve; private System.Windows.Forms.Panel pnlListeEleve;
private System.Windows.Forms.Label lblListeEleve; private System.Windows.Forms.Label lblListeEleve;
private System.Windows.Forms.ImageList imgListPerso;
} }
} }
...@@ -17,6 +17,9 @@ namespace psychorientation ...@@ -17,6 +17,9 @@ namespace psychorientation
private int anneeActuelle = 0; private int anneeActuelle = 0;
private GestionnaireEleve gestEleve = new GestionnaireEleve(); private GestionnaireEleve gestEleve = new GestionnaireEleve();
private int[] positionElevex = { 322, 571, 698, 951, 322, 571, 698, 951 };
private int[] positionElevey = { 398, 398, 398, 398, 505, 505, 505, 505 };
public InterfaceClasse() public InterfaceClasse()
{ {
InitializeComponent(); InitializeComponent();
...@@ -24,11 +27,7 @@ namespace psychorientation ...@@ -24,11 +27,7 @@ namespace psychorientation
private void Form1_Load(object sender, EventArgs e) private void Form1_Load(object sender, EventArgs e)
{ {
for (int i = 1; i < 3; i++) AjouterEleveImage();
{
gestEleve.AjouterEleve(new Eleve(i));
}
gestEleve.AjouterEleve(new Eleve(3,0,10.0,10.0,0));
lblDate.Text = libelle.Mois(moisActuel % 12); lblDate.Text = libelle.Mois(moisActuel % 12);
lblClasse.Text=libelle.Niveau(anneeActuelle); lblClasse.Text=libelle.Niveau(anneeActuelle);
lblEffort.Text = "Effort de la classe : " + Math.Round(gestEleve.GetEffortClasse(),1).ToString(); lblEffort.Text = "Effort de la classe : " + Math.Round(gestEleve.GetEffortClasse(),1).ToString();
...@@ -51,6 +50,51 @@ namespace psychorientation ...@@ -51,6 +50,51 @@ namespace psychorientation
mAccueil.ShowDialog(); mAccueil.ShowDialog();
} }
private void AjouterEleveImage()
{
for (int i = 1; i < 5; i++)
{
gestEleve.AjouterEleve(new Eleve(i));
}
int nb = gestEleve.GetListeEleves().Count;
if (nb > 8)
{
nb = 8;
}
int indexImage = 0;
for (int i = 0; i < nb; i++)
{
PictureBox pbEleve = new PictureBox();
pbEleve.Location = new System.Drawing.Point(572, 396);
pbEleve.Size = new System.Drawing.Size(73, 85);
pbEleve.Image = imgListPerso.Images[indexImage];
pbEleve.Left = positionElevex[i];
pbEleve.Tag = gestEleve.GetEleve(i);
pbEleve.BackColor = System.Drawing.Color.Transparent;
pbEleve.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
pbEleve.Top = positionElevey[i];
pbEleve.Click += new System.EventHandler(PbOuvrirInfo);
indexImage++;
if (indexImage == 4)
{
indexImage = 0;
}
this.Controls.Add(pbEleve);
}
}
private void PbOuvrirInfo(object sender, EventArgs e)
{
PictureBox pb = (PictureBox)sender;
Eleve tag = (Eleve)pb.Tag;
InterfaceInfoCompletEleve iice = new InterfaceInfoCompletEleve();
iice.setParam(tag);
iice.ShowDialog();
}
private void Pb_action_suivante_Click(object sender, EventArgs e) private void Pb_action_suivante_Click(object sender, EventArgs e)
{ {
// Traite les actions à effectuer avant de passer au mois suivant. // Traite les actions à effectuer avant de passer au mois suivant.
......
This diff is collapsed.
File added
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment