Merge pull request #14 from Cambio-Project/Fix-no-data-displayed-for-…

…time-0

Shift ValidationResponse to match data set

src/app/shared/components/graph-plotter/graph-plotter.component.ts

@@ -118,7 +118,7 @@ export class GraphPlotterComponent implements OnInit, AfterViewInit {
 					Plot.lineY(this.dataset?.data, { x: "time", y: property0 }),
 					Plot.lineY(this.dataset?.data, Plot.mapY((D: any) => D.map(secondaryYAxis), { x: "time", y: property1, stroke: secondaryYAxisColor }))
 				);
-			} else {
+			} else {				
 				marks.push(...properties.map(property => Plot.line(this.dataset?.data, { x: 'time', y: property })));
 				yAxis = {
 					label: properties.join(', '),
@@ -140,11 +140,10 @@ export class GraphPlotterComponent implements OnInit, AfterViewInit {
 				} else {
 					height = Math.max(...properties.map(property => this.dataset?.metricMax(property) || 0)) * 1.5;
 				}
-
-				this.validationResponse.intervals.forEach(interval => {
-					const arr = Array.from({ length: interval.end - interval.start + 1 }).map((val, i) => {
+				this.validationResponse.intervals.forEach((interval, intervalIndex) => {
+					const arr = Array.from({ length: interval.end - interval.start + (intervalIndex > 0 ? 1 : 0) + (this.validationResponse?.intervals && intervalIndex === this.validationResponse?.intervals?.length - 1 ? 1 : 0 )}).map((val, i) => {
 						return {
-							time: i + interval.start,
+							time: i + interval.start + (intervalIndex > 0 ? - 1 : 0),
 							height: height,
 						}
 					});

src/app/shared/models/dataset.ts

@@ -8,7 +8,7 @@ export class Dataset {
 			this.metricDefinitions = dataset[0];
 			this.data = dataset.splice(1, dataset.length).map((el: any, i: number) => {
 				const obj: any = {};
-				obj.time = i + 1;
+				obj.time = i;
 				for (let i = 0; i < this.metricDefinitions.length; i++) {
 					let val = el[i];
 					if (!Number.isNaN(val)) {
@@ -18,7 +18,6 @@ export class Dataset {
 				}
 				return obj;
 			});
-			//this.metricDefinitions = ['time', ...this.metricDefinitions];
 		} else {
 			throw new Error('Invalid Dataset');
 		}