diff --git a/src/assets/icons/visu/equipments/GARDEN.svg b/src/assets/icons/visu/equipments/GARDEN.svg
new file mode 100644
index 0000000000000000000000000000000000000000..5529a9c0e29e34e55646c5c1a670fb1c231f4529
--- /dev/null
+++ b/src/assets/icons/visu/equipments/GARDEN.svg
@@ -0,0 +1,6 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7714 6.27598L25.6335 6.42525C25.0024 7.11492 24.6132 7.50794 24.292 7.76302C23.9865 7.36436 23.6835 6.96378 23.3831 6.5613C22.837 5.85463 22.3836 5.34257 21.9187 4.95145C21.3519 4.47152 20.7888 4.19565 20.1823 4.19565C19.863 4.19565 19.5531 4.27501 19.2546 4.4205C18.5233 4.77573 17.9111 5.44272 17.0911 6.58964C16.9872 6.73324 16.7283 7.10358 16.5734 7.32654L16.4543 7.4966L16.254 7.77435L16.2238 7.75168C15.8856 7.49282 15.4793 7.09791 14.8086 6.39691L14.6782 6.26087C13.6711 5.20275 13.3971 4.925 12.9758 4.58111C12.6319 4.30146 12.3352 4.12196 12.0121 4.0426C11.7173 3.96167 11.4027 3.9969 11.1331 4.14102C10.8634 4.28515 10.6594 4.52719 10.5629 4.81729C10.0481 6.24554 9.7866 7.75267 9.79007 9.27083C9.79007 16.2355 13.5993 21.0084 20.1823 21.0084C26.7653 21.0084 30.5745 16.2355 30.5745 9.27083C30.578 7.7525 30.3158 6.24527 29.7998 4.81729C29.7042 4.52714 29.5004 4.28497 29.2309 4.14107C28.9614 3.99716 28.6468 3.96258 28.3525 4.04449C28.0313 4.12574 27.7403 4.30902 27.4077 4.59244C26.9996 4.93822 26.7464 5.20653 25.7714 6.27409V6.27598Z" fill="#121212"/>
+<path d="M19 19.1333C19 18.8328 19.158 18.5445 19.4393 18.3319C19.7206 18.1194 20.1022 18 20.5 18C20.8978 18 21.2794 18.1194 21.5607 18.3319C21.842 18.5445 22 18.8328 22 19.1333V33.8667C22 34.1672 21.842 34.4555 21.5607 34.6681C21.2794 34.8806 20.8978 35 20.5 35C20.1022 35 19.7206 34.8806 19.4393 34.6681C19.158 34.4555 19 34.1672 19 33.8667V19.1333Z" fill="#121212"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.3446 26.7304C31.2269 26.6705 30.8617 26.5428 30.0185 26.6696C28.8316 26.8482 27.2528 27.4993 25.6937 28.7196C24.1346 29.9399 23.1233 31.316 22.6648 32.4252C22.3391 33.2132 22.3753 33.5985 22.4052 33.727C22.5228 33.7869 22.8881 33.9147 23.7313 33.7878C24.9181 33.6093 26.4969 32.9581 28.056 31.7378C29.6151 30.5176 30.6265 29.1414 31.085 28.0322C31.4107 27.2442 31.3744 26.859 31.3446 26.7304ZM29.9051 34.1003C33.6853 31.1416 35.3931 27.0097 33.7196 24.8715C32.0461 22.7333 27.6249 23.3985 23.8447 26.3572C20.0645 29.3159 18.3567 33.4477 20.0302 35.5859C21.7037 37.7241 26.1248 37.059 29.9051 34.1003Z" fill="#121212"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.40545 26.7304C9.52306 26.6705 9.88835 26.5428 10.7315 26.6696C11.9184 26.8482 13.4972 27.4993 15.0563 28.7196C16.6154 29.9399 17.6267 31.316 18.0852 32.4252C18.4109 33.2132 18.3747 33.5985 18.3448 33.727C18.2272 33.7869 17.8619 33.9147 17.0187 33.7878C15.8319 33.6093 14.2531 32.9581 12.694 31.7378C11.1349 30.5176 10.1235 29.1414 9.66503 28.0322C9.33932 27.2442 9.37555 26.859 9.40545 26.7304ZM10.8449 34.1003C7.06472 31.1416 5.3569 27.0097 7.03042 24.8715C8.70394 22.7333 13.1251 23.3985 16.9053 26.3572C20.6855 29.3159 22.3933 33.4477 20.7198 35.5859C19.0463 37.7241 14.6252 37.059 10.8449 34.1003Z" fill="#121212"/>
+</svg>
diff --git a/src/components/Ecogesture/EcogestureTabsView.tsx b/src/components/Ecogesture/EcogestureTabsView.tsx
index 73492100aa51f1c9e88db3a045de3c4a348bf851..65302f8b6615809abceaa08f1d611918ed83b841 100644
--- a/src/components/Ecogesture/EcogestureTabsView.tsx
+++ b/src/components/Ecogesture/EcogestureTabsView.tsx
@@ -8,7 +8,7 @@ import { useClient } from 'cozy-client'
import { useI18n } from 'cozy-ui/transpiled/react/I18n'
import { EcogestureTab } from 'enums'
import { Ecogesture } from 'models'
-import React, { useCallback, useEffect, useState } from 'react'
+import React, { useCallback, useEffect, useMemo, useState } from 'react'
import { useLocation, useNavigate } from 'react-router-dom'
import EcogestureService from 'services/ecogesture.service'
import { useAppDispatch, useAppSelector } from 'store/hooks'
@@ -65,6 +65,11 @@ const EcogestureTabsView = () => {
const [openEcogestureReinitModal, setOpenEcogestureReinitModal] =
useState<boolean>(false)
+ const ecogestureService = useMemo(
+ () => new EcogestureService(client),
+ [client]
+ )
+
const handleReinitClick = useCallback(() => {
setOpenEcogestureReinitModal(true)
}, [])
@@ -83,14 +88,13 @@ const EcogestureTabsView = () => {
const handleLaunchReinit = useCallback(async () => {
setOpenEcogestureReinitModal(false)
setIsLoading(true)
- const ecogestureService = new EcogestureService(client)
const reset = await ecogestureService.reinitAllEcogestures()
if (reset) {
setOpenEcogestureReinitModal(false)
setIsLoading(false)
navigate('/ecogesture-form?modal=true')
}
- }, [client, navigate])
+ }, [ecogestureService, navigate])
const handleCloseEcogestureReinitModal = useCallback(() => {
setOpenEcogestureReinitModal(false)
@@ -136,6 +140,9 @@ const EcogestureTabsView = () => {
async function loadEcogestures() {
const ecogestureService = new EcogestureService(client)
+ const currentProfile = profile.isProfileTypeCompleted
+ ? profileType
+ : profileEcogesture
const { ecogestureList, ecogestureHash } =
await ecogestureService.initEcogesture(profile.ecogestureHash)
@@ -144,10 +151,11 @@ const EcogestureTabsView = () => {
}
const availableList =
- await ecogestureService.getEcogestureListByProfile(profileEcogesture)
+ await ecogestureService.getEcogestureListByProfile(currentProfile)
const filteredList = availableList.filter(
ecogesture => ecogesture.viewedInSelection === false
)
+
if (subscribed && ecogestureList) {
const doing = ecogestureList.filter(
ecogesture => ecogesture.doing === true
@@ -163,11 +171,19 @@ const EcogestureTabsView = () => {
}
setIsLoading(false)
}
+
loadEcogestures()
return () => {
subscribed = false
}
- }, [client, profileEcogesture, profileType, dispatch, profile.ecogestureHash])
+ }, [
+ client,
+ profileEcogesture,
+ profileType,
+ dispatch,
+ profile.ecogestureHash,
+ profile.isProfileTypeCompleted,
+ ])
return (
<>
diff --git a/src/components/EcogestureForm/EcogestureFormEquipment/__snapshots__/EcogestureFormEquipment.spec.tsx.snap b/src/components/EcogestureForm/EcogestureFormEquipment/__snapshots__/EcogestureFormEquipment.spec.tsx.snap
index 61893059fa3c958e17c6ae4e4dc4d66c90fd1952..3173cfc5db5eb8609d8f69dadfbc24f37a79c438 100644
--- a/src/components/EcogestureForm/EcogestureFormEquipment/__snapshots__/EcogestureFormEquipment.spec.tsx.snap
+++ b/src/components/EcogestureForm/EcogestureFormEquipment/__snapshots__/EcogestureFormEquipment.spec.tsx.snap
@@ -306,6 +306,25 @@ exports[`EcogestureFormEquipment component should be rendered correctly 1`] = `
class="MuiTouchRipple-root"
/>
</button>
+ <button
+ aria-label="ecogesture_profile.equipments.accessible_label"
+ class="MuiButtonBase-root MuiIconButton-root checkbox-equipment"
+ style="border-radius: 5px;"
+ tabindex="0"
+ type="button"
+ >
+ <span
+ class="MuiIconButton-label"
+ >
+ <mock-equipment-icon
+ equipment="GARDEN"
+ ischecked="false"
+ />
+ </span>
+ <span
+ class="MuiTouchRipple-root"
+ />
+ </button>
</div>
</div>
</div>
diff --git a/src/components/EcogestureSelection/EcogestureSelectionView.tsx b/src/components/EcogestureSelection/EcogestureSelectionView.tsx
index caee2255dc9aad60665f5d18439b2ec41087da4e..2231b9fad5dcebfd100e3cde624a67a7de318066 100644
--- a/src/components/EcogestureSelection/EcogestureSelectionView.tsx
+++ b/src/components/EcogestureSelection/EcogestureSelectionView.tsx
@@ -19,7 +19,11 @@ const EcogestureSelectionView = () => {
const { t } = useI18n()
const client = useClient()
const navigate = useNavigate()
- const { profileEcogesture } = useAppSelector(state => state.ecolyo)
+ const {
+ profileType,
+ profileEcogesture,
+ profile: { isProfileTypeCompleted },
+ } = useAppSelector(state => state.ecolyo)
const [isLoading, setIsLoading] = useState(true)
const [indexEcogesture, setIndexEcogesture] = useState<number>(0)
const [ecogestureList, setEcogestureList] = useState<Ecogesture[]>([])
@@ -51,9 +55,11 @@ const EcogestureSelectionView = () => {
doing: doing,
viewedInSelection: true,
})
- const updatedList = ecogestureList
- updatedList[indexEcogesture] = updatedEcogesture
- setEcogestureList(updatedList)
+ setEcogestureList(prevList => {
+ const updatedList = [...prevList]
+ updatedList[indexEcogesture] = updatedEcogesture
+ return updatedList
+ })
setIndexEcogesture(prev => prev + 1)
},
[ecogestureList, ecogestureService, indexEcogesture]
@@ -61,8 +67,9 @@ const EcogestureSelectionView = () => {
const restartSelection = useCallback(async () => {
setIsLoading(true)
+ const profile = isProfileTypeCompleted ? profileType : profileEcogesture
const availableList =
- await ecogestureService.getEcogestureListByProfile(profileEcogesture)
+ await ecogestureService.getEcogestureListByProfile(profile)
const filteredList = availableList.filter(
ecogesture => ecogesture.viewedInSelection === false
)
@@ -71,20 +78,26 @@ const EcogestureSelectionView = () => {
setEcogestureList(slicedFilteredList)
setIndexEcogesture(0)
setIsLoading(false)
- }, [ecogestureService, profileEcogesture])
+ }, [
+ ecogestureService,
+ isProfileTypeCompleted,
+ profileEcogesture,
+ profileType,
+ ])
useEffect(() => {
let subscribed = true
async function getFilteredList() {
+ const profile = isProfileTypeCompleted ? profileType : profileEcogesture
const availableList =
- await ecogestureService.getEcogestureListByProfile(profileEcogesture)
+ await ecogestureService.getEcogestureListByProfile(profile)
const filteredList = availableList.filter(
ecogesture => ecogesture.viewedInSelection === false
)
const slicedFilteredList = filteredList.slice(0, 10)
if (subscribed) {
if (
- availableList.length === filteredList.length &&
+ availableList.length === slicedFilteredList.length &&
slicedFilteredList.length > 0
) {
setOpenEcogestureSelectionModal(true)
@@ -96,11 +109,17 @@ const EcogestureSelectionView = () => {
setIsLoading(false)
}
}
+
getFilteredList()
return () => {
subscribed = false
}
- }, [ecogestureService, profileEcogesture])
+ }, [
+ ecogestureService,
+ profileType,
+ profileEcogesture,
+ isProfileTypeCompleted,
+ ])
const renderEcogestureSelection = () => {
if (indexEcogesture <= ecogestureList.length - 1) {
diff --git a/src/db/ecogestureData.json b/src/db/ecogestureData.json
index 7e148d5614d73bce385b84431b8d8fd1aecf7b9f..97b9924c1af5d4fc5c33ad08b4f7ea71612d3645 100644
--- a/src/db/ecogestureData.json
+++ b/src/db/ecogestureData.json
@@ -9,7 +9,7 @@
"impactLevel": 8,
"efficiency": 4,
"difficulty": 1,
- "room": [0],
+ "room": ["ALL"],
"season": "Hiver",
"equipment": false,
"equipmentType": [],
@@ -32,7 +32,7 @@
"impactLevel": 8,
"efficiency": 4,
"difficulty": 1,
- "room": [0],
+ "room": ["ALL"],
"season": "Eté",
"equipment": true,
"equipmentType": ["AIR_CONDITIONING"],
@@ -55,7 +55,7 @@
"impactLevel": 8,
"efficiency": 4,
"difficulty": 1,
- "room": [0],
+ "room": ["ALL"],
"season": "Hiver",
"equipment": false,
"equipmentType": [],
@@ -78,7 +78,7 @@
"impactLevel": 5,
"efficiency": 2.5,
"difficulty": 1,
- "room": [1],
+ "room": ["BATHROOM"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -101,7 +101,7 @@
"impactLevel": 5,
"efficiency": 2.5,
"difficulty": 1,
- "room": [1],
+ "room": ["BATHROOM"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -124,7 +124,7 @@
"impactLevel": 4,
"efficiency": 2,
"difficulty": 1,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["COMPUTER"],
@@ -147,7 +147,7 @@
"impactLevel": 3,
"efficiency": 1.5,
"difficulty": 1,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": true,
"equipmentType": ["MICROWAVE"],
@@ -170,7 +170,7 @@
"impactLevel": 3,
"efficiency": 1.5,
"difficulty": 1,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -193,7 +193,7 @@
"impactLevel": 3,
"efficiency": 1.5,
"difficulty": 1,
- "room": [0],
+ "room": ["ALL"],
"season": "Hiver",
"equipment": false,
"equipmentType": [],
@@ -216,7 +216,7 @@
"impactLevel": 3,
"efficiency": 1.5,
"difficulty": 1,
- "room": [1, 2],
+ "room": ["BATHROOM", "KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -239,7 +239,7 @@
"impactLevel": 3,
"efficiency": 1.5,
"difficulty": 1,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -262,7 +262,7 @@
"impactLevel": 2,
"efficiency": 1,
"difficulty": 1,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -285,7 +285,7 @@
"impactLevel": 2,
"efficiency": 1,
"difficulty": 1,
- "room": [1, 2, 3],
+ "room": ["BATHROOM", "KITCHEN", "LAUNDRY"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["WASHING_MACHINE", "DISHWASHER"],
@@ -308,7 +308,7 @@
"impactLevel": 2,
"efficiency": 1,
"difficulty": 1,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["REFREGIRATOR"],
@@ -331,7 +331,7 @@
"impactLevel": 2,
"efficiency": 1,
"difficulty": 1,
- "room": [1, 2],
+ "room": ["BATHROOM", "KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -354,7 +354,7 @@
"impactLevel": 2,
"efficiency": 1,
"difficulty": 1,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -377,7 +377,7 @@
"impactLevel": 2,
"efficiency": 1,
"difficulty": 1,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -400,7 +400,7 @@
"impactLevel": 2,
"efficiency": 1,
"difficulty": 1,
- "room": [1, 2, 3],
+ "room": ["BATHROOM", "KITCHEN", "LAUNDRY"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["WASHING_MACHINE", "DISHWASHER"],
@@ -423,7 +423,7 @@
"impactLevel": 2,
"efficiency": 1,
"difficulty": 1,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["COOKING_PLATES"],
@@ -446,7 +446,7 @@
"impactLevel": 1,
"efficiency": 0.5,
"difficulty": 1,
- "room": [1, 2, 3],
+ "room": ["BATHROOM", "KITCHEN", "LAUNDRY"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["WASHING_MACHINE", "DISHWASHER"],
@@ -469,7 +469,7 @@
"impactLevel": 1,
"efficiency": 0.5,
"difficulty": 1,
- "room": [1, 2, 3],
+ "room": ["BATHROOM", "KITCHEN", "LAUNDRY"],
"season": "Sans saison",
"equipment": true,
"equipmentType": ["DRYER"],
@@ -492,7 +492,7 @@
"impactLevel": 1,
"efficiency": 0.5,
"difficulty": 1,
- "room": [1, 2, 3],
+ "room": ["BATHROOM", "KITCHEN", "LAUNDRY"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["WASHING_MACHINE", "DISHWASHER"],
@@ -515,7 +515,7 @@
"impactLevel": 1,
"efficiency": 0.5,
"difficulty": 1,
- "room": [1, 2, 3],
+ "room": ["BATHROOM", "KITCHEN", "LAUNDRY"],
"season": "Sans saison",
"equipment": true,
"equipmentType": ["WASHING_MACHINE", "DISHWASHER"],
@@ -538,7 +538,7 @@
"impactLevel": 1,
"efficiency": 0.5,
"difficulty": 1,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["COOKING_PLATES"],
@@ -561,7 +561,7 @@
"impactLevel": 1,
"efficiency": 0.5,
"difficulty": 1,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -584,7 +584,7 @@
"impactLevel": 1,
"efficiency": 0.5,
"difficulty": 1,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -607,7 +607,7 @@
"impactLevel": 1,
"efficiency": 0.5,
"difficulty": 1,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -630,7 +630,7 @@
"impactLevel": 1,
"efficiency": 0.5,
"difficulty": 1,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["REFREGIRATOR"],
@@ -653,7 +653,7 @@
"impactLevel": 1,
"efficiency": 0.5,
"difficulty": 1,
- "room": [1, 2, 3],
+ "room": ["BATHROOM", "KITCHEN", "LAUNDRY"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["WASHING_MACHINE"],
@@ -676,7 +676,7 @@
"impactLevel": 1,
"efficiency": 0.5,
"difficulty": 1,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["REFREGIRATOR"],
@@ -699,7 +699,7 @@
"impactLevel": 10,
"efficiency": 5,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Hiver",
"equipment": false,
"equipmentType": [],
@@ -722,7 +722,7 @@
"impactLevel": 10,
"efficiency": 5,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Hiver",
"equipment": false,
"equipmentType": [],
@@ -745,7 +745,7 @@
"impactLevel": 8,
"efficiency": 4,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -768,7 +768,7 @@
"impactLevel": 8,
"efficiency": 4,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Eté",
"equipment": true,
"equipmentType": ["AIR_CONDITIONING", "FAN"],
@@ -791,7 +791,7 @@
"impactLevel": 8,
"efficiency": 4,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Eté",
"equipment": true,
"equipmentType": ["AIR_CONDITIONING"],
@@ -814,7 +814,7 @@
"impactLevel": 8,
"efficiency": 4,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Hiver",
"equipment": false,
"equipmentType": [],
@@ -837,7 +837,7 @@
"impactLevel": 8,
"efficiency": 4,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Hiver",
"equipment": false,
"equipmentType": [],
@@ -860,7 +860,7 @@
"impactLevel": 8,
"efficiency": 4,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Hiver",
"equipment": false,
"equipmentType": [],
@@ -906,7 +906,7 @@
"impactLevel": 7,
"efficiency": 3.5,
"difficulty": 2,
- "room": [1],
+ "room": ["BATHROOM"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -929,7 +929,7 @@
"impactLevel": 7,
"efficiency": 3.5,
"difficulty": 2,
- "room": [1],
+ "room": ["BATHROOM"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -952,7 +952,7 @@
"impactLevel": 7,
"efficiency": 3.5,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -975,7 +975,7 @@
"impactLevel": 7,
"efficiency": 3.5,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Eté",
"equipment": false,
"equipmentType": [],
@@ -998,7 +998,7 @@
"impactLevel": 6,
"efficiency": 3,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1044,7 +1044,7 @@
"impactLevel": 6,
"efficiency": 3,
"difficulty": 2,
- "room": [1, 2, 3],
+ "room": ["BATHROOM", "KITCHEN", "LAUNDRY"],
"season": "Sans saison",
"equipment": true,
"equipmentType": ["BOILER"],
@@ -1067,7 +1067,7 @@
"impactLevel": 4,
"efficiency": 2,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": true,
"equipmentType": ["CURTAIN"],
@@ -1090,7 +1090,7 @@
"impactLevel": 3,
"efficiency": 1.5,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["INTERNET_BOX"],
@@ -1113,7 +1113,7 @@
"impactLevel": 3,
"efficiency": 1.5,
"difficulty": 2,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": true,
"equipmentType": ["MICROWAVE"],
@@ -1136,7 +1136,7 @@
"impactLevel": 3,
"efficiency": 1.5,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": true,
"equipmentType": ["VENTILATION"],
@@ -1159,7 +1159,7 @@
"impactLevel": 3,
"efficiency": 1.5,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1182,7 +1182,7 @@
"impactLevel": 3,
"efficiency": 1.5,
"difficulty": 2,
- "room": [3],
+ "room": ["LAUNDRY"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["DRYER"],
@@ -1205,7 +1205,7 @@
"impactLevel": 3,
"efficiency": 1.5,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1228,7 +1228,7 @@
"impactLevel": 3,
"efficiency": 1.5,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1251,7 +1251,7 @@
"impactLevel": 3,
"efficiency": 1.5,
"difficulty": 2,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["REFREGIRATOR", "FREEZER"],
@@ -1274,7 +1274,7 @@
"impactLevel": 3,
"efficiency": 1.5,
"difficulty": 2,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1297,7 +1297,7 @@
"impactLevel": 3,
"efficiency": 1.5,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": true,
"equipmentType": ["VENTILATION"],
@@ -1320,7 +1320,7 @@
"impactLevel": 2,
"efficiency": 1,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1343,7 +1343,7 @@
"impactLevel": 2,
"efficiency": 1,
"difficulty": 2,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1366,7 +1366,7 @@
"impactLevel": 1,
"efficiency": 0.5,
"difficulty": 2,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["REFREGIRATOR", "FREEZER"],
@@ -1389,7 +1389,7 @@
"impactLevel": 1,
"efficiency": 0.5,
"difficulty": 2,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["REFREGIRATOR", "FREEZER"],
@@ -1412,7 +1412,7 @@
"impactLevel": 1,
"efficiency": 0.5,
"difficulty": 2,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["REFREGIRATOR"],
@@ -1435,7 +1435,7 @@
"impactLevel": 1,
"efficiency": 0.5,
"difficulty": 2,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["REFREGIRATOR", "FREEZER"],
@@ -1458,7 +1458,7 @@
"impactLevel": 1,
"efficiency": 0.5,
"difficulty": 2,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1481,7 +1481,7 @@
"impactLevel": 8,
"efficiency": 4,
"difficulty": 3,
- "room": [0],
+ "room": ["ALL"],
"season": "Hiver",
"equipment": false,
"equipmentType": [],
@@ -1504,7 +1504,7 @@
"impactLevel": 7,
"efficiency": 3.5,
"difficulty": 3,
- "room": [1, 2, 3],
+ "room": ["BATHROOM", "KITCHEN", "LAUNDRY"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1527,7 +1527,7 @@
"impactLevel": 7,
"efficiency": 3.5,
"difficulty": 3,
- "room": [1, 2, 3],
+ "room": ["BATHROOM", "KITCHEN", "LAUNDRY"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1550,7 +1550,7 @@
"impactLevel": 6,
"efficiency": 3,
"difficulty": 3,
- "room": [1, 2, 3],
+ "room": ["BATHROOM", "KITCHEN", "LAUNDRY"],
"season": "Sans saison",
"equipment": true,
"equipmentType": ["BOILER"],
@@ -1573,7 +1573,7 @@
"impactLevel": 6,
"efficiency": 3,
"difficulty": 3,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1596,7 +1596,7 @@
"impactLevel": 6,
"efficiency": 3,
"difficulty": 3,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": true,
"equipmentType": ["HYDRAULIC_HEATING"],
@@ -1619,7 +1619,7 @@
"impactLevel": 6,
"efficiency": 3,
"difficulty": 3,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": true,
"equipmentType": [],
@@ -1642,7 +1642,7 @@
"impactLevel": 6,
"efficiency": 3,
"difficulty": 3,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": true,
"equipmentType": ["HYDRAULIC_HEATING"],
@@ -1665,7 +1665,7 @@
"impactLevel": 5,
"efficiency": 2.5,
"difficulty": 3,
- "room": [0],
+ "room": ["ALL"],
"season": "Sans saison",
"equipment": true,
"equipmentType": ["HYDRAULIC_HEATING"],
@@ -1688,7 +1688,7 @@
"impactLevel": 5,
"efficiency": 2.5,
"difficulty": 3,
- "room": [4],
+ "room": ["TOILET"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1711,7 +1711,7 @@
"impactLevel": 5,
"efficiency": 2.5,
"difficulty": 3,
- "room": [1],
+ "room": ["BATHROOM"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1734,7 +1734,7 @@
"impactLevel": 2,
"efficiency": 1,
"difficulty": 3,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": ["REFREGIRATOR"],
@@ -1757,7 +1757,7 @@
"impactLevel": 2,
"efficiency": 1,
"difficulty": 3,
- "room": [3],
+ "room": ["LAUNDRY"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1773,14 +1773,14 @@
{
"_id": "ECOGESTURE0078",
"usage": 6,
- "fluidTypes": [0,2],
+ "fluidTypes": [0, 2],
"shortName": "Du tout cuit",
"longName": "J'éteins mon four avant la fin de la cuisson.",
"longDescription": "Lorsque votre plat arrive en fin de cuisson, éteignez le four. Il continuera de cuire grâce à la chaleur gardée par le four. Vous pouvez économiser jusqu'à 10 % d'électricité en prenant cette habitude !",
"impactLevel": 1,
"efficiency": 2,
"difficulty": 1,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1803,7 +1803,7 @@
"impactLevel": 2,
"efficiency": 1,
"difficulty": 1,
- "room": [2,3],
+ "room": ["KITCHEN", "LAUNDRY"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1826,10 +1826,10 @@
"impactLevel": 5,
"efficiency": 3,
"difficulty": 2,
- "room": [0],
+ "room": ["GARDEN"],
"season": "Eté",
"equipment": false,
- "equipmentType": [],
+ "equipmentType": ["GARDEN"],
"equipmentInstallation": false,
"investment": null,
"action": false,
@@ -1849,7 +1849,7 @@
"impactLevel": 3,
"efficiency": 2,
"difficulty": 2,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1872,10 +1872,10 @@
"impactLevel": 4,
"efficiency": 1,
"difficulty": 2,
- "room": [0],
+ "room": ["GARDEN"],
"season": "Sans saison",
"equipment": false,
- "equipmentType": [],
+ "equipmentType": ["GARDEN"],
"equipmentInstallation": false,
"investment": null,
"action": false,
@@ -1895,7 +1895,7 @@
"impactLevel": 3,
"efficiency": 2,
"difficulty": 2,
- "room": [2],
+ "room": ["KITCHEN"],
"season": "Sans saison",
"equipment": false,
"equipmentType": [],
@@ -1911,14 +1911,14 @@
{
"_id": "ECOGESTURE0084",
"usage": 1,
- "fluidTypes": [0,2],
+ "fluidTypes": [0, 2],
"shortName": "Défense d'entrer",
"longName": " J’isole les coffrets des volets roulants.",
"longDescription": "Un coffre de volets roulants mal isolé engendre la formation de ponts thermiques, pouvant donc laisser l'air froid s’infiltrer. Pour empêcher cela, mieux vaut les isoler avec de la laine de roche ou de la mousse multicouche, par exemple.",
"impactLevel": 7,
"efficiency": 2,
"difficulty": 3,
- "room": [0],
+ "room": ["ALL"],
"season": "Hiver",
"equipment": false,
"equipmentType": [],
@@ -1934,14 +1934,14 @@
{
"_id": "ECOGESTURE0085",
"usage": 4,
- "fluidTypes": [0,2],
+ "fluidTypes": [0, 2],
"shortName": "Ballon au Chaud",
"longName": "J'isole mon ballon d'eau chaude.",
"longDescription": "Pour éviter un maximum les pertes de chaleur, vous pouvez vous munir d'un matériau isolant, comme la laine de roche ou la mousse de polyuréthane. Il vous suffira d'entourer votre ballon d'eau chaude avec celui-ci.",
"impactLevel": 6,
"efficiency": 3,
"difficulty": 3,
- "room": [2,3],
+ "room": ["KITCHEN", "LAUNDRY"],
"season": "Sans saison",
"equipment": true,
"equipmentType": ["BOILER"],
@@ -1964,10 +1964,10 @@
"impactLevel": 6,
"efficiency": 3,
"difficulty": 3,
- "room": [0],
+ "room": ["GARDEN"],
"season": "Eté",
"equipment": false,
- "equipmentType": [],
+ "equipmentType": ["GARDEN"],
"equipmentInstallation": true,
"investment": "Pluviomètre",
"action": false,
diff --git a/src/enums/ecogesture.enum.ts b/src/enums/ecogesture.enum.ts
index c43e069b0065a9f0d1e09ddbcd0ce474c8efdda1..89a1c8f8e9197016231aa050d130ca5e65b11a47 100644
--- a/src/enums/ecogesture.enum.ts
+++ b/src/enums/ecogesture.enum.ts
@@ -9,11 +9,12 @@ export enum Usage {
}
export enum Room {
- ALL = 0,
- BATHROOM = 1,
- KITCHEN = 2,
- LAUNDRY = 3,
- TOILET = 4,
+ ALL = 'ALL',
+ BATHROOM = 'BATHROOM',
+ KITCHEN = 'KITCHEN',
+ LAUNDRY = 'LAUNDRY',
+ TOILET = 'TOILET',
+ GARDEN = 'GARDEN',
}
export enum Season {
@@ -38,6 +39,7 @@ export enum EquipmentType {
FREEZER = 'FREEZER',
BOILER = 'BOILER',
HYDRAULIC_HEATING = 'HYDRAULIC_HEATING',
+ GARDEN = 'GARDEN',
}
export enum EcogestureTab {
diff --git a/src/migrations/migration.data.ts b/src/migrations/migration.data.ts
index abaf259e49dc579d75feda279dceb962c988d873..650fce8de0a109e7405dd8dbf12e19fa152e8b0a 100644
--- a/src/migrations/migration.data.ts
+++ b/src/migrations/migration.data.ts
@@ -1,5 +1,6 @@
import { Client } from 'cozy-client'
import {
+ ECOGESTURE_DOCTYPE,
EGL_DAY_DOCTYPE,
EGL_MONTH_DOCTYPE,
EGL_YEAR_DOCTYPE,
@@ -17,7 +18,14 @@ import {
} from 'doctypes'
import { UserQuizState } from 'enums'
import { DateTime } from 'luxon'
-import { DataloadEntity, Profile, ProfileType, UserChallenge } from 'models'
+import {
+ DataloadEntity,
+ Ecogesture,
+ Profile,
+ ProfileType,
+ UserChallenge,
+} from 'models'
+import ecogestureData from '../db/ecogestureData.json'
import { Migration } from './migration.type'
export const SCHEMA_INITIAL_VERSION = 0
@@ -585,4 +593,26 @@ export const migrations: Migration[] = [
})
},
},
+ {
+ baseSchemaVersion: 23,
+ targetSchemaVersion: 24,
+ appVersion: '3.0.0',
+ description: 'Add garden room & equipment type',
+ releaseNotes: null,
+ docTypes: ECOGESTURE_DOCTYPE,
+ run: async (_client: Client, ecogestures: Ecogesture[]) => {
+ return ecogestures.map(ecogesture => {
+ const ecData = ecogestureData.find(
+ ec => ec._id === ecogesture.id
+ ) as Ecogesture
+
+ if (!ecData) return ecogesture
+
+ ecogesture.room = ecData.room
+ ecogesture.equipmentType = ecData.equipmentType
+
+ return ecogesture
+ })
+ },
+ },
]
diff --git a/src/services/ecogesture.service.ts b/src/services/ecogesture.service.ts
index 7faee66f184661836d3f70cfcb2c5ed458910857..b3e6ddc5dc1282728e747d3138b56fb4604423f0 100644
--- a/src/services/ecogesture.service.ts
+++ b/src/services/ecogesture.service.ts
@@ -252,17 +252,14 @@ export default class EcogestureService {
ecogestureList: Ecogesture[],
profileEcogesture: ProfileEcogesture
): Ecogesture[] {
- for (const ecogesture of ecogestureList) {
- if (ecogesture.equipment === true) {
- for (const equipmentType of ecogesture.equipmentType) {
- if (!profileEcogesture.equipments.includes(equipmentType)) {
- const index = ecogestureList.indexOf(ecogesture)
- ecogestureList.splice(index, 1)
- }
- }
+ return ecogestureList.filter(ecogesture => {
+ if (ecogesture.equipmentType.length === 0) {
+ return true
}
- }
- return ecogestureList
+ return ecogesture.equipmentType.some(type =>
+ profileEcogesture.equipments.includes(type)
+ )
+ })
}
/**
diff --git a/src/utils/hash.spec.ts b/src/utils/hash.spec.ts
index 0edc793c186e28d821bc301fadb7ddb7a2f5dd34..54472af2ea4a7571e44487cdf60c31ee4c6edbbd 100644
--- a/src/utils/hash.spec.ts
+++ b/src/utils/hash.spec.ts
@@ -5,7 +5,7 @@ describe('hash utils test', () => {
describe('hashFile test', () => {
it('should return the correct hash of the file', () => {
const result = hashFile(mockedEcogesturesData)
- expect(result).toBe('21c72fc0b67b0393ee457a25956703ef17b5b724')
+ expect(result).toBe('cfe97043548a13a186b9545388804615c4feeb6f')
})
})
})