diff --git a/src/components/Analysis/AnalysisView.tsx b/src/components/Analysis/AnalysisView.tsx
index 34b135007e51ff05bfaa8f78eb6ce1b268f5ba4a..9bef8722c57729b28fca4bc63556607b35dc6229 100644
--- a/src/components/Analysis/AnalysisView.tsx
+++ b/src/components/Analysis/AnalysisView.tsx
@@ -102,6 +102,7 @@ const AnalysisView: React.FC = () => {
<DateNavigator
currentAnalysisDate={currentAnalysisDate}
setCurrentAnalysisDate={setCurrentAnalysisDate}
+ inlineDateDisplay={true}
/>
</Header>
<Content height={headerHeight}>
diff --git a/src/components/Analysis/MonthlyAnalysis.tsx b/src/components/Analysis/MonthlyAnalysis.tsx
index 77131983da7c84662e6bfdd796b39e8ef0bc6165..b70cc4f5de0fe36a92c82806e07e3b012d4610dc 100644
--- a/src/components/Analysis/MonthlyAnalysis.tsx
+++ b/src/components/Analysis/MonthlyAnalysis.tsx
@@ -11,7 +11,6 @@ import { PerformanceIndicator } from 'models'
import ConsumptionService from 'services/consumption.service'
import PerformanceIndicatorService from 'services/performanceIndicator.service'
import ConfigService from 'services/fluidConfig.service'
-import { convertDateToMonthString } from 'utils/date'
import PerformanceIndicatorContent from 'components/PerformanceIndicator/PerformanceIndicatorContent'
import FluidPerformanceIndicator from 'components/PerformanceIndicator/FluidPerformanceIndicator'
@@ -23,6 +22,7 @@ import { useHistory } from 'react-router-dom'
import StyledSpinner from 'components/CommonKit/Spinner/StyledSpinner'
import AnalysisErrorModal from './AnalysisErrorModal'
import { DateTime } from 'luxon'
+import StyledCard from 'components/CommonKit/Card/StyledCard'
interface MonthlyAnalysisProps {
analysisDate: DateTime
@@ -108,53 +108,9 @@ const MonthlyAnalysis: React.FC<MonthlyAnalysisProps> = ({
<>
{isLoaded ? (
<div>
- <div className="analysis-root black">
- <div className="analysis-content">
- <div className="status-header">
- <div className="text-16-normal-uppercase">
- {t('analysis.status')}
- </div>
- <Button
- aria-label={t('analysis.accessibility.button_go_to_profil')}
- onClick={goToForm}
- classes={{
- root: 'btn-secondary-negative',
- label: 'text-16-normal',
- }}
- >
- <StyledIcon icon={ProfileEditIcon} size={40} />
- </Button>
- </div>
- {fluidTypes.length >= 1 ? (
- <AnalysisConsumption
- aggregatedPerformanceIndicator={
- aggregatedPerformanceIndicators
- }
- performanceIndicators={performanceIndicators}
- analysisDate={analysisDate}
- />
- ) : (
- <AnalysisErrorModal />
- )}
- </div>
- </div>
<div className="analysis-root">
<div className="analysis-content">
- <div className="analysis-header text-16-normal-uppercase">
- {t('analysis.analysis_date')}{' '}
- {convertDateToMonthString(analysisDate.plus({ month: -1 }))}
- </div>
- <PerformanceIndicatorContent
- performanceIndicator={aggregatedPerformanceIndicators}
- timeStep={timeStep}
- fluidLackOfData={fluidLackOfData}
- analysisDate={analysisDate}
- />
<div>
- <div className="analysis-header text-16-normal-uppercase">
- {t('analysis.detail')}
- {convertDateToMonthString(analysisDate.plus({ month: -1 }))}
- </div>
{fluidConfig.map((fluid, index) => {
return fluidTypes.includes(fluid.fluidTypeId) ? (
<FluidPerformanceIndicator
@@ -169,6 +125,48 @@ const MonthlyAnalysis: React.FC<MonthlyAnalysisProps> = ({
})}
</div>
</div>
+ <div className="analysis-content">
+ <StyledCard>
+ <span className="analysis-header text-16-normal-uppercase">
+ {t('analysis.analysis_date')}
+ </span>
+ <div>
+ <PerformanceIndicatorContent
+ performanceIndicator={aggregatedPerformanceIndicators}
+ timeStep={timeStep}
+ fluidLackOfData={fluidLackOfData}
+ analysisDate={analysisDate}
+ />
+ </div>
+ </StyledCard>
+ </div>
+ <div className="analysis-content">
+ <StyledCard>
+ <div className="status-header">
+ <Button
+ aria-label={t('analysis.accessibility.button_go_to_profil')}
+ onClick={goToForm}
+ classes={{
+ root: 'btn-secondary-negative',
+ label: 'text-16-normal',
+ }}
+ >
+ <StyledIcon icon={ProfileEditIcon} size={40} />
+ </Button>
+ </div>
+ {fluidTypes.length >= 1 ? (
+ <AnalysisConsumption
+ aggregatedPerformanceIndicator={
+ aggregatedPerformanceIndicators
+ }
+ performanceIndicators={performanceIndicators}
+ analysisDate={analysisDate}
+ />
+ ) : (
+ <AnalysisErrorModal />
+ )}
+ </StyledCard>
+ </div>
</div>
</div>
) : (
diff --git a/src/components/Analysis/monthlyanalysis.scss b/src/components/Analysis/monthlyanalysis.scss
index 00ab31ae150c37b451bf5e3001a82faf17b05ce1..2ce582839b8cbbd2dbfc9191f449082324956ee7 100644
--- a/src/components/Analysis/monthlyanalysis.scss
+++ b/src/components/Analysis/monthlyanalysis.scss
@@ -14,7 +14,6 @@
margin-bottom: 0;
}
.analysis-content {
- min-height: 23.875rem;
width: 45.75rem;
@media #{$large-phone} {
diff --git a/src/components/DateNavigator/DateNavigator.tsx b/src/components/DateNavigator/DateNavigator.tsx
index 509d47c4dbe16f1864b88b7ee0d8710078af556f..6ab0e3bdd0851dc9d436848b507626bcbefd9d12 100644
--- a/src/components/DateNavigator/DateNavigator.tsx
+++ b/src/components/DateNavigator/DateNavigator.tsx
@@ -1,138 +1,141 @@
-import React from 'react'
-import './datenavigator.scss'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { useDispatch, useSelector } from 'react-redux'
-import { AppStore } from 'store'
-import { setCurrentIndex, setSelectedDate } from 'store/chart/chart.actions'
-import { DateTime } from 'luxon'
-import classNames from 'classnames'
-
-import DateChartService from 'services/dateChart.service'
-import { isLastDateReached } from 'utils/date'
-
-import DateNavigatorFormat from 'components/DateNavigator/DateNavigatorFormat'
-import LeftArrowIcon from 'assets/icons/ico/left-arrow.svg'
-import RigthArrowIcon from 'assets/icons/ico/right-arrow.svg'
-import IconButton from '@material-ui/core/IconButton'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import { TimeStep } from 'enum/timeStep.enum'
-import { isKonnectorActive } from 'utils/utils'
-import { FluidType } from 'enum/fluid.enum'
-
-interface DateNavigatorProps {
- currentAnalysisDate?: DateTime
- setCurrentAnalysisDate?: React.Dispatch<React.SetStateAction<DateTime>>
-}
-
-const DateNavigator: React.FC<DateNavigatorProps> = ({
- currentAnalysisDate,
- setCurrentAnalysisDate,
-}: DateNavigatorProps) => {
- const { t } = useI18n()
- const dispatch = useDispatch()
- const { currentTimeStep, selectedDate, currentIndex } = useSelector(
- (state: AppStore) => state.ecolyo.chart
- )
- const { fluidStatus } = useSelector((state: AppStore) => state.ecolyo.global)
-
- const disablePrev =
- selectedDate <
- DateTime.local(0, 1, 1).setZone('utc', {
- keepLocalTime: true,
- })
- const disableNext: boolean = currentAnalysisDate
- ? isLastDateReached(currentAnalysisDate, TimeStep.MONTH)
- : isLastDateReached(selectedDate, currentTimeStep)
-
- const dateChartService = new DateChartService()
-
- const handleClickMove = (increment: number) => {
- if (!currentAnalysisDate) {
- const updatedDate: DateTime = dateChartService.incrementeDate(
- currentTimeStep,
- selectedDate,
- increment
- )
- const updatedIndex: number = dateChartService.defineDateIndex(
- currentTimeStep,
- updatedDate
- )
- dispatch(setSelectedDate(updatedDate))
- dispatch(setCurrentIndex(updatedIndex))
- } else {
- const updatedDate: DateTime = dateChartService.incrementeDate(
- TimeStep.MONTH,
- currentAnalysisDate,
- increment
- )
- setCurrentAnalysisDate && setCurrentAnalysisDate(updatedDate)
- }
- }
-
- const handleChangePrevIndex = () => {
- if (!disablePrev && isKonnectorActive(fluidStatus, FluidType.MULTIFLUID)) {
- const increment: number = dateChartService.defineIncrementForPreviousIndex(
- currentTimeStep,
- selectedDate,
- currentIndex
- )
- if (currentAnalysisDate) {
- handleClickMove(-1)
- } else handleClickMove(increment)
- }
- }
- const handleChangeNextIndex = () => {
- if (!disableNext && isKonnectorActive(fluidStatus, FluidType.MULTIFLUID)) {
- const increment: number = dateChartService.defineIncrementForNextIndex(
- currentTimeStep,
- selectedDate,
- currentIndex
- )
- if (currentAnalysisDate) {
- handleClickMove(1)
- } else handleClickMove(increment)
- }
- }
-
- return (
- <div className="date-navigator">
- <div>
- <IconButton
- aria-label={t('consumption.accessibility.button_previous_value')}
- className={classNames('date-navigator-button', {
- ['disable']:
- disablePrev ||
- !isKonnectorActive(fluidStatus, FluidType.MULTIFLUID),
- })}
- onClick={() => handleChangePrevIndex()}
- >
- <Icon icon={LeftArrowIcon} size={16} />
- </IconButton>
- </div>
- <DateNavigatorFormat
- timeStep={currentAnalysisDate ? TimeStep.MONTH : currentTimeStep}
- date={
- currentAnalysisDate
- ? currentAnalysisDate.minus({ month: 1 })
- : selectedDate
- }
- />
-
- <div>
- <IconButton
- aria-label={t('consumption.accessibility.button_next_value')}
- className={classNames('date-navigator-button', {
- ['disable']:
- disableNext ||
- !isKonnectorActive(fluidStatus, FluidType.MULTIFLUID),
- })}
- onClick={() => handleChangeNextIndex()}
- >
- <Icon icon={RigthArrowIcon} size={16} />
- </IconButton>
- </div>
- </div>
- )
-}
-
-export default DateNavigator
+import React from 'react'
+import './datenavigator.scss'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+import { useDispatch, useSelector } from 'react-redux'
+import { AppStore } from 'store'
+import { setCurrentIndex, setSelectedDate } from 'store/chart/chart.actions'
+import { DateTime } from 'luxon'
+import classNames from 'classnames'
+
+import DateChartService from 'services/dateChart.service'
+import { isLastDateReached } from 'utils/date'
+
+import DateNavigatorFormat from 'components/DateNavigator/DateNavigatorFormat'
+import LeftArrowIcon from 'assets/icons/ico/left-arrow.svg'
+import RigthArrowIcon from 'assets/icons/ico/right-arrow.svg'
+import IconButton from '@material-ui/core/IconButton'
+import Icon from 'cozy-ui/transpiled/react/Icon'
+import { TimeStep } from 'enum/timeStep.enum'
+import { isKonnectorActive } from 'utils/utils'
+import { FluidType } from 'enum/fluid.enum'
+
+interface DateNavigatorProps {
+ currentAnalysisDate?: DateTime
+ setCurrentAnalysisDate?: React.Dispatch<React.SetStateAction<DateTime>>
+ inlineDateDisplay?: boolean
+}
+
+const DateNavigator: React.FC<DateNavigatorProps> = ({
+ currentAnalysisDate,
+ setCurrentAnalysisDate,
+ inlineDateDisplay = false,
+}: DateNavigatorProps) => {
+ const { t } = useI18n()
+ const dispatch = useDispatch()
+ const { currentTimeStep, selectedDate, currentIndex } = useSelector(
+ (state: AppStore) => state.ecolyo.chart
+ )
+ const { fluidStatus } = useSelector((state: AppStore) => state.ecolyo.global)
+
+ const disablePrev =
+ selectedDate <
+ DateTime.local(0, 1, 1).setZone('utc', {
+ keepLocalTime: true,
+ })
+ const disableNext: boolean = currentAnalysisDate
+ ? isLastDateReached(currentAnalysisDate, TimeStep.MONTH)
+ : isLastDateReached(selectedDate, currentTimeStep)
+
+ const dateChartService = new DateChartService()
+
+ const handleClickMove = (increment: number) => {
+ if (!currentAnalysisDate) {
+ const updatedDate: DateTime = dateChartService.incrementeDate(
+ currentTimeStep,
+ selectedDate,
+ increment
+ )
+ const updatedIndex: number = dateChartService.defineDateIndex(
+ currentTimeStep,
+ updatedDate
+ )
+ dispatch(setSelectedDate(updatedDate))
+ dispatch(setCurrentIndex(updatedIndex))
+ } else {
+ const updatedDate: DateTime = dateChartService.incrementeDate(
+ TimeStep.MONTH,
+ currentAnalysisDate,
+ increment
+ )
+ setCurrentAnalysisDate && setCurrentAnalysisDate(updatedDate)
+ }
+ }
+
+ const handleChangePrevIndex = () => {
+ if (!disablePrev && isKonnectorActive(fluidStatus, FluidType.MULTIFLUID)) {
+ const increment: number = dateChartService.defineIncrementForPreviousIndex(
+ currentTimeStep,
+ selectedDate,
+ currentIndex
+ )
+ if (currentAnalysisDate) {
+ handleClickMove(-1)
+ } else handleClickMove(increment)
+ }
+ }
+ const handleChangeNextIndex = () => {
+ if (!disableNext && isKonnectorActive(fluidStatus, FluidType.MULTIFLUID)) {
+ const increment: number = dateChartService.defineIncrementForNextIndex(
+ currentTimeStep,
+ selectedDate,
+ currentIndex
+ )
+ if (currentAnalysisDate) {
+ handleClickMove(1)
+ } else handleClickMove(increment)
+ }
+ }
+
+ return (
+ <div className="date-navigator">
+ <div>
+ <IconButton
+ aria-label={t('consumption.accessibility.button_previous_value')}
+ className={classNames('date-navigator-button', {
+ ['disable']:
+ disablePrev ||
+ !isKonnectorActive(fluidStatus, FluidType.MULTIFLUID),
+ })}
+ onClick={() => handleChangePrevIndex()}
+ >
+ <Icon icon={LeftArrowIcon} size={16} />
+ </IconButton>
+ </div>
+ <DateNavigatorFormat
+ timeStep={currentAnalysisDate ? TimeStep.MONTH : currentTimeStep}
+ date={
+ currentAnalysisDate
+ ? currentAnalysisDate.minus({ month: 1 })
+ : selectedDate
+ }
+ inline={inlineDateDisplay}
+ />
+
+ <div>
+ <IconButton
+ aria-label={t('consumption.accessibility.button_next_value')}
+ className={classNames('date-navigator-button', {
+ ['disable']:
+ disableNext ||
+ !isKonnectorActive(fluidStatus, FluidType.MULTIFLUID),
+ })}
+ onClick={() => handleChangeNextIndex()}
+ >
+ <Icon icon={RigthArrowIcon} size={16} />
+ </IconButton>
+ </div>
+ </div>
+ )
+}
+
+export default DateNavigator
diff --git a/src/components/DateNavigator/DateNavigatorFormat.tsx b/src/components/DateNavigator/DateNavigatorFormat.tsx
index 0a112e4391576e25cc88d171d2b939563792ecc1..d13361f6e38964276732aa2fa5b079bfea3e04c2 100644
--- a/src/components/DateNavigator/DateNavigatorFormat.tsx
+++ b/src/components/DateNavigator/DateNavigatorFormat.tsx
@@ -6,11 +6,13 @@ import './datenavigatorformat.scss'
interface DateNavigatorFormatProps {
timeStep: TimeStep
date: DateTime
+ inline: boolean
}
const DateNavigatorFormat: React.FC<DateNavigatorFormatProps> = ({
timeStep,
date,
+ inline,
}: DateNavigatorFormatProps) => {
const formatDate = (_timeStep: TimeStep) => {
switch (_timeStep) {
@@ -61,15 +63,27 @@ const DateNavigatorFormat: React.FC<DateNavigatorFormatProps> = ({
return (
<div className="date-navigator-format">
- {formatedDate[0] && (
- <div className="date-navigator-format-date text-16-bold">
- {formatedDate[0]}
- </div>
- )}
- {formatedDate[1] && (
- <div className="date-navigator-format-date text-15-normal">
- {formatedDate[1]}
- </div>
+ {inline ? (
+ <>
+ {formatedDate[0] && formatedDate[1] && (
+ <div className="date-navigator-format-date text-16-bold">
+ {formatedDate[0]} {formatedDate[1]}
+ </div>
+ )}
+ </>
+ ) : (
+ <>
+ {formatedDate[0] && (
+ <div className="date-navigator-format-date text-16-bold">
+ {formatedDate[0]}
+ </div>
+ )}
+ {formatedDate[1] && (
+ <div className="date-navigator-format-date text-15-normal">
+ {formatedDate[1]}
+ </div>
+ )}
+ </>
)}
</div>
)
diff --git a/src/components/PerformanceIndicator/FluidPerformanceIndicator.tsx b/src/components/PerformanceIndicator/FluidPerformanceIndicator.tsx
index 0de905de98b67f8b75acf3101c6d0a1929b89fa6..42a9043b0d6c1b39a2eb5df693db53232369e5c7 100644
--- a/src/components/PerformanceIndicator/FluidPerformanceIndicator.tsx
+++ b/src/components/PerformanceIndicator/FluidPerformanceIndicator.tsx
@@ -1,24 +1,15 @@
-import React, { useCallback } from 'react'
+import React from 'react'
import './fluidPerformanceIndicator.scss'
-import { useHistory } from 'react-router-dom'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-import { useDispatch } from 'react-redux'
import { DateTime } from 'luxon'
import { FluidType } from 'enum/fluid.enum'
import { PerformanceIndicator } from 'models'
import { getPicto } from 'utils/picto'
-import { formatNumberValues } from 'utils/utils'
+import { formatNumberValues, getPreviousMonthName } from 'utils/utils'
import StyledCard from 'components/CommonKit/Card/StyledCard'
import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import BlackArrowIcon from 'assets/icons/ico/black-arrow.svg'
-import ConverterService from 'services/converter.service'
-import { setCurrentTimeStep, setSelectedDate } from 'store/chart/chart.actions'
-import { TimeStep } from 'enum/timeStep.enum'
-import { useClient } from 'cozy-client'
-import { UsageEventType } from 'enum/usageEvent.enum'
-import UsageEventService from 'services/usageEvent.service'
interface FluidPerformanceIndicatorProps {
performanceIndicator: PerformanceIndicator
@@ -32,33 +23,16 @@ const FluidPerformanceIndicator: React.FC<FluidPerformanceIndicatorProps> = ({
date,
}: FluidPerformanceIndicatorProps) => {
const { t } = useI18n()
- const history = useHistory()
- const dispatch = useDispatch()
const iconType = getPicto(fluidType)
- const converterService = new ConverterService()
- const client = useClient()
let displayedValue: string
if (performanceIndicator && performanceIndicator.value)
displayedValue = formatNumberValues(performanceIndicator.value).toString()
else displayedValue = '-----'
- const handleClick = useCallback(async () => {
- await UsageEventService.addEvent(client, {
- type: UsageEventType.NAVIGATION_EVENT,
- target: FluidType[fluidType].toLowerCase(),
- })
- dispatch(setCurrentTimeStep(TimeStep.DAY))
- dispatch(setSelectedDate(date))
- history.push(`/consumption/${FluidType[fluidType].toLowerCase()}`)
- }, [dispatch, history, date, fluidType, client])
-
return (
- <StyledCard onClick={handleClick} fluidType={fluidType}>
+ <StyledCard>
<div className="fpi">
<div className="fpi-left">
- <div className="fpi-title card-title-on">
- {t('FLUID.' + FluidType[fluidType] + '.LABEL')}
- </div>
<div className="fpi-content">
<StyledIcon
className="fpi-content-icon"
@@ -71,25 +45,37 @@ const FluidPerformanceIndicator: React.FC<FluidPerformanceIndicatorProps> = ({
<span className="card-indicator">
{t('FLUID.' + FluidType[fluidType] + '.UNIT')}
</span>
- <span
- className={`${FluidType[fluidType] + '-color euro-value'}`}
- >
- {performanceIndicator &&
- performanceIndicator.value &&
- `${formatNumberValues(
- converterService.LoadToEuro(
- performanceIndicator.value,
- fluidType
+ <span className={`euro-value month`}>
+ <span
+ className={`${
+ performanceIndicator &&
+ performanceIndicator.percentageVariation &&
+ performanceIndicator.percentageVariation > 0
+ ? 'positive'
+ : 'negative'
+ }`}
+ >
+ {performanceIndicator &&
+ performanceIndicator.percentageVariation ? (
+ performanceIndicator.percentageVariation > 0 ? (
+ `+${formatNumberValues(
+ performanceIndicator.percentageVariation * 100
+ )} %`
+ ) : (
+ `${formatNumberValues(
+ performanceIndicator.percentageVariation * 100
+ )} %`
)
- )} €`}
+ ) : (
+ <></>
+ )}
+ </span>
+ {`/ ${getPreviousMonthName(date.minus({ month: 1 }))}`}
</span>
</div>
</div>
</div>
</div>
- <div className="fpi-right">
- <StyledIcon icon={BlackArrowIcon} size={18} />
- </div>
</div>
</StyledCard>
)
diff --git a/src/components/PerformanceIndicator/PerformanceIndicatorContent.tsx b/src/components/PerformanceIndicator/PerformanceIndicatorContent.tsx
index 286cdd842de0f806a9922218e0d1d80675222e21..44380016085d123a1729f10fb9755bee2f04ebe9 100644
--- a/src/components/PerformanceIndicator/PerformanceIndicatorContent.tsx
+++ b/src/components/PerformanceIndicator/PerformanceIndicatorContent.tsx
@@ -1,158 +1,157 @@
-import React from 'react'
-import { useI18n } from 'cozy-ui/transpiled/react/I18n'
-
-import { TimeStep } from 'enum/timeStep.enum'
-import { PerformanceIndicator } from 'models'
-import { formatNumberValues } from 'utils/utils'
-
-import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
-import PileIcon from 'assets/icons/ico/coins.svg'
-
-import GreenIndicatorIcon from 'assets/icons/visu/indicator/green.svg'
-import RedIndicatorIcon from 'assets/icons/visu/indicator/red.svg'
-import GreyIndicatorIcon from 'assets/icons/visu/indicator/grey.svg'
-import ErrorIndicatorIcon from 'assets/icons/visu/indicator/error.svg'
-import { FluidType } from 'enum/fluid.enum'
-import './fluidPerformanceIndicator.scss'
-import { convertDateToMonthString } from 'utils/date'
-import { DateTime } from 'luxon'
-
-interface PerformanceIndicatorContentProps {
- performanceIndicator: PerformanceIndicator
- timeStep: TimeStep
- fluidLackOfData?: Array<FluidType>
- analysisDate?: DateTime
-}
-
-const PerformanceIndicatorContent: React.FC<PerformanceIndicatorContentProps> = ({
- performanceIndicator,
- fluidLackOfData = [],
- analysisDate,
-}: PerformanceIndicatorContentProps) => {
- const { t } = useI18n()
- let displayedValue: string
- if (performanceIndicator && performanceIndicator.value)
- displayedValue = formatNumberValues(performanceIndicator.value).toString()
- else displayedValue = '-----'
-
- let errorInPerf = false
- if (performanceIndicator && !performanceIndicator.value) {
- errorInPerf = true
- }
-
- let perf: number | null = null
- let diffInEuro: number | null = null
- if (
- performanceIndicator &&
- performanceIndicator.value &&
- performanceIndicator.compareValue
- ) {
- perf =
- 100 * (performanceIndicator.value / performanceIndicator.compareValue - 1)
- diffInEuro = performanceIndicator.value - performanceIndicator.compareValue
- }
- const perfString = perf ? formatNumberValues(perf) : ''
- const diffString = diffInEuro ? formatNumberValues(diffInEuro) : ''
- let perfStatus = ['error', ErrorIndicatorIcon]
- if (perf === null && !errorInPerf) perfStatus = ['nodata', ErrorIndicatorIcon]
- else if (perf === null && errorInPerf)
- perfStatus = ['error', ErrorIndicatorIcon]
- else if (perf && perf === 0) perfStatus = ['zero', GreyIndicatorIcon]
- else if (perf && perf > 0) perfStatus = ['positive', RedIndicatorIcon]
- else if (perf && perf < 0) perfStatus = ['negative', GreenIndicatorIcon]
- return (
- <div className="fpi">
- <div className="fpi-left">
- <div className="fpi-content">
- <div className="fpi-content-perf">
- <div className="fpi-content-perf-result card-result">
- <div className="icon-line">
- <StyledIcon
- className="fpi-content-icon perf-icon"
- icon={PileIcon}
- size={35}
- />
- <div>
- <span className="euro-value">{displayedValue}</span>
- <span className="card-indicator"> €</span>
- </div>
- </div>
- </div>
- {perfStatus[0] === 'positive' ||
- perfStatus[0] === 'negative' ||
- perfStatus[0] === 'zero' ? (
- <div className="fpi-content-perf-indicator bilan-card card-text">
- <div className="icon-line">
- <StyledIcon
- className="fpi-content-icon perf-icon"
- icon={perfStatus[1]}
- size={35}
- />
- <div className="evolution-text">
- {t('performance_indicator.bilan.text1')}
- {analysisDate &&
- convertDateToMonthString(
- analysisDate.plus({ month: -2 })
- ).substring(3)}{' '}
- :
- <span
- className={`fpi-content-perf-indicator-kpi ${perfStatus[0]} card-text-bold`}
- >
- {perfStatus[0] === 'positive' ? ' + ' : ' '}
- {perfString}%
- </span>
- <br />
- <span>
- {t('performance_indicator.bilan.text2')}
- <span className="diff-value">{diffString} €</span>
- </span>
- </div>
- </div>
- </div>
- ) : (
- <div className="fpi-content-perf-indicator card-text error">
- <StyledIcon
- className="fpi-content-icon perf-icon"
- icon={perfStatus[1]}
- size={35}
- />
-
- {fluidLackOfData.length !== 0 ? (
- <div>
- <div>
- {' '}
- {t('performance_indicator.error_no_compare_no_data')}{' '}
- </div>
- <div>
- {fluidLackOfData.map(fluidType => {
- return (
- <div key={fluidType} className="fluid-enum">
- {' '}
- - {t(
- 'FLUID.' + FluidType[fluidType] + '.NAME'
- )}{' '}
- </div>
- )
- })}
- </div>
- </div>
- ) : (
- <div>
- <div> {t('performance_indicator.error_no_compare')} </div>
- <div>
- {' '}
- {t('performance_indicator.error_no_compare_reason')}{' '}
- </div>
- </div>
- )}
- </div>
- )}
- </div>
- </div>
- </div>
- <div className="fpi-right"></div>
- </div>
- )
-}
-
-export default PerformanceIndicatorContent
+import React from 'react'
+import { useI18n } from 'cozy-ui/transpiled/react/I18n'
+
+import { TimeStep } from 'enum/timeStep.enum'
+import { PerformanceIndicator } from 'models'
+import { formatNumberValues } from 'utils/utils'
+
+import StyledIcon from 'components/CommonKit/Icon/StyledIcon'
+import PileIcon from 'assets/icons/ico/coins.svg'
+
+import GreenIndicatorIcon from 'assets/icons/visu/indicator/green.svg'
+import RedIndicatorIcon from 'assets/icons/visu/indicator/red.svg'
+import GreyIndicatorIcon from 'assets/icons/visu/indicator/grey.svg'
+import ErrorIndicatorIcon from 'assets/icons/visu/indicator/error.svg'
+import { FluidType } from 'enum/fluid.enum'
+import './fluidPerformanceIndicator.scss'
+import { convertDateToMonthString } from 'utils/date'
+import { DateTime } from 'luxon'
+
+interface PerformanceIndicatorContentProps {
+ performanceIndicator: PerformanceIndicator
+ timeStep: TimeStep
+ fluidLackOfData?: Array<FluidType>
+ analysisDate?: DateTime
+}
+
+const PerformanceIndicatorContent: React.FC<PerformanceIndicatorContentProps> = ({
+ performanceIndicator,
+ fluidLackOfData = [],
+ analysisDate,
+}: PerformanceIndicatorContentProps) => {
+ const { t } = useI18n()
+ let displayedValue: string
+ if (performanceIndicator && performanceIndicator.value)
+ displayedValue = formatNumberValues(performanceIndicator.value).toString()
+ else displayedValue = '-----'
+
+ let errorInPerf = false
+ if (performanceIndicator && !performanceIndicator.value) {
+ errorInPerf = true
+ }
+
+ let perf: number | null = null
+ let diffInEuro: number | null = null
+ if (
+ performanceIndicator &&
+ performanceIndicator.value &&
+ performanceIndicator.compareValue
+ ) {
+ perf =
+ 100 * (performanceIndicator.value / performanceIndicator.compareValue - 1)
+ diffInEuro = performanceIndicator.value - performanceIndicator.compareValue
+ }
+ const perfString = perf ? formatNumberValues(perf) : ''
+ const diffString = diffInEuro ? formatNumberValues(diffInEuro) : ''
+ let perfStatus = ['error', ErrorIndicatorIcon]
+ if (perf === null && !errorInPerf) perfStatus = ['nodata', ErrorIndicatorIcon]
+ else if (perf === null && errorInPerf)
+ perfStatus = ['error', ErrorIndicatorIcon]
+ else if (perf && perf === 0) perfStatus = ['zero', GreyIndicatorIcon]
+ else if (perf && perf > 0) perfStatus = ['positive', RedIndicatorIcon]
+ else if (perf && perf < 0) perfStatus = ['negative', GreenIndicatorIcon]
+ return (
+ <div className="fpi">
+ <div className="fpi-left">
+ <div className="fpi-content">
+ <div className="fpi-content-perf">
+ <div className="fpi-content-perf-result card-result">
+ <div className="icon-line">
+ <StyledIcon
+ className="fpi-content-icon perf-icon"
+ icon={PileIcon}
+ size={35}
+ />
+ <div>
+ <span className="euro-value">{displayedValue}</span>
+ <span className="card-indicator"> €</span>
+ </div>
+ </div>
+ </div>
+ {perfStatus[0] === 'positive' ||
+ perfStatus[0] === 'negative' ||
+ perfStatus[0] === 'zero' ? (
+ <div className="fpi-content-perf-indicator bilan-card card-text">
+ <div className="icon-line">
+ <StyledIcon
+ className="fpi-content-icon perf-icon"
+ icon={perfStatus[1]}
+ size={35}
+ />
+ <div className="evolution-text">
+ {t('performance_indicator.bilan.text1')}
+ {analysisDate &&
+ convertDateToMonthString(
+ analysisDate.plus({ month: -2 })
+ ).substring(3)}{' '}
+ :
+ <span
+ className={`fpi-content-perf-indicator-kpi ${perfStatus[0]} card-text-bold`}
+ >
+ {perfStatus[0] === 'positive' ? ' + ' : ' '}
+ {perfString}%
+ </span>
+ <br />
+ <span>
+ {t('performance_indicator.bilan.text2')}
+ <span className="diff-value">{diffString} €</span>
+ </span>
+ </div>
+ </div>
+ </div>
+ ) : (
+ <div className="fpi-content-perf-indicator card-text error">
+ <StyledIcon
+ className="fpi-content-icon perf-icon"
+ icon={perfStatus[1]}
+ size={35}
+ />
+
+ {fluidLackOfData.length !== 0 ? (
+ <div>
+ <div>
+ {' '}
+ {t('performance_indicator.error_no_compare_no_data')}{' '}
+ </div>
+ <div>
+ {fluidLackOfData.map(fluidType => {
+ return (
+ <div key={fluidType} className="fluid-enum">
+ {' '}
+ - {t(
+ 'FLUID.' + FluidType[fluidType] + '.NAME'
+ )}{' '}
+ </div>
+ )
+ })}
+ </div>
+ </div>
+ ) : (
+ <div>
+ <div> {t('performance_indicator.error_no_compare')} </div>
+ <div>
+ {' '}
+ {t('performance_indicator.error_no_compare_reason')}{' '}
+ </div>
+ </div>
+ )}
+ </div>
+ )}
+ </div>
+ </div>
+ </div>
+ </div>
+ )
+}
+
+export default PerformanceIndicatorContent
diff --git a/src/components/PerformanceIndicator/fluidPerformanceIndicator.scss b/src/components/PerformanceIndicator/fluidPerformanceIndicator.scss
index 248f2bbaa53b28ce0bcefda5d21fd54347347488..69f2f9029a9b9ddce005a15f86ba4c97d475d7a8 100644
--- a/src/components/PerformanceIndicator/fluidPerformanceIndicator.scss
+++ b/src/components/PerformanceIndicator/fluidPerformanceIndicator.scss
@@ -113,6 +113,15 @@
display: inline-block;
padding-right: 0.25rem;
}
+ .positive {
+ color: $red-primary !important;
+ }
+ .negative {
+ color: $green !important;
+ }
+ .month {
+ color: $soft-grey !important;
+ }
.euro-value {
font-size: 1.125rem;
display: block;
@@ -135,9 +144,6 @@
color: $soft-grey;
}
}
- .fpi-right {
- align-self: center;
- }
}
.flex-center {
display: flex;
diff --git a/src/components/ProfileType/ProfileTypeView.tsx b/src/components/ProfileType/ProfileTypeView.tsx
index bbb61f1f0b7da12b75a84c2e9e2480368e15e3fb..6ca59dd4ee963c5b6a049d80902d42d231dafd90 100644
--- a/src/components/ProfileType/ProfileTypeView.tsx
+++ b/src/components/ProfileType/ProfileTypeView.tsx
@@ -17,6 +17,7 @@ import {
OutsideFacingWalls,
ProfileTypeFormType,
ThreeChoicesAnswer,
+ WarmingType,
} from 'enum/profileType.enum'
import { FluidType } from 'enum/fluid.enum'
import { ProfileTypeStepForm } from 'enum/profileType.enum'
@@ -52,7 +53,7 @@ const ProfileTypeView = () => {
hasReplacedHeater: ThreeChoicesAnswer.NO,
hotWater: IndividualOrCollective.INDIVIDUAL,
hotWaterEquipment: HotWaterEquipment.OTHER,
- warmingFluid: FluidType.ELECTRICITY,
+ warmingFluid: WarmingType.ELECTRICITY,
hotWaterFluid: FluidType.ELECTRICITY,
cookingFluid: FluidType.ELECTRICITY,
})
diff --git a/src/constants/faq.json b/src/constants/faq.json
index 49fd5d515676970fd06d36346b7284e929ff3573..a0bd1e2079c4b10e6f17a733e26697dcec8ac70c 100644
--- a/src/constants/faq.json
+++ b/src/constants/faq.json
@@ -24,7 +24,9 @@
"summary": "Mes données ne s'affichent pas. Que se passe-t-il ?",
"details": [
"En fonctionnement normal, vos données électricité arrivent à J+1 (le lendemain), vos données eau et gaz arrivent quant à elles 3 jours après (à J+3).",
- "Si passé ce délai vos données manquent toujours à l'appel, il y a effectivement un soucis. Rendez-vous dans la page Options du service au niveau des connecteurs et mettez-les à jour. Si cela ne fonctionne toujours pas, tentez de les supprimer et de réaliser à nouveau la procédure de connexion. Si le connecteur semble fonctionner mais qu'il vous manque des données, il se peut que votre compteur ait un problème. Dans ce cas, et en fonction du fluide concerné, contactez directement Enedis (pour l'électricité), GRDF (pour le gaz) ou Eau du Grand Lyon (pour l'eau)."
+ "Plusieurs raisons peuvent expliquer l'absence de données :",
+ "- Le lien entre Ecolyo et le fournisseur de données est rompu. Une mise à jour de ce lien (en bas de la page) peut parfois résoudre ce problème.",
+ "- Si la mise à jour a été effectuée mais que la donnée n'apparaît toujours pas, le souci vient du fournisseur de données (Enedis pour l'électricité, GRDF pour le gaz, Eau du Grand Lyon pour l'eau). Cela peut être un problème de transmission de données entre le compte et le système de données du partenaire, ou un problème sur votre compteur. Dans ce cas, le mieux est de contacter directement Enedis, GRDF ou Eau du Grand Lyon pour tenter de régler le problème avec eux. "
]
},
{
@@ -44,7 +46,8 @@
{
"summary": "Qui a accès à mes données de consommation?",
"details": [
- "Personne n'a accès à vos données de consommation, pas même la Métropole de Lyon qui vous met à disposition un cloud personnel dans lequel le service traite vos données. Seul vous, pouvez accéder et visualiser vos données de consommation. "
+ "Vos données privées de consommation d’énergie et d’eau sont récupérées, sauvegardées et stockées dans votre cloud personnel à votre initiative sans visibilité de la Métropole de Lyon sur leur contenu. Il en est de même pour les données privées de composition du logement et du foyer, fournies par vos soins. Elles restent également sans visibilité de la Métropole de Lyon sur leur contenu.",
+ "Dans le cadre de l’évaluation et de l’amélioration du service, des données d’utilisation anonymisées sont cependant remontées à des fins d’exploitation statistiques. La récupération de ces statistiques anonymisées nous permettra de s’assurer du bon fonctionnement technique de la connexion à vos données de consommation ainsi que d’évaluer l’impact global en termes de baisse des consommations énergétiques de notre service (Plus d’informations sur la manière dont votre anonymat est bien préservé dans ce processus <a href=\" https://ecolyo.com/cloud_statistiques.html\">ici</a>)."
]
},
{
diff --git a/src/enum/profileType.enum.ts b/src/enum/profileType.enum.ts
index c4134f2a98af8ca6f4af02f9ccbd23e751f85567..d20224f37b1524b64d1c5623975cf02a3df821eb 100644
--- a/src/enum/profileType.enum.ts
+++ b/src/enum/profileType.enum.ts
@@ -49,6 +49,13 @@ export enum HotWaterEquipment {
OTHER = 'other',
}
+export enum WarmingType {
+ ELECTRICITY = 0,
+ GAS = 2,
+ WOOD = 3,
+ FUEL = 4,
+}
+
export enum ProfileTypeStepForm {
HOUSING_TYPE = 0,
AREA = 1,
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 1f868421c47485d78a51c18ba7de27260ee6b845..c5597da739a13dcf3597c1f093a1df67f20ddca8 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -72,10 +72,8 @@
},
"analysis": {
"viewTitle": "Analyse",
- "status": "Votre situation",
"comparison": "Comparatif",
- "analysis_date": "Conso du mois",
- "detail": "Détail du mois",
+ "analysis_date": "Conso totale",
"challenge": "Défis terminés en",
"user_consumption": "Votre conso",
"average_home": "Conso moyenne d'un profil similaire",
@@ -808,9 +806,13 @@
"question": "Quelle source d’énergie utilisez-vous pour vous chauffer ?",
"0": "Électricité",
"2": "Gaz",
- "no_fluid_text": "Produit ni par de l'électricité, ni par du gaz",
+ "3": "Bois",
+ "4": "Fuel",
+ "no_fluid_text": "Produit ni par de l'électricité, ni par du gaz, ni par du bois ou du fuel",
"0_text": "Produit grâce à de l'électricité",
- "2_text": "Produit grâce au gaz"
+ "2_text": "Produit grâce au gaz",
+ "3_text": "Produit grâce au bois",
+ "4_text": "Produit grâce au fuel"
},
"hot_water_fluid": {
"title": "Source eau chaude",
diff --git a/src/models/profileType.model.ts b/src/models/profileType.model.ts
index af01150b1d99aff5dc52ee49eec39bd8e56256c1..4fbe2c974c1f2eddfb30fa8770dcaee30f3a63f5 100644
--- a/src/models/profileType.model.ts
+++ b/src/models/profileType.model.ts
@@ -8,6 +8,7 @@ import {
IndividualOrCollective,
ProfileTypeFormType,
ThreeChoicesAnswer,
+ WarmingType,
} from 'enum/profileType.enum'
import { FluidType } from 'enum/fluid.enum'
import { DateTime } from 'luxon'
@@ -44,7 +45,7 @@ export interface ProfileType extends ProfileTypeIndexableTypes {
hasInstalledVentilation: ThreeChoicesAnswer
hasReplacedHeater: ThreeChoicesAnswer
hotWaterEquipment: HotWaterEquipment
- warmingFluid: FluidType | null
+ warmingFluid: WarmingType | null
hotWaterFluid: FluidType | null
cookingFluid: FluidType
}
diff --git a/src/services/ecogesture.service.spec.ts b/src/services/ecogesture.service.spec.ts
index 6f779445df328ea44ed96012452c932b4458acf9..3d3aaef11f87549b63000ffbf6ff98cbe60e806c 100644
--- a/src/services/ecogesture.service.spec.ts
+++ b/src/services/ecogesture.service.spec.ts
@@ -12,9 +12,9 @@ import {
ecogesturesHeatingData,
} from '../../tests/__mocks__/ecogesturesData.mock'
import { ProfileType } from 'models/profileType.model'
-import { profileData } from '../../tests/__mocks__/profile.mock'
-import { IndividualOrCollective } from 'enum/profileType.enum'
+import { IndividualOrCollective, WarmingType } from 'enum/profileType.enum'
import { FluidType } from 'enum/fluid.enum'
+import { mockProfileType2 } from '../../tests/__mocks__/profileType.mock'
describe('Ecogesture service', () => {
const ecogestureService = new EcogestureService(mockClient)
@@ -87,9 +87,9 @@ describe('Ecogesture service', () => {
it('should return ecogesture with electricity', async () => {
const mockEcogestureList: Ecogesture[] = ecogesturesHeatingData
const mockProfileType: ProfileType = {
- ...profileData.profileType,
+ ...mockProfileType2,
heating: IndividualOrCollective.INDIVIDUAL,
- warmingFluid: FluidType.ELECTRICITY,
+ warmingFluid: WarmingType.ELECTRICITY,
}
const result = EcogestureService.getEcogestureListByProfile(
mockEcogestureList,
@@ -100,9 +100,9 @@ describe('Ecogesture service', () => {
it('should return ecogesture with gas', async () => {
const mockEcogestureList: Ecogesture[] = ecogesturesHeatingData
const mockProfileType: ProfileType = {
- ...profileData.profileType,
+ ...mockProfileType2,
heating: IndividualOrCollective.INDIVIDUAL,
- warmingFluid: FluidType.GAS,
+ warmingFluid: WarmingType.GAS,
}
const result = EcogestureService.getEcogestureListByProfile(
mockEcogestureList,
@@ -113,9 +113,9 @@ describe('Ecogesture service', () => {
it('should not return ecogesture when profile heating is collective', async () => {
const mockEcogestureList: Ecogesture[] = ecogesturesHeatingData
const mockProfileType: ProfileType = {
- ...profileData.profileType,
+ ...mockProfileType2,
heating: IndividualOrCollective.COLLECTIVE,
- warmingFluid: FluidType.ELECTRICITY,
+ warmingFluid: WarmingType.ELECTRICITY,
}
const result = EcogestureService.getEcogestureListByProfile(
mockEcogestureList,
@@ -129,7 +129,7 @@ describe('Ecogesture service', () => {
it('should return ecogesture with electricity', async () => {
const mockEcogestureList: Ecogesture[] = ecogesturesECSData
const mockProfileType: ProfileType = {
- ...profileData.profileType,
+ ...mockProfileType2,
hotWater: IndividualOrCollective.INDIVIDUAL,
hotWaterFluid: FluidType.ELECTRICITY,
}
@@ -142,7 +142,7 @@ describe('Ecogesture service', () => {
it('should return ecogesture with gas', async () => {
const mockEcogestureList: Ecogesture[] = ecogesturesECSData
const mockProfileType: ProfileType = {
- ...profileData.profileType,
+ ...mockProfileType2,
hotWater: IndividualOrCollective.INDIVIDUAL,
hotWaterFluid: FluidType.GAS,
}
@@ -155,7 +155,7 @@ describe('Ecogesture service', () => {
it('should not return ecogesture when profile warming is collective', async () => {
const mockEcogestureList: Ecogesture[] = ecogesturesECSData
const mockProfileType: ProfileType = {
- ...profileData.profileType,
+ ...mockProfileType2,
hotWater: IndividualOrCollective.COLLECTIVE,
hotWaterFluid: FluidType.ELECTRICITY,
}
@@ -171,7 +171,7 @@ describe('Ecogesture service', () => {
it('should return ecogesture with electricity', async () => {
const mockEcogestureList: Ecogesture[] = ecogesturesCookingData
const mockProfileType: ProfileType = {
- ...profileData.profileType,
+ ...mockProfileType2,
cookingFluid: FluidType.ELECTRICITY,
}
const result = EcogestureService.getEcogestureListByProfile(
@@ -183,7 +183,7 @@ describe('Ecogesture service', () => {
it('should return ecogesture with gas', async () => {
const mockEcogestureList: Ecogesture[] = ecogesturesCookingData
const mockProfileType: ProfileType = {
- ...profileData.profileType,
+ ...mockProfileType2,
cookingFluid: FluidType.GAS,
}
const result = EcogestureService.getEcogestureListByProfile(
@@ -198,7 +198,7 @@ describe('Ecogesture service', () => {
it('should return all water ecogestures', async () => {
const mockEcogestureList: Ecogesture[] = ecogesturesColdWaterData
const mockProfileType: ProfileType = {
- ...profileData.profileType,
+ ...mockProfileType2,
coldWater: IndividualOrCollective.INDIVIDUAL,
}
const result = EcogestureService.getEcogestureListByProfile(
@@ -210,7 +210,7 @@ describe('Ecogesture service', () => {
it('should not return water ecogestures', async () => {
const mockEcogestureList: Ecogesture[] = ecogesturesColdWaterData
const mockProfileType: ProfileType = {
- ...profileData.profileType,
+ ...mockProfileType2,
coldWater: IndividualOrCollective.COLLECTIVE,
}
const result = EcogestureService.getEcogestureListByProfile(
@@ -225,7 +225,7 @@ describe('Ecogesture service', () => {
it('should return all ecogestures', async () => {
const mockEcogestureList: Ecogesture[] = ecogesturesElecSpecificData
const mockProfileType: ProfileType = {
- ...profileData.profileType,
+ ...mockProfileType2,
}
const result = EcogestureService.getEcogestureListByProfile(
mockEcogestureList,
@@ -239,7 +239,7 @@ describe('Ecogesture service', () => {
it('should not return ecogestures', async () => {
const mockEcogestureList: Ecogesture[] = ecogesturesAirConditioningData
const mockProfileType: ProfileType = {
- ...profileData.profileType,
+ ...mockProfileType2,
}
const result = EcogestureService.getEcogestureListByProfile(
mockEcogestureList,
diff --git a/src/services/ecogesture.service.ts b/src/services/ecogesture.service.ts
index f979140aa8ead2e7d63c3b631a3256081e90ccb4..bc1eb9018e26d8ce6ee617d9e94908e479ee71b2 100644
--- a/src/services/ecogesture.service.ts
+++ b/src/services/ecogesture.service.ts
@@ -2,7 +2,7 @@ import { Client, QueryDefinition, QueryResult, Q } from 'cozy-client'
import { ECOGESTURE_DOCTYPE } from 'doctypes'
import { Usage } from 'enum/ecogesture.enum'
import { FluidType } from 'enum/fluid.enum'
-import { IndividualOrCollective } from 'enum/profileType.enum'
+import { IndividualOrCollective, WarmingType } from 'enum/profileType.enum'
import { Season } from 'enum/ecogesture.enum'
import { Ecogesture } from 'models'
import { ProfileType } from 'models/profileType.model'
@@ -82,13 +82,13 @@ export default class EcogestureService {
if (
ecogesture.fluidTypes.includes(FluidType.ELECTRICITY) &&
profileType.heating === IndividualOrCollective.INDIVIDUAL &&
- profileType.warmingFluid === FluidType.ELECTRICITY
+ profileType.warmingFluid === WarmingType.ELECTRICITY
) {
return true
} else if (
ecogesture.fluidTypes.includes(FluidType.GAS) &&
profileType.heating === IndividualOrCollective.INDIVIDUAL &&
- profileType.warmingFluid === FluidType.GAS
+ profileType.warmingFluid === WarmingType.GAS
) {
return true
} else {
diff --git a/src/services/profileType.service.spec.ts b/src/services/profileType.service.spec.ts
index 3061153a0fb3cebfac1811e45433a602c27bef7f..03a12f9ba4efbc181fe4fa9f42cf1da8282edd98 100644
--- a/src/services/profileType.service.spec.ts
+++ b/src/services/profileType.service.spec.ts
@@ -6,6 +6,7 @@ import {
IndividualOrCollective,
ProfileTypeStepForm,
ThreeChoicesAnswer,
+ WarmingType,
} from 'enum/profileType.enum'
import { ProfileType } from 'models/profileType.model'
import {
@@ -228,6 +229,27 @@ describe('ProfileType service', () => {
mockMonthlyForecastJanuaryTest1WithFullArrays
)
})
+
+ it('should get the monthly forecast with null heating for a profile with fuel or wood heating', async () => {
+ const profileTypeService2 = new ProfileTypeService(
+ { ...mockTestProfile2, warmingFluid: WarmingType.FUEL },
+ mockClient,
+ DateTime.now().year
+ )
+ const monthlyForecast = await profileTypeService2.getMonthlyForecast(1)
+ expect(
+ monthlyForecast.fluidForecast[0].detailsMonthlyForecast
+ .heatingConsumption
+ ).toEqual(null)
+ expect(
+ monthlyForecast.fluidForecast[1].detailsMonthlyForecast
+ .heatingConsumption
+ ).toEqual(null)
+ expect(
+ monthlyForecast.fluidForecast[2].detailsMonthlyForecast
+ .heatingConsumption
+ ).toEqual(null)
+ })
})
describe('getNextFormStep', () => {
it('should get the next step in function of the current step', () => {
diff --git a/src/services/profileType.service.ts b/src/services/profileType.service.ts
index 5cbeae894da890c806ffda1bcb546b892ed9df61..89c5c44fc0cb255c2f2953b92961c64234d17203 100644
--- a/src/services/profileType.service.ts
+++ b/src/services/profileType.service.ts
@@ -22,10 +22,11 @@ import {
ProfileTypeStepForm,
ProfileTypeFormType,
ThreeChoicesAnswer,
+ WarmingType,
} from 'enum/profileType.enum'
import { FluidType } from 'enum/fluid.enum'
import ConverterService from './converter.service'
-import { Client, Q, QueryDefinition, QueryResult } from 'cozy-client'
+import { Client } from 'cozy-client'
import log from 'utils/logger'
export default class ProfileTypeService {
@@ -36,7 +37,9 @@ export default class ProfileTypeService {
constructor(profileType: ProfileType, _client: Client, year: number) {
log.info(
'[ProfileType] Analysis loaded profileType relative to: ',
- profileType.updateDate.toString()
+ profileType.updateDate
+ ? profileType.updateDate.toString()
+ : 'no update date'
)
this.profileType = profileType
this._client = _client
@@ -385,7 +388,8 @@ export default class ProfileTypeService {
heatingConsumption:
this.profileType.heating === IndividualOrCollective.COLLECTIVE
? null
- : fluidType === warmingFluid
+ : warmingFluid !== null &&
+ (fluidType as number) === (warmingFluid as number)
? await this.getMonthHeating(month)
: null,
ecsConsumption:
@@ -681,7 +685,12 @@ export default class ProfileTypeService {
return {
type: ProfileTypeFormType.SINGLE_CHOICE,
attribute: 'warmingFluid',
- choices: [FluidType.ELECTRICITY, FluidType.GAS],
+ choices: [
+ WarmingType.ELECTRICITY,
+ WarmingType.GAS,
+ WarmingType.WOOD,
+ WarmingType.FUEL,
+ ],
}
case ProfileTypeStepForm.INDIVIDUAL_INSULATION_WORK:
return {
diff --git a/src/store/profileType/profileType.reducer.ts b/src/store/profileType/profileType.reducer.ts
index 66884deae13145f44bd9b90eca0dabd51a9512b1..95a0dc1937eda85ef6ec8edc0b8295ca2478409c 100644
--- a/src/store/profileType/profileType.reducer.ts
+++ b/src/store/profileType/profileType.reducer.ts
@@ -14,6 +14,7 @@ import {
IndividualOrCollective,
OutsideFacingWalls,
ThreeChoicesAnswer,
+ WarmingType,
} from 'enum/profileType.enum'
import { FluidType } from 'enum/fluid.enum'
import { ProfileTypeActionTypes } from './profileType.actions'
@@ -35,7 +36,7 @@ const initialState: ProfileType = {
hasInstalledVentilation: ThreeChoicesAnswer.UNKNOWN,
hasReplacedHeater: ThreeChoicesAnswer.UNKNOWN,
hotWaterEquipment: HotWaterEquipment.SOLAR,
- warmingFluid: FluidType.ELECTRICITY,
+ warmingFluid: WarmingType.ELECTRICITY,
hotWaterFluid: FluidType.ELECTRICITY,
cookingFluid: FluidType.ELECTRICITY,
updateDate: DateTime.fromISO('0000-01-01T00:00:00.000Z'),
diff --git a/src/targets/services/aggregatorUsageEvents.ts b/src/targets/services/aggregatorUsageEvents.ts
index 9139d35fc6ff566b0338ee26bae807c9693aff89..4feba6b1a672cbbcbb961ffa9a2481e748566f29 100644
--- a/src/targets/services/aggregatorUsageEvents.ts
+++ b/src/targets/services/aggregatorUsageEvents.ts
@@ -19,6 +19,7 @@ import ChallengeService from 'services/challenge.service'
import { UserChallengeState } from 'enum/userChallenge.enum'
import ProfileTypeEntityService from 'services/profileTypeEntity.service'
import TermsService from 'services/terms.service'
+import { WarmingType } from 'enum/profileType.enum'
const log = logger.namespace('aggregatorUsageEvents')
@@ -393,10 +394,24 @@ const buildProfileWithFuildType = async (
if (
profile &&
profileType &&
- profileType.warmingFluid === FluidType.ELECTRICITY
+ profileType.warmingFluid === WarmingType.ELECTRICITY
) {
formatedProfile = 'chauffage élec'
}
+ if (
+ profile &&
+ profileType &&
+ profileType.warmingFluid === WarmingType.WOOD
+ ) {
+ formatedProfile = 'chauffage bois'
+ }
+ if (
+ profile &&
+ profileType &&
+ profileType.warmingFluid === WarmingType.FUEL
+ ) {
+ formatedProfile = 'chauffage fuel'
+ }
if (
profile &&
profileType &&
@@ -425,7 +440,11 @@ const buildProfileWithFuildType = async (
return formatedProfile
}
} else if (fluidType === FluidType.GAS) {
- if (profile && profileType && profileType.warmingFluid === FluidType.GAS) {
+ if (
+ profile &&
+ profileType &&
+ profileType.warmingFluid === WarmingType.GAS
+ ) {
formatedProfile = 'chauffage gaz'
}
if (profile && profileType && profileType.hotWaterFluid === FluidType.GAS) {
diff --git a/src/targets/services/consumptionAlert.ts b/src/targets/services/consumptionAlert.ts
index a133d59848c591e72e2644b42381ece7af7b3a0f..77227394457adc670ec8007e390c31b94c39725f 100644
--- a/src/targets/services/consumptionAlert.ts
+++ b/src/targets/services/consumptionAlert.ts
@@ -80,8 +80,8 @@ const consumptionAlert = async ({ client }: ConsumptionAlertProps) => {
title: 'Ça déborde !',
baseUrl: environementService.getPublicURL(),
username: username,
- clientUrl: appLink,
- unsubscribeUrl: appLink + '/#/options',
+ clientUrl: `${appLink}/#/consumption/water`,
+ unsubscribeUrl: `${appLink}/#/options`,
userLimit: userProfil.waterDailyConsumptionLimit,
limitDate: `${today.day} ${getPreviousMonthName(today)}`,
})
diff --git a/tests/__mocks__/profileType.mock.ts b/tests/__mocks__/profileType.mock.ts
index 851b7b4faea13424cdd4cd64300e7bb1a27ebd00..9493b055be5ba6b775c56814887155f5ebe63553 100644
--- a/tests/__mocks__/profileType.mock.ts
+++ b/tests/__mocks__/profileType.mock.ts
@@ -10,6 +10,7 @@ import {
OutsideFacingWalls,
ProfileTypeFormType,
ThreeChoicesAnswer,
+ WarmingType,
} from 'enum/profileType.enum'
import { DateTime } from 'luxon'
import {
@@ -58,7 +59,7 @@ export const mockProfileType: ProfileType = {
hasInstalledVentilation: ThreeChoicesAnswer.NO,
hasReplacedHeater: ThreeChoicesAnswer.NO,
hotWaterEquipment: HotWaterEquipment.THERMODYNAMIC,
- warmingFluid: FluidType.ELECTRICITY,
+ warmingFluid: WarmingType.ELECTRICITY,
hotWaterFluid: FluidType.ELECTRICITY,
cookingFluid: FluidType.ELECTRICITY,
updateDate: DateTime.fromISO('2021-01-01T00:00:00.000Z', {
@@ -94,7 +95,7 @@ export const mockProfileType1: ProfileType = {
hasInstalledVentilation: ThreeChoicesAnswer.NO,
hasReplacedHeater: ThreeChoicesAnswer.NO,
hotWaterEquipment: HotWaterEquipment.SOLAR,
- warmingFluid: FluidType.ELECTRICITY,
+ warmingFluid: WarmingType.ELECTRICITY,
hotWaterFluid: FluidType.ELECTRICITY,
cookingFluid: FluidType.ELECTRICITY,
updateDate: DateTime.fromISO('2021-01-01T00:00:00.000Z', {
@@ -122,7 +123,7 @@ export const mockProfileType2: ProfileType = {
hasInstalledVentilation: ThreeChoicesAnswer.NO,
hasReplacedHeater: ThreeChoicesAnswer.YES,
hotWaterEquipment: HotWaterEquipment.SOLAR,
- warmingFluid: FluidType.ELECTRICITY,
+ warmingFluid: WarmingType.ELECTRICITY,
hotWaterFluid: FluidType.ELECTRICITY,
cookingFluid: FluidType.ELECTRICITY,
updateDate: DateTime.fromISO('2021-01-01T00:00:00.000Z', {
@@ -148,7 +149,7 @@ export const mockTestProfile1: ProfileType = {
hasInstalledVentilation: ThreeChoicesAnswer.NO,
hasReplacedHeater: ThreeChoicesAnswer.NO,
hotWaterEquipment: HotWaterEquipment.SOLAR,
- warmingFluid: FluidType.ELECTRICITY,
+ warmingFluid: WarmingType.ELECTRICITY,
hotWaterFluid: FluidType.GAS,
cookingFluid: FluidType.GAS,
updateDate: DateTime.fromISO('2021-01-01T00:00:00.000Z', {
@@ -212,7 +213,7 @@ export const mockTestProfile2: ProfileType = {
hasInstalledVentilation: ThreeChoicesAnswer.NO,
hasReplacedHeater: ThreeChoicesAnswer.NO,
hotWaterEquipment: HotWaterEquipment.OTHER,
- warmingFluid: FluidType.ELECTRICITY,
+ warmingFluid: WarmingType.ELECTRICITY,
hotWaterFluid: FluidType.ELECTRICITY,
cookingFluid: FluidType.ELECTRICITY,
updateDate: DateTime.fromISO('2021-01-01T00:00:00.000Z', {
@@ -367,7 +368,12 @@ export const mockProfileTypeAnswers: ProfileTypeAnswer[] = [
{
type: ProfileTypeFormType.SINGLE_CHOICE,
attribute: 'warmingFluid',
- choices: [FluidType.ELECTRICITY, FluidType.GAS],
+ choices: [
+ WarmingType.ELECTRICITY,
+ WarmingType.GAS,
+ WarmingType.WOOD,
+ WarmingType.FUEL,
+ ],
},
{
type: ProfileTypeFormType.MULTI_CHOICE,
diff --git a/tests/__mocks__/store.ts b/tests/__mocks__/store.ts
index eb5c49b9761e2c97d6be56ea3a9e7810eba95da4..c717c47996f3d1e4bcd02c39d643f36ca448fb28 100644
--- a/tests/__mocks__/store.ts
+++ b/tests/__mocks__/store.ts
@@ -8,6 +8,7 @@ import {
IndividualOrCollective,
OutsideFacingWalls,
ThreeChoicesAnswer,
+ WarmingType,
} from 'enum/profileType.enum'
import { ScreenType } from 'enum/screen.enum'
import { TimeStep } from 'enum/timeStep.enum'
@@ -135,7 +136,7 @@ export const mockInitialProfileTypeState: ProfileType = {
hasInstalledVentilation: ThreeChoicesAnswer.UNKNOWN,
hasReplacedHeater: ThreeChoicesAnswer.UNKNOWN,
hotWaterEquipment: HotWaterEquipment.SOLAR,
- warmingFluid: FluidType.ELECTRICITY,
+ warmingFluid: WarmingType.ELECTRICITY,
hotWaterFluid: FluidType.ELECTRICITY,
cookingFluid: FluidType.ELECTRICITY,
updateDate: DateTime.fromISO('0000-01-01T00:00:00.000Z'),