Merge pull request #592 from micronutrientsupport/stever-projectionTh…

…resholds Stever projection thresholds
micronutrientsupport · Oct 13, 2021 · 3e56285 · 3e56285
2 parents 873efc7 + 79410a6
commit 3e56285
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 10 deletions.
diff --git a/src/app/apiAndObjects/objects/misc/chartjsObject.ts b/src/app/apiAndObjects/objects/misc/chartjsObject.ts
@@ -67,7 +67,7 @@ export interface ChartJSObject {
  annotation?: {
  annotations: Array<{
  type: string;
- id: string;
+ id?: string;
  mode: string;
  scaleID: string;
  value: number; // data-value at which the line is drawn

diff --git a/src/app/pages/quickMaps/pages/baselineDetails/householdSupply/householdSupply.component.ts b/src/app/pages/quickMaps/pages/baselineDetails/householdSupply/householdSupply.component.ts
@@ -191,7 +191,6 @@ export class HouseholdSupplyComponent implements AfterViewInit {
  annotations: [
  {
  type: 'line',
- id: 'vLine',
  mode: 'vertical',
  scaleID: 'x-axis-0',
  value: Number(data.adequacyThreshold), // data-value at which the line is drawn

diff --git a/src/app/pages/quickMaps/pages/biomarkers/biomarkerInfo/biomarkerInfo.component.ts b/src/app/pages/quickMaps/pages/biomarkers/biomarkerInfo/biomarkerInfo.component.ts
@@ -298,7 +298,6 @@ export class BiomarkerInfoComponent implements AfterViewInit {
  annotations: [
  {
  type: 'line',
- id: 'defLine',
  mode: 'vertical',
  scaleID: 'x-axis-0',
  value: this.defThreshold,

diff --git a/...app/pages/quickMaps/pages/biomarkers/biomarkerStatus/statusChart/statusChart.component.ts b/...app/pages/quickMaps/pages/biomarkers/biomarkerStatus/statusChart/statusChart.component.ts
@@ -92,7 +92,6 @@ export class StatusChartComponent implements AfterViewInit {
  annotations: [
  {
  type: 'line',
- id: 'defLine',
  mode: 'horizontal',
  scaleID: 'y-axis-0',
  value: this.defThreshold,
@@ -106,7 +105,6 @@ export class StatusChartComponent implements AfterViewInit {
  },
  {
  type: 'line',
- id: 'abnLine',
  mode: 'horizontal',
  scaleID: 'y-axis-0',
  value: this.abnThreshold,

diff --git a/...ges/quickMaps/pages/projection/projectionAvailability/projectionAvailability.component.ts b/...ges/quickMaps/pages/projection/projectionAvailability/projectionAvailability.component.ts
@@ -147,9 +147,7 @@ export class ProjectionAvailabilityComponent implements AfterViewInit {
  );
  this.errorSrc.next(false);
  this.chartData = null;
- // force change detection to:
- // remove chart before re-setting it to stop js error
- this.cdr.detectChanges();
+
  this.initialiseGraph(filteredData);
 
  // show table and init paginator and sorter
@@ -259,7 +257,6 @@ export class ProjectionAvailabilityComponent implements AfterViewInit {
  annotations: [
  {
  type: 'line',
- id: 'defLine',
  mode: 'horizontal',
  scaleID: 'y-axis-0',
  value: this.projectionsSummary.recommended,
@@ -276,7 +273,6 @@ export class ProjectionAvailabilityComponent implements AfterViewInit {
  },
  },
  };
-
  this.chartData = generatedChart;
  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
  const chartForRender: ChartJSObject = JSON.parse(JSON.stringify(generatedChart));