Merge branch 'Freehand' of https://git.ccom.uprrp.edu/ccorrada/ErEduGilMor

App.js

@@ -7,7 +7,7 @@ import { createDrawerNavigator } from '@react-navigation/drawer';
 import { Provider } from 'react-redux';
 import { createStore, applyMiddleware } from 'redux';
 
-import AvailabilityScreen from './screens/AvailabilityScreen';
+import AvailabilityScreen from './screens/main/AvailabilityScreen';
 import MailScreen from './screens/MailScreen';
 //import RegisterScreen from './screens/RegisterScreen';
 import RegisterScreen from './screens/auth/RegisterScreen';
@@ -102,6 +102,7 @@ export default class App extends Component {
             <Stack.Screen name = "Map" component={Map}/>
             <Stack.Screen name = "Confirm" component={Confirm}/>
             <Stack.Screen name = "Cita" component={Cita}/>
+            <Stack.Screen name = "Availability" component={AvailabilityScreen}/>
           </Stack.Navigator>
         </NavigationContainer>
       </Provider>

screens/auth/RegisterScreen.js

@@ -13,7 +13,7 @@ export default class RegisterScreen extends Component {
             username: '',
             email: '',
             password: '',
-            interpreter: '',
+            interpreter: false,
         };
         this.onRegister = this.onRegister.bind(this)
     };
