diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea33dd9abed76b2310c473b904d2f5a52750dc0f..580584bc976d11c8c6569e5770e8704db3406e95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,43 +2,34 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
-### [1.7.1](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.7.0...v1.7.1) (2022-01-26)
+### [1.7.2](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.7.1...v1.7.2) (2022-01-28)
### Features
-* **newsletter:** Added feedback image for newsletter ([7cded54](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/7cded54362ed5511602c60d7e26c1505a5bedbdb))
+* **enedisAnalysis:** New calculation for minimum consumption ([292a95d](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/292a95dee13fde8b8b220f81e77ca5c74bae7fc4))
+* **newsletter:** Added new image and styles ([4dabbc5](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/4dabbc58e4cf6bccd37164a7d96ecb0c3b3b92c6))
### Bug Fixes
-* Change text in next button in profile type form in third step ([febb74a](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/febb74a1e6a2d5a954e074a911f430022373e407))
-* **conso:** Resolve issue data doesn't refresh between conso tabs ([74c76c4](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/74c76c4ae7d31443deb69a210763795c82c23e52))
-* **ecogesture:** optimise design, correct text, and fix focus on button ([11945e6](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/11945e614d05db25efb7fb64a08955cce64ef4ee))
-* **faq:** typo ([8e545fa](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/8e545fac7b637e28ee91314be6a35424dacd4974))
-* **waterAlert:** Fix issue unable to activate alert (we already double check in service) ([6b310f7](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/6b310f775a5c8df09420309506f66ee981b5138b))
+* **ecogesture:** Fix focus buttons on IOS ([ed3dfb0](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/ed3dfb0c0aa4a78985acebaa3e6568a41f6136f0))
+* **Migration:** Resolve "Bloqué sur écran chargement Ecolyo" ([630a690](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/630a690dcd3d54a3590f9ac9cf4f749c14f0adde))
+* **profileType:** Remove data from previous profileType when the question is not asked again ([00e53fd](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/00e53fdef9d79f1ba30ebcc4c656fb56a90055a5))
### [1.7.1](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.7.0...v1.7.1) (2022-01-26)
-
### Features
-* **newsletter:** Added feedback image for newsletter ([7cded54](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/7cded54362ed5511602c60d7e26c1505a5bedbdb))
-
-
-### Bug Fixes
-
-* Change text in next button in profile type form in third step ([febb74a](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/febb74a1e6a2d5a954e074a911f430022373e407))
-* **conso:** Resolve issue data doesn't refresh between conso tabs ([74c76c4](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/74c76c4ae7d31443deb69a210763795c82c23e52))
-* **ecogesture:** optimise design, correct text, and fix focus on button ([11945e6](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/11945e614d05db25efb7fb64a08955cce64ef4ee))
-* **faq:** typo ([8e545fa](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/8e545fac7b637e28ee91314be6a35424dacd4974))
-* **waterAlert:** Fix issue unable to activate alert (we already double check in service) ([6b310f7](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/6b310f775a5c8df09420309506f66ee981b5138b))
-
-### [1.7.1](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.4.4...v1.7.1) (2022-01-26)
+- **newsletter:** Added feedback image for newsletter ([7cded54](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/7cded54362ed5511602c60d7e26c1505a5bedbdb))
### Bug Fixes
-- fix tagging issue
+- Change text in next button in profile type form in third step ([febb74a](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/febb74a1e6a2d5a954e074a911f430022373e407))
+- **conso:** Resolve issue data doesn't refresh between conso tabs ([74c76c4](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/74c76c4ae7d31443deb69a210763795c82c23e52))
+- **ecogesture:** optimise design, correct text, and fix focus on button ([11945e6](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/11945e614d05db25efb7fb64a08955cce64ef4ee))
+- **faq:** typo ([8e545fa](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/8e545fac7b637e28ee91314be6a35424dacd4974))
+- **waterAlert:** Fix issue unable to activate alert (we already double check in service) ([6b310f7](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/6b310f775a5c8df09420309506f66ee981b5138b))
## [1.7.0](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.5.0...v1.7.0) (2022-01-21)
diff --git a/manifest.webapp b/manifest.webapp
index ae6aa278d29a5e34035c34b174bbc778610524b4..856c53207f364e8bdde3055da5dbf9401dd625e6 100644
--- a/manifest.webapp
+++ b/manifest.webapp
@@ -3,7 +3,7 @@
"slug": "ecolyo",
"icon": "icon.svg",
"categories": ["energy"],
- "version": "1.7.1",
+ "version": "1.7.2",
"licence": "AGPL-3.0",
"editor": "Métropole de Lyon",
"default_locale": "fr",
diff --git a/package.json b/package.json
index 2ec391a2fad51c3d387c3298a84a0d0dca10f06c..fbca002b19720557f92ceda9b532b0ca95531df4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "ecolyo",
- "version": "1.7.1",
+ "version": "1.7.2",
"scripts": {
"tx": "tx pull --all || true",
"lint": "yarn lint:js && yarn lint:styles",
diff --git a/src/components/Analysis/ElecHalfHourMonthlyAnalysis.spec.tsx b/src/components/Analysis/ElecHalfHourMonthlyAnalysis.spec.tsx
index ef633974e471f917d59c3c818d6e5e833928ed00..299d2a4da67c4bdb964de2cc7608efca9c4dc1fe 100644
--- a/src/components/Analysis/ElecHalfHourMonthlyAnalysis.spec.tsx
+++ b/src/components/Analysis/ElecHalfHourMonthlyAnalysis.spec.tsx
@@ -9,6 +9,8 @@ import {
mockDataLoadEnedisAnalysis,
mockEnedisMonthlyAnalysisArray,
} from '../../../tests/__mocks__/enedisMonthlyAnalysisData.mock'
+import { PerformanceIndicator } from 'models'
+import { allLastFluidPrices } from '../../../tests/__mocks__/fluidPrice.mock'
jest.mock('cozy-ui/transpiled/react/I18n', () => {
return {
@@ -47,6 +49,20 @@ jest.mock('services/enedisMonthlyAnalysisData.service', () => {
}
})
})
+const mockPerfIndicator: PerformanceIndicator = {
+ value: 10,
+ compareValue: null,
+ percentageVariation: null,
+ price: null,
+}
+const mockGetPrices = jest.fn()
+jest.mock('services/fluidsPrices.service', () => {
+ return jest.fn(() => {
+ return {
+ getPrices: mockGetPrices,
+ }
+ })
+})
describe('ElecHalfHourMonthlyAnalysis component', () => {
beforeEach(() => {
@@ -57,11 +73,13 @@ describe('ElecHalfHourMonthlyAnalysis component', () => {
it('should be rendered correctly when isHalfHourActivated is false', async () => {
mockCheckDoctypeEntries.mockResolvedValueOnce(false)
+ mockGetPrices.mockResolvedValue(allLastFluidPrices[0])
const wrapper = mount(
<ElecHalfHourMonthlyAnalysis
analysisDate={DateTime.fromISO('2021-07-01T00:00:00.000Z', {
zone: 'utc',
})}
+ perfIndicator={mockPerfIndicator}
/>
)
await waitForComponentToPaint(wrapper)
@@ -76,11 +94,14 @@ describe('ElecHalfHourMonthlyAnalysis component', () => {
mockAggregateValuesToDataLoad.mockResolvedValueOnce(
mockDataLoadEnedisAnalysis
)
+ mockGetPrices.mockResolvedValue(allLastFluidPrices[0])
+
const wrapper = mount(
<ElecHalfHourMonthlyAnalysis
analysisDate={DateTime.fromISO('2021-07-01T00:00:00.000Z', {
zone: 'utc',
})}
+ perfIndicator={mockPerfIndicator}
/>
)
await waitForComponentToPaint(wrapper)
@@ -95,11 +116,13 @@ describe('ElecHalfHourMonthlyAnalysis component', () => {
mockAggregateValuesToDataLoad.mockResolvedValueOnce(
mockDataLoadEnedisAnalysis
)
+ mockGetPrices.mockResolvedValue(allLastFluidPrices[0])
const wrapper = mount(
<ElecHalfHourMonthlyAnalysis
analysisDate={DateTime.fromISO('2021-07-01T00:00:00.000Z', {
zone: 'utc',
})}
+ perfIndicator={mockPerfIndicator}
/>
)
await waitForComponentToPaint(wrapper)
@@ -119,11 +142,14 @@ describe('ElecHalfHourMonthlyAnalysis component', () => {
mockAggregateValuesToDataLoad.mockResolvedValueOnce(
mockDataLoadEnedisAnalysis
)
+ mockGetPrices.mockResolvedValue(allLastFluidPrices[0])
+
const wrapper = mount(
<ElecHalfHourMonthlyAnalysis
analysisDate={DateTime.fromISO('2021-07-01T00:00:00.000Z', {
zone: 'utc',
})}
+ perfIndicator={mockPerfIndicator}
/>
)
await waitForComponentToPaint(wrapper)
diff --git a/src/components/Analysis/ElecHalfHourMonthlyAnalysis.tsx b/src/components/Analysis/ElecHalfHourMonthlyAnalysis.tsx
index 68cf39659a63832172bbdf017190bc30ecbb1db2..e93d9fc31cbed610adf8676d93330ae83340ccc7 100644
--- a/src/components/Analysis/ElecHalfHourMonthlyAnalysis.tsx
+++ b/src/components/Analysis/ElecHalfHourMonthlyAnalysis.tsx
@@ -25,16 +25,19 @@ import { TimeStep } from 'enum/timeStep.enum'
import { Button } from '@material-ui/core'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
import useExploration from 'components/Hooks/useExploration'
-import { FluidConfig } from 'models'
+import { FluidConfig, FluidPrice, PerformanceIndicator } from 'models'
import ConfigService from 'services/fluidConfig.service'
import ElecInfoModal from './ElecInfoModal'
+import FluidPricesService from 'services/fluidsPrices.service'
interface ElecHalfHourMonthlyAnalysisProps {
analysisDate: DateTime
+ perfIndicator: PerformanceIndicator
}
const ElecHalfHourMonthlyAnalysis: React.FC<ElecHalfHourMonthlyAnalysisProps> = ({
analysisDate,
+ perfIndicator,
}: ElecHalfHourMonthlyAnalysisProps) => {
const { t } = useI18n()
const client = useClient()
@@ -49,6 +52,8 @@ const ElecHalfHourMonthlyAnalysis: React.FC<ElecHalfHourMonthlyAnalysisProps> =
const [enedisAnalysisValues, setenedisAnalysisValues] = useState<
EnedisMonthlyAnalysisData
>()
+ const [facturePercentage, setFacturePercentage] = useState<number>()
+ const [elecPrice, setElecPrice] = useState<FluidPrice>()
const [openInfoModal, setOpenInfoModal] = useState<boolean>(false)
const handleChangeWeek = useCallback(() => {
@@ -79,6 +84,11 @@ const ElecHalfHourMonthlyAnalysis: React.FC<ElecHalfHourMonthlyAnalysisProps> =
const aggregatedData = emas.aggregateValuesToDataLoad(data[0])
setenedisAnalysisValues(data[0])
setMonthDataloads(aggregatedData)
+ if (data[0].minimumLoad && perfIndicator.value && subscribed) {
+ const percentage =
+ (data[0].minimumLoad / perfIndicator.value) * 100
+ setFacturePercentage(percentage)
+ }
}
} else {
setisHalfHourActivated(false)
@@ -86,9 +96,26 @@ const ElecHalfHourMonthlyAnalysis: React.FC<ElecHalfHourMonthlyAnalysisProps> =
setisLoading(false)
}
}
-
getEnedisAnalysisData()
+ return () => {
+ subscribed = false
+ }
+ }, [analysisDate, client, perfIndicator])
+
+ useEffect(() => {
+ let subscribed = true
+ const fluidsPricesService = new FluidPricesService(client)
+ async function getAllLastPrices() {
+ const price: FluidPrice = await fluidsPricesService.getPrices(
+ FluidType.ELECTRICITY,
+ analysisDate.minus({ month: 1 })
+ )
+ if (subscribed && price) {
+ setElecPrice(price)
+ }
+ }
+ getAllLastPrices()
return () => {
subscribed = false
}
@@ -147,43 +174,62 @@ const ElecHalfHourMonthlyAnalysis: React.FC<ElecHalfHourMonthlyAnalysisProps> =
)}
{enedisAnalysisValues && (
<div className="min-max">
- <div className="container">
- <Icon icon={MinIcon} size={40} className="minIcon" />
- <div className="text">
- <div className="min text-18-normal">
- {t('special_elec.min')}
- </div>
- <div className="value text-18-bold">
- {enedisAnalysisValues.minLoad !== 0 &&
- enedisAnalysisValues.minLoad !== null ? (
- <>
- {enedisAnalysisValues.minLoad} <span> kWh</span>
- </>
- ) : (
- <span>----</span>
- )}
- </div>
- </div>
- </div>
<div className="container">
<Icon icon={MaxPowerIcon} size={40} className="minIcon" />
<div className="text">
<div className="min text-18-normal">
{t('special_elec.maxPower')}
</div>
- <div className="value text-18-bold">
- {enedisAnalysisValues.maxPower !== 0 &&
- enedisAnalysisValues.maxPower !== null ? (
- <>
- {enedisAnalysisValues.maxPower.toFixed(2)}
- <span> kVA</span>
- </>
- ) : (
- <span>----</span>
- )}
- </div>
+ </div>
+ <div className="value kvAval">
+ {enedisAnalysisValues.maxPower !== 0 &&
+ enedisAnalysisValues.maxPower !== null ? (
+ <div className="text-18-bold">
+ {enedisAnalysisValues.maxPower.toFixed(1)}
+ <span className="text-18-normal"> kVA</span>
+ </div>
+ ) : (
+ <span>----</span>
+ )}
+ </div>
+ </div>
+ <div className="container consomin">
+ <Icon icon={MinIcon} size={40} className="minIcon" />
+ <div className="text text-18-normal">
+ <div>{t('special_elec.min')}</div>
+ <div>{t('special_elec.percentage')}</div>
+ <div>{t('special_elec.price')}</div>
+ </div>
+ <div className="value">
+ {enedisAnalysisValues.minimumLoad !== 0 &&
+ enedisAnalysisValues.minimumLoad !== null ? (
+ <>
+ <div className="text-18-bold">
+ {enedisAnalysisValues.minimumLoad.toFixed(1)}
+ <span className="text-18-normal"> kWh</span>
+ </div>
+ <div className="text-18-bold">
+ {facturePercentage
+ ? facturePercentage.toFixed(0)
+ : '---'}
+ <span className="text-18-normal"> %</span>
+ </div>
+ <div className="text-18-bold">
+ {elecPrice
+ ? (
+ enedisAnalysisValues.minimumLoad *
+ elecPrice.price
+ ).toFixed(1)
+ : '---'}
+ <span className="text-18-normal"> €</span>
+ </div>
+ </>
+ ) : (
+ <span>----</span>
+ )}
</div>
</div>
+
<div onClick={toggleOpenModal} className="showmodal">
{t('special_elec.showModal')}
</div>
diff --git a/src/components/Analysis/MonthlyAnalysis.tsx b/src/components/Analysis/MonthlyAnalysis.tsx
index d8725f87f92aa29506a9ffa0577e940378014150..3f27d49a2df76b35bfc7b54d416273e691c39e37 100644
--- a/src/components/Analysis/MonthlyAnalysis.tsx
+++ b/src/components/Analysis/MonthlyAnalysis.tsx
@@ -202,6 +202,9 @@ const MonthlyAnalysis: React.FC<MonthlyAnalysisProps> = ({
<div className="card">
<ElecHalfHourMonthlyAnalysis
analysisDate={analysisDate}
+ perfIndicator={
+ performanceIndicators[FluidType.ELECTRICITY]
+ }
/>
</div>
</div>
diff --git a/src/components/Analysis/__snapshots__/ElecHalfHourMonthlyAnalysis.spec.tsx.snap b/src/components/Analysis/__snapshots__/ElecHalfHourMonthlyAnalysis.spec.tsx.snap
index 5300385498177f89b076b8797d9403dd944fde18..3e66e5b70ea8e852ea46c8d5b18f7bdf2b35e28b 100644
--- a/src/components/Analysis/__snapshots__/ElecHalfHourMonthlyAnalysis.spec.tsx.snap
+++ b/src/components/Analysis/__snapshots__/ElecHalfHourMonthlyAnalysis.spec.tsx.snap
@@ -3,6 +3,14 @@
exports[`ElecHalfHourMonthlyAnalysis component should be rendered correctly when isHalfHourActivated is false 1`] = `
<ElecHalfHourMonthlyAnalysis
analysisDate={"2021-07-01T00:00:00.000Z"}
+ perfIndicator={
+ Object {
+ "compareValue": null,
+ "percentageVariation": null,
+ "price": null,
+ "value": 10,
+ }
+ }
>
<div
className="special-elec-container"
@@ -230,6 +238,14 @@ exports[`ElecHalfHourMonthlyAnalysis component should be rendered correctly when
exports[`ElecHalfHourMonthlyAnalysis component should be rendered correctly when isHalfHourActivated is true 1`] = `
<ElecHalfHourMonthlyAnalysis
analysisDate={"2021-07-01T00:00:00.000Z"}
+ perfIndicator={
+ Object {
+ "compareValue": null,
+ "percentageVariation": null,
+ "price": null,
+ "value": 10,
+ }
+ }
>
<div
className="special-elec-container"
@@ -580,21 +596,26 @@ exports[`ElecHalfHourMonthlyAnalysis component should be rendered correctly when
<div
className="min text-18-normal"
>
- special_elec.min
+ special_elec.maxPower
</div>
+ </div>
+ <div
+ className="value kvAval"
+ >
<div
- className="value text-18-bold"
+ className="text-18-bold"
>
- 3
-
- <span>
- kWh
+ 2.0
+ <span
+ className="text-18-normal"
+ >
+ kVA
</span>
</div>
</div>
</div>
<div
- className="container"
+ className="container consomin"
>
<Icon
className="minIcon"
@@ -621,19 +642,49 @@ exports[`ElecHalfHourMonthlyAnalysis component should be rendered correctly when
</Component>
</Icon>
<div
- className="text"
+ className="text text-18-normal"
+ >
+ <div>
+ special_elec.min
+ </div>
+ <div>
+ special_elec.percentage
+ </div>
+ <div>
+ special_elec.price
+ </div>
+ </div>
+ <div
+ className="value"
>
<div
- className="min text-18-normal"
+ className="text-18-bold"
>
- special_elec.maxPower
+ 3.0
+ <span
+ className="text-18-normal"
+ >
+ kWh
+ </span>
</div>
<div
- className="value text-18-bold"
+ className="text-18-bold"
>
- 2.00
- <span>
- kVA
+ ---
+ <span
+ className="text-18-normal"
+ >
+ %
+ </span>
+ </div>
+ <div
+ className="text-18-bold"
+ >
+ 0.4
+ <span
+ className="text-18-normal"
+ >
+ €
</span>
</div>
</div>
diff --git a/src/components/Analysis/elecHalfHourMonthlyAnalysis.scss b/src/components/Analysis/elecHalfHourMonthlyAnalysis.scss
index 4f79df64482152cad1eafab89160fe74e4cd6908..0bf6cb51094b1d014c0657507fcfe2d01c81678b 100644
--- a/src/components/Analysis/elecHalfHourMonthlyAnalysis.scss
+++ b/src/components/Analysis/elecHalfHourMonthlyAnalysis.scss
@@ -29,7 +29,7 @@
}
}
.minIcon {
- margin-right: 0.7rem;
+ margin: auto 0.8rem auto 0;
}
.activation-text {
margin: 1rem 0 0.7rem 0;
@@ -44,6 +44,33 @@
}
.container {
margin-bottom: 1rem;
+ padding: 1rem;
+ border: 1px solid $grey-bright;
+ border-radius: 10px;
+ display: flex;
+
+ .min {
+ max-width: 150px;
+ }
+ .text {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ }
+ .value {
+ margin-left: auto;
+ display: flex;
+ flex-direction: column;
+ align-items: self-end;
+ min-width: 80px;
+ justify-content: space-between;
+ }
+ .kvAval {
+ margin: auto 0 auto auto;
+ }
+ }
+ .consomin {
+ min-height: 100px;
}
.loader-container {
text-align: center;
diff --git a/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.tsx b/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.tsx
index 3fbdf2f78c6f09e538eedfd3d39fe3a842428e26..565557ecd29baa51c56b71e848fb15fb21e28f05 100644
--- a/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.tsx
+++ b/src/components/ConsumptionVisualizer/EstimatedConsumptionModal.tsx
@@ -22,12 +22,12 @@ const EstimatedConsumptionModal: React.FC<EstimatedConsumptionModalProps> = ({
}: EstimatedConsumptionModalProps) => {
const { t } = useI18n()
const client = useClient()
- const fluidsPricesService = new FluidPricesService(client)
const [prices, setPrices] = useState<FluidPrice[]>([])
useEffect(() => {
let subscribed = true
+ const fluidsPricesService = new FluidPricesService(client)
async function getAllLastPrices() {
const prices = await fluidsPricesService.getAllLastPrices()
if (subscribed && prices) {
@@ -38,7 +38,7 @@ const EstimatedConsumptionModal: React.FC<EstimatedConsumptionModalProps> = ({
return () => {
subscribed = false
}
- }, [])
+ }, [client])
return (
<Dialog
diff --git a/src/components/EcogestureSelection/EcogestureSelectionDetail.tsx b/src/components/EcogestureSelection/EcogestureSelectionDetail.tsx
index 055a3402acc7a20affe9c2c2ec7d0ceebc8716c9..5f79549fc7b92f9214766f98ab9fa43a3454a5d3 100644
--- a/src/components/EcogestureSelection/EcogestureSelectionDetail.tsx
+++ b/src/components/EcogestureSelection/EcogestureSelectionDetail.tsx
@@ -52,6 +52,7 @@ const EcogestureSelectionDetail: React.FC<EcogestureSelectionDetailProps> = ({
classes={{
root: 'btn-secondary-negative',
label: 'text-14-bold',
+ focusVisible: 'noFocus',
}}
onClick={() => validate(true, false)}
>
@@ -63,6 +64,7 @@ const EcogestureSelectionDetail: React.FC<EcogestureSelectionDetailProps> = ({
classes={{
root: 'btn-secondary-negative',
label: 'text-14-bold',
+ focusVisible: 'noFocus',
}}
onClick={() => validate(false, true)}
>
@@ -74,6 +76,7 @@ const EcogestureSelectionDetail: React.FC<EcogestureSelectionDetailProps> = ({
classes={{
root: 'btn-secondary-negative',
label: 'text-14-bold',
+ focusVisible: 'noFocus',
}}
onClick={() => validate(false, false)}
>
diff --git a/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap
index 04807f72f8a09f0e5297a783496455859fa7612a..2eaf1e7ab2f2ffca19057a87b6a1c90cef18aa60 100644
--- a/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap
+++ b/src/components/EcogestureSelection/__snapshots__/EcogestureSelectionDetail.spec.tsx.snap
@@ -89,6 +89,7 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
aria-label="ecogesture_selection.button_objective"
classes={
Object {
+ "focusVisible": "noFocus",
"label": "text-14-bold",
"root": "btn-secondary-negative",
}
@@ -108,7 +109,7 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
"disableElevation": "MuiButton-disableElevation",
"disabled": "Mui-disabled",
"endIcon": "MuiButton-endIcon",
- "focusVisible": "Mui-focusVisible",
+ "focusVisible": "Mui-focusVisible noFocus",
"fullWidth": "MuiButton-fullWidth",
"iconSizeLarge": "MuiButton-iconSizeLarge",
"iconSizeMedium": "MuiButton-iconSizeMedium",
@@ -138,7 +139,7 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
component="button"
disabled={false}
focusRipple={true}
- focusVisibleClassName="Mui-focusVisible"
+ focusVisibleClassName="Mui-focusVisible noFocus"
onClick={[Function]}
type="button"
>
@@ -155,7 +156,7 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
component="button"
disabled={false}
focusRipple={true}
- focusVisibleClassName="Mui-focusVisible"
+ focusVisibleClassName="Mui-focusVisible noFocus"
onClick={[Function]}
type="button"
>
@@ -253,6 +254,7 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
aria-label="ecogesture_selection.button_doing"
classes={
Object {
+ "focusVisible": "noFocus",
"label": "text-14-bold",
"root": "btn-secondary-negative",
}
@@ -272,7 +274,7 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
"disableElevation": "MuiButton-disableElevation",
"disabled": "Mui-disabled",
"endIcon": "MuiButton-endIcon",
- "focusVisible": "Mui-focusVisible",
+ "focusVisible": "Mui-focusVisible noFocus",
"fullWidth": "MuiButton-fullWidth",
"iconSizeLarge": "MuiButton-iconSizeLarge",
"iconSizeMedium": "MuiButton-iconSizeMedium",
@@ -302,7 +304,7 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
component="button"
disabled={false}
focusRipple={true}
- focusVisibleClassName="Mui-focusVisible"
+ focusVisibleClassName="Mui-focusVisible noFocus"
onClick={[Function]}
type="button"
>
@@ -319,7 +321,7 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
component="button"
disabled={false}
focusRipple={true}
- focusVisibleClassName="Mui-focusVisible"
+ focusVisibleClassName="Mui-focusVisible noFocus"
onClick={[Function]}
type="button"
>
@@ -417,6 +419,7 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
aria-label="ecogesture_selection.button_skip"
classes={
Object {
+ "focusVisible": "noFocus",
"label": "text-14-bold",
"root": "btn-secondary-negative",
}
@@ -436,7 +439,7 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
"disableElevation": "MuiButton-disableElevation",
"disabled": "Mui-disabled",
"endIcon": "MuiButton-endIcon",
- "focusVisible": "Mui-focusVisible",
+ "focusVisible": "Mui-focusVisible noFocus",
"fullWidth": "MuiButton-fullWidth",
"iconSizeLarge": "MuiButton-iconSizeLarge",
"iconSizeMedium": "MuiButton-iconSizeMedium",
@@ -466,7 +469,7 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
component="button"
disabled={false}
focusRipple={true}
- focusVisibleClassName="Mui-focusVisible"
+ focusVisibleClassName="Mui-focusVisible noFocus"
onClick={[Function]}
type="button"
>
@@ -483,7 +486,7 @@ exports[`EcogestureSelectionDetail component should be rendered correctly 1`] =
component="button"
disabled={false}
focusRipple={true}
- focusVisibleClassName="Mui-focusVisible"
+ focusVisibleClassName="Mui-focusVisible noFocus"
onClick={[Function]}
type="button"
>
diff --git a/src/components/EcogestureSelection/ecogestureSelectionDetail.scss b/src/components/EcogestureSelection/ecogestureSelectionDetail.scss
index db61bfa253cdd25701e539fd2863ae849e296265..51956d80474f8324f80b90625194f83d22252cfa 100644
--- a/src/components/EcogestureSelection/ecogestureSelectionDetail.scss
+++ b/src/components/EcogestureSelection/ecogestureSelectionDetail.scss
@@ -47,13 +47,20 @@
height: 7.375rem;
width: 6.5rem;
border-radius: 0.25rem;
- &:focus {
+ &:focus,
+ &.active,
+ &:disabled,
+ &:hover {
background: transparent;
}
+
span {
flex-direction: column;
color: $grey-bright;
}
}
+ button.noFocus {
+ background: transparent;
+ }
}
}
diff --git a/src/locales/fr.json b/src/locales/fr.json
index df2803bb5a2366380b4cbff7adaa676df1b25dde..c5fd454cb92a5e925d0efb516151bf2433cdb143 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -113,7 +113,9 @@
"weektype": "un jour de ",
"week": "semaine",
"weekend": "week-end",
- "min": "Consommation minimum",
+ "min": "Conso minimum",
+ "percentage": "Part dans la facture",
+ "price": "Soit",
"maxPower": "Puissance maximum atteinte",
"showModal": "Plus d'infos"
},
@@ -124,8 +126,8 @@
},
"title1": "Qu’est-ce que la consommation minimum ?",
"title2": "Qu’est-ce que la puissance maximum ?",
- "text1": "La consommation minimum correspond à votre plus petite consommation du mois, sur un créneau d'une demi-heure.",
- "text2": "Elle peut comprendre la consommation de vos appareils électriques en veille (box, télé, ...) ou encore celle de vos frigo et congélateur.",
+ "text1": "Elle correspond à votre plus petite consommation du mois sur un créneau d'une demi-heure.",
+ "text2": "Nous extrapolons cette consommation sur 1 mois afin vous donner un aperçu de la consommation de vos consommations électriques en veille (box, télé, chargeurs, ...) ou encore de celle, incompressible, de vos appareils de froid (frigo, congélateur).",
"text3": "C’est la puissance maximum délivrée par tous les appareils fonctionnant au même moment dans votre logement.",
"text4": "Vous avez choisi une puissance maximum dans votre offre d’éléctricité (3, 6 ou 9 kVA...) que vous ne devez pas dépasser pour ne pas faire sauter votre compteur. ",
"text5": "Cette puissance varie d'un mois à l'autre, regardez cette valeur sur l'ensemble de l'année pour vérifier si votre puissance souscrite correspond bien à votre usage."
diff --git a/src/migrations/migration.data.ts b/src/migrations/migration.data.ts
index b2ce441822b0f252c58e7b8967c8556c6c532d05..014a1a104c81a6f43bf29d9679aed3f96ea62e6e 100644
--- a/src/migrations/migration.data.ts
+++ b/src/migrations/migration.data.ts
@@ -13,8 +13,15 @@ import {
ENEDIS_YEAR_DOCTYPE,
GRDF_MONTH_DOCTYPE,
GRDF_YEAR_DOCTYPE,
+ ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE,
} from 'doctypes'
-import { DataloadEntity, Profile, ProfileType, UserChallenge } from 'models'
+import {
+ DataloadEntity,
+ FluidPrice,
+ Profile,
+ ProfileType,
+ UserChallenge,
+} from 'models'
import { Client } from 'cozy-client'
import { DateTime } from 'luxon'
import { UserQuizState } from 'enum/userQuiz.enum'
@@ -282,6 +289,12 @@ export const migrations: Migration[] = [
docTypes: FLUIDPRICES_DOCTYPE,
isCreate: true,
run: async (_client: Client, docs: any[]): Promise<any> => {
+ if (docs.length > 0) {
+ console.log('collection already exists, delete all')
+ docs.forEach(async doc => {
+ await _client.destroy(doc)
+ })
+ }
for (const fluidPrice of fluidsPricesData) {
await _client.create(FLUIDPRICES_DOCTYPE, fluidPrice)
}
@@ -300,7 +313,6 @@ export const migrations: Migration[] = [
doc.partnersIssueDate = DateTime.local()
.minus({ day: 1 })
.startOf('day')
- console.log(doc)
return doc
})
},
@@ -495,15 +507,38 @@ export const migrations: Migration[] = [
docTypes: FLUIDPRICES_DOCTYPE,
run: async (_client: Client, docs: any[]): Promise<any> => {
- const waterPricesData = fluidsPricesData.filter(fluidPriceData => {
+ const waterPricesData: any[] = fluidsPricesData.filter(fluidPriceData => {
return fluidPriceData.fluidType === FluidType.WATER
})
- const createWaterPricesData = waterPricesData.map(waterPriceData => {
- waterPriceData.createAction = true
- waterPriceData.doctype = FLUIDPRICES_DOCTYPE
- return waterPriceData
- })
+ const createWaterPricesData = waterPricesData.map(
+ (waterPriceData: any) => {
+ waterPriceData.createAction = true
+ waterPriceData.doctype = FLUIDPRICES_DOCTYPE
+ return waterPriceData
+ }
+ )
return createWaterPricesData
},
},
+ {
+ baseSchemaVersion: 18,
+ targetSchemaVersion: 19,
+ appVersion: '1.7.0',
+ description: 'Replace old minCons with the new calculation',
+ releaseNotes: null,
+ docTypes: ENEDIS_MONTHLY_ANALYSIS_DATA_DOCTYPE,
+ run: async (_client: Client, docs: any[]): Promise<any> => {
+ docs.map(doc => {
+ if (doc.minLoad) {
+ const numberofDaysInMonth = DateTime.fromObject({
+ month: doc.month,
+ year: doc.year,
+ }).daysInMonth
+ doc.minimumLoad = doc.minLoad * 48 * numberofDaysInMonth
+ delete doc.minLoad
+ }
+ })
+ return docs
+ },
+ },
]
diff --git a/src/migrations/migration.ts b/src/migrations/migration.ts
index 11acfabade7a54242e12b9764fd4343729eaf349..6dfe010f6526d38de1c8bfce281de623acb3f1d4 100644
--- a/src/migrations/migration.ts
+++ b/src/migrations/migration.ts
@@ -143,7 +143,7 @@ export async function migrate(
migration.docTypes,
migration.queryOptions
)
- if (docToUpdate.length) {
+ if (docToUpdate.length && !migration.isCreate) {
const migratedDocs = await migration.run(_client, docToUpdate)
if (migratedDocs.length) {
result = await save(_client, migratedDocs)
diff --git a/src/models/enedisMonthlyAnalysis.ts b/src/models/enedisMonthlyAnalysis.ts
index 78d16f72770f9faebfb755367f82254da2d1a655..7c0547ce604b7d60bd2963b79773ed34d3906eb0 100644
--- a/src/models/enedisMonthlyAnalysis.ts
+++ b/src/models/enedisMonthlyAnalysis.ts
@@ -5,7 +5,7 @@ export interface EnedisMonthlyAnalysisData {
weekEndDaysHalfHourAverageValues: number[]
month: number
year: number
- minLoad: number | null
+ minimumLoad: number | null
maxPower: number | null
}
export interface AggregatedEnedisMonthlyDataloads {
diff --git a/src/notifications/monthlyReport.hbs b/src/notifications/monthlyReport.hbs
index ea0a22d1e577cb822e8a510501ebbabd36c61a8b..0ed4363828c25b93ca5215b1256734d126e2aab6 100644
--- a/src/notifications/monthlyReport.hbs
+++ b/src/notifications/monthlyReport.hbs
@@ -5,15 +5,15 @@
<mj-style>
.elec-text {
color: #d87b39 !important;
- font-weight: bold !important;
+ font-weight: normal !important;
}
.gas-text {
color: #45d1b8 !important;
- font-weight: bold !important;
+ font-weight: normal !important;
}
.water-text {
color: #3a98ec !important;
- font-weight: bold !important;
+ font-weight: normal !important;
}
</mj-style>
</mj-head>
@@ -22,22 +22,20 @@
{{/base/header}}
<mj-section background-color="#121212">
- <mj-column width="60%" vertical-align="middle">
+ <mj-column width="55%" vertical-align="middle">
<mj-text color="white" font-weight="900" font-size="24px">
Bonjour {{username}},
</mj-text>
{{#if consumptionTextExist }}
- <mj-text color="white" font-weight="400" font-size="18px">Ce mois-ci vous avez consommé {{{consumptionText}}} par rapport au mois de {{previousMonth}}. <br /><br /> Retrouvez le détail de vos consommations et plus d'informations dans votre bilan Ecolyo.</mj-text>
+ <mj-text color="white" font-weight="400" font-size="18px">Par rapport au mois {{previousMonth}}, vous avez consommé :{{{consumptionText}}}<br /></mj-text>
{{/if}}
- {{#unless consumptionTextExist }}
- <mj-text color="white" font-weight="400" font-size="18px">Retrouvez le détail de vos consommations et plus d'informations dans votre bilan Ecolyo.</mj-text>
- {{/unless}}
</mj-column>
- <mj-column width="40%" vertical-align="middle">
+ <mj-column width="45%" vertical-align="middle">
<mj-image src={{consoImageUrl}} width="132px" align="center" alt="consomation"></mj-image>
</mj-column>
</mj-section>
<mj-section background-color="#121212">
+ <mj-text color="white" font-weight="400" font-size="18px">Retrouvez le détail de vos consommations et plus d'informations dans votre bilan Ecolyo.<br /><br /></mj-text>
<mj-column>
<mj-social css-class="button-with-icon" icon-size="36px" mode="horizontal" font-size="20px" font-weight="700" >
<mj-social-element src="{{baseUrl}}/assets/ecolyo-icon.png" name="ecolyo" padding="0 10px 0 0" href="{{clientUrl}}">
@@ -52,27 +50,37 @@
L'info du mois
</mj-text>
<mj-image src="{{infoImage}}" width="82px" alt="nouveauté"></mj-image>
- <mj-text color="white" font-weight="400" font-size="18px" align="center" css-class="custom-link">{{{infoText}}}</mj-text>
+ <mj-text color="white" font-weight="400" font-size="18px" css-class="custom-link">{{{infoText}}}</mj-text>
{{#if isServiceNews}}
<mj-divider css-class="m-divider"></mj-divider>
<mj-text css-class="title custom-link" color="white" font-weight="900" font-size="24px" align="center" >
{{newsTitle}}
</mj-text>
- <mj-text color="white" font-weight="400" font-size="18px" align="center" css-class="custom-link" >{{{newsContent}}}</mj-text>
+ <mj-text color="white" font-weight="400" font-size="18px" css-class="custom-link" >{{{newsContent}}}</mj-text>
{{/if}}
{{#if isPoll}}
<mj-divider css-class="m-divider"></mj-divider>
<mj-text css-class="title " color="white" font-weight="900" font-size="24px" align="center" >
Votre avis nous intéresse
</mj-text>
- <mj-text color="white" font-weight="400" font-size="18px" align="center" css-class="custom-link" >{{{pollText}}}</mj-text>
+ <mj-text color="white" font-weight="400" font-size="18px" css-class="custom-link" >{{{pollText}}}</mj-text>
<mj-button color="black" background-color="#F1C017" css-class="button" font-size="20px" font-weight="700" >
<a href="{{pollUrl}}" style="text-decoration: none; color: black">C'est parti !</a>
</mj-button>
{{/if}}
</mj-column>
</mj-section>
-
+ <mj-section background-color="#121212">
+ <mj-column width="40%" vertical-align="middle">
+ <mj-image src={{feedbackImageUrl}} width="53px" align="center" alt="feedback"></mj-image>
+ </mj-column>
+ <mj-text color="white" font-weight="900" align="center" font-size="18px">
+ Un problème, une question, une suggestion ?
+ </mj-text>
+ <mj-text color="white" align="center" font-size="18px">
+ N'hésitez pas à nous écrire via la bulle dans le service.
+ </mj-text>
+ </mj-section>
<mj-section background-color="black">
<mj-column>
{{#> base/footer}}
@@ -82,5 +90,4 @@
</mj-column>
</mj-section>
</mj-body>
-</mjml>
-
+</mjml>
\ No newline at end of file
diff --git a/src/notifications/style.hbs b/src/notifications/style.hbs
index 47bc896a98c723d236929371973da3e90194d508..e3eda4f4d1bf833aab71e90678bd58aa0889b6f5 100644
--- a/src/notifications/style.hbs
+++ b/src/notifications/style.hbs
@@ -15,11 +15,12 @@
.m-divider p { margin: 60px 0 54px 0 !important; }
</mj-style>
<mj-style>
- .button table { background-color: #F1C017 !important; margin: 10px !important
- } .button-with-icon td { padding-right: 10px !important; } .button-with-icon
- table { background-color: #F1C017 !important; margin: 10px !important; }
+ .button table { background-color: #F1C017 !important; margin: 10px !important;
+ } .button-with-icon td { padding-right: 1px !important; } .button-with-icon
+ table { background-color: #F1C017 !important; margin-left: 10px !important; margin-right: 10px !important; }
.button-with-icon span { vertical-align: middle !important; }
- .button-with-icon a { vertical-align: middle !important; }
+ .button-with-icon a { vertical-align: middle !important; padding-right: 10px !important;}
+ .button-with-icon a img { padding-top: 20px;}
</mj-style>
<mj-style>
.custom-link a { color: #F1C017 !important; text-decoration: none !important;
diff --git a/src/services/profileType.service.ts b/src/services/profileType.service.ts
index aaa2dc314117b2b6d213556a4a7dfec7289869d6..5ce0179da5ab78063e0e7706387d1beaf48b64a6 100644
--- a/src/services/profileType.service.ts
+++ b/src/services/profileType.service.ts
@@ -544,6 +544,9 @@ export default class ProfileTypeService {
profileType.hotWaterEquipment = HotWaterEquipment.OTHER
}
}
+ if (profileType.constructionYear === ConstructionYear.AFTER_1998) {
+ profileType.individualInsulationWork = [IndividualInsulationWork.NONE]
+ }
// Remove potential metadata from already existing profileType in order
// to create a new entry. Otherwise will update existing one.
if (profileType._id) {
diff --git a/src/styles/index.css b/src/styles/index.css
index 049ceff4849fb46ae394e1707c1a164e3ac5db92..9e1b70aab157ae4e9f6c485cc9310d15b259c173 100644
--- a/src/styles/index.css
+++ b/src/styles/index.css
@@ -38,31 +38,36 @@ body {
width: 100%;
display: flex;
align-items: center;
- justify-content: center; }
+ justify-content: center;
+ margin-left: 0; }
+ @media only screen and (max-width: 768px) {
+ /* line 24, src/styles/base/_layout.scss */
+ .cozy-bar {
+ margin-left: 1.25rem; } }
-/* line 31, src/styles/base/_layout.scss */
+/* line 35, src/styles/base/_layout.scss */
[role='banner'] .coz-bar-container {
background-color: #ffffff; }
@media only screen and (max-width: 768px) {
- /* line 31, src/styles/base/_layout.scss */
+ /* line 35, src/styles/base/_layout.scss */
[role='banner'] .coz-bar-container {
padding: 0 0 0 0;
background-color: unset; } }
-/* line 39, src/styles/base/_layout.scss */
+/* line 43, src/styles/base/_layout.scss */
.coz-bar-wrapper {
box-shadow: unset !important;
background: unset !important; }
-/* line 43, src/styles/base/_layout.scss */
+/* line 47, src/styles/base/_layout.scss */
.cv-button {
width: 4.25rem; }
-/* line 46, src/styles/base/_layout.scss */
+/* line 50, src/styles/base/_layout.scss */
.coz-label {
color: #32363f; }
-/* line 50, src/styles/base/_layout.scss */
+/* line 54, src/styles/base/_layout.scss */
.header {
display: flex;
align-items: center;
@@ -74,63 +79,63 @@ body {
top: 48px;
left: 0; }
@media only screen and (max-width: 768px) {
- /* line 50, src/styles/base/_layout.scss */
+ /* line 54, src/styles/base/_layout.scss */
.header {
top: 0; } }
- /* line 63, src/styles/base/_layout.scss */
+ /* line 67, src/styles/base/_layout.scss */
.header .header-top {
background: radial-gradient(74.83% 76.97% at 50% 13.64%, #343641 0%, #1b1c22 100%);
width: 100%; }
- /* line 70, src/styles/base/_layout.scss */
+ /* line 74, src/styles/base/_layout.scss */
.header .header-top .header-text {
padding: 0 1rem 1rem 1rem;
color: #e0e0e0; }
- /* line 75, src/styles/base/_layout.scss */
+ /* line 79, src/styles/base/_layout.scss */
.header .header-content {
margin: 0 0 0 220px;
display: flex;
flex-direction: column; }
@media only screen and (max-width: 1023px) {
- /* line 75, src/styles/base/_layout.scss */
+ /* line 79, src/styles/base/_layout.scss */
.header .header-content {
margin: 0; } }
@media only screen and (max-width: 768px) {
- /* line 75, src/styles/base/_layout.scss */
+ /* line 79, src/styles/base/_layout.scss */
.header .header-content {
margin: 60px 0 0 0; } }
- /* line 85, src/styles/base/_layout.scss */
+ /* line 89, src/styles/base/_layout.scss */
.header .header-content .header-content-top {
display: flex;
flex-direction: row; }
- /* line 88, src/styles/base/_layout.scss */
+ /* line 92, src/styles/base/_layout.scss */
.header .header-content .header-content-top.header-content-top-right {
justify-content: flex-end; }
- /* line 91, src/styles/base/_layout.scss */
+ /* line 95, src/styles/base/_layout.scss */
.header .header-content .header-content-top .header-text {
padding: 2rem 1rem;
flex: 1; }
- /* line 95, src/styles/base/_layout.scss */
+ /* line 99, src/styles/base/_layout.scss */
.header .header-content .header-content-top .header-text-desktop {
display: flex;
flex: 1;
padding: 2rem 1.25rem;
color: #e0e0e0; }
- /* line 101, src/styles/base/_layout.scss */
+ /* line 105, src/styles/base/_layout.scss */
.header .header-content .header-content-top .header-back-button {
padding: 0 0.75rem; }
@media only screen and (max-width: 768px) {
- /* line 105, src/styles/base/_layout.scss */
+ /* line 109, src/styles/base/_layout.scss */
.header .header-content .header-content-top .header-text {
padding: 0 1rem 1rem 1rem;
color: #e0e0e0; }
- /* line 109, src/styles/base/_layout.scss */
+ /* line 113, src/styles/base/_layout.scss */
.header .header-content .header-content-top .header-text-desktop {
display: none; }
- /* line 112, src/styles/base/_layout.scss */
+ /* line 116, src/styles/base/_layout.scss */
.header .header-content .header-content-top .header-feedbacks-button {
display: none; } }
-/* line 120, src/styles/base/_layout.scss */
+/* line 124, src/styles/base/_layout.scss */
.content-view-loading {
height: 80vh;
width: 100%;
@@ -139,28 +144,28 @@ body {
justify-content: center;
align-items: center;
color: #e0e0e0; }
- /* line 128, src/styles/base/_layout.scss */
+ /* line 132, src/styles/base/_layout.scss */
.content-view-loading .content-view-loading-text {
padding-top: 1rem;
margin: 0 2rem;
text-align: center; }
- /* line 133, src/styles/base/_layout.scss */
+ /* line 137, src/styles/base/_layout.scss */
.content-view-loading .content-view-loading-button {
max-width: 50vw;
margin-top: 1rem; }
-/* line 139, src/styles/base/_layout.scss */
+/* line 143, src/styles/base/_layout.scss */
[role='main'] {
/* width */
/* Track */
/* Handle */ }
- /* line 141, src/styles/base/_layout.scss */
+ /* line 145, src/styles/base/_layout.scss */
[role='main']::-webkit-scrollbar {
width: 10px; }
- /* line 145, src/styles/base/_layout.scss */
+ /* line 149, src/styles/base/_layout.scss */
[role='main']::-webkit-scrollbar-track {
background: #3e4045; }
- /* line 149, src/styles/base/_layout.scss */
+ /* line 153, src/styles/base/_layout.scss */
[role='main']::-webkit-scrollbar-thumb {
background: #6f7074; }
@@ -1389,7 +1394,3 @@ a.MuiTypography-colorPrimary {
.application {
overflow-x: hidden;
background-color: #121212; }
- @media only screen and (max-width: 768px) {
- /* line 55, src/styles/index.scss */
- .application {
- min-height: 100vh; } }
diff --git a/src/targets/services/enedisHalfHourMonthlyAnalysis.ts b/src/targets/services/enedisHalfHourMonthlyAnalysis.ts
index 3f03bbdcb025e6bbb2a23bd406f94ed7bc87f4dd..c56a6a79364388d9c435360b3a7d14ce9143132c 100644
--- a/src/targets/services/enedisHalfHourMonthlyAnalysis.ts
+++ b/src/targets/services/enedisHalfHourMonthlyAnalysis.ts
@@ -28,13 +28,15 @@ interface EnedisMonthlyProps {
*/
const getMinMonthlyLoad = (
weekEndValuesArray: number[][],
- weekValuesArray: number[][]
+ weekValuesArray: number[][],
+ numberofDaysInMonth: number
): number => {
const totalArray = union(...weekEndValuesArray, ...weekValuesArray)
const filteredTotal = totalArray.filter(val => val !== -1 && val !== 0)
- const minLoad = Math.min(...filteredTotal)
- log('info', `Minimum value is ${minLoad} `)
- return minLoad
+ const talonCons = Math.min(...filteredTotal)
+ const minCons = talonCons * 48 * numberofDaysInMonth
+ log('info', `Minimum value is ${minCons} `)
+ return minCons
}
/**
@@ -122,7 +124,7 @@ const getEnedisMonthAnalysisData = async (
const monthlyAveragesLoads: EnedisMonthlyAnalysisData = {
weekDaysHalfHourAverageValues: [],
weekEndDaysHalfHourAverageValues: [],
- minLoad: null,
+ minimumLoad: null,
maxPower: null,
month: month,
year: year,
@@ -149,9 +151,14 @@ const getEnedisMonthAnalysisData = async (
populateArrayWithTotalData(weekValuesArray, halfHourDayData, false)
}
}
- monthlyAveragesLoads.minLoad = getMinMonthlyLoad(
+ const numberofDaysInMonth = DateTime.fromObject({
+ month: month,
+ year: year,
+ }).daysInMonth
+ monthlyAveragesLoads.minimumLoad = getMinMonthlyLoad(
weekValuesArray,
- weekEndValuesArray
+ weekEndValuesArray,
+ numberofDaysInMonth
)
const arrAvg = (arr: number[]) =>
arr.reduce((a, b) => a + b, 0) / arr.length
diff --git a/src/targets/services/monthlyReportNotification.ts b/src/targets/services/monthlyReportNotification.ts
index e6f0e0b3331cfaee35c3b564f03611f11615aa4f..630f7381ef80300a049c2d1b3572e3a80c388935 100644
--- a/src/targets/services/monthlyReportNotification.ts
+++ b/src/targets/services/monthlyReportNotification.ts
@@ -13,7 +13,7 @@ import { TimeStep } from 'enum/timeStep.enum'
import ConsumptionService from 'services/consumption.service'
import { MonthlReport } from 'models/monthlyReport.model'
import EnvironmentService from 'services/environment.service'
-import { getMonthNameWithPrep, getPreviousMonthName } from 'utils/utils'
+import { getMonthNameWithPrep } from 'utils/utils'
const log = logger.namespace('report')
@@ -71,12 +71,12 @@ const buildConsumptionText = async (client: Client) => {
if (value) {
if (value > 0) {
text +=
- '<span class="elec-text">- ' +
+ '<span class="elec-text"><br>- ' +
Math.ceil(value * 100) +
" % d'électricité</span>"
} else {
text +=
- '<span class="elec-text">+ ' +
+ '<span class="elec-text"><br>+ ' +
Math.ceil(Math.abs(value * 100)) +
" % d'électricité</span>"
}
@@ -89,17 +89,14 @@ const buildConsumptionText = async (client: Client) => {
? consumption[FluidType.GAS].percentageVariation
: 0
if (value) {
- if (text.length > 0) {
- text += ', '
- }
if (value > 0) {
text +=
- '<span class="gas-text">- ' +
+ '<span class="gas-text"><br>- ' +
Math.ceil(value * 100) +
' % de gaz</span>'
} else {
text +=
- '<span class="gas-text">+ ' +
+ '<span class="gas-text"><br>+ ' +
Math.ceil(Math.abs(value * 100)) +
' % de gaz</span>'
}
@@ -110,17 +107,14 @@ const buildConsumptionText = async (client: Client) => {
? consumption[FluidType.WATER].percentageVariation
: 0
if (value) {
- if (text.length > 0) {
- text += ', '
- }
if (value > 0) {
text +=
- '<span class="water-text">- ' +
+ '<span class="water-text"><br>- ' +
Math.ceil(value * 100) +
" % d'eau</span>"
} else {
text +=
- '<span class="water-text">+ ' +
+ '<span class="water-text"><br>+ ' +
Math.ceil(Math.abs(value * 100)) +
" % d'eau</span>"
}
@@ -285,13 +279,14 @@ const monthlyReportNotification = async ({
),
pollText: monthlyReport.question.replace(/{cozyUrl}/g, appLink + '#/'),
pollUrl: monthlyReport.link,
- previousMonth: getPreviousMonthName(date.minus({ month: 1 })),
+ previousMonth: getMonthNameWithPrep(date.minus({ month: 1 })),
consoImageUrl: baseUrl + '/assets/multifluidConsumption.png',
+ feedbackImageUrl: baseUrl + '/assets/feedback.png',
})
const mailData = {
mode: 'noreply',
- subject: `[Ecolyo] - Votre bilan mensuel ${getMonthNameWithPrep(date)} ${
+ subject: `[Ecolyo] Votre bilan mensuel ${getMonthNameWithPrep(date)} ${
date.year
}`,
parts: [
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 7367f265008945b7ed7d88a7e4aa18b5d9f92942..9489a28f540e8c99dc726b41fc2d2a4aa01a2248 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -132,7 +132,7 @@ export const importIconbyId = async (id: string, pathType: string) => {
*/
export const getPreviousMonthName = (date: DateTime) => {
const monthNames = [
- 'janiver',
+ 'janvier',
'février',
'mars',
'avril',
diff --git a/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts b/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts
index 179c85a83bb9087a3749b9efc44586b7f9fb61f8..e58cf19889ade7ac6ebc28ed9ad94a1a3e8e5564 100644
--- a/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts
+++ b/tests/__mocks__/enedisMonthlyAnalysisData.mock.ts
@@ -10,7 +10,7 @@ export const mockEnedisMonthlyAnalysis: EnedisMonthlyAnalysisData = {
weekEndDaysHalfHourAverageValues: [0.25, 0.24, 0.23, 0.22, 0.21, 0.2],
month: 11,
year: 2021,
- minLoad: 3,
+ minimumLoad: 3,
maxPower: 2,
}
@@ -20,7 +20,7 @@ export const mockEnedisMonthlyAnalysisArray: EnedisMonthlyAnalysisData[] = [
weekEndDaysHalfHourAverageValues: [0.25, 0.24, 0.23],
month: 11,
year: 2021,
- minLoad: 3,
+ minimumLoad: 3,
maxPower: 2,
},
{
@@ -28,7 +28,7 @@ export const mockEnedisMonthlyAnalysisArray: EnedisMonthlyAnalysisData[] = [
weekEndDaysHalfHourAverageValues: [0.25, 0.24, 0.23, 0.22, 0.21, 0.2],
month: 10,
year: 2021,
- minLoad: 3,
+ minimumLoad: 3,
maxPower: 2,
},
{
@@ -36,7 +36,7 @@ export const mockEnedisMonthlyAnalysisArray: EnedisMonthlyAnalysisData[] = [
weekEndDaysHalfHourAverageValues: [0.25, 0.24, 0.23, 0.22, 0.21, 0.2],
month: 8,
year: 2021,
- minLoad: 3,
+ minimumLoad: 3,
maxPower: 2,
},
{
@@ -44,7 +44,7 @@ export const mockEnedisMonthlyAnalysisArray: EnedisMonthlyAnalysisData[] = [
weekEndDaysHalfHourAverageValues: [0.25, 0.24, 0.23, 0.22, 0.21, 0.2],
month: 7,
year: 2021,
- minLoad: 3,
+ minimumLoad: 3,
maxPower: 2,
},
]