From 4e340700bef9e499b3a9d083f2b7c557e369b376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Gross?= <loic.gross@unistra.fr>
Date: Wed, 1 Apr 2020 16:47:40 +0200
Subject: [PATCH 1/4] =?UTF-8?q?cr=C3=A9ation=20InterfaceInfoCompletEleve?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../InterfaceInfoCompletEleve.Designer.cs | 202 ++++++++++++++++++
.../InterfaceInfoCompletEleve.cs | 61 ++++++
.../InterfaceInfoCompletEleve.resx | 120 +++++++++++
.../InterfaceInfoEleve.Designer.cs | 4 +-
.../psychorientation/InterfaceInfoEleve.cs | 1 -
.../psychorientation/psychorientation.csproj | 20 +-
6 files changed, 396 insertions(+), 12 deletions(-)
create mode 100755 psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs
create mode 100755 psychorientation/psychorientation/InterfaceInfoCompletEleve.cs
create mode 100755 psychorientation/psychorientation/InterfaceInfoCompletEleve.resx
diff --git a/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs b/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs
new file mode 100755
index 0000000..1c31329
--- /dev/null
+++ b/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs
@@ -0,0 +1,202 @@
+namespace psychorientation
+{
+ partial class InterfaceInfoCompletEleve
+ {
+ /// <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.lblNomEleve = new System.Windows.Forms.Label();
+ this.lblClasse = new System.Windows.Forms.Label();
+ this.lblEffort = new System.Windows.Forms.Label();
+ this.lblCompetence = new System.Windows.Forms.Label();
+ this.lblMoyenne = new System.Windows.Forms.Label();
+ this.lblNiveau = new System.Windows.Forms.Label();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.pnlEffort = new System.Windows.Forms.Panel();
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.pnlCompetence = new System.Windows.Forms.Panel();
+ this.lblMoyenneNote = new System.Windows.Forms.Label();
+ this.pcbEleve = new System.Windows.Forms.PictureBox();
+ this.panel1.SuspendLayout();
+ this.panel2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pcbEleve)).BeginInit();
+ this.SuspendLayout();
+ //
+ // lblNomEleve
+ //
+ this.lblNomEleve.AutoSize = true;
+ this.lblNomEleve.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F);
+ this.lblNomEleve.Location = new System.Drawing.Point(253, 14);
+ this.lblNomEleve.Name = "lblNomEleve";
+ this.lblNomEleve.Size = new System.Drawing.Size(118, 24);
+ this.lblNomEleve.TabIndex = 0;
+ this.lblNomEleve.Text = "lblNomEleve";
+ //
+ // lblClasse
+ //
+ this.lblClasse.AutoSize = true;
+ this.lblClasse.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F);
+ this.lblClasse.Location = new System.Drawing.Point(254, 71);
+ this.lblClasse.Name = "lblClasse";
+ this.lblClasse.Size = new System.Drawing.Size(70, 18);
+ this.lblClasse.TabIndex = 2;
+ this.lblClasse.Text = "Classe : ";
+ //
+ // lblEffort
+ //
+ this.lblEffort.AutoSize = true;
+ this.lblEffort.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
+ this.lblEffort.Location = new System.Drawing.Point(254, 126);
+ this.lblEffort.Name = "lblEffort";
+ this.lblEffort.Size = new System.Drawing.Size(44, 15);
+ this.lblEffort.TabIndex = 3;
+ this.lblEffort.Text = "Effort : ";
+ //
+ // lblCompetence
+ //
+ this.lblCompetence.AutoSize = true;
+ this.lblCompetence.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
+ this.lblCompetence.Location = new System.Drawing.Point(212, 160);
+ this.lblCompetence.Name = "lblCompetence";
+ this.lblCompetence.Size = new System.Drawing.Size(86, 15);
+ this.lblCompetence.TabIndex = 4;
+ this.lblCompetence.Text = "Compétence : ";
+ //
+ // lblMoyenne
+ //
+ this.lblMoyenne.AutoSize = true;
+ this.lblMoyenne.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
+ this.lblMoyenne.Location = new System.Drawing.Point(186, 195);
+ this.lblMoyenne.Name = "lblMoyenne";
+ this.lblMoyenne.Size = new System.Drawing.Size(112, 15);
+ this.lblMoyenne.TabIndex = 10;
+ this.lblMoyenne.Text = "Moyenne général : ";
+ //
+ // lblNiveau
+ //
+ this.lblNiveau.AutoSize = true;
+ this.lblNiveau.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F);
+ this.lblNiveau.Location = new System.Drawing.Point(330, 71);
+ this.lblNiveau.Name = "lblNiveau";
+ this.lblNiveau.Size = new System.Drawing.Size(67, 18);
+ this.lblNiveau.TabIndex = 11;
+ this.lblNiveau.Text = "lblNiveau";
+ this.lblNiveau.Click += new System.EventHandler(this.Label1_Click);
+ //
+ // panel1
+ //
+ this.panel1.BackColor = System.Drawing.Color.Silver;
+ this.panel1.Controls.Add(this.pnlEffort);
+ this.panel1.Location = new System.Drawing.Point(320, 121);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(139, 26);
+ this.panel1.TabIndex = 12;
+ //
+ // 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.Name = "pnlEffort";
+ this.pnlEffort.Size = new System.Drawing.Size(133, 18);
+ this.pnlEffort.TabIndex = 6;
+ //
+ // panel2
+ //
+ this.panel2.BackColor = System.Drawing.Color.Silver;
+ this.panel2.Controls.Add(this.pnlCompetence);
+ this.panel2.Location = new System.Drawing.Point(320, 156);
+ this.panel2.Name = "panel2";
+ this.panel2.Size = new System.Drawing.Size(139, 26);
+ this.panel2.TabIndex = 13;
+ //
+ // pnlCompetence
+ //
+ 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.TabIndex = 7;
+ //
+ // lblMoyenneNote
+ //
+ this.lblMoyenneNote.AutoSize = true;
+ this.lblMoyenneNote.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
+ this.lblMoyenneNote.Location = new System.Drawing.Point(317, 195);
+ this.lblMoyenneNote.Name = "lblMoyenneNote";
+ this.lblMoyenneNote.Size = new System.Drawing.Size(97, 15);
+ this.lblMoyenneNote.TabIndex = 14;
+ this.lblMoyenneNote.Text = "lblMoyenneNote";
+ //
+ // pcbEleve
+ //
+ this.pcbEleve.Location = new System.Drawing.Point(32, 24);
+ this.pcbEleve.Name = "pcbEleve";
+ this.pcbEleve.Size = new System.Drawing.Size(109, 97);
+ this.pcbEleve.TabIndex = 15;
+ this.pcbEleve.TabStop = false;
+ //
+ // InterfaceInfoCompletEleve
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(579, 408);
+ this.Controls.Add(this.pcbEleve);
+ this.Controls.Add(this.lblMoyenneNote);
+ this.Controls.Add(this.panel2);
+ this.Controls.Add(this.panel1);
+ this.Controls.Add(this.lblNiveau);
+ this.Controls.Add(this.lblMoyenne);
+ this.Controls.Add(this.lblCompetence);
+ this.Controls.Add(this.lblEffort);
+ this.Controls.Add(this.lblClasse);
+ this.Controls.Add(this.lblNomEleve);
+ this.Name = "InterfaceInfoCompletEleve";
+ this.Text = "InterfaceInfoCompletEleve";
+ this.Load += new System.EventHandler(this.InterfaceInfoCompletEleve_Load);
+ this.panel1.ResumeLayout(false);
+ this.panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.pcbEleve)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label lblNomEleve;
+ private System.Windows.Forms.Label lblClasse;
+ private System.Windows.Forms.Label lblEffort;
+ private System.Windows.Forms.Label lblCompetence;
+ private System.Windows.Forms.Label lblMoyenne;
+ private System.Windows.Forms.Label lblNiveau;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Panel pnlEffort;
+ private System.Windows.Forms.Panel panel2;
+ private System.Windows.Forms.Panel pnlCompetence;
+ private System.Windows.Forms.Label lblMoyenneNote;
+ private System.Windows.Forms.PictureBox pcbEleve;
+ }
+}
\ No newline at end of file
diff --git a/psychorientation/psychorientation/InterfaceInfoCompletEleve.cs b/psychorientation/psychorientation/InterfaceInfoCompletEleve.cs
new file mode 100755
index 0000000..52fe073
--- /dev/null
+++ b/psychorientation/psychorientation/InterfaceInfoCompletEleve.cs
@@ -0,0 +1,61 @@
+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 InterfaceInfoCompletEleve : Form
+ {
+ Eleve eleve;
+ public InterfaceInfoCompletEleve()
+ {
+ InitializeComponent();
+ }
+
+ private void Label1_Click(object sender, EventArgs e)
+ {
+
+ }
+
+ private void InterfaceInfoCompletEleve_Load(object sender, EventArgs e)
+ {
+
+ }
+
+ private void InterfaceInfoCompletEleve_Load(object sender, EventArgs e, Eleve el)
+ {
+ this.eleve = el;
+ actualiser();
+ }
+
+ private void actualiser()
+ {
+ Libelle lib = new Libelle();
+ lblNomEleve.Text = "Eleve n°" + eleve.GetId();
+ lblNiveau.Text = lib.Niveau(eleve.GetClasse());
+ double moyenne = eleve.GetMoyenne();
+ if (moyenne == -1)
+ {
+ lblMoyenneNote.Text = "Pas encore d'évaluation";
+ }
+ else
+ {
+ lblMoyenneNote.Text = eleve.GetMoyenne().ToString() + "/20";
+ }
+
+ MajPanel(pnlCompetence, eleve.GetCompetence());
+ MajPanel(pnlEffort, eleve.GetEffort());
+ }
+ private void MajPanel(Panel p, double valeur)
+ {
+ int val = (int)valeur;
+ p.Size = new Size(val * 133 / 10, p.Height);
+ }
+ }
+}
diff --git a/psychorientation/psychorientation/InterfaceInfoCompletEleve.resx b/psychorientation/psychorientation/InterfaceInfoCompletEleve.resx
new file mode 100755
index 0000000..1af7de1
--- /dev/null
+++ b/psychorientation/psychorientation/InterfaceInfoCompletEleve.resx
@@ -0,0 +1,120 @@
+<?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
diff --git a/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs b/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
index 9d4d0ff..6a1cccf 100644
--- a/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
+++ b/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
@@ -67,7 +67,7 @@
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(50, 100);
+ this.label2.Location = new System.Drawing.Point(41, 105);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(41, 13);
this.label2.TabIndex = 2;
@@ -76,7 +76,7 @@
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(15, 146);
+ this.label3.Location = new System.Drawing.Point(15, 150);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(76, 13);
this.label3.TabIndex = 3;
diff --git a/psychorientation/psychorientation/InterfaceInfoEleve.cs b/psychorientation/psychorientation/InterfaceInfoEleve.cs
index ccfa2fc..b499ea9 100644
--- a/psychorientation/psychorientation/InterfaceInfoEleve.cs
+++ b/psychorientation/psychorientation/InterfaceInfoEleve.cs
@@ -13,7 +13,6 @@ namespace psychorientation
public partial class InterfaceInfoEleve : UserControl
{
Eleve eleve;
- List<string> listClasse;
public InterfaceInfoEleve()
{
InitializeComponent();
diff --git a/psychorientation/psychorientation/psychorientation.csproj b/psychorientation/psychorientation/psychorientation.csproj
index 16f7cf5..b5934bb 100644
--- a/psychorientation/psychorientation/psychorientation.csproj
+++ b/psychorientation/psychorientation/psychorientation.csproj
@@ -57,6 +57,12 @@
<Compile Include="InterfaceClasse.Designer.cs">
<DependentUpon>InterfaceClasse.cs</DependentUpon>
</Compile>
+ <Compile Include="InterfaceInfoCompletEleve.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="InterfaceInfoCompletEleve.Designer.cs">
+ <DependentUpon>InterfaceInfoCompletEleve.cs</DependentUpon>
+ </Compile>
<Compile Include="ListeEleve.cs">
<SubType>Form</SubType>
</Compile>
@@ -80,10 +86,13 @@
<Compile Include="Note.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="InterfaceClasse.resx">
- <DependentUpon>InterfaceClasse.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ListeEleve.resx">
+ <EmbeddedResource Include="InterfaceInfoCompletEleve.resx">
+ <DependentUpon>InterfaceInfoCompletEleve.cs</DependentUpon>
+ </EmbeddedResource>
<DependentUpon>ListeEleve.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="InterfaceInfoEleve.resx">
@@ -99,8 +108,7 @@
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
- <DependentUpon>Resources.resx</DependentUpon>
- <DesignTime>True</DesignTime>
+ <AutoGen>True</AutoGen>
</Compile>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
@@ -114,13 +122,7 @@
</Compile>
</ItemGroup>
<ItemGroup>
- <None Include="App.config" />
</ItemGroup>
<ItemGroup>
- <None Include="Resources\passer.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\salleV1.png" />
- </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
--
GitLab
From 435521ee2cae9ef1e9a9d6c88e76c41a49f3d5de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Gross?= <loic.gross@unistra.fr>
Date: Wed, 1 Apr 2020 17:53:58 +0200
Subject: [PATCH 2/4] =?UTF-8?q?InterfaceInfoCompletEleve=20barre=20effort?=
=?UTF-8?q?=20comp=C3=A9tence?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
psychorientation/psychorientation/InterfaceClasse.cs | 4 ++++
.../InterfaceInfoCompletEleve.Designer.cs | 2 +-
.../psychorientation/InterfaceInfoCompletEleve.cs | 7 +++++--
psychorientation/psychorientation/ListeEleve.cs | 5 -----
psychorientation/psychorientation/psychorientation.csproj | 8 +++++---
5 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/psychorientation/psychorientation/InterfaceClasse.cs b/psychorientation/psychorientation/InterfaceClasse.cs
index d28b2e6..68ad225 100644
--- a/psychorientation/psychorientation/InterfaceClasse.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.cs
@@ -28,6 +28,10 @@ namespace psychorientation
Message m_accueil = new Message(-1, "Bonjour apprenti prof, vous allez apprendre à éduquer des joueurs !! ", "Début", TypeMessage.INFORMATION);
m_accueil.ShowDialog();
+
+ InterfaceInfoCompletEleve iice = new InterfaceInfoCompletEleve();
+ iice.setParam(new Eleve(3));
+ iice.ShowDialog();
}
private void Pb_action_suivante_Click(object sender, EventArgs e)
diff --git a/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs b/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs
index 1c31329..bdaf1c6 100755
--- a/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs
+++ b/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs
@@ -137,7 +137,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(133, 18);
this.pnlCompetence.TabIndex = 7;
//
// lblMoyenneNote
diff --git a/psychorientation/psychorientation/InterfaceInfoCompletEleve.cs b/psychorientation/psychorientation/InterfaceInfoCompletEleve.cs
index 52fe073..8338f69 100755
--- a/psychorientation/psychorientation/InterfaceInfoCompletEleve.cs
+++ b/psychorientation/psychorientation/InterfaceInfoCompletEleve.cs
@@ -28,7 +28,8 @@ namespace psychorientation
}
- private void InterfaceInfoCompletEleve_Load(object sender, EventArgs e, Eleve el)
+
+ public void setParam(Eleve el)
{
this.eleve = el;
actualiser();
@@ -37,7 +38,9 @@ namespace psychorientation
private void actualiser()
{
Libelle lib = new Libelle();
- lblNomEleve.Text = "Eleve n°" + eleve.GetId();
+ string nom = "Eleve n°" + eleve.GetId();
+ this.Text = nom;
+ lblNomEleve.Text = nom;
lblNiveau.Text = lib.Niveau(eleve.GetClasse());
double moyenne = eleve.GetMoyenne();
if (moyenne == -1)
diff --git a/psychorientation/psychorientation/ListeEleve.cs b/psychorientation/psychorientation/ListeEleve.cs
index c9d7fec..2175b83 100755
--- a/psychorientation/psychorientation/ListeEleve.cs
+++ b/psychorientation/psychorientation/ListeEleve.cs
@@ -23,11 +23,6 @@ namespace psychorientation
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.GetListeEleves();
int y = 0;
foreach ( Eleve eleve in listEleve)
diff --git a/psychorientation/psychorientation/psychorientation.csproj b/psychorientation/psychorientation/psychorientation.csproj
index 546e853..5edca88 100644
--- a/psychorientation/psychorientation/psychorientation.csproj
+++ b/psychorientation/psychorientation/psychorientation.csproj
@@ -86,13 +86,13 @@
<Compile Include="Note.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="InterfaceClasse.resx">
+ <DependentUpon>InterfaceClasse.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="ListeEleve.resx">
<EmbeddedResource Include="InterfaceInfoCompletEleve.resx">
<DependentUpon>InterfaceInfoCompletEleve.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="ListeEleve.resx">
<DependentUpon>ListeEleve.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="InterfaceInfoEleve.resx">
@@ -108,7 +108,8 @@
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
- <AutoGen>True</AutoGen>
+ <DependentUpon>Resources.resx</DependentUpon>
+ <DesignTime>True</DesignTime>
</Compile>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
@@ -122,6 +123,7 @@
</Compile>
</ItemGroup>
<ItemGroup>
+ <None Include="App.config" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\passer.png" />
--
GitLab
From 7f634a4b6c2fb85e81e214029632d59d55938623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Gross?= <loic.gross@unistra.fr>
Date: Wed, 1 Apr 2020 18:26:18 +0200
Subject: [PATCH 3/4] =?UTF-8?q?Click=20ListeEleve=20=C3=A0=20InterfaceInfo?=
=?UTF-8?q?CompletEleve?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
psychorientation/psychorientation/InterfaceClasse.cs | 7 ++++---
.../InterfaceInfoCompletEleve.Designer.cs | 10 ++++++++++
.../psychorientation/InterfaceInfoEleve.Designer.cs | 12 ++++++++++++
.../psychorientation/InterfaceInfoEleve.cs | 9 ++++++++-
psychorientation/psychorientation/ListeEleve.cs | 6 ++++++
5 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/psychorientation/psychorientation/InterfaceClasse.cs b/psychorientation/psychorientation/InterfaceClasse.cs
index 68ad225..7e10da2 100644
--- a/psychorientation/psychorientation/InterfaceClasse.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.cs
@@ -29,9 +29,10 @@ namespace psychorientation
Message m_accueil = new Message(-1, "Bonjour apprenti prof, vous allez apprendre à éduquer des joueurs !! ", "Début", TypeMessage.INFORMATION);
m_accueil.ShowDialog();
- InterfaceInfoCompletEleve iice = new InterfaceInfoCompletEleve();
- iice.setParam(new Eleve(3));
- iice.ShowDialog();
+
+
+ ListeEleve listE = new ListeEleve();
+ listE.ShowDialog();
}
private void Pb_action_suivante_Click(object sender, EventArgs e)
diff --git a/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs b/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs
index bdaf1c6..2eb7f24 100755
--- a/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs
+++ b/psychorientation/psychorientation/InterfaceInfoCompletEleve.Designer.cs
@@ -40,6 +40,7 @@
this.pnlCompetence = new System.Windows.Forms.Panel();
this.lblMoyenneNote = new System.Windows.Forms.Label();
this.pcbEleve = new System.Windows.Forms.PictureBox();
+ this.pnlNote = new System.Windows.Forms.Panel();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pcbEleve)).BeginInit();
@@ -158,11 +159,19 @@
this.pcbEleve.TabIndex = 15;
this.pcbEleve.TabStop = false;
//
+ // pnlNote
+ //
+ this.pnlNote.Location = new System.Drawing.Point(98, 243);
+ this.pnlNote.Name = "pnlNote";
+ this.pnlNote.Size = new System.Drawing.Size(391, 134);
+ this.pnlNote.TabIndex = 16;
+ //
// InterfaceInfoCompletEleve
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(579, 408);
+ this.Controls.Add(this.pnlNote);
this.Controls.Add(this.pcbEleve);
this.Controls.Add(this.lblMoyenneNote);
this.Controls.Add(this.panel2);
@@ -198,5 +207,6 @@
private System.Windows.Forms.Panel pnlCompetence;
private System.Windows.Forms.Label lblMoyenneNote;
private System.Windows.Forms.PictureBox pcbEleve;
+ private System.Windows.Forms.Panel pnlNote;
}
}
\ No newline at end of file
diff --git a/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs b/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
index 6a1cccf..f15db69 100644
--- a/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
+++ b/psychorientation/psychorientation/InterfaceInfoEleve.Designer.cs
@@ -54,6 +54,7 @@
this.lblEleve.Size = new System.Drawing.Size(99, 33);
this.lblEleve.TabIndex = 0;
this.lblEleve.Text = "label1";
+ this.lblEleve.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// label1
//
@@ -63,6 +64,7 @@
this.label1.Size = new System.Drawing.Size(50, 13);
this.label1.TabIndex = 1;
this.label1.Text = "Classe : ";
+ this.label1.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// label2
//
@@ -72,6 +74,7 @@
this.label2.Size = new System.Drawing.Size(41, 13);
this.label2.TabIndex = 2;
this.label2.Text = "Effort : ";
+ this.label2.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// label3
//
@@ -81,6 +84,7 @@
this.label3.Size = new System.Drawing.Size(76, 13);
this.label3.TabIndex = 3;
this.label3.Text = "Compétence : ";
+ this.label3.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// lblClasse
//
@@ -90,6 +94,7 @@
this.lblClasse.Size = new System.Drawing.Size(35, 13);
this.lblClasse.TabIndex = 4;
this.lblClasse.Text = "label4";
+ this.lblClasse.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// panel1
//
@@ -99,6 +104,7 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(139, 26);
this.panel1.TabIndex = 5;
+ this.panel1.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// pnlEffort
//
@@ -107,6 +113,7 @@
this.pnlEffort.Name = "pnlEffort";
this.pnlEffort.Size = new System.Drawing.Size(133, 18);
this.pnlEffort.TabIndex = 6;
+ this.pnlEffort.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// panel2
//
@@ -116,6 +123,7 @@
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(139, 26);
this.panel2.TabIndex = 6;
+ this.panel2.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// pnlCompetence
//
@@ -124,6 +132,7 @@
this.pnlCompetence.Name = "pnlCompetence";
this.pnlCompetence.Size = new System.Drawing.Size(125, 18);
this.pnlCompetence.TabIndex = 7;
+ this.pnlCompetence.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// lblEffort
//
@@ -149,6 +158,7 @@
this.label4.Size = new System.Drawing.Size(98, 13);
this.label4.TabIndex = 9;
this.label4.Text = "Moyenne général : ";
+ this.label4.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// lblMoyenne
//
@@ -158,6 +168,7 @@
this.lblMoyenne.Size = new System.Drawing.Size(35, 13);
this.lblMoyenne.TabIndex = 10;
this.lblMoyenne.Text = "label5";
+ this.lblMoyenne.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
//
// InterfaceInfoEleve
//
@@ -177,6 +188,7 @@
this.Name = "InterfaceInfoEleve";
this.Size = new System.Drawing.Size(246, 216);
this.Load += new System.EventHandler(this.InterfaceInfoEleve_Load);
+ this.Click += new System.EventHandler(this.InterfaceInfoEleve_Click);
this.panel1.ResumeLayout(false);
this.panel2.ResumeLayout(false);
this.ResumeLayout(false);
diff --git a/psychorientation/psychorientation/InterfaceInfoEleve.cs b/psychorientation/psychorientation/InterfaceInfoEleve.cs
index 10b55ce..80c58fe 100644
--- a/psychorientation/psychorientation/InterfaceInfoEleve.cs
+++ b/psychorientation/psychorientation/InterfaceInfoEleve.cs
@@ -20,7 +20,7 @@ namespace psychorientation
private void InterfaceInfoEleve_Load(object sender, EventArgs e)
{
-
+
}
public void setParam(Eleve el)
@@ -54,5 +54,12 @@ namespace psychorientation
int val = (int)valeur;
p.Size = new Size(val * 133 / 10, p.Height);
}
+
+ private void InterfaceInfoEleve_Click(object sender, EventArgs e)
+ {
+ InterfaceInfoCompletEleve iice = new InterfaceInfoCompletEleve();
+ iice.setParam(this.eleve);
+ iice.Show();
+ }
}
}
diff --git a/psychorientation/psychorientation/ListeEleve.cs b/psychorientation/psychorientation/ListeEleve.cs
index 2175b83..465ead1 100755
--- a/psychorientation/psychorientation/ListeEleve.cs
+++ b/psychorientation/psychorientation/ListeEleve.cs
@@ -23,6 +23,12 @@ namespace psychorientation
GestionnaireEleve gestEleve = new GestionnaireEleve();
Libelle lib = new Libelle();
+ // TEST
+ //Eleve e1 = new Eleve(4);
+ //Eleve e2 = new Eleve(5);
+ //gestEleve.AjouterEleve(e1);
+ //gestEleve.AjouterEleve(e2);
+
List<Eleve> listEleve = gestEleve.GetListeEleves();
int y = 0;
foreach ( Eleve eleve in listEleve)
--
GitLab
From b0c6853e1febf61823fbe3aa79721936473c213c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Gross?= <loic.gross@unistra.fr>
Date: Wed, 1 Apr 2020 18:29:12 +0200
Subject: [PATCH 4/4] InterfaceInfoCompletEleve appararitions show
---
psychorientation/psychorientation/InterfaceClasse.cs | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/psychorientation/psychorientation/InterfaceClasse.cs b/psychorientation/psychorientation/InterfaceClasse.cs
index e1cfcd6..d28b2e6 100644
--- a/psychorientation/psychorientation/InterfaceClasse.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.cs
@@ -28,11 +28,6 @@ namespace psychorientation
Message m_accueil = new Message(-1, "Bonjour apprenti prof, vous allez apprendre à éduquer des joueurs !! ", "Début", TypeMessage.INFORMATION);
m_accueil.ShowDialog();
-
-
-
- ListeEleve listE = new ListeEleve();
- listE.ShowDialog();
}
private void Pb_action_suivante_Click(object sender, EventArgs e)
@@ -74,8 +69,7 @@ namespace psychorientation
private void Pb_liste_eleves_Click(object sender, EventArgs e)
{
- ListeEleve le = new ListeEleve();
- le.Show();
+
}
private void InterfaceClasse_SizeChanged(object sender, EventArgs e)
--
GitLab