Merge pull request #1422 from huss/simpleFixes

New test case placeholders & simple fixes

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 <h1><b>${translate('bar.raw')}</b></h1>;
+		return <h1><b>{translate('bar.raw')}</b></h1>;
 	}
 	// At least one viable dataset.
 	const enoughData = datasets.find(dataset => dataset.x!.length >= 1);

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
             });
         });
     });

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([

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
+            });
             });
         });
     });

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([

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
 			});
 		});
 	});
-});
+});

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
 			});
 		});
 	});

src/server/test/web/readingsLineGroupFlow.js

@@ -207,6 +207,8 @@ mocha.describe('readings API', () => {
                         expectReadingToEqualExpected(res, expected, GROUP_ID);
                     }
                 );
+
+                // Add LG26 here
             });
         });
     });

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

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
             });
         });
     });