diff --git a/src/client/app/components/BarChartComponent.tsx b/src/client/app/components/BarChartComponent.tsx
index 680eec4bc..292f7f5c9 100644
--- a/src/client/app/components/BarChartComponent.tsx
+++ b/src/client/app/components/BarChartComponent.tsx
@@ -73,7 +73,7 @@ export default function BarChartComponent() {
// The Plotly toolbar is displayed if displayModeBar is set to true (not for bar charts)
if (raw) {
- return ${translate('bar.raw')}
;
+ return {translate('bar.raw')}
;
}
// At least one viable dataset.
const enoughData = datasets.find(dataset => dataset.x!.length >= 1);
diff --git a/src/server/test/web/readingsBarGroupFlow.js b/src/server/test/web/readingsBarGroupFlow.js
index 2a9965740..55c42aa57 100644
--- a/src/server/test/web/readingsBarGroupFlow.js
+++ b/src/server/test/web/readingsBarGroupFlow.js
@@ -21,7 +21,7 @@ mocha.describe('readings API', () => {
mocha.describe('readings test, test if data returned by API is as expected', () => {
mocha.describe('for bar charts', () => {
mocha.describe('for flow groups', () => {
- mocha.it('BG15: should have daily points for 15 + 20 minute reading intervals and flow units with +-inf start/end time & kW as kW', async () =>{
+ mocha.it('BG15: 13 day bars for 15 + 20 minute reading intervals and flow units with +-inf start/end time & kW as kW', async () =>{
const unitDatakW = [
{
// u4
@@ -112,7 +112,7 @@ mocha.describe('readings API', () => {
expectReadingToEqualExpected(res, expected, GROUP_ID);
});
- mocha.it('BG16: should have daily points for 15 + 20 minute reading intervals and flow units with +-inf start/end time & thing as thing where rate is 36', async () => {
+ mocha.it('BG16: 13 day bars for 15 + 20 minute reading intervals and flow units with +-inf start/end time & thing as thing where rate is 36', async () => {
const unitDataThing = [
{
// u14
@@ -202,6 +202,18 @@ mocha.describe('readings API', () => {
// Check that the API reading is equal to what it is expected to equal
expectReadingToEqualExpected(res, expected, GROUP_ID);
});
+
+ // Add BG17 here
+
+ // Add BG18 here
+
+ // Add BG19 here
+
+ // Add BG20 here
+
+ // Add BG21 here
+
+ // Add BG22 here
});
});
});
diff --git a/src/server/test/web/readingsBarGroupQuantity.js b/src/server/test/web/readingsBarGroupQuantity.js
index dd8e8f2bb..88c7aa1d3 100644
--- a/src/server/test/web/readingsBarGroupQuantity.js
+++ b/src/server/test/web/readingsBarGroupQuantity.js
@@ -201,7 +201,6 @@ mocha.describe('readings API', () => {
});
- // Add BG9 here
mocha.it('BG9: 1 day bars for 15 + 20 minute reading intervals and quantity units with +-inf start/end time & kWh as MJ reverse conversion', async () => {
const unitData = unitDatakWh.concat([
diff --git a/src/server/test/web/readingsBarMeterFlow.js b/src/server/test/web/readingsBarMeterFlow.js
index e3930f238..626c1d48f 100644
--- a/src/server/test/web/readingsBarMeterFlow.js
+++ b/src/server/test/web/readingsBarMeterFlow.js
@@ -26,7 +26,7 @@ mocha.describe('readings API', () => {
mocha.describe('for bar charts', () => {
mocha.describe('for flow meters', () => {
- mocha.it('B15: should have daily points for 15 minute reading intervals and flow units with +-inf start/end time & kW as kW', async () => {
+ mocha.it('B15: 13 day bars for 15 minute reading intervals and flow units with +-inf start/end time & kW as kW', async () => {
const unitData = [
{
// u4
@@ -95,7 +95,7 @@ mocha.describe('readings API', () => {
expectReadingToEqualExpected(res, expected);
});
- mocha.it('B16: should have daily points for 15 minute reading intervals and flow units with +-inf start/end time & thing as thing where rate is 36', async () => {
+ mocha.it('B16: 13 day bars for 15 minute reading intervals and flow units with +-inf start/end time & thing as thing where rate is 36', async () => {
const unitData = [
{
// u14
@@ -162,7 +162,19 @@ mocha.describe('readings API', () => {
});
// Check that the API reading is equal to what it is expected to equal
expectReadingToEqualExpected(res, expected);
- });
+
+ // Add B17 here
+
+ // Add B18 here
+
+ // Add B19 here
+
+ // Add B20 here
+
+ // Add B21 here
+
+ // Add B22 here
+ });
});
});
});
diff --git a/src/server/test/web/readingsBarMeterQuantity.js b/src/server/test/web/readingsBarMeterQuantity.js
index df931d955..e50450533 100644
--- a/src/server/test/web/readingsBarMeterQuantity.js
+++ b/src/server/test/web/readingsBarMeterQuantity.js
@@ -261,7 +261,6 @@ mocha.describe('readings API', () => {
expectReadingToEqualExpected(res, expected);
});
- // Add B10 here
mocha.it('B10: 1 day bars for 15 minute reading intervals and quantity units with +-inf start/end time & kWh as BTU', async () => {
// Load the data into the database
const unitData = unitDatakWh.concat([
diff --git a/src/server/test/web/readingsCompareGroupFlow.js b/src/server/test/web/readingsCompareGroupFlow.js
index 84293202b..683f417d3 100644
--- a/src/server/test/web/readingsCompareGroupFlow.js
+++ b/src/server/test/web/readingsCompareGroupFlow.js
@@ -212,7 +212,15 @@ mocha.describe('readings API', () => {
});
expectCompareToEqualExpected(res, expected, GROUP_ID);
});
+
+ // Add CG17 here
+
+ // Add CG18 here
+
+ // Add CG19 here
+
+ // Add CG20 here
});
});
});
-});
\ No newline at end of file
+});
diff --git a/src/server/test/web/readingsCompareMeterFlow.js b/src/server/test/web/readingsCompareMeterFlow.js
index 563825054..cb7c2c132 100644
--- a/src/server/test/web/readingsCompareMeterFlow.js
+++ b/src/server/test/web/readingsCompareMeterFlow.js
@@ -163,6 +163,14 @@ mocha.describe('readings API', () => {
// Check that the API reading is equal to what it is expected to equal
expectCompareToEqualExpected(res, expected, METER_ID);
})
+
+ // Add C17 here
+
+ // Add C18 here
+
+ // Add C19 here
+
+ // Add C20 here
});
});
});
diff --git a/src/server/test/web/readingsLineGroupFlow.js b/src/server/test/web/readingsLineGroupFlow.js
index 5b52e2240..6f52e668a 100644
--- a/src/server/test/web/readingsLineGroupFlow.js
+++ b/src/server/test/web/readingsLineGroupFlow.js
@@ -207,6 +207,8 @@ mocha.describe('readings API', () => {
expectReadingToEqualExpected(res, expected, GROUP_ID);
}
);
+
+ // Add LG26 here
});
});
});
diff --git a/src/server/test/web/readingsLineGroupQuantity.js b/src/server/test/web/readingsLineGroupQuantity.js
index 810aced53..b16abe53b 100644
--- a/src/server/test/web/readingsLineGroupQuantity.js
+++ b/src/server/test/web/readingsLineGroupQuantity.js
@@ -600,7 +600,6 @@ mocha.describe('readings API', () => {
expectReadingToEqualExpected(res, expected, GROUP_ID);
});
- // Add LG20 here
mocha.it('LG20: should have daily points for 15 + 20 minute reading intervals and quantity units with +-inf start/end time & kWh as lbs of CO2 & chained & reversed', async () => {
const unitData = [
//Add units u2, u10, u11, u12, u13
diff --git a/src/server/test/web/readingsLineMeterFlow.js b/src/server/test/web/readingsLineMeterFlow.js
index 479c7cbd2..2b4575ab5 100644
--- a/src/server/test/web/readingsLineMeterFlow.js
+++ b/src/server/test/web/readingsLineMeterFlow.js
@@ -146,6 +146,10 @@ mocha.describe('readings API', () => {
.query({ timeInterval: ETERNITY.toString(), graphicUnitId: unitId });
expectReadingToEqualExpected(res, expected)
});
+
+ // Add L26 here
+
+ // Add L27 here
});
});
});