kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-15 19:41:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #533 from roramirez/onlyTemp

Browse Source 
Only temp
This commit is contained in:
Michael Teeuw 2016-11-21 11:02:30 +01:00 committed by GitHub
commit 980835981f
2 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/default/currentweather/README.md
View File

@ -113,7 +113,14 @@ The following properties can be configured:
<br><b>Default value:</b> <code>false</code> <br><b>Default value:</b> <code>false</code>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><code>onlyTemp</code></td>
<td>Show only current Temperature and weather icon.<br>
<br><b>Possible values:</b> <code>true</code> or <code>false</code>
<br><b>Default value:</b> <code>false</code>
</td>
</tr>
<tr>
<td><code>useBeaufort</code></td> <td><code>useBeaufort</code></td>
<td>Pick between using the Beaufort scale for wind speed or using the default units.<br> <td>Pick between using the Beaufort scale for wind speed or using the default units.<br>
<br><b>Possible values:</b> <code>true</code> or <code>false</code> <br><b>Possible values:</b> <code>true</code> or <code>false</code>

51
modules/default/currentweather/currentweather.js
View File

@ -35,6 +35,8 @@ Module.register("currentweather",{
appendLocationNameToHeader: true, appendLocationNameToHeader: true,
calendarClass: "calendar", calendarClass: "calendar",
onlyTemp: false,
iconTable: { iconTable: {
"01d": "wi-day-sunny", "01d": "wi-day-sunny",
"02d": "wi-day-cloudy", "02d": "wi-day-cloudy",
@ -100,21 +102,9 @@ Module.register("currentweather",{
}, },
// Override dom generator. // add extra information of current weather
getDom: function() { // windDirection, humidity, sunrise and sunset
var wrapper = document.createElement("div"); addExtraInfoWeather: function(wrapper) {
if (this.config.appid === "") {
wrapper.innerHTML = "Please set the correct openweather <i>appid</i> in the config for module: " + this.name + ".";
wrapper.className = "dimmed light small";
return wrapper;
}
if (!this.loaded) {
wrapper.innerHTML = this.translate('LOADING');
wrapper.className = "dimmed light small";
return wrapper;
}
var small = document.createElement("div"); var small = document.createElement("div");
small.className = "normal medium"; small.className = "normal medium";
@ -142,7 +132,7 @@ Module.register("currentweather",{
humidity.innerHTML = this.humidity; humidity.innerHTML = this.humidity;
var spacer = document.createElement("sup"); var spacer = document.createElement("sup");
spacer.innerHTML = "&nbsp;"; spacer.innerHTML = "&nbsp;";
var humidityIcon = document.createElement("sup"); var humidityIcon = document.createElement("sup");
humidityIcon.className = "wi wi-humidity humidityIcon"; humidityIcon.className = "wi wi-humidity humidityIcon";
@ -162,6 +152,27 @@ Module.register("currentweather",{
small.appendChild(sunriseSunsetTime); small.appendChild(sunriseSunsetTime);
wrapper.appendChild(small); wrapper.appendChild(small);
},
// Override dom generator.
getDom: function() {
var wrapper = document.createElement("div");
if (this.config.appid === "") {
wrapper.innerHTML = "Please set the correct openweather <i>appid</i> in the config for module: " + this.name + ".";
wrapper.className = "dimmed light small";
return wrapper;
}
if (!this.loaded) {
wrapper.innerHTML = this.translate('LOADING');
wrapper.className = "dimmed light small";
return wrapper;
}
if (this.config.onlyTemp === false) {
this.addExtraInfoWeather(wrapper);
}
var large = document.createElement("div"); var large = document.createElement("div");
large.className = "large light"; large.className = "large light";
@ -197,15 +208,15 @@ Module.register("currentweather",{
} }
if (notification === "CALENDAR_EVENTS") { if (notification === "CALENDAR_EVENTS") {
var senderClasses = sender.data.classes.toLowerCase().split(" "); var senderClasses = sender.data.classes.toLowerCase().split(" ");
if (senderClasses.indexOf(this.config.calendarClass.toLowerCase()) !== -1) { if (senderClasses.indexOf(this.config.calendarClass.toLowerCase()) !== -1) {
var lastEvent = this.firstEvent; var lastEvent = this.firstEvent;
this.firstEvent = false; this.firstEvent = false;
for (e in payload) { for (e in payload) {
var event = payload[e]; var event = payload[e];
if (event.location || event.geo) { if (event.location || event.geo) {
this.firstEvent = event; this.firstEvent = event;
//Log.log("First upcoming event with location: ", event); //Log.log("First upcoming event with location: ", event);
break; break;
} }
} }
@ -222,7 +233,7 @@ Module.register("currentweather",{
Log.error("CurrentWeather: APPID not set!"); Log.error("CurrentWeather: APPID not set!");
return; return;
} }
var url = this.config.apiBase + this.config.apiVersion + "/" + this.config.weatherEndpoint + this.getParams(); var url = this.config.apiBase + this.config.apiVersion + "/" + this.config.weatherEndpoint + this.getParams();
var self = this; var self = this;
var retry = true; var retry = true;