From aa9a939e11f0aac8a6ce2369712c99497d20d633 Mon Sep 17 00:00:00 2001
From: analuizaff <nanaluff@hotmail.com>
Date: Thu, 25 Nov 2021 12:23:31 -0300
Subject: [PATCH] updating situation for automatic Pluviometer

---
 src/app/components/AssembleModalObject.js | 64 +++++++++++------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/src/app/components/AssembleModalObject.js b/src/app/components/AssembleModalObject.js
index 13c58b1..b45999b 100644
--- a/src/app/components/AssembleModalObject.js
+++ b/src/app/components/AssembleModalObject.js
@@ -146,41 +146,39 @@ const AssembleModalObject = async (response, name, userId, formId) => {
     //(waiting for issue #16) user = r[0].formsanswersuserinformer;
 
     if (name == "automaticPluviometer") {
-      (situation = "PLUVIÔMETRO"),
-        r[0].array_to_json.forEach(function (f) {
-          var day = { label: null, values: [] };
-          if (f.fieldname == "medicao") {
-            var measureDate = moment(
-              f.fieldsanswersdtfilling,
-              "YYYY-MM-DDTHH:mm:ss"
-            ).format("DD/MM");
+      situation = "PLUVIÔMETRO";
+      r[0].array_to_json.forEach(function (f) {
+        var day = { label: null, values: [] };
+        if (f.fieldname == "medicao") {
+          var measureDate = moment(
+            f.fieldsanswersdtfilling,
+            "YYYY-MM-DDTHH:mm:ss"
+          ).format("DD/MM");
 
-            if (verifymeasureDates(data.labels, measureDate, day)) {
-              day.values.push(
-                f.fieldsanswersvalue ? parseFloat(f.fieldsanswersvalue) : null
-              );
-              day.label = measureDate;
-              datapluv.push(day);
-            } else {
-              datapluv.forEach((d) => {
-                if (d.label == measureDate) {
-                  d.values.push(
-                    f.fieldsanswersvalue
-                      ? parseFloat(f.fieldsanswersvalue)
-                      : null
-                  );
-                }
-              });
-            }
+          if (verifymeasureDates(data.labels, measureDate, day)) {
+            day.values.push(
+              f.fieldsanswersvalue ? parseFloat(f.fieldsanswersvalue) : null
+            );
+            day.label = measureDate;
+            datapluv.push(day);
+          } else {
+            datapluv.forEach((d) => {
+              if (d.label == measureDate) {
+                d.values.push(
+                  f.fieldsanswersvalue ? parseFloat(f.fieldsanswersvalue) : null
+                );
+              }
+            });
           }
+        }
 
-          if (f.fieldname == "siglarede") {
-            institution = f.fieldsanswersvalue;
-          }
-          if (f.fieldname == "nome") {
-            address = f.fieldsanswersvalue;
-          }
-        });
+        if (f.fieldname == "siglarede") {
+          institution = f.fieldsanswersvalue;
+        }
+        if (f.fieldname == "nome") {
+          address = f.fieldsanswersvalue;
+        }
+      });
 
       if (datapluv) {
         datapluv.sort(function (dataPluv, dataPluvB) {
@@ -188,7 +186,7 @@ const AssembleModalObject = async (response, name, userId, formId) => {
         });
       }
 
-     // console.log(datapluv);
+      // console.log(datapluv);
     } else if (name == "pluviometer") {
       situation = "PLUVIÔMETRO";
       r[r.length - 1].array_to_json.forEach(function (f) {