@@ -23,7 +23,7 @@ export default class RegisterScreen extends Component {
         firebase.auth().createUserWithEmailAndPassword(email, password)
             .then((result) => {
                 if (interpreter) {
-                    firebase.firestore().collection("Interprete")
+                    firebase.firestore().collection("Interpreters")
                         .doc(firebase.auth().currentUser.uid)
                         .set({
                             username,

screens/main/AvailabilityScreen.js

@@ -0,0 +1,134 @@
+import React, { Component } from "react";
+import { TextInput, TouchableWithoutFeedback, Keyboard, ImageBackground, Image, View, Text, Button } from "react-native";
+import firebase from "firebase";
+import { Calendar } from "react-native-calendars";
+import { ScrollView } from "react-native-gesture-handler";
+import SectionedMultiSelect from 'react-native-sectioned-multi-select';
+import Icon from 'react-native-vector-icons/MaterialIcons';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+
+import { fetchUser } from "../../redux/actions";
+import { styles } from "../../config/styles";
+import { availability } from "../../config/availability";
+
+export class AvailabilityScreen extends Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            english: false,
+            spanish: false,
+            virtual: false,
+            face_to_face: false,
+            personal: false,
+            group: false,
+            cities: [],
+            selectedItems: [],
+            markedDates: {}
+        };
+        this.onSelectedItemsChange = this.onSelectedItemsChange.bind(this);
+        this.onDaySelect = this.onDaySelect.bind(this);
+        this.onSave = this.onSave.bind(this);
+        this.handleUpdate = this.handleUpdate.bind(this);
+    };
+
+    componentDidMount(){
+        this.props.fetchUser();
+        this.forceUpdate(() => {this.handleUpdate()})
+    };
+
+    handleUpdate(){
+        const { currentUser } = this.props;
+        if (currentUser != undefined){
+            if (currentUser.hasOwnProperty('selectedItems') && currentUser.hasOwnProperty('markedDates'))
+            this.setState( {selectedItems: currentUser.selectedItems});
+            this.setState( {markedDates: currentUser.markedDates});
+        }    
+    };
+
+    onSave(){
+        const { selectedItems } = this.state;
+    
+        selectedItems.forEach((value) => {
+            if(value === 'English'){
+                this.setState({english : true}, () => firebase.firestore().collection('Interpreters').doc(firebase.auth().currentUser.uid).set({english : true}, {merge : true}));
+            }
+            else if(value === 'Spanish'){
+                this.setState({spanish : true}, () => firebase.firestore().collection('Interpreters').doc(firebase.auth().currentUser.uid).set({spanish : true}, {merge : true}));
+            }
+            else if(value === 'Virtual'){
+                this.setState({virtual : true}, () => firebase.firestore().collection('Interpreters').doc(firebase.auth().currentUser.uid).set({virtual : true}, {merge : true}));
+            }
+            else if(value === 'Face-to-Face'){
+                this.setState({face_to_face : true}, () => firebase.firestore().collection('Interpreters').doc(firebase.auth().currentUser.uid).set({face_to_face : true}, {merge : true}));
+            }
+            else if(value === 'Personal Session'){
+                this.setState({personal : true}, () => firebase.firestore().collection('Interpreters').doc(firebase.auth().currentUser.uid).set({personal : true}, {merge : true}));
+            }
+            else if(value === 'Group Session'){
+                this.setState({group : true}, () => firebase.firestore().collection('Interpreters').doc(firebase.auth().currentUser.uid).set({group : true}, {merge : true}));
+            }
+            else if(!isNaN(value.charAt(0))){
+                for (let key in this.state.markedDates) {
+                    if(this.state.markedDates[key].hasOwnProperty('timeSlot')){
+                        this.state.markedDates[key].timeSlot.push(value);
+                    }
+                    else{
+                        this.state.markedDates[key].timeSlot = [];
+                        this.state.markedDates[key].timeSlot.push(value);
+                    }
+                }
+            }
+            else{
+                this.state.cities.push(value);
+            }
+        })
+        firebase.firestore().collection('Interpreters')
+            .doc(firebase.auth().currentUser.uid)
+            .set(this.state, {merge : true})
+            .then(() => {this.props.navigation.goBack()});
+    };
+
+    onSelectedItemsChange = (selectedItems) => {
+        this.setState({selectedItems});
+    };
+
+    onDaySelect = (day) => {
+        const selectedDay = day.dateString;
+        let selected = true;
+
+        if (this.state.markedDates[selectedDay]) {
+            selected = !this.state.markedDates[selectedDay].selected;
+        }
+        const updatedMarkedDates = {...this.state.markedDates, ...{ [selectedDay]: { selected } } }
+        this.setState({ markedDates : updatedMarkedDates });
+    };
+
+    render() {
+        return (
+            <ScrollView contentContainerstyle={styles.stdcontainer}>
+                <Calendar
+                    onDayPress={this.onDaySelect}
+                    style={styles.calendar}
+                    markedDates={this.state.markedDates}
+                    theme={{selectedDayBackgroundColor: 'green'}}
+                />
+                <SectionedMultiSelect 
+                    items={availability}
+                    IconRenderer={Icon}
+                    readOnlyHeadings={true}
+                    uniqueKey='name'
+                    subKey='children'
+                    selectText='Choose your availability...'
+                    onSelectedItemsChange={this.onSelectedItemsChange}
+                    selectedItems={this.state.selectedItems}
+                />
+                <Button title='Save' onPress={() => {this.onSave()}}/>
+            </ScrollView>
+        );
+    }
+}
+
+const mapStateProps = (store) => ({currentUser : store.userState.currentUser})
+const mapDispatchProps = (dispatch) => bindActionCreators({fetchUser}, dispatch)
+export default connect(mapStateProps, mapDispatchProps)(AvailabilityScreen)

screens/main/Home_page.js

@@ -58,7 +58,7 @@ export function Home_page({navigation}) {
     const user_email = firebase.auth().currentUser.email;
 
   const Iuser_data = firebase.firestore()
-  .collection('Interprete')
+  .collection('Interpreters')
   .where("email", "==", user_email)
   .onSnapshot(snapShot => {
     const user = snapShot.docs.map(docSnap => {
@@ -158,7 +158,7 @@ export function Home_page({navigation}) {
   function check_user_type_INT(){ 
 
     firebase.firestore()
-    .collection("Interprete")
+    .collection("Interpreters")
     .doc(firebase.auth().currentUser.uid)
     .get()
     .then((snapshot) => {
@@ -414,7 +414,7 @@ async function registerForPushNotificationsAsync() {
     });
   }
 
-  firebase.firestore().collection('Interprete').doc(firebase.auth().currentUser.uid).update({'push_token': token})
+  firebase.firestore().collection('Interpreters').doc(firebase.auth().currentUser.uid).update({'push_token': token})
   firebase.firestore().collection('Users').doc(firebase.auth().currentUser.uid).update({'push_token': token})
 
   return token;

screens/main/Search.js

@@ -106,7 +106,7 @@ function Search({route, navigation }) {
     
 
     const db = firebase.firestore()
-    var query = db.collection('Interprete')
+    var query = db.collection('Interpreters')
     
     for (let i = 0; i < tags.length; i++) {
 
@@ -116,23 +116,23 @@ function Search({route, navigation }) {
       //check which tags where called in the search 
       if (tags[i].id === 'PL') {
         console.log('Presencial')
-        query = query.where('Modalidad.Presencial', '==', true)
+        query = query.where('face_to_face', '==', true)
         mapflag = true
       }
       if (tags[i].id == 'ON') {
-        query = query.where('Modalidad.Online', '==', true)
+        query = query.where('virtual', '==', true)
       }
       if (tags[i].id == 'IL') {
-        query = query.where('Cantidad.Individual', '==', true)
+        query = query.where('personal', '==', true)
       }
       if (tags[i].id == 'GL') {
-        query = query.where('Cantidad.Grupal', '==', true)
+        query = query.where('group', '==', true)
       }
       if (tags[i].id == 'ESP') {
-        query = query.where('Lenguaje.Esp', '==', true)
+        query = query.where('spanish', '==', true)
       }
       if (tags[i].id == 'ING') {
-        query = query.where('Lenguaje.Ing', '==', true)
+        query = query.where('english', '==', true)
       }
   }
   for(let i = 0; i < days.length; i++) {
@@ -252,7 +252,7 @@ function Search({route, navigation }) {
           <View>
             <View style={{ flexDirection: "row", paddingBottom: 20, paddingTop: 20,  justifyContent: "space-between" }}>
               <Text>{item.data.username}</Text>
-              <Text>{item.data.Precio}</Text>
+              <Text>{item.data.precio}</Text>
               <Button title='Buscar' onPress={() => { dothing(item.id, item.data.push_token, u_token, item.data.username) }}/>
             </View>
             <View style={{ borderBottomColor: 'black', borderBottomWidth: 1 }} />