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

src/app/api/Ingestion/sendFormAnswer.js

@@ -9,7 +9,6 @@ async function sendFormAnswer(ingestionObject) {
     endpoint,
     JSON.stringify(ingestionObject)
   );
-  
   return response;
 } 
 

src/app/components/forms/AssembleIngestionObject.js

@@ -1,7 +1,6 @@
 import moment from "moment";
 import sendFormAnswer from "../../api/Ingestion/sendFormAnswer";
 
-
 const AssembleIngestionObject = (
   { images, description },
   user,
@@ -17,7 +16,7 @@ const AssembleIngestionObject = (
       array_to_json: [
         {
           formcode: code,
-          formsanswersuserinformer: "admin@wpd.com",//user.id,
+          formsanswersuserinformer: "admin@wpd.com", //user.id,
           fieldsanswerslongitude: location["longitude"],
           fieldsanswerslatitude: location["latitude"],
           fields: [
@@ -49,7 +48,7 @@ const AssembleIngestionPluviometer = ({
       array_to_json: [
         {
           formcode: "PLUVIOMETERS_FORM",
-          formsanswersuserinformer: "admin@wpd.com",//user.id,
+          formsanswersuserinformer: "admin@wpd.com", //user.id,
           fias: [
             {
               fieldsanswersdate: moment(date).format("DD-MM-YYYY"),
@@ -64,7 +63,13 @@ const AssembleIngestionPluviometer = ({
   };
 };
 
-const AssembleIngestionPluvRegistration = ( date, time, user, address, coordinates ) => {
+async function AssembleIngestionPluvRegistration(
+  date,
+  time,
+  user,
+  address,
+  coordinates
+) {
   console.log(user);
   console.log(coordinates);
   const pluvResgistrationObject = {
@@ -72,24 +77,29 @@ const AssembleIngestionPluvRegistration = ( date, time, user, address, coordinat
       array_to_json: [
         {
           formcode: "PLUVIOMETER_REGISTRATION",
-          formsanswersuserinformer: "admin@wpd.com",//user.id,
+          formsanswersuserinformer: "admin@wpd.com", //user.id,
           fieldsanswerslongitude: coordinates["longitude"],
-          fieldsanswerslatitude:  coordinates["latitude"],
+          fieldsanswerslatitude: coordinates["latitude"],
           fields: [
             {
               fieldsanswerseventaddress: address,
               fieldsanswerseventdate: moment(date).format("DD-MM-YYYY"),
               fieldsanswerseventtime: moment(time).format("HH:mm"),
-              fieldsanswersinstitutename: user.institutionName ? user.institutionName : null,
-              fieldsanswerrinstitutetype: user.institutionType ? user.institutionType : null
+              fieldsanswersinstitutename: user.institutionName
+                ? user.institutionName
+                : null,
+              fieldsanswerrinstitutetype: user.institutionType
+                ? user.institutionType
+                : null,
             },
           ],
         },
       ],
     },
   };
-  const a = sendFormAnswer(pluvResgistrationObject);
-};
+  const a = await sendFormAnswer(pluvResgistrationObject);
+  return a;
+}
 export {
   AssembleIngestionObject,
   AssembleIngestionPluviometer,

src/app/config/assets.js

@@ -1,4 +1,6 @@
 import Pluviometer from "../assets/pluviometer/pluviometer-logo.svg";
+import PluviometerSharingData from "../assets/pluviometer/pluviometricDataIcon.svg";
+
 import OfficialPluviometer from "../assets/pluviometer/PluviometroOficial.svg";
 import SusceptibilityAreas from "../assets/dataMenu/suceptibilitiesAreas.svg";
 import RainIcon from "../assets/rain/rain-icon.svg";
@@ -105,6 +107,7 @@ export default {
   officialPluviometer: require("../assets/pluviometer/pluviometroOficial.png"),
   officialPluviometer_pin: PinPluviometerOfficial,
   PluviometerIcon: Pluviometer,
+  PluviometricDataIcon: PluviometerSharingData,
   OfficialPluviometer: OfficialPluviometer,
   AppLogoTitle: AppLogoTitle,
   SusceptibilityAreas: SusceptibilityAreas,

src/app/navigation/FeedNavigator.js

@@ -8,7 +8,7 @@ const FeedNavigator = () => (
   <Stack.Navigator>
     <Stack.Screen name="Map" component={MapFeedScreen}
       options={{
-        title: "Pega Chuva",
+        title: "Dados à Prova d'água",
         headerStyle: {
           backgroundColor: "white",
         },

src/app/screens/Abbout.js

@@ -15,7 +15,7 @@ export default function Abbout(props) {
   return (
     <View style={styles.container}>
       <View style={styles.HeaderBackground}>
-        <Text style={styles.txtHeader}>Waterproofing Data</Text>
+        <Text style={styles.txtHeader}>Dados à Prova d'água</Text>
       </View>
       <ScrollView style={styles.scrollContainer}>
         <View style={{ padding: dimensions.spacing.normal_padding }}>

src/app/screens/LoginScreen.js

@@ -102,13 +102,7 @@ export default function LoginScreen(props) {
         }
       >
         <View paddingHorizontal={14}>
-          <assets.AppLogoTitle
-            preserveAspectRatio="xMidYMid meet"
-            width={300}
-            height={30}
-            alignSelf="center"
-            marginBottom={dimensions.spacing.big_padding}
-          />
+        <Text style={styles.txtHeader}>Dados à Prova d'água</Text>
 
           <ErrorMessage
             error="Email ou senha inválidos"
@@ -182,4 +176,11 @@ const styles = StyleSheet.create({
   containter: {
     justifyContent: "center",
   },
+  txtHeader: {
+    fontSize: dimensions.text.header,
+    color: colors.primary,
+    fontWeight: "bold",
+    textAlign: "center",
+    padding: dimensions.spacing.normal_padding,
+  },
 });

src/app/screens/PluviometerRegisterScreen.js

@@ -102,46 +102,74 @@ function PluviometerRegisterScreen(props) {
     <View>
       <Form
         initialValues={{}}
-        onSubmit={() => {
-          AssembleIngestionPluvRegistration(
+        onSubmit={async () => {
+          showMessage({
+            message: "Aguarde! Estamos enviando a informação.",
+            duration: 2005,
+            icon: "warning",
+            type: "warning",
+            onPress: () => {},
+          });
+          const isSent = await AssembleIngestionPluvRegistration(
             date,
             time,
             user,
             location,
             coordinates
           );
+          if (isSent.ok) {
+            showMessage({
+              message: "Pluviômetro cadastrado!",
+              duration: 1950,
+              icon: "success",
+              type: "success",
+              onPress: () => {},
+            });
+            
+            props.navigation.navigate("Home");
+          }
+          else{
+            showMessage({
+              message: "Erro ao cadastrar pluviômetro. Por favor, tente mais tarde!",
+              duration: 1950,
+              icon: "danger",
+              type: "danger",
+              onPress: () => {},
+            });
+            
+          }
         }}
       >
         <View padding={16}>
           <Text style={styles.title}>Cadastro do Pluviômetro</Text>
+          <View>
+            <Text
+              style={{
+                marginTop: 24,
+                marginBottom: 16,
+                fontSize: dimensions.text.secondary,
+                fontWeight: "bold",
+                textAlign: "left",
+                color: colors.secondary,
+              }}
+            >
+              Data do cadastro:{" "}
+            </Text>
 
-          <Text
-            style={{
-              marginTop: 24,
-              marginBottom: 16,
-              fontSize: dimensions.text.secondary,
-              fontWeight: "bold",
-              textAlign: "left",
-              color: colors.secondary,
-            }}
-          >
-            Data do cadastro:{" "}
-          </Text>
-
-          <View
-            style={{
-              marginBottom: 24,
-            }}
-          >
-            <FormDatePicker
-              onDateChange={(value) => setDate(value)}
-              onTimeChange={(value) => setTime(value)}
-              date={date}
-              time={time}
-              formTypeFace={"pluviometerRegister"}
-            />
+            <View
+              style={{
+                marginBottom: 24,
+              }}
+            >
+              <FormDatePicker
+                onDateChange={(value) => setDate(value)}
+                onTimeChange={(value) => setTime(value)}
+                date={date}
+                time={time}
+                formTypeFace={"pluviometerRegister"}
+              />
+            </View>
           </View>
-
           <Text style={styles.label}>Endereço do pluviômetro*: </Text>
           <LocationPicker
             navigation={props.navigation}

src/app/screens/SharingDataScreen.js

@@ -65,7 +65,7 @@ function SharingDataScreen({ navigation }) {
             style={{ marginRight: 24 }}
             label={"DIÁRIO DO\nPLUVIÔMETRO"}
             onPress={() => navigation.navigate("PluviometerSharingData", { user: currentUser })}
-            SvgImage={assets.PluviometerIcon}
+            SvgImage={assets.PluviometricDataIcon}
             active={isRegistered}
             inactiveOnPress={() => setShowLog(true)}
           />