Merge branch 'fix/consumption-graph' into dev

felixvonsamson · Dec 20, 2024 · 2728fc1 · 2728fc1
2 parents d7dfcef + 3c22d65
commit 2728fc1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/energetica/static/charts/electricity.js b/energetica/static/charts/electricity.js
@@ -412,7 +412,7 @@ function sortConsumingFacilitiesTable(columnName, reorder = true) {
     }
     // Reset the table headers
     table.querySelector(".facility_col").innerHTML = "Facility";
-    table.querySelector(".usage_col").innerHTML = `Generated
+    table.querySelector(".usage_col").innerHTML = `Consumed
         <span class="popup_info bottom small">over the last ${ticks_to_time(res, prefix = "")}</span>`;
     sortTable(table, columnName, table_content, reorder);
 }
@@ -455,7 +455,7 @@ function sortTable(table, column_name, table_content, reorder = true) {
         for (const [id, facility] of sortedData) {
             table.insertRow().innerHTML = `<tr>
                     <td>${facility.facility_col}</td>
-                    <td>${format_power(facility.usage_col)}</td>
+                    <td>${format_energy(facility.usage_col)}</td>
                     <td>
                         <label class="switch">
                             <input type="checkbox"