energy device optimizations and correct labelling

Author: fellownet

main/SQLHelper.cpp

@@ -2432,10 +2432,6 @@ bool CSQLHelper::OpenDatabase()
 	if (nValue < 1)
 		nValue = 5;
 	m_ShortLogInterval = nValue;
-	if (!GetPreferencesVar("DisplayPowerUsageInkWhGraph", nValue))
-	{
-		UpdatePreferencesVar("DisplayPowerUsageInkWhGraph", 1);
-	}
 	//Start background thread
 	if (!StartThread())
 		return false;

main/WebServer.cpp

@@ -6549,7 +6549,6 @@ namespace http {
 			}
 			m_sql.UpdatePreferencesVar("DoorbellCommand", atoi(request::findValue(&req, "DoorbellCommand").c_str()));
 			m_sql.UpdatePreferencesVar("SmartMeterType", atoi(request::findValue(&req, "SmartMeterType").c_str()));
-			m_sql.UpdatePreferencesVar("DisplayPowerUsageInkWhGraph", atoi(request::findValue(&req, "DisplayPowerUsageInkWhGraph").c_str()));
 
 			std::string EnableTabFloorplans = request::findValue(&req, "EnableTabFloorplans");
 			m_sql.UpdatePreferencesVar("EnableTabFloorplans", (EnableTabFloorplans == "on" ? 1 : 0));
@@ -11142,10 +11141,6 @@ namespace http {
 				{
 					root["SmartMeterType"] = nValue;
 				}
-				else if (Key == "DisplayPowerUsageInkWhGraph")
-				{
-					root["DisplayPowerUsageInkWhGraph"] = nValue;
-				}
 				else if (Key == "EnableTabFloorplans")
 				{
 					root["EnableTabFloorplans"] = nValue;
@@ -12295,19 +12290,6 @@ namespace http {
 						if ((dType == pTypeYouLess) && ((metertype == MTYPE_ENERGY) || (metertype == MTYPE_ENERGY_GENERATED)))
 							method = 1;
 
-						int iDisplayInPower = 1;
-						m_sql.GetPreferencesVar("DisplayPowerUsageInkWhGraph", iDisplayInPower);
-						if (!iDisplayInPower)
-						{
-							// Force Value graph even if device should show Value graph
-							if ((method == 1) && (
-								((dType == pTypeENERGY) && ((dSubType == sTypeELEC2) || (dSubType == sTypeELEC3))) ||
-								((dType == pTypeGeneral) && (dSubType == sTypeKwh))
-								)) {
-								//_log.Log(LOG_ERROR, "Energy/CMxxx or General/kWh device graph method should be 0!");
-								method = 0;
-							}
-						}
 						if (method != 0)
 						{
 							//realtime graph

www/app/SetupController.js

@@ -447,9 +447,6 @@ define(['app'], function (app) {
 			  if (typeof data.SmartMeterType != 'undefined') {
 				$("#p1metertable #comboP1MeterType").val(data.SmartMeterType);
 			  }
-			  if (typeof data.DisplayPowerUsageInkWhGraph != 'undefined') {
-				$("#kwhshortlogtable #combokWhShotlogDisplay").val(data.DisplayPowerUsageInkWhGraph);
-			  }
 			  if (typeof data.EnableTabFloorplans != 'undefined') {
 				$("#activemenustable #EnableTabFloorplans").prop('checked',data.EnableTabFloorplans==1);
 			  }

www/html5.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# ref 1251
+# ref 1254
 
 CACHE:
 # CSS

www/images/down2.png

@@ -1041,7 +1041,7 @@ <h2 data-i18n="Year">Year</h2>
 		<a class="btnstylerev" onclick="ShowP1YearReportGas(0)" data-i18n="Back">Back</a>&nbsp;
 		<h1 id="theader" data-i18n="Usage this Month">Usage this Month</h1>
 		<br>
-		<span data-i18n="Total Usage">Total Usage</span>: <span id="tu">-</span> <span id="munit">m3</span><br>
+		<span data-i18n="Total Usage" id="spanmonthgastotalusage">Total Usage</span>: <span id="tu">-</span> <span id="munit">m3</span><br>
 		<span data-i18n="Monthly Cost">Monthly Cost</span>: <span id="mc">-</span><br>
 		<br>
 	</div>
@@ -1067,7 +1067,7 @@ <h1 id="theader" data-i18n="Usage this Year">Usage this Year</h1>
 		</tr>
 		</table>
 		<br>
-		<span data-i18n="Total Usage">Total Usage</span>: <span id="tu">-</span> <span id="munit">m3</span><br>
+		<span data-i18n="Total Usage" id="spanyeargastotalusage">Total Usage</span>: <span id="tu">-</span> <span id="munit">m3</span><br>
 		<span data-i18n="Counter">Counter</span>: <span id="cntr">-</span><br>
 		<span data-i18n="Year Cost">Year Cost</span>: <span id="mc">-</span><br>
 		<br>
@@ -1197,7 +1197,7 @@ <h1 id="theader"></h1>
 					<th width="30" align="right" data-i18n="Day">Day</th>
 					<th width="70" align="left"></th>
 					<th width="60" align="right" data-i18n="Counter">Counter</th>
-					<th width="60" align="right" data-i18n="Usage">Usage</th>
+					<th width="60" align="right" data-i18n="Usage" id="thmonthgasusage">Usage</th>
 					<th width="60" align="right" data-i18n="Costs">Costs</th>
 					<th width="40" align="right">&lt;&gt;</th>
 				</tr>
@@ -1211,7 +1211,7 @@ <h1 id="theader"></h1>
 			<thead>
 				<tr valign="middle">
 					<th width="30" align="right" data-i18n="Month">Month</th>
-					<th width="60" align="right" data-i18n="Usage">Usage</th>
+					<th width="60" align="right" data-i18n="Usage" id="thyeargasusage">Usage</th>
 					<th width="60" align="right" data-i18n="Costs">Costs</th>
 					<th width="40" align="right">&lt;&gt;</th>
 				</tr>

www/images/up2.png

@@ -769,17 +769,6 @@ <h2><span data-i18n="P1 Smart Meter Type"></span>:</h2>
 									</select></td>
 								</tr>
 							</table>
-							<br>
-							<h2><span data-i18n="General/kWh Day Graph with Power">General/kWh Day Graph with Power</span>:</h2>
-							<table class="display" id="kwhshortlogtable" border="0" cellpadding="0" cellspacing="0">
-								<tr>
-									<td align="right" style="width:60px"><label><span data-i18n="Display"></span>: </label></td>
-									<td><select id="combokWhShotlogDisplay" name="DisplayPowerUsageInkWhGraph" style="width:180px" class="combobox ui-corner-all">
-										<option value="0" data-i18n="Energy day graph">Energy day graph</option>
-										<option value="1" data-i18n="Power day graph">Power day graph</option>
-									</select></td>
-								</tr>
-							</table>
 						</section>
 					</div>
 					<div class="tab-pane" id="tabfloorplan">