diff --git a/src/app/components/AssembleModalObject.js b/src/app/components/AssembleModalObject.js index 77b3277..3233857 100644 --- a/src/app/components/AssembleModalObject.js +++ b/src/app/components/AssembleModalObject.js @@ -1,9 +1,7 @@ import moment from "moment"; -import React from "react"; -import { View, Text } from "react-native"; import getFieldsAnswers from "../api/RequestFieldsAnswers/getFieldsAnswers"; import assets from "../config/assets"; -//----- 1/3: melhorar código (URGENTE) +//----- 1/3: melhorar código (URGENTE) +1 up-vote const custom_assets = { pluviometer: assets.PluviometerIcon, officialPluviometer: assets.OfficialPluviometer, @@ -46,7 +44,7 @@ function getLogo(name, situation) { return custom_assets.riverLevel[1]; } else if (situation == "ALTO") { return custom_assets.riverLevel[2]; - } else if (situation == "INUNDAR") { + } else if (situation == "INUNDAR" || situation == "TRANSBORDADO") { return custom_assets.riverLevel[3]; } return custom_assets.riverLevel[0]; @@ -278,9 +276,12 @@ const AssembleModalObject = async (response, name, userId, formId) => { } } + // GATO 2: Now INUNDAR is replaced to TRANSBORDADO, so checking from + // response and changing to new value + const _title = situation == "INUNDAR" ? "TRANSBORDADO" : situation; return { name: name, - title: situation, + title: _title, user: null, institution: institution, address: address, diff --git a/src/app/hooks/useSocketMarkers.js b/src/app/hooks/useSocketMarkers.js index 6f6f36a..62398e4 100644 --- a/src/app/hooks/useSocketMarkers.js +++ b/src/app/hooks/useSocketMarkers.js @@ -69,7 +69,7 @@ function getImage(name, situation) { return custom_assets_pin.riverLevel[1]; } else if (situation == "ALTO") { return custom_assets_pin.riverLevel[2]; - } else if (situation == "INUNDAR") { + } else if (situation == "INUNDAR" || situation == "TRANSBORDADO") { return custom_assets_pin.riverLevel[3]; } return custom_assets_pin.riverLevel[0]; diff --git a/src/app/screens/RiverFloodSharingDataScreen.js b/src/app/screens/RiverFloodSharingDataScreen.js index 37899cc..1091763 100644 --- a/src/app/screens/RiverFloodSharingDataScreen.js +++ b/src/app/screens/RiverFloodSharingDataScreen.js @@ -169,10 +169,10 @@ function RiverFloodSharingDataScreen(props) { { setRiverScale(3); - setRiverSituation("INUNDAR"); + setRiverSituation("TRANSBORDADO"); }} SvgImage={assets.riverLevel.Flooding} - label={"INUNDAR"} + label={"TRANSBORDADO"} isToggle={riverScale == 3} />