From 627a50ab509a97239d19fbf9bafed0588a1fb680 Mon Sep 17 00:00:00 2001
From: Gunnar Skjold <gunnar@origin.no>
Date: Sun, 16 Oct 2022 18:46:31 +0200
Subject: [PATCH] Fixed priceapi dropdowns

---
 src/web/AmsWebServer.cpp | 36 +++++++++++++++---------------------
 web/priceapi.html        | 30 +++++++++++++++---------------
 2 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp
index 21215df4..ba6e69c8 100644
--- a/src/web/AmsWebServer.cpp
+++ b/src/web/AmsWebServer.cpp
@@ -555,31 +555,25 @@ void AmsWebServer::configPriceApiHtml() {
 	if(ESP.getFreeHeap() > 32000) {
 		html.replace("{et}", entsoe.token);
 		html.replace("{dt}", "");
-		html.replace("{em}", String(entsoe.multiplier / 1000.0, 3));
-
-		server.setContentLength(html.length() + HEAD_HTML_LEN + FOOT_HTML_LEN);
-		server.send_P(200, MIME_HTML, HEAD_HTML);
-		server.sendContent(html);
-		server.sendContent_P(FOOT_HTML);
 	} else {
 		html.replace("{et}", "");
 		html.replace("{dt}", "d-none");
 	}
 	html.replace("{em}", String(entsoe.multiplier / 1000.0, 3));
 
-	html.replace("{eaNo1}", strcmp(entsoe.area, "10YNO-1--------2") == 0 ? "selected" : "");
-	html.replace("{eaNo2}", strcmp(entsoe.area, "10YNO-2--------T") == 0 ? "selected" : "");
-	html.replace("{eaNo3}", strcmp(entsoe.area, "10YNO-3--------J") == 0 ? "selected" : "");
-	html.replace("{eaNo4}", strcmp(entsoe.area, "10YNO-4--------9") == 0 ? "selected" : "");
-	html.replace("{eaNo5}", strcmp(entsoe.area, "10Y1001A1001A48H") == 0 ? "selected" : "");
+	html.replace("{no1}", strcmp(entsoe.area, "10YNO-1--------2") == 0 ? "selected" : "");
+	html.replace("{no2}", strcmp(entsoe.area, "10YNO-2--------T") == 0 ? "selected" : "");
+	html.replace("{no3}", strcmp(entsoe.area, "10YNO-3--------J") == 0 ? "selected" : "");
+	html.replace("{no4}", strcmp(entsoe.area, "10YNO-4--------9") == 0 ? "selected" : "");
+	html.replace("{no5}", strcmp(entsoe.area, "10Y1001A1001A48H") == 0 ? "selected" : "");
 
-	html.replace("{eaSe1}", strcmp(entsoe.area, "10Y1001A1001A44P") == 0 ? "selected" : "");
-	html.replace("{eaSe2}", strcmp(entsoe.area, "10Y1001A1001A45N") == 0 ? "selected" : "");
-	html.replace("{eaSe3}", strcmp(entsoe.area, "10Y1001A1001A46L") == 0 ? "selected" : "");
-	html.replace("{eaSe4}", strcmp(entsoe.area, "10Y1001A1001A47J") == 0 ? "selected" : "");
+	html.replace("{se1}", strcmp(entsoe.area, "10Y1001A1001A44P") == 0 ? "selected" : "");
+	html.replace("{se2}", strcmp(entsoe.area, "10Y1001A1001A45N") == 0 ? "selected" : "");
+	html.replace("{se3}", strcmp(entsoe.area, "10Y1001A1001A46L") == 0 ? "selected" : "");
+	html.replace("{se4}", strcmp(entsoe.area, "10Y1001A1001A47J") == 0 ? "selected" : "");
 
-	html.replace("{eaDk1}", strcmp(entsoe.area, "10YDK-1--------W") == 0 ? "selected" : "");
-	html.replace("{eaDk2}", strcmp(entsoe.area, "10YDK-2--------M") == 0 ? "selected" : "");
+	html.replace("{dk1}", strcmp(entsoe.area, "10YDK-1--------W") == 0 ? "selected" : "");
+	html.replace("{dk2}", strcmp(entsoe.area, "10YDK-2--------M") == 0 ? "selected" : "");
 
 	html.replace("{at}", strcmp(entsoe.area, "10YAT-APG------L") == 0 ? "selected" : "");
 	html.replace("{be}", strcmp(entsoe.area, "10YBE----------2") == 0 ? "selected" : "");
@@ -595,10 +589,10 @@ void AmsWebServer::configPriceApiHtml() {
 	html.replace("{pl}", strcmp(entsoe.area, "10YPL-AREA-----S") == 0 ? "selected" : "");
 	html.replace("{ch}", strcmp(entsoe.area, "10YCH-SWISSGRIDZ") == 0 ? "selected" : "");
 
-	html.replace("{ecNOK}", strcmp(entsoe.currency, "NOK") == 0 ? "selected" : "");
-	html.replace("{ecSEK}", strcmp(entsoe.currency, "SEK") == 0 ? "selected" : "");
-	html.replace("{ecDKK}", strcmp(entsoe.currency, "DKK") == 0 ? "selected" : "");
-	html.replace("{ecEUR}", strcmp(entsoe.currency, "EUR") == 0 ? "selected" : "");
+	html.replace("{nok}", strcmp(entsoe.currency, "NOK") == 0 ? "selected" : "");
+	html.replace("{sek}", strcmp(entsoe.currency, "SEK") == 0 ? "selected" : "");
+	html.replace("{dkk}", strcmp(entsoe.currency, "DKK") == 0 ? "selected" : "");
+	html.replace("{eur}", strcmp(entsoe.currency, "EUR") == 0 ? "selected" : "");
 
 	server.setContentLength(html.length() + HEAD_HTML_LEN + FOOT_HTML_LEN);
 	server.send_P(200, MIME_HTML, HEAD_HTML);
diff --git a/web/priceapi.html b/web/priceapi.html
index bd41e398..60dc4e6f 100644
--- a/web/priceapi.html
+++ b/web/priceapi.html
@@ -11,21 +11,21 @@
                     <select name="ea" class="form-control">
                         <option value="">None</option>
                         <optgroup label="Norway">
-                            <option value="10YNO-1--------2" {eaNo1}>NO1</option>
-                            <option value="10YNO-2--------T" {eaNo2}>NO2</option>
-                            <option value="10YNO-3--------J" {eaNo3}>NO3</option>
-                            <option value="10YNO-4--------9" {eaNo4}>NO4</option>
-                            <option value="10Y1001A1001A48H" {eaNo5}>NO5</option>
+                            <option value="10YNO-1--------2" {no1}>NO1</option>
+                            <option value="10YNO-2--------T" {no2}>NO2</option>
+                            <option value="10YNO-3--------J" {no3}>NO3</option>
+                            <option value="10YNO-4--------9" {no4}>NO4</option>
+                            <option value="10Y1001A1001A48H" {no5}>NO5</option>
                         </optgroup>
                         <optgroup label="Sweden">
-                            <option value="10Y1001A1001A44P" {eaSe1}>SE1</option>
-                            <option value="10Y1001A1001A45N" {eaSe2}>SE2</option>
-                            <option value="10Y1001A1001A46L" {eaSe3}>SE3</option>
-                            <option value="10Y1001A1001A47J" {eaSe4}>SE4</option>
+                            <option value="10Y1001A1001A44P" {se1}>SE1</option>
+                            <option value="10Y1001A1001A45N" {se2}>SE2</option>
+                            <option value="10Y1001A1001A46L" {se3}>SE3</option>
+                            <option value="10Y1001A1001A47J" {se4}>SE4</option>
                             </optgroup>
                         <optgroup label="Denmark">
-                            <option value="10YDK-1--------W" {eaDk1}>DK1</option>
-                            <option value="10YDK-2--------M" {eaDk2}>DK2</option>
+                            <option value="10YDK-1--------W" {dk1}>DK1</option>
+                            <option value="10YDK-2--------M" {dk2}>DK2</option>
                         </optgroup>
                         <option value="10YAT-APG------L" {at}>Austria</option>
                         <option value="10YBE----------2" {be}>Belgium</option>
@@ -49,10 +49,10 @@
                         <span class="input-group-text">Currency</span>
                     </div>
                     <select name="ecu" class="form-control">
-                        <option value="NOK" {ecNOK}>NOK</option>
-                        <option value="SEK" {ecSEK}>SEK</option>
-                        <option value="DKK" {ecDKK}>DKK</option>
-                        <option value="EUR" {ecEUR}>EUR</option>
+                        <option value="NOK" {nok}>NOK</option>
+                        <option value="SEK" {sek}>SEK</option>
+                        <option value="DKK" {dkk}>DKK</option>
+                        <option value="EUR" {eur}>EUR</option>
                     </select>
                 </div>
             </div>