diff --git a/src/App.js b/src/App.js
index 8c57e70..0eb3621 100644
--- a/src/App.js
+++ b/src/App.js
@@ -7,7 +7,7 @@ import "./app/config/globals.js";
import openDatabase from "./app/database/database-connection";
import initDatabase from "./app/database/database-init";
-
+import FlashMessage from "react-native-flash-message";
export default function App() {
global.userDataBase = openDatabase();
initDatabase(global.userDataBase);
@@ -15,6 +15,7 @@ export default function App() {
return (
+
);
}
diff --git a/src/app/database/databaseLoader.js b/src/app/database/databaseLoader.js
index 42baac9..336885a 100644
--- a/src/app/database/databaseLoader.js
+++ b/src/app/database/databaseLoader.js
@@ -33,7 +33,7 @@ function insertFloodZone({ images, description, passable, location }) {
transaction(global.userDataBase, query, values);
}
-function insertPluviometerData({ pluviometer, images, date, location }) {
+function insertPluviometerData({ pluviometer, images, dateTime, location }) {
const query = `INSERT INTO Pluviometer(Date, Images, Latitude, Longitude, Precipitation) VALUES(?, ?, ?, ?, ?);`;
if (location === undefined) {
@@ -42,7 +42,7 @@ function insertPluviometerData({ pluviometer, images, date, location }) {
}
const values = [
- date,
+ dateTime,
JSON.stringify(images),
parseFloat(location["latitude"]),
parseFloat(location["longitude"]),
diff --git a/src/app/screens/PluviometerSharingDataScreen.js b/src/app/screens/PluviometerSharingDataScreen.js
index 8f7cbf1..74f1a5c 100644
--- a/src/app/screens/PluviometerSharingDataScreen.js
+++ b/src/app/screens/PluviometerSharingDataScreen.js
@@ -1,6 +1,6 @@
import React, { useState } from "react";
-import { StyleSheet, Text, View, Image, Button, TouchableHighlight, Platform } from "react-native";
+import { StyleSheet, Text, View, Image, ScrollView } from "react-native";
import * as Yup from "yup";
import {
@@ -10,15 +10,13 @@ import {
SubmitButton,
} from "../components/forms";
import Screen from "../components/Screen";
-import DatePicker from "react-native-datepicker";
import useLocation from "../hooks/useLocation";
import FormImagePicker from "../components/forms/FormImagePicker";
import { insertPluviometerData } from "../database/databaseLoader";
-import RNDateTimePicker from '@react-native-community/datetimepicker';
-import { TextInput, TouchableOpacity } from "react-native-gesture-handler";
+import { TouchableOpacity } from "react-native-gesture-handler";
import DateTimePicker from '@react-native-community/datetimepicker';
import { FontAwesome5 } from '@expo/vector-icons';
-
+import { showMessage } from "react-native-flash-message";
import moment from 'moment';
const validationSchema = Yup.object().shape({
@@ -34,25 +32,16 @@ function PluviometerSharingDataScreen(props) {
const { textStyle, defaultDate } = props;
const [date, setDate] = useState(moment(defaultDate))
const [show, setShow] = useState(false);
+ let dateTime = new Date().toString();
const onAndroidChange = (e, selectedDate) => {
setShow(false);
if (selectedDate) {
setDate(moment(selectedDate));
+ dateTime = moment(selectedDate).format("DD/MM/YYYY").toString();
//props.onDateChange(selectedDate);
}
}
-
- const onCancelPress = () => {
- setDate(moment(defaultDate));
- setShow(false);
- }
-
- const onDonePress = () => {
- // props.onDateChange(date);
- setShow(false);
- }
-
const renderDatePicker = () => {
return (
)
}
-
/*---------------------------------------------------------------------------------------------------------*/
-
- // var day = new Date().getDate();
- // var month = new Date().getMonth() + 1;
- // var year = new Date().getFullYear();
return (
+
-
+
+
);
}
@@ -135,6 +129,7 @@ function PluviometerSharingDataScreen(props) {
const styles = StyleSheet.create({
container: {
paddingHorizontal: 10,
+ width: "100%",
},
image: {
width: 85,
@@ -144,9 +139,9 @@ const styles = StyleSheet.create({
},
datePickerView: {
width: 280,
- flexDirection: "row",
- justifyContent:"space-between",
- paddingVertical:15,
+ flexDirection: "row",
+ justifyContent: "space-between",
+ paddingVertical: 15,
},
datepickerStyle: {
borderRadius: 25,
@@ -154,14 +149,14 @@ const styles = StyleSheet.create({
backgroundColor: "#f8f4f4",
},
dateIcon: {
- marginRight:15,
+ marginRight: 15,
},
- labelStyle:{
- fontSize: 16,
- fontWeight: "bold",
- textAlign: "left",
- color: "#1976D2",
- marginBottom: 5,
+ labelStyle: {
+ fontSize: 16,
+ fontWeight: "bold",
+ textAlign: "left",
+ color: "#1976D2",
+ marginBottom: 5,
},
});
diff --git a/src/app/screens/RainSharingDataScreen.js b/src/app/screens/RainSharingDataScreen.js
index 9ebd235..572bec6 100644
--- a/src/app/screens/RainSharingDataScreen.js
+++ b/src/app/screens/RainSharingDataScreen.js
@@ -1,14 +1,12 @@
import React, { useState } from "react";
-import { Button, StyleSheet, View } from "react-native";
+import { StyleSheet, View, ScrollView } from "react-native";
import * as Yup from "yup";
import {
Form,
- FormField,
FormPicker as Picker,
SubmitButton,
} from "../components/forms";
-import CategoryPickerItem from "../components/CategoryPickerItem";
import Screen from "../components/Screen";
import FormImagePicker from "../components/forms/FormImagePicker";
import useLocation from "../hooks/useLocation";
@@ -16,6 +14,7 @@ import { Image, Text, TouchableOpacity } from "react-native";
import colors from "../config/colors";
import { TouchableNativeFeedback } from "react-native-gesture-handler";
import { insertRainData } from "../database/databaseLoader";
+import { showMessage } from "react-native-flash-message";
const validationSchema = Yup.object().shape({
images: Yup.array().min(1, "Por favor, selecione ao menos uma imagem"),
@@ -40,12 +39,21 @@ function RainSharingDataScreen(props) {
>
Chuva
+
+
);
}
diff --git a/src/app/screens/RiverFloodSharingDataScreen.js b/src/app/screens/RiverFloodSharingDataScreen.js
index 13ec016..aa60c85 100644
--- a/src/app/screens/RiverFloodSharingDataScreen.js
+++ b/src/app/screens/RiverFloodSharingDataScreen.js
@@ -10,6 +10,8 @@ import { Image, Text } from "react-native";
import colors from "../config/colors";
import { TouchableNativeFeedback } from "react-native-gesture-handler";
import { insertRiverData } from "../database/databaseLoader";
+import { showMessage } from "react-native-flash-message";
+import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
const validationSchema = Yup.object().shape({
images: Yup.array().min(1, "Por favor, selecione ao menos uma imagem"),
@@ -34,12 +36,22 @@ function RiverFloodSharingDataScreen(props) {
>
Nível da água do rio
+
+
);
}
diff --git a/src/app/screens/SharingFloodZonesScreen.js b/src/app/screens/SharingFloodZonesScreen.js
index 3737e09..82602a9 100644
--- a/src/app/screens/SharingFloodZonesScreen.js
+++ b/src/app/screens/SharingFloodZonesScreen.js
@@ -5,17 +5,18 @@ import {
Text,
Image,
View,
- KeyboardAvoidingView,
} from "react-native";
import * as Yup from "yup";
import { Form, SubmitButton, FormField } from "../components/forms";
import FormImagePicker from "../components/forms/FormImagePicker";
-import Screen from "../components/Screen";
import useLocation from "../hooks/useLocation";
import colors from "../config/colors";
import { TouchableNativeFeedback } from "react-native-gesture-handler";
import { insertFloodZone } from "../database/databaseLoader";
+import { showMessage } from "react-native-flash-message";
+import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view'
+import Screen from "../components/Screen";
function submitForm(props) {
// console.log(props);
@@ -37,7 +38,7 @@ function SharingFloodZonesScreen(props) {
const location = useLocation();
return (
-
+
Pontos de alagamento
+
-
+
+
);
}