diff --git a/psychorientation/psychorientation/InterfaceClasse.cs b/psychorientation/psychorientation/InterfaceClasse.cs index 970b29a3b92ed637c66337673645f0ac3da37055..96dacdef08368b3deeeff28e11e36f787e58c046 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 d6d9b8426f168d711c589661f0310afdd7dda8dd..e9dc2f737d185ed67349a091e66fefe819b61be6 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);