Skip to content
Snippets Groups Projects
Commit 03fad37d authored by GROSS LOIC's avatar GROSS LOIC
Browse files

Merge branch 'master' into 'master' 

Ajout ListeEleve

See merge request !12
parents 6e210029 78b29cdf
Branches
1 merge request!12Ajout ListeEleve
Hide whitespace changes
Inline Side-by-side
Showing
with 266 additions and 21 deletions
psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
+ 11
− 11
View file @ 03fad37d
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
// //
this.lblEleve.AutoSize = true; 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.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.Name = "lblEleve";
this.lblEleve.Size = new System.Drawing.Size(99, 33); this.lblEleve.Size = new System.Drawing.Size(99, 33);
this.lblEleve.TabIndex = 0; this.lblEleve.TabIndex = 0;
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
// label1 // label1
// //
this.label1.AutoSize = true; 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.Name = "label1";
this.label1.Size = new System.Drawing.Size(50, 13); this.label1.Size = new System.Drawing.Size(50, 13);
this.label1.TabIndex = 1; this.label1.TabIndex = 1;
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
// label2 // label2
// //
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(69, 136); this.label2.Location = new System.Drawing.Point(50, 100);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(41, 13); this.label2.Size = new System.Drawing.Size(41, 13);
this.label2.TabIndex = 2; this.label2.TabIndex = 2;
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(34, 177); this.label3.Location = new System.Drawing.Point(15, 146);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(76, 13); this.label3.Size = new System.Drawing.Size(76, 13);
this.label3.TabIndex = 3; this.label3.TabIndex = 3;
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
// lblClasse // lblClasse
// //
this.lblClasse.AutoSize = true; 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.Name = "lblClasse";
this.lblClasse.Size = new System.Drawing.Size(35, 13); this.lblClasse.Size = new System.Drawing.Size(35, 13);
this.lblClasse.TabIndex = 4; this.lblClasse.TabIndex = 4;
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
// //
this.panel1.BackColor = System.Drawing.Color.Silver; this.panel1.BackColor = System.Drawing.Color.Silver;
this.panel1.Controls.Add(this.pnlEffort); 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.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(139, 26); this.panel1.Size = new System.Drawing.Size(139, 26);
this.panel1.TabIndex = 5; this.panel1.TabIndex = 5;
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
// pnlEffort // pnlEffort
// //
this.pnlEffort.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); 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.Name = "pnlEffort";
this.pnlEffort.Size = new System.Drawing.Size(133, 18); this.pnlEffort.Size = new System.Drawing.Size(133, 18);
this.pnlEffort.TabIndex = 6; this.pnlEffort.TabIndex = 6;
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
// //
this.panel2.BackColor = System.Drawing.Color.Silver; this.panel2.BackColor = System.Drawing.Color.Silver;
this.panel2.Controls.Add(this.pnlCompetence); 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.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(139, 26); this.panel2.Size = new System.Drawing.Size(139, 26);
this.panel2.TabIndex = 6; this.panel2.TabIndex = 6;
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
// label4 // label4
// //
this.label4.AutoSize = true; 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.Name = "label4";
this.label4.Size = new System.Drawing.Size(98, 13); this.label4.Size = new System.Drawing.Size(98, 13);
this.label4.TabIndex = 9; this.label4.TabIndex = 9;
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
// lblMoyenne // lblMoyenne
// //
this.lblMoyenne.AutoSize = true; 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.Name = "lblMoyenne";
this.lblMoyenne.Size = new System.Drawing.Size(35, 13); this.lblMoyenne.Size = new System.Drawing.Size(35, 13);
this.lblMoyenne.TabIndex = 10; this.lblMoyenne.TabIndex = 10;
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
this.Controls.Add(this.lblEleve); this.Controls.Add(this.lblEleve);
this.Name = "InterfaceInfoEleve"; 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.Load += new System.EventHandler(this.InterfaceInfoEleve_Load);
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
this.panel2.ResumeLayout(false); this.panel2.ResumeLayout(false);
......
psychorientation/psychorientation/InterfaceInfoEleve.cs
+ 10
− 10
View file @ 03fad37d
...@@ -24,31 +24,31 @@ namespace psychorientation ...@@ -24,31 +24,31 @@ namespace psychorientation
} }
public void setParam(Eleve el, List<string> listClasse) public void setParam(Eleve el)
{ {
this.eleve = el; this.eleve = el;
this.listClasse = listClasse;
actualiser(); actualiser();
} }
private void actualiser() private void actualiser()
{ {
lblEleve.Text = "Eleve n°"+eleve.getId(); Libelle lib = new Libelle();
lblClasse.Text = listClasse[eleve.getClasse()]; lblEleve.Text = "Eleve n°"+eleve.GetId();
lblEffort.Text = eleve.getEffort().ToString(); lblClasse.Text = lib.Niveau(eleve.GetClasse());
lblCompetence.Text = eleve.getCompetence().ToString(); lblEffort.Text = eleve.GetEffort().ToString();
double moyenne = eleve.getMoyenne(); lblCompetence.Text = eleve.GetCompetence().ToString();
double moyenne = eleve.GetMoyenne();
if (moyenne == -1) if (moyenne == -1)
{ {
lblMoyenne.Text="Pas encore d'évaluation"; lblMoyenne.Text="Pas encore d'évaluation";
} }
else else
{ {
lblMoyenne.Text = eleve.getMoyenne().ToString()+"/20"; lblMoyenne.Text = eleve.GetMoyenne().ToString()+"/20";
} }
MajPanel(pnlCompetence,eleve.getCompetence()); MajPanel(pnlCompetence,eleve.GetCompetence());
MajPanel(pnlEffort, eleve.getEffort()); MajPanel(pnlEffort, eleve.GetEffort());
} }
private void MajPanel(Panel p, double valeur) private void MajPanel(Panel p, double valeur)
{ {
......
psychorientation/psychorientation/ListeEleve.Designer.cs 0 → 100755
+ 73
− 0
View file @ 03fad37d
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
psychorientation/psychorientation/ListeEleve.cs 0 → 100755
+ 43
− 0
View file @ 03fad37d
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();
Eleve el1 = new Eleve(1);
Eleve el2 = new Eleve(2);
gestEleve.AjouterEleve(el1);
gestEleve.AjouterEleve(el2);
List<Eleve> listEleve = gestEleve.GetListEleve();
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;
}
}
}
}
psychorientation/psychorientation/ListeEleve.resx 0 → 100755
+ 120
− 0
View file @ 03fad37d
<?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
psychorientation/psychorientation/psychorientation.csproj
+ 9
− 0
View file @ 03fad37d
...@@ -57,6 +57,12 @@ ...@@ -57,6 +57,12 @@
<Compile Include="InterfaceClasse.Designer.cs"> <Compile Include="InterfaceClasse.Designer.cs">
<DependentUpon>InterfaceClasse.cs</DependentUpon> <DependentUpon>InterfaceClasse.cs</DependentUpon>
</Compile> </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="GestionnaireEleve.cs" />
<Compile Include="InterfaceInfoEleve.cs"> <Compile Include="InterfaceInfoEleve.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
...@@ -77,6 +83,9 @@ ...@@ -77,6 +83,9 @@
<EmbeddedResource Include="InterfaceClasse.resx"> <EmbeddedResource Include="InterfaceClasse.resx">
<DependentUpon>InterfaceClasse.cs</DependentUpon> <DependentUpon>InterfaceClasse.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="ListeEleve.resx">
<DependentUpon>ListeEleve.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="InterfaceInfoEleve.resx"> <EmbeddedResource Include="InterfaceInfoEleve.resx">
<DependentUpon>InterfaceInfoEleve.cs</DependentUpon> <DependentUpon>InterfaceInfoEleve.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
......
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