diff --git a/src/components/ContentComponents/Charts/AxisRight.tsx b/src/components/ContentComponents/Charts/AxisRight.tsx index 54519c76c225cacb3eb23ff19c4825943459ee06..c41678d74cd746f352ff9763db9f2affbb866396 100644 --- a/src/components/ContentComponents/Charts/AxisRight.tsx +++ b/src/components/ContentComponents/Charts/AxisRight.tsx @@ -16,8 +16,14 @@ interface AxisRightProps { const AxisRight = (props: AxisRightProps) => { const { yScale, fluidTypes, width, marginRight, marginTop, t } = props + let isHome + if (!window.location.hash.split('/')[2]) { + isHome = true + } else { + isHome = false + } const fluidStyle = - fluidTypes.length > 1 ? 'MULTIFLUID' : FluidType[fluidTypes[0]] + fluidTypes.length > 1 || isHome ? 'MULTIFLUID' : FluidType[fluidTypes[0]] const yAxisRef = useRef<SVGGElement>(null) const drawYAxis = () => { diff --git a/src/components/ContentComponents/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx b/src/components/ContentComponents/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx index af8a52377b7de0e8461aaf060f9f38b9e7b820f3..75ef9f8f2617dd975ac980c1ed9f504257d8fb91 100644 --- a/src/components/ContentComponents/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx +++ b/src/components/ContentComponents/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx @@ -99,14 +99,10 @@ const DataloadConsumptionVisualizer = ({ <div className={`cv-load-value ${fluidStyle.toLowerCase()} chart-result`} > - {multiFluid && fluidTypes.length === 1 - ? formatNumberValues( - ltcc.Convert(dataload.value, fluidTypes[0]) - ) - : formatNumberValues(dataload.value)} - <span className="text-18-normal">{`${t( - 'FLUID.' + fluidStyle + '.UNIT' - )}`}</span> + {formatNumberValues(dataload.value)} + <span className="text-18-normal"> + {`${t('FLUID.' + fluidStyle + '.UNIT')}`} + </span> </div> {!multiFluid ? ( <div diff --git a/src/components/ContentComponents/FluidChart/FluidChartSlide.tsx b/src/components/ContentComponents/FluidChart/FluidChartSlide.tsx index 1eb1465ea6dd297c5f44e2abb4041ff8d3f4797f..fa2726ba53ba9db67234584cac10717248f06dee 100644 --- a/src/components/ContentComponents/FluidChart/FluidChartSlide.tsx +++ b/src/components/ContentComponents/FluidChart/FluidChartSlide.tsx @@ -51,7 +51,7 @@ const FluidChartSlide: React.FC<FluidChartSlideProps> = ({ const [chartData, setChartData] = useState<IChartData>(new ChartData([])) const [isLoaded, setIsLoaded] = useState<boolean>(false) - const { setChartIsLoaded, chartIsLoaded } = useContext(AppContext) + const { setChartIsLoaded } = useContext(AppContext) useEffect(() => { let subscribed = true @@ -60,12 +60,21 @@ const FluidChartSlide: React.FC<FluidChartSlideProps> = ({ defineTimePeriod(referenceDate, timeStep, index), defineTimePeriod(referenceDate, timeStep, index + 1), ]) + let isHome + if (!window.location.hash.split('/')[2]) { + isHome = true + } else { + isHome = false + } + const graphData = await consumptionDataManager.getGraphData( timePeriod, timeStep, fluidTypes, - compareTimePeriod + compareTimePeriod, + isHome ) + if (subscribed && graphData && graphData.actualData.length > 0) { setChartData(graphData) setIsLoaded(true) diff --git a/src/services/consumptionDataManagerService.ts b/src/services/consumptionDataManagerService.ts index b203ecb491b6e8db3d992536e511e790cf11a23d..072de5291e9b0caab88e75d41bd66d6fc61a1b37 100644 --- a/src/services/consumptionDataManagerService.ts +++ b/src/services/consumptionDataManagerService.ts @@ -37,7 +37,8 @@ export default class ConsumptionDataManager implements IConsumptionDataManager { timePeriod: ITimePeriod, timeStep: TimeStep, fluidTypes: FluidType[], - compareTimePeriod?: ITimePeriod + compareTimePeriod?: ITimePeriod, + isHome?: boolean ): Promise<IChartData | null> { const InputisValid: boolean = this._consumptionDataValidator.ValidateGetGraphData( timePeriod, @@ -50,7 +51,7 @@ export default class ConsumptionDataManager implements IConsumptionDataManager { let mappedData = null - if (fluidTypes.length === 1) { + if (fluidTypes.length === 1 && !isHome) { //TODO validating input data //TODO applying buisness logic to the query arguments @@ -75,7 +76,7 @@ export default class ConsumptionDataManager implements IConsumptionDataManager { // mapping result to contract mappedData = formattedData - } else if (fluidTypes.length > 1) { + } else if (fluidTypes.length > 1 || isHome) { const toBeAgreggatedData: ISingleFluidChartData[] = [] for (const fluidType of fluidTypes) { const fetchedData = await this.fetchSingleFLuidGraphData( diff --git a/src/services/dataConsumptionContracts.ts b/src/services/dataConsumptionContracts.ts index ef8373498613e85d5600e8f4640d4aae5c9b39d3..8255488b9da0e577716535187c72a493213c0ad8 100644 --- a/src/services/dataConsumptionContracts.ts +++ b/src/services/dataConsumptionContracts.ts @@ -73,7 +73,8 @@ export interface IConsumptionDataManager { timePeriod: ITimePeriod, timeStep: TimeStep, fluidTypes: FluidType[], - compareTimePeriod?: ITimePeriod + compareTimePeriod?: ITimePeriod, + isHome?: boolean ): Promise<IChartData | null> fetchLastDateData(fluidType: FluidType[]): Promise<DateTime | null>