From f073c5a49e58577950da2ef018de76392fa55579 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20F=C3=A9lix?= <felixantoine67@yahoo.fr>
Date: Fri, 3 Apr 2020 14:31:14 +0200
Subject: [PATCH] Ajout de coefficients pertinents.
---
psychorientation/psychorientation/InterfaceClasse.cs | 1 +
psychorientation/psychorientation/Message.cs | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/psychorientation/psychorientation/InterfaceClasse.cs b/psychorientation/psychorientation/InterfaceClasse.cs
index 970b29a..96dacde 100644
--- a/psychorientation/psychorientation/InterfaceClasse.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.cs
@@ -225,6 +225,7 @@ namespace psychorientation
m_fin.ShowDialog();
UntransmitKeyDown();
pb_action_suivante.Click -= new System.EventHandler(Pb_action_suivante_Click);
+ Close();
break;
}
diff --git a/psychorientation/psychorientation/Message.cs b/psychorientation/psychorientation/Message.cs
index d6d9b84..e9dc2f7 100644
--- a/psychorientation/psychorientation/Message.cs
+++ b/psychorientation/psychorientation/Message.cs
@@ -49,7 +49,7 @@ namespace psychorientation
public void setParamRes(double effortInitial, double competenceInitial, double moyenneInitiale, double effortFinal, double competenceFinal, double moyenneFinale)
{
effortScore = Math.Round(100 * (effortFinal - effortInitial) / effortInitial, 1);
- competenceScore = Math.Round(100 * (competenceFinal - competenceInitial) / competenceInitial, 1);
+ competenceScore = Math.Round(100 * (competenceFinal - competenceInitial) / competenceInitial, 1);
moyenneScore = Math.Round(100 * (moyenneFinale - moyenneInitiale) / moyenneInitiale, 1);
effortLimite = Math.Round(100 * ((10 - effortInitial) / 3) / effortInitial, 1);
competenceLimite = Math.Round(100 * ((10 - competenceInitial) / 4) / competenceInitial, 1);
--
GitLab