Skip to content

Commit

Permalink
💄 Numbers in charts have now the same decimals as the display values
Browse files Browse the repository at this point in the history
  • Loading branch information
@neoground
neoground committed Mar 7, 2021
1 parent 1c17889 commit afc1451
Show file tree
Hide file tree
Showing 9 changed files with 104 additions and 103 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Added

- Unit labels to y-axis of charts
- Numbers in charts now have units
- Missing favicons
- Skin version
- Imprint / privacy links in the footer can be set in skin.conf
Expand All @@ -13,6 +14,7 @@
### Changed

- iOS Webapp appearance is now better and includes a splash screen
- Numbers in charts have the same decimals as the display values


## 1.3 (2021-03-07)
Expand Down
26 changes: 13 additions & 13 deletions src/index.html.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.outTemp";
return formatNumber(val, "$unit.format.outTemp") + "$unit.label.outTemp";
}
}
},
Expand Down Expand Up @@ -524,7 +524,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.windchill";
return formatNumber(val, "$unit.format.windchill") + "$unit.label.windchill";
}
}
},
Expand Down Expand Up @@ -560,7 +560,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.barometer";
return formatNumber(val, "$unit.format.barometer") + "$unit.label.barometer";
}
}
},
Expand Down Expand Up @@ -588,7 +588,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.rain";
return formatNumber(val, "$unit.format.rain") + "$unit.label.rain";
}
}
},
Expand Down Expand Up @@ -616,7 +616,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.windSpeed";
return formatNumber(val, "$unit.format.windSpeed") + "$unit.label.windSpeed";
}
}
},
Expand Down Expand Up @@ -652,7 +652,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.outHumidity";
return formatNumber(val, "$unit.format.outHumidity") + "$unit.label.outHumidity";
}
}
},
Expand Down Expand Up @@ -764,7 +764,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.windSpeed";
return formatNumber(val, "$unit.format.windSpeed") + "$unit.label.windSpeed";
}
}
},
Expand Down Expand Up @@ -793,7 +793,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.UV";
return formatNumber(val, "$unit.format.UV") + "$unit.label.UV";
}
}
},
Expand All @@ -819,7 +819,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.ET";
return formatNumber(val, "$unit.format.ET") + "$unit.label.ET";
}
}
},
Expand All @@ -845,7 +845,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.radiation";
return formatNumber(val, "$unit.format.radiation") + "$unit.label.radiation";
}
}
},
Expand Down Expand Up @@ -875,7 +875,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.extraTemp1";
return formatNumber(val, "$unit.format.extraTemp1") + "$unit.label.extraTemp1";
}
}
},
Expand All @@ -901,7 +901,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.extraTemp2";
return formatNumber(val, "$unit.format.extraTemp2") + "$unit.label.extraTemp2";
}
}
},
Expand All @@ -927,7 +927,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.extraTemp3";
return formatNumber(val, "$unit.format.extraTemp3") + "$unit.label.extraTemp3";
}
}
},
Expand Down
23 changes: 11 additions & 12 deletions src/js/app.js
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
$(document).ready(function() {
// Archive sub menu handling especially for mobile
$('.dropdown-submenu > a').on("click", function(e) {
var submenu = $(this);
$('.dropdown-submenu .dropdown-menu').removeClass('show');
submenu.next('.dropdown-menu').addClass('show');
e.stopPropagation();
});
// Tooltip support
$(function () {
$('[data-toggle="tooltip"]').tooltip()
});

$(function () {
$('[data-toggle="tooltip"]').tooltip()
});
});
// Number rounding based on weewx values
// Example: Number: 34.5678 Format: %.2f Result: 34.57
function formatNumber(no, format) {
// Extract number of decimal places from format
format = format.replace(/[^0-9]/g, '');
return no.toFixed(format);
}
26 changes: 13 additions & 13 deletions src/month-%Y-%m.html.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.outTemp";
return formatNumber(val, "$unit.format.outTemp") + "$unit.label.outTemp";
}
}
},
Expand Down Expand Up @@ -549,7 +549,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.windchill";
return formatNumber(val, "$unit.format.windchill") + "$unit.label.windchill";
}
}
},
Expand Down Expand Up @@ -584,7 +584,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.barometer";
return formatNumber(val, "$unit.format.barometer") + "$unit.label.barometer";
}
}
},
Expand Down Expand Up @@ -614,7 +614,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.rain";
return formatNumber(val, "$unit.format.rain") + "$unit.label.rain";
}
}
},
Expand Down Expand Up @@ -650,7 +650,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.windSpeed";
return formatNumber(val, "$unit.format.windSpeed") + "$unit.label.windSpeed";
}
}
},
Expand Down Expand Up @@ -684,7 +684,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.outHumidity";
return formatNumber(val, "$unit.format.outHumidity") + "$unit.label.outHumidity";
}
}
},
Expand Down Expand Up @@ -792,7 +792,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.windSpeed";
return formatNumber(val, "$unit.format.windSpeed") + "$unit.label.windSpeed";
}
}
},
Expand Down Expand Up @@ -821,7 +821,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.UV";
return formatNumber(val, "$unit.format.UV") + "$unit.label.UV";
}
}
},
Expand All @@ -847,7 +847,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.ET";
return formatNumber(val, "$unit.format.ET") + "$unit.label.ET";
}
}
},
Expand All @@ -873,7 +873,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.radiation";
return formatNumber(val, "$unit.format.radiation") + "$unit.label.radiation";
}
}
},
Expand Down Expand Up @@ -903,7 +903,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.extraTemp1";
return formatNumber(val, "$unit.format.extraTemp1") + "$unit.label.extraTemp1";
}
}
},
Expand All @@ -929,7 +929,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.extraTemp2";
return formatNumber(val, "$unit.format.extraTemp2") + "$unit.label.extraTemp2";
}
}
},
Expand All @@ -955,7 +955,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.extraTemp3";
return formatNumber(val, "$unit.format.extraTemp3") + "$unit.label.extraTemp3";
}
}
},
Expand Down
26 changes: 13 additions & 13 deletions src/month.html.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.outTemp";
return formatNumber(val, "$unit.format.outTemp") + "$unit.label.outTemp";
}
}
},
Expand Down Expand Up @@ -533,7 +533,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.windchill";
return formatNumber(val, "$unit.format.windchill") + "$unit.label.windchill";
}
}
},
Expand Down Expand Up @@ -567,7 +567,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.barometer";
return formatNumber(val, "$unit.format.barometer") + "$unit.label.barometer";
}
}
},
Expand Down Expand Up @@ -597,7 +597,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.rain";
return formatNumber(val, "$unit.format.rain") + "$unit.label.rain";
}
}
},
Expand Down Expand Up @@ -633,7 +633,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.windSpeed";
return formatNumber(val, "$unit.format.windSpeed") + "$unit.label.windSpeed";
}
}
},
Expand Down Expand Up @@ -667,7 +667,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.outHumidity";
return formatNumber(val, "$unit.format.outHumidity") + "$unit.label.outHumidity";
}
}
},
Expand Down Expand Up @@ -775,7 +775,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.windSpeed";
return formatNumber(val, "$unit.format.windSpeed") + "$unit.label.windSpeed";
}
}
},
Expand Down Expand Up @@ -804,7 +804,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.UV";
return formatNumber(val, "$unit.format.UV") + "$unit.label.UV";
}
}
},
Expand All @@ -830,7 +830,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.ET";
return formatNumber(val, "$unit.format.ET") + "$unit.label.ET";
}
}
},
Expand All @@ -856,7 +856,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.radiation";
return formatNumber(val, "$unit.format.radiation") + "$unit.label.radiation";
}
}
},
Expand Down Expand Up @@ -886,7 +886,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.extraTemp1";
return formatNumber(val, "$unit.format.extraTemp1") + "$unit.label.extraTemp1";
}
}
},
Expand All @@ -912,7 +912,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.extraTemp2";
return formatNumber(val, "$unit.format.extraTemp2") + "$unit.label.extraTemp2";
}
}
},
Expand All @@ -938,7 +938,7 @@
yaxis: {
labels: {
formatter: function (val) {
return val + "$unit.label.extraTemp3";
return formatNumber(val, "$unit.format.extraTemp3") + "$unit.label.extraTemp3";
}
}
},
Expand Down
Loading

0 comments on commit afc1451

Please sign in to comment.