diff --git a/src/app/assets/pluviometer/pluviometer-logo.svg b/src/app/assets/pluviometer/pluviometer-logo.svg
index 17789b3..80ba966 100644
--- a/src/app/assets/pluviometer/pluviometer-logo.svg
+++ b/src/app/assets/pluviometer/pluviometer-logo.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/components/AssembleModalObject.js b/src/app/components/AssembleModalObject.js
index c57e186..caadc28 100644
--- a/src/app/components/AssembleModalObject.js
+++ b/src/app/components/AssembleModalObject.js
@@ -4,7 +4,7 @@ import { View, Text } from "react-native";
import assets from "../config/assets";
const custom_assets = {
- pluviometer: assets.pluviometer,
+ pluviometer: assets.PluviometerIcon,
officialPluviometer: assets.OfficialPluviometer,
floodZones: assets.floodZones,
riverLevel: ["Low", "Normal", "High", "Flooding"].map((key) => {
@@ -66,7 +66,7 @@ function verifyMeasureDates(labels, measureDate) {
}
const AssembleModalObject = (response, name) => {
- console.log(response);
+ //console.log(response);
var situation = null;
var user = null;
var institution = null;
@@ -82,7 +82,6 @@ const AssembleModalObject = (response, name) => {
if (JSON.parse(response).array_to_json) {
const r = JSON.parse(response).array_to_json;
- console.log(response);
//(waiting for issue #16) user = r[0].formsanswersuserinformer;
@@ -105,6 +104,9 @@ const AssembleModalObject = (response, name) => {
address = f.fieldsanswersvalue;
}
});
+ } else if (name == "pluviometer") {
+ situation = "PLUVIÔMETRO";
+ //buscar todos os PLUVIOMETERS_FORMS REPORTADOS PELO USUÁRIO DOS ULTIMOS 5 DIAS
} else {
if (r[0].array_to_json) {
user = r[0].formsanswersuserinformer;
diff --git a/src/app/components/MapModal.js b/src/app/components/MapModal.js
index 9d75d38..72967b6 100644
--- a/src/app/components/MapModal.js
+++ b/src/app/components/MapModal.js
@@ -28,14 +28,6 @@ function notImplemented() {
});
}
-function loadingData() {
- return (
-
- Carregando dados...
-
- );
-}
-
function onCloseModal(setShowModal, setCurrentMarker) {
setShowModal(null);
setCurrentMarker(undefined);
@@ -282,8 +274,7 @@ function MapModal({ showModal, setShowModal, markers }) {
var timeFilter = null;
const getAnswers = async (id, name) => {
- // console.log("----------id:"+id);
- if (isPluviometer(name)) {
+ if (isOfficialPluviometer(name)) {
const initialDate = moment().format("YYYY-MM-DD");
const finalDate = moment().subtract(5, "days").format("YYYY-MM-DD");
@@ -294,6 +285,8 @@ function MapModal({ showModal, setShowModal, markers }) {
const result = await getFieldsAnswers.fieldsAnswers(timeFilter, id);
if (result.data && showModal && currentMarker == undefined) {
+
+
setCurrentMarker(
AssembleModalObject(
JSON.stringify(result.data.responseData),