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

activateHalfHourLoad absolute position

With background transparency
parent 6d2b5d45
No related branches found
No related tags found
3 merge requests!28Merge fix from dev,!27Dev,!18Features/us135 cta enedis activation
...@@ -7,6 +7,7 @@ import { TimeStep } from 'services/dataConsumptionContracts' ...@@ -7,6 +7,7 @@ import { TimeStep } from 'services/dataConsumptionContracts'
import { TypeChallenge, UserChallenge } from 'services/dataChallengeContracts' import { TypeChallenge, UserChallenge } from 'services/dataChallengeContracts'
import ConsumptionDataManager from 'services/consumptionDataManagerService' import ConsumptionDataManager from 'services/consumptionDataManagerService'
import FluidChartContent from 'components/ContentComponents/FluidChart/FluidChartContent' import FluidChartContent from 'components/ContentComponents/FluidChart/FluidChartContent'
import ActivateHalfHourLoad from 'components/ContentComponents/ConsumptionNavigator/ActivateHalfHourLoad'
interface FluidChartContainerProps { interface FluidChartContainerProps {
timeStep: TimeStep timeStep: TimeStep
...@@ -47,10 +48,10 @@ const FluidChartContainer: React.FC<FluidChartContainerProps> = ({ ...@@ -47,10 +48,10 @@ const FluidChartContainer: React.FC<FluidChartContainerProps> = ({
useEffect(() => { useEffect(() => {
let subscribed = true let subscribed = true
async function loadData() { async function loadData() {
const activateHalfHourLoad = await consumptionDataManager.checkDoctypeEntries( const activateHalfHourLoad = !(await consumptionDataManager.checkDoctypeEntries(
FluidType.ELECTRICITY, FluidType.ELECTRICITY,
TimeStep.HALF_AN_HOUR TimeStep.HALF_AN_HOUR
) ))
const data = await consumptionDataManager.fetchLastDateData(fluidTypes) const data = await consumptionDataManager.fetchLastDateData(fluidTypes)
const dataWithAllFluids = await consumptionDataManager.fetchLastDateData( const dataWithAllFluids = await consumptionDataManager.fetchLastDateData(
fluidTypes, fluidTypes,
...@@ -113,6 +114,9 @@ const FluidChartContainer: React.FC<FluidChartContainerProps> = ({ ...@@ -113,6 +114,9 @@ const FluidChartContainer: React.FC<FluidChartContainerProps> = ({
{isLoaded ? ( {isLoaded ? (
<div className="fc-root"> <div className="fc-root">
<div className="fc-content"> <div className="fc-content">
{isMinuteBlocked && timeStep === 10 && (
<ActivateHalfHourLoad timeStep={timeStep} />
)}
<FluidChartContent <FluidChartContent
referenceDate={referenceDate} referenceDate={referenceDate}
lastDataDate={lastDataDate} lastDataDate={lastDataDate}
......
...@@ -13,10 +13,11 @@ const ActivateHalfHourLoad = ({ t }: ActivateHalfHourLoadProps) => { ...@@ -13,10 +13,11 @@ const ActivateHalfHourLoad = ({ t }: ActivateHalfHourLoadProps) => {
return ( return (
<div className="cta-box"> <div className="cta-box">
<div className="header-text text-16-normal"> <div className="cta-box-header header-text text-16-normal">
{t('timestep.activate.enedis.info')} {t('timestep.activate.enedis.info')}
</div> </div>
<StyledButton <StyledButton
className="cta-box-button"
type="submit" type="submit"
color="primary" color="primary"
onClick={() => window.open(siteLink, '_blank')} onClick={() => window.open(siteLink, '_blank')}
......
...@@ -143,10 +143,6 @@ const FluidChartContent: React.FC<FluidChartContentProps> = ({ ...@@ -143,10 +143,6 @@ const FluidChartContent: React.FC<FluidChartContentProps> = ({
/> />
</div> </div>
{activateHalfHourLoad && timeStep === 10 && (
<ActivateHalfHourLoad timeStep={timeStep} />
)}
{isDataLoaded && ( {isDataLoaded && (
<FluidChartSwipe <FluidChartSwipe
fluidTypes={fluidTypes} fluidTypes={fluidTypes}
......
...@@ -293,9 +293,9 @@ export default class ConsumptionDataManager implements IConsumptionDataManager { ...@@ -293,9 +293,9 @@ export default class ConsumptionDataManager implements IConsumptionDataManager {
): Promise<boolean> { ): Promise<boolean> {
const queryResult = await this._queryRunner.getEntries(fluideType, timeStep) const queryResult = await this._queryRunner.getEntries(fluideType, timeStep)
if (queryResult.length > 0) { if (queryResult.length > 0) {
return false return true
} }
return true return false
} }
private aggregateGraphData( private aggregateGraphData(
......
...@@ -123,9 +123,28 @@ body { ...@@ -123,9 +123,28 @@ body {
} }
.cta-box { .cta-box {
width: 100%; background-color:rgba(18, 18, 18, 0.7);
opacity: 1; position: absolute;
color: $text-bright
padding: 1.5rem 1rem 1rem 0rem;
z-index: 1;
display: flex;
justify-content: center;
flex-direction: column;
height: 50%;
.cta-box-header {
text-align: center;
font-weight: bold;
letter-spacing: 0.2px;
margin-bottom: 1.5em;
color: $text-bright;
}
.cta-box-button {
margin-left: auto;
margin-right: auto;
color: black;
width: 80%;
}
} }
[role='main'] { [role='main'] {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment