Merge branch 'main' of github.com:IGSD-UoW/WPD-MobileApp

src/App.js

@@ -33,7 +33,7 @@ export default function App() {
     const storageUser = await authStorage.getUser();
     if (storageUser) setUser(storageUser);
 
-    global.location = { lat: -9.969802, long: -67.816956 }; // await getLocation();
+    global.location = { lat: -9.9740, long: -67.8098 }; // await getLocation();
   };
 
   if (!isReady && netInfo.isInternetReachable) {

src/app/components/AssembleModalObject.js

@@ -75,10 +75,11 @@ const AssembleModalObject = (response, name) => {
     labels: [],
   };
 
-  if (JSON.parse(response)) {
+  if (JSON.parse(response).array_to_json) {
     const r = JSON.parse(response).array_to_json;
+    console.log(response);
 
-    user = r[0].formsanswersuserinformer;
+    //(waiting for issue #16) user = r[0].formsanswersuserinformer;
 
     if (name == "automaticPluviometer") {
       (situation = "PLUVIÔMETRO"),
@@ -101,6 +102,7 @@ const AssembleModalObject = (response, name) => {
         });
     } else {
       if (r[0].array_to_json) {
+        user = r[0].formsanswersuserinformer;
         r[0].array_to_json.forEach(function (f) {
           if (f.fieldname == "situation") {
             situation = f.fieldsanswersvalue;

src/app/config/colors.js

@@ -19,5 +19,4 @@ export default {
   gold: "#ffd700",
   toggle: "#e5eff4",
   grayBG: "#EEECEC",
-
 };

src/app/screens/MapFeedScreen.js

@@ -17,11 +17,11 @@ export default function MapFeedScreen(props) {
       susceptibilityAreas: false,
     },
     citzen: {
-      floodRisk: true,
-      pluviometer: true,
-      rain: true,
-      floodZones: true,
-      riverFlood: true,
+      floodRisk: false,
+      pluviometer: false,
+      rain: false,
+      floodZones: false,
+      riverFlood: false,
     },
   });