theoludwig/FunctionProject
theoludwig/FunctionProject
Archived
1
1
Fork 0
Code Pull Requests Actions Releases Activity

Removed Switch toDo sur weatherRequest

Browse Source
This commit is contained in:
Divlo 2019-09-16 18:17:02 +02:00
parent 8d11d1b804
commit 1739942c61
2 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
scripts/fonctions.js
View File

@ -2,37 +2,26 @@
/* Fonctions Principales */
// Requête à l'API openweathermap.org
function weatherRequest(url,toDo) {
function weatherRequest(url) {
$.ajax({
url : url,
dataType : "json",
success: function (json) {
let city = json.name;
let showDateTimeValue = timeZone(json);
switch (toDo) {
case 'time':
$('.results').html("La date et l'heure de " + city + " : " + showDateTimeValue);
$("#cityName, #submitWeatherRequest").click(function() {
document.location.replace("../../views/function-views/weatherRequest.php");
});
break;
case 'weather':
if(city === 'Moscou')
{
$('.results').html(`🌎 Position : <a href='https://www.google.com/maps/place/${city}/' class="yellow-color" target="_blank">${city}, RU</a><br>⏰ Date et heure : ${showDateTimeValue}<br>☁️ Météo : ${capitalize(json.weather[0].description)}<br> 🌡️ Température : ${json.main.temp} °C<br> 💧 Humidité : ${json.main.humidity}% <br> <img src="https://openweathermap.org/img/wn/${json.weather[0].icon}@2x.png"/>`);
$("#cityName, #submitWeatherRequest").click(function() {
document.location.replace("../../views/function-views/weatherRequest.php");
});
}
else
{
$('.results').html(`🌎 Position : <a href='https://www.google.com/maps/place/${city}/' class="yellow-color" target="_blank">${city}, ${json.sys.country}</a><br>⏰ Date et heure : ${showDateTimeValue}<br>☁️ Météo : ${capitalize(json.weather[0].description)}<br> 🌡️ Température : ${json.main.temp} °C<br> 💧 Humidité : ${json.main.humidity}% <br> <img src="https://openweathermap.org/img/wn/${json.weather[0].icon}@2x.png"/>`);
$("#cityName, #submitWeatherRequest").click(function() {
document.location.replace("../../views/function-views/weatherRequest.php");
});
}
break;
default:
if(city === 'Moscou')
{
$('.results').html(`🌎 Position : <a href='https://www.google.com/maps/place/${city}/' class="yellow-color" target="_blank">${city}, RU</a><br>⏰ Date et heure : ${showDateTimeValue}<br>☁️ Météo : ${capitalize(json.weather[0].description)}<br> 🌡️ Température : ${json.main.temp} °C<br> 💧 Humidité : ${json.main.humidity}% <br> <img src="https://openweathermap.org/img/wn/${json.weather[0].icon}@2x.png"/>`);
$("#cityName, #submitWeatherRequest").click(function() {
document.location.replace("../../views/function-views/weatherRequest.php");
});
}
else
{
$('.results').html(`🌎 Position : <a href='https://www.google.com/maps/place/${city}/' class="yellow-color" target="_blank">${city}, ${json.sys.country}</a><br>⏰ Date et heure : ${showDateTimeValue}<br>☁️ Météo : ${capitalize(json.weather[0].description)}<br> 🌡️ Température : ${json.main.temp} °C<br> 💧 Humidité : ${json.main.humidity}% <br> <img src="https://openweathermap.org/img/wn/${json.weather[0].icon}@2x.png"/>`);
$("#cityName, #submitWeatherRequest").click(function() {
document.location.replace("../../views/function-views/weatherRequest.php");
});
}
},
statusCode: {

2
scripts/main.js
View File

@ -22,7 +22,7 @@ $(function () {
else
{
let url = "https://api.openweathermap.org/data/2.5/weather?q=" + cityName + "&lang=fr&units=metric&appid=" + config.APIkeyWeather + "";
weatherRequest(url, 'weather');
weatherRequest(url);
}
});