Skip to content
Snippets Groups Projects
Commit 2554005d authored by Hugo NOUTS's avatar Hugo NOUTS
Browse files

doing - query runner return empty

parent 190892d1
Branches
Tags
3 merge requests!28Merge fix from dev,!27Dev,!18Features/us135 cta enedis activation
...@@ -57,14 +57,15 @@ const FluidChartContainer: React.FC<FluidChartContainerProps> = ({ ...@@ -57,14 +57,15 @@ const FluidChartContainer: React.FC<FluidChartContainerProps> = ({
true true
) )
if (subscribed && data) { if (subscribed && data) {
console.log('this is my LASTLASTLASTdata lalala : ', dataWithAllFluids)
setLastDataDate(data) setLastDataDate(data)
setReferenceDate(data) setReferenceDate(data)
} }
if (subscribed && dataWithAllFluids) { if (subscribed && dataWithAllFluids) {
console.log('this is my LAST ALL data lalala : ', dataWithAllFluids)
setLastDateWithAllData(dataWithAllFluids) setLastDateWithAllData(dataWithAllFluids)
} }
if (subscribed && isMinute) {
setMinuteActive(true)
}
if (subscribed && currentChallenge) { if (subscribed && currentChallenge) {
if ( if (
currentChallenge.challengeType && currentChallenge.challengeType &&
...@@ -118,6 +119,7 @@ const FluidChartContainer: React.FC<FluidChartContainerProps> = ({ ...@@ -118,6 +119,7 @@ const FluidChartContainer: React.FC<FluidChartContainerProps> = ({
lastDateWithAllData={lastDateWithAllData} lastDateWithAllData={lastDateWithAllData}
fluidTypes={fluidTypes} fluidTypes={fluidTypes}
timeStep={timeStep} timeStep={timeStep}
halfHourLoad={isMinuteActive}
multiFluid={multiFluid} multiFluid={multiFluid}
currentChallenge={challenge} currentChallenge={challenge}
consumptionDataManager={consumptionDataManager} consumptionDataManager={consumptionDataManager}
......
...@@ -10,7 +10,6 @@ import DataloadConsumptionVisualizer from 'components/ContentComponents/Consumpt ...@@ -10,7 +10,6 @@ import DataloadConsumptionVisualizer from 'components/ContentComponents/Consumpt
import DetailedConsumptionVisualizer from 'components/ContentComponents/ConsumptionVisualizer/DetailedConsumptionVisualizer' import DetailedConsumptionVisualizer from 'components/ContentComponents/ConsumptionVisualizer/DetailedConsumptionVisualizer'
import LastDataConsumptionVisualizer from 'components/ContentComponents/ConsumptionVisualizer/LastDataConsumptionVisualizer' import LastDataConsumptionVisualizer from 'components/ContentComponents/ConsumptionVisualizer/LastDataConsumptionVisualizer'
import ErrorDataConsumptionVisualizer from 'components/ContentComponents/ConsumptionVisualizer/ErrorDataConsumptionVisualizer' import ErrorDataConsumptionVisualizer from 'components/ContentComponents/ConsumptionVisualizer/ErrorDataConsumptionVisualizer'
import ActivateHalfHourLoad from '../ConsumptionNavigator/ActivateHalfHourLoad'
interface ConsumptionVisualizerProps { interface ConsumptionVisualizerProps {
fluidTypes: FluidType[] fluidTypes: FluidType[]
...@@ -67,54 +66,40 @@ const ConsumptionVisualizer = ({ ...@@ -67,54 +66,40 @@ const ConsumptionVisualizer = ({
isLoaded={isLoaded} isLoaded={isLoaded}
/> />
<div className="cv-info"> <div className="cv-info">
{timeStep === 10 ? ( {!multiFluid && dataload && dataload.value > -1 && (
!dataload || <DetailedConsumptionVisualizer
(dataload && dataload.value === -1 && ( fluidTypes={fluidTypes}
<ActivateHalfHourLoad timeStep={timeStep} /> timeStep={timeStep}
)) multiFluid={multiFluid}
) : ( handleClickDetails={handleClickDetails}
<div> />
{!multiFluid && dataload && dataload.value > -1 && (
<DetailedConsumptionVisualizer
fluidTypes={fluidTypes}
timeStep={timeStep}
multiFluid={multiFluid}
handleClickDetails={handleClickDetails}
/>
)}
{dataload &&
dataload.valueDetail &&
((dataload.valueDetail[0] === -1 &&
!isDataToCome(dataload, fluidTypes[0])) ||
(dataload.valueDetail[1] === -1 &&
!isDataToCome(dataload, fluidTypes[1])) ||
(dataload.valueDetail[2] === -1 &&
!isDataToCome(dataload, fluidTypes[2]))) && (
<ErrorDataConsumptionVisualizer
date={date}
indexDisplayed={indexDisplayed}
setIndexDisplayed={setIndexDisplayed}
lastDateWithAllData={lastDateWithAllData}
setSelectedDate={setSelectedDate}
/>
)}
{!dataload ||
(dataload && dataload.value === -1 && (
<LastDataConsumptionVisualizer
fluidTypes={fluidTypes}
timeStep={timeStep}
multiFluid={multiFluid}
handleChangeIndex={handleChangeIndex}
/>
))}
</div>
)} )}
{dataload &&
dataload.valueDetail &&
((dataload.valueDetail[0] === -1 &&
!isDataToCome(dataload, fluidTypes[0])) ||
(dataload.valueDetail[1] === -1 &&
!isDataToCome(dataload, fluidTypes[1])) ||
(dataload.valueDetail[2] === -1 &&
!isDataToCome(dataload, fluidTypes[2]))) && (
<ErrorDataConsumptionVisualizer
date={date}
indexDisplayed={indexDisplayed}
setIndexDisplayed={setIndexDisplayed}
lastDateWithAllData={lastDateWithAllData}
setSelectedDate={setSelectedDate}
/>
)}
{!dataload ||
(dataload && dataload.value === -1 && (
<LastDataConsumptionVisualizer
fluidTypes={fluidTypes}
timeStep={timeStep}
multiFluid={multiFluid}
handleChangeIndex={handleChangeIndex}
/>
))}
</div> </div>
{/* {timeStep === 10 && (
!dataload ||
(dataload && dataload.value === -1 && (
<ActivateHalfHourLoad timeStep={timeStep} />
)))} */}
</div> </div>
) )
} }
......
...@@ -23,6 +23,7 @@ import ConsumptionVisualizer from 'components/ContentComponents/ConsumptionVisua ...@@ -23,6 +23,7 @@ import ConsumptionVisualizer from 'components/ContentComponents/ConsumptionVisua
import StyledIcon from 'components/CommonKit/Icon/StyledIcon' import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import captionIcon from 'assets/icons/visu/challenge-caption-chart.svg' import captionIcon from 'assets/icons/visu/challenge-caption-chart.svg'
import ActivateHalfHourLoad from '../ConsumptionNavigator/ActivateHalfHourLoad'
interface FluidChartContentProps { interface FluidChartContentProps {
fluidTypes: FluidType[] fluidTypes: FluidType[]
...@@ -30,6 +31,7 @@ interface FluidChartContentProps { ...@@ -30,6 +31,7 @@ interface FluidChartContentProps {
referenceDate: DateTime referenceDate: DateTime
lastDataDate: DateTime lastDataDate: DateTime
lastDateWithAllData: DateTime lastDateWithAllData: DateTime
halfHourLoad: boolean
multiFluid: boolean multiFluid: boolean
currentChallenge: UserChallenge | null currentChallenge: UserChallenge | null
consumptionDataManager: IConsumptionDataManager consumptionDataManager: IConsumptionDataManager
...@@ -45,6 +47,7 @@ const FluidChartContent: React.FC<FluidChartContentProps> = ({ ...@@ -45,6 +47,7 @@ const FluidChartContent: React.FC<FluidChartContentProps> = ({
lastDataDate, lastDataDate,
lastDateWithAllData, lastDateWithAllData,
multiFluid, multiFluid,
halfHourLoad,
currentChallenge, currentChallenge,
consumptionDataManager, consumptionDataManager,
isDataLoaded, isDataLoaded,
...@@ -59,7 +62,6 @@ const FluidChartContent: React.FC<FluidChartContentProps> = ({ ...@@ -59,7 +62,6 @@ const FluidChartContent: React.FC<FluidChartContentProps> = ({
>() >()
const [showCompare, setShowCompare] = useState<boolean>(false) const [showCompare, setShowCompare] = useState<boolean>(false)
const [isLoaded, setIsLoaded] = useState<boolean>(true) const [isLoaded, setIsLoaded] = useState<boolean>(true)
const challengePeriod: ITimePeriod | null = const challengePeriod: ITimePeriod | null =
currentChallenge && currentChallenge &&
currentChallenge.startingDate && currentChallenge.startingDate &&
...@@ -140,6 +142,11 @@ const FluidChartContent: React.FC<FluidChartContentProps> = ({ ...@@ -140,6 +142,11 @@ const FluidChartContent: React.FC<FluidChartContentProps> = ({
handleChangeIndex={handleChangeIndex} handleChangeIndex={handleChangeIndex}
/> />
</div> </div>
{!halfHourLoad && timeStep === 10 && (
<ActivateHalfHourLoad timeStep={timeStep} />
)}
{isDataLoaded && ( {isDataLoaded && (
<FluidChartSwipe <FluidChartSwipe
fluidTypes={fluidTypes} fluidTypes={fluidTypes}
......
...@@ -257,7 +257,6 @@ export default class ConsumptionDataManager implements IConsumptionDataManager { ...@@ -257,7 +257,6 @@ export default class ConsumptionDataManager implements IConsumptionDataManager {
fluidTypes: FluidType[], fluidTypes: FluidType[],
allFluids?: boolean allFluids?: boolean
): Promise<DateTime | null> { ): Promise<DateTime | null> {
console.log('you called fetchlastdataDATA')
let lastDay = null let lastDay = null
if (fluidTypes.length === 1) { if (fluidTypes.length === 1) {
lastDay = (await this._queryRunner.getLastDateData(fluidTypes[0])) || null lastDay = (await this._queryRunner.getLastDateData(fluidTypes[0])) || null
...@@ -291,9 +290,11 @@ export default class ConsumptionDataManager implements IConsumptionDataManager { ...@@ -291,9 +290,11 @@ export default class ConsumptionDataManager implements IConsumptionDataManager {
public async checkDoctypeEntries( public async checkDoctypeEntries(
fluideType: FluidType[], fluideType: FluidType[],
timeStep: TimeStep timeStep: TimeStep
) { ): Promise<boolean> {
//GET RELEVANT DOCTYPE //GET RELEVANT DOCTYPE
//QUERY RUNNER THIS DOCTYPE AND CHECK LENGTH //QUERY RUNNER THIS DOCTYPE AND CHECK LENGTH
const queryResult = await this._queryRunner.getEntries(fluideType, timeStep)
return false
} }
private aggregateGraphData( private aggregateGraphData(
......
...@@ -112,6 +112,16 @@ export class QueryRunner { ...@@ -112,6 +112,16 @@ export class QueryRunner {
return result return result
} }
public async getEntries(fluidType: FluidType[], timeStep: TimeStep) {
let result = null
try {
result = await this._client.find(ENEDIS_DAY_DOCTYPE).where({})
} catch (error) {
return null
}
return result
}
private filterDataList(data, timePeriod: ITimePeriod) { private filterDataList(data, timePeriod: ITimePeriod) {
const filteredResult = data.data.filter(entry => const filteredResult = data.data.filter(entry =>
this.withinDateBoundaries( this.withinDateBoundaries(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment