Loading js/WeatherCard.js +25 −1 Original line number Diff line number Diff line Loading @@ -10,11 +10,15 @@ class WeatherCard{ this.prevision = null; } <<<<<<< HEAD async remplir() { ======= async remplir(jour) { >>>>>>> d4c2a5017a25d771f0ee3379c37cfa00204bee75 try { // Utilisez "await" pour attendre la réponse de la requête const response = await fetch( `https://api.meteo-concept.com/api/forecast/daily/${jour}?token=${Token}&insee=${this.CodeInsee}` `https://api.meteo-concept.com/api/forecast/daily?token=${Token}&insee=${this.CodeInsee}` ); if (!response.ok) { throw new Error(`Erreur de requête: ${response.status}`); Loading Loading @@ -42,8 +46,13 @@ class WeatherCard{ Ville(){ return this.ville["name"]; } <<<<<<< HEAD pourcentPluie(jour){ return this.prevision[jour].probarain; ======= pourcentPluie(){ return this.prevision.probarain; >>>>>>> d4c2a5017a25d771f0ee3379c37cfa00204bee75 } latitudeVille(){ return this.ville.latitude; Loading @@ -51,6 +60,20 @@ class WeatherCard{ longitudeVille(){ return this.ville.longitude; } <<<<<<< HEAD TempMin(jour){ return this.prevision[jour].tmin; } TempMax(jour){ return this.prevision[jour].tmax; } ensoleillement(jour){ return this.prevision[jour].sun_hours; } meteo(jour){ let weather=this.prevision[jour].weather; ======= TempMin(){ return this.prevision.tmin; } Loading @@ -63,6 +86,7 @@ class WeatherCard{ meteo(){ let weather=this.prevision.weather; >>>>>>> d4c2a5017a25d771f0ee3379c37cfa00204bee75 if (weather<0){ return Error; } Loading js/interface.js +12 −2 Original line number Diff line number Diff line Loading @@ -86,14 +86,24 @@ function onSelectionneVille(){ function afficherMeteo(weatherCard){ labelVille.textContent = weatherCard.Ville(); <<<<<<< HEAD labelBref.textContent = " :" + weatherCard.meteo(0); ======= labelBref.textContent = "Temps :" + weatherCard.meteo(); >>>>>>> d4c2a5017a25d771f0ee3379c37cfa00204bee75 labelTemperatureMin.textContent = `${weatherCard.TempMin()} °C`; labelTemperatureMax.textContent = `${weatherCard.TempMax()} °C`; labelTemperatureMin.textContent = `${weatherCard.TempMin(0)} °C`; labelTemperatureMax.textContent = `${weatherCard.TempMax(0)} °C`; <<<<<<< HEAD labelPluie.textContent = weatherCard.pourcentPluie(0) + "%"; labelEnsoleillement.textContent = `${weatherCard.ensoleillement(0)} heures`; ======= labelPluie.textContent = weatherCard.pourcentPluie() + "%"; labelEnsoleillement.textContent = `${weatherCard.ensoleillement()} heures`; >>>>>>> d4c2a5017a25d771f0ee3379c37cfa00204bee75 actualiserArrierePlan(weatherCard); Loading Loading
js/WeatherCard.js +25 −1 Original line number Diff line number Diff line Loading @@ -10,11 +10,15 @@ class WeatherCard{ this.prevision = null; } <<<<<<< HEAD async remplir() { ======= async remplir(jour) { >>>>>>> d4c2a5017a25d771f0ee3379c37cfa00204bee75 try { // Utilisez "await" pour attendre la réponse de la requête const response = await fetch( `https://api.meteo-concept.com/api/forecast/daily/${jour}?token=${Token}&insee=${this.CodeInsee}` `https://api.meteo-concept.com/api/forecast/daily?token=${Token}&insee=${this.CodeInsee}` ); if (!response.ok) { throw new Error(`Erreur de requête: ${response.status}`); Loading Loading @@ -42,8 +46,13 @@ class WeatherCard{ Ville(){ return this.ville["name"]; } <<<<<<< HEAD pourcentPluie(jour){ return this.prevision[jour].probarain; ======= pourcentPluie(){ return this.prevision.probarain; >>>>>>> d4c2a5017a25d771f0ee3379c37cfa00204bee75 } latitudeVille(){ return this.ville.latitude; Loading @@ -51,6 +60,20 @@ class WeatherCard{ longitudeVille(){ return this.ville.longitude; } <<<<<<< HEAD TempMin(jour){ return this.prevision[jour].tmin; } TempMax(jour){ return this.prevision[jour].tmax; } ensoleillement(jour){ return this.prevision[jour].sun_hours; } meteo(jour){ let weather=this.prevision[jour].weather; ======= TempMin(){ return this.prevision.tmin; } Loading @@ -63,6 +86,7 @@ class WeatherCard{ meteo(){ let weather=this.prevision.weather; >>>>>>> d4c2a5017a25d771f0ee3379c37cfa00204bee75 if (weather<0){ return Error; } Loading
js/interface.js +12 −2 Original line number Diff line number Diff line Loading @@ -86,14 +86,24 @@ function onSelectionneVille(){ function afficherMeteo(weatherCard){ labelVille.textContent = weatherCard.Ville(); <<<<<<< HEAD labelBref.textContent = " :" + weatherCard.meteo(0); ======= labelBref.textContent = "Temps :" + weatherCard.meteo(); >>>>>>> d4c2a5017a25d771f0ee3379c37cfa00204bee75 labelTemperatureMin.textContent = `${weatherCard.TempMin()} °C`; labelTemperatureMax.textContent = `${weatherCard.TempMax()} °C`; labelTemperatureMin.textContent = `${weatherCard.TempMin(0)} °C`; labelTemperatureMax.textContent = `${weatherCard.TempMax(0)} °C`; <<<<<<< HEAD labelPluie.textContent = weatherCard.pourcentPluie(0) + "%"; labelEnsoleillement.textContent = `${weatherCard.ensoleillement(0)} heures`; ======= labelPluie.textContent = weatherCard.pourcentPluie() + "%"; labelEnsoleillement.textContent = `${weatherCard.ensoleillement()} heures`; >>>>>>> d4c2a5017a25d771f0ee3379c37cfa00204bee75 actualiserArrierePlan(weatherCard); Loading