Skip to content

Commit 5d3d298

Browse files
author
TrystanLea
committed
fix cop in window in power view
1 parent ab3028b commit 5d3d298

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

apps/OpenEnergyMonitor/myheatpump/myheatpump.js

+9
Original file line numberDiff line numberDiff line change
@@ -999,6 +999,14 @@ function powergraph_load()
999999
if (heat_enabled) heat_mean = feedstats["heatpump_heat"].mean;
10001000
if (elec_mean>0) {
10011001
$("#window-cop").html((heat_mean / elec_mean).toFixed(2));
1002+
1003+
var tooltip_text = "";
1004+
tooltip_text += "Electric: "+feedstats["heatpump_elec"].kwh.toFixed(1)+" kWh\n";
1005+
if (feedstats["heatpump_heat"]!=undefined) {
1006+
tooltip_text += "Heat: "+feedstats["heatpump_heat"].kwh.toFixed(1)+" kWh\n";
1007+
}
1008+
$("#window-cop").attr("title",tooltip_text);
1009+
10021010
if (feedstats["heatpump_heat"]!=undefined) {
10031011
$("#standby_cop").html((feedstats["heatpump_heat"].kwh / (feedstats["heatpump_elec"].kwh-standby_kwh)).toFixed(2));
10041012
} else {
@@ -1243,6 +1251,7 @@ function bargraph_load(start,end)
12431251
tooltip_text += "Heat: "+heat_kwh_in_window.toFixed(0)+" kWh ("+(heat_kwh_in_window/days_heat).toFixed(1)+" kWh/d)\n";
12441252
tooltip_text += "Days: "+days_elec;
12451253
$("#window-cop").attr("title",tooltip_text);
1254+
12461255
$("#window-carnot-cop").html("");
12471256

12481257
set_url_view_params('daily',start,end);

apps/OpenEnergyMonitor/myheatpump/myheatpump.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -268,4 +268,4 @@
268268
config.name = "<?php echo $name; ?>";
269269
config.db = <?php echo json_encode($config); ?>;
270270
</script>
271-
<script type="text/javascript" src="<?php echo $path; ?>Modules/app/apps/OpenEnergyMonitor/myheatpump/myheatpump.js?v=71"></script>
271+
<script type="text/javascript" src="<?php echo $path; ?>Modules/app/apps/OpenEnergyMonitor/myheatpump/myheatpump.js?v=72"></script>

module.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name" : "App",
3-
"version" : "2.7.8",
3+
"version" : "2.7.9",
44
"location" : "/var/www/emoncms/Modules",
55
"branches_available": ["stable","master"]
66
}

0 commit comments

Comments
 (0)