Merge branch 'features/US135-CTA-enedis-activation' into 'dev'

Features/us135 cta enedis activation

See merge request web-et-numerique/llle_project/ecolyo!19

src/components/ContainerComponents/FluidChartContainer/FluidChartContainer.tsx

@@ -52,6 +52,7 @@ const FluidChartContainer: React.FC<FluidChartContainerProps> = ({
         FluidType.ELECTRICITY,
         TimeStep.HALF_AN_HOUR
       ))
+
       const data = await consumptionDataManager.fetchLastDateData(fluidTypes)
       const dataWithAllFluids = await consumptionDataManager.fetchLastDateData(
         fluidTypes,
@@ -112,23 +113,27 @@ const FluidChartContainer: React.FC<FluidChartContainerProps> = ({
   return (
     <>
       {isLoaded ? (
-        <div className="fc-root">
-          <div className="fc-content">
-            {isMinuteBlocked && timeStep === 10 && <ActivateHalfHourLoad />}
-            <FluidChartContent
-              referenceDate={referenceDate}
-              lastDataDate={lastDataDate}
-              lastDateWithAllData={lastDateWithAllData}
-              fluidTypes={fluidTypes}
-              timeStep={timeStep}
-              multiFluid={multiFluid}
-              currentChallenge={challenge}
-              consumptionDataManager={consumptionDataManager}
-              isDataLoaded={isLoaded}
-              handleDetailedDate={handleDetailedDate}
-            ></FluidChartContent>
+        <>
+          {isMinuteBlocked && timeStep === TimeStep.HALF_AN_HOUR && (
+            <ActivateHalfHourLoad />
+          )}
+          <div className="fc-root">
+            <div className="fc-content">
+              <FluidChartContent
+                referenceDate={referenceDate}
+                lastDataDate={lastDataDate}
+                lastDateWithAllData={lastDateWithAllData}
+                fluidTypes={fluidTypes}
+                timeStep={timeStep}
+                multiFluid={multiFluid}
+                currentChallenge={challenge}
+                consumptionDataManager={consumptionDataManager}
+                isDataLoaded={isLoaded}
+                handleDetailedDate={handleDetailedDate}
+              ></FluidChartContent>
+            </div>
           </div>
-        </div>
+        </>
       ) : null}
     </>
   )

src/services/consumptionDataManagerService.ts

@@ -292,7 +292,7 @@ export default class ConsumptionDataManager implements IConsumptionDataManager {
     timeStep: TimeStep
   ): Promise<boolean> {
     const queryResult = await this._queryRunner.getEntries(fluideType, timeStep)
-    if (queryResult.length > 0) {
+    if (queryResult.data.length > 0) {
       return true
     }
     return false

src/styles/base/_layout.scss

@@ -122,30 +122,6 @@ body {
   }
 }
 
-.cta-box {
-  background-color:rgba(18, 18, 18, 0.7);
-  position: absolute;
-
-  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;
-    width: 80%;
-  }
-}
-
 [role='main'] {
   /* width */
   &::-webkit-scrollbar {

src/styles/components/_fluid.scss

@@ -90,7 +90,7 @@
         }
       }
     }
-    
+
     .fv-footer-challenge {
       width: 100%;
       max-width: 58.75rem;
@@ -126,3 +126,45 @@
     }
   }
 }
+
+// Enedis Half Hour Load Activation
+.cta-box {
+  background-color: rgba(18, 18, 18, 0.8);
+  position: absolute;
+  left: 0;
+  width: calc(100vw - 220px);
+  padding: 0rem 1rem 0rem 0rem;
+  z-index: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  height: 37.5rem;
+  @media #{$large-phone} {
+    height: 29rem;
+    width: 100vw;
+  }
+  @media #{$tablet} {
+    width: 100vw;
+  }
+
+  .cta-box-header {
+    text-align: center;
+    font-weight: bold;
+    letter-spacing: 0.2px;
+    margin-bottom: 1.5em;
+    color: $text-bright;
+    width: 50%;
+    @media #{$large-phone} {
+      width: 80%;
+    }
+  }
+  .cta-box-button {
+    margin-left: auto;
+    margin-right: auto;
+    width: 50%;
+    @media #{$large-phone} {
+      width: 80%;
+    }
+  }
+}

src/styles/components/_oauth.scss

@@ -12,5 +12,6 @@
     display: flex;
     flex-direction: column;
     align-items: flex-start;
+    text-align: left;
   }
 }
\ No newline at end of file