diff --git a/scripts/fonctions.js b/scripts/fonctions.js index d06fa9d..c1fa5d4 100644 --- a/scripts/fonctions.js +++ b/scripts/fonctions.js @@ -193,7 +193,7 @@ function convertCurrency(value, currency, url) { $('.results').html(formatNumberResult(value) + ' ' + jsonFixer.base + ' = ' + ((parseFloat(jsonFixer.rates.MXN) * value)).toFixed(2) + ' ' + currency); $('.rateDate').html("Dernier rafraîchissement du taux d'échange : " + jsonFixer.date); break; - case 'Fr': + case 'CHF': $('.results').html(formatNumberResult(value) + ' ' + jsonFixer.base + ' = ' + ((parseFloat(jsonFixer.rates.CHF) * value)).toFixed(2) + ' ' + currency); $('.rateDate').html("Dernier rafraîchissement du taux d'échange : " + jsonFixer.date); break; diff --git a/scripts/main.js b/scripts/main.js index 4de0368..da4a0b8 100644 --- a/scripts/main.js +++ b/scripts/main.js @@ -42,13 +42,10 @@ $(function () { { $('.results').html("Nombre aléatoire compris entre " + minEntered + " inclus et " + maxEntered + " inclus : " + formatNumberResult(result)); } - else if (minEntered > maxEntered) { - $('.results').html("Votre nombre minimum est plus grand que le nombre maximum."); + else + { + $('.results').html(messageError); } - else - { - $('.results').html(messageError); - } } }); diff --git a/views/function-views/convertCurrency.php b/views/function-views/convertCurrency.php index a51b0ea..dc20bcd 100644 --- a/views/function-views/convertCurrency.php +++ b/views/function-views/convertCurrency.php @@ -33,7 +33,7 @@ - + @@ -42,6 +42,7 @@
+