Skip to content
Snippets Groups Projects

[COMP-351] Added graph for commodity vs R&E traffic

Merged James Constantinos Ladd requested to merge feature/COMP-351 into develop
1 unresolved thread
3 files
+ 27
59
Compare changes
  • Side-by-side
  • Inline
Files
3
import { cartesianProduct } from 'cartesian-product-multiple-arrays';
import {
FundingSource, FundingSourceDataset,
Budget, BasicDataset, NrenStaff, NrenStaffDataset, TrafficVolume, NrenAndYearDatapoint,
TrafficRatio, TrafficRatioDataset
FundingSource, BarChartDataset,
Budget, BasicDataset, NrenStaff, TrafficVolume, NrenAndYearDatapoint,
TrafficRatio
} from "../Schema";
import { remitCover } from "./ConnectivityDisplayConstant";
@@ -129,7 +129,7 @@ export const createFundingSourceDataset = (data: FundingSource[]) => {
}
})
const dataResponse: FundingSourceDataset = {
const dataResponse: BarChartDataset = {
datasets: fundingSourceDataset,
labels: labelsNREN.map(l => l.toString())
}
@@ -268,7 +268,7 @@ export const createNRENStaffDataset = (data: NrenStaff[], roles: boolean, select
}
})
const dataset: NrenStaffDataset = {
const dataset: BarChartDataset = {
datasets: nrenStaffDataset,
labels: labelsNREN
}
@@ -350,7 +350,7 @@ export const createTrafficRatioDataset = (data: TrafficRatio[], selectedYear: nu
}
})
const dataset: TrafficRatioDataset = {
const dataset: BarChartDataset = {
datasets: trafficRatioDataset,
labels: labelsNREN
}
@@ -431,7 +431,7 @@ export const createNRENStaffDatasetAbsolute = (data: NrenStaff[], selectedYears:
}
const nrenStaffDataset = selectedYears.sort().map(getDataset)
const dataset: NrenStaffDataset = {
const dataset: BarChartDataset = {
datasets: nrenStaffDataset,
labels: labelsNREN
}
@@ -683,7 +683,7 @@ export const createNetworkCapacityDataLookUp = <Datatype extends NrenAndYearData
}
const nrenStaffDataset = selectedYears.map(getDataset)
const dataset: NrenStaffDataset = {
const dataset: BarChartDataset = {
datasets: nrenStaffDataset,
labels: labelsNREN
}
Loading