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

screens/main/Calendar.js

@@ -11,7 +11,9 @@ export default class Calendario extends Component {
       interpreter_id : this.props.route.params.Intereprete_id,
       mapflag : this.props.route.params.Flag,
       i_token: this.props.route.params.I_Token,
-      u_token: this.props.route.params.U_Token
+      u_token: this.props.route.params.U_Token,
+      username: this.props.route.params.Username,
+      I_username: this.props.route.params.I_Username,
     };
     this.onDateChange = this.onDateChange.bind(this);
     
@@ -25,10 +27,14 @@ export default class Calendario extends Component {
     console.log(this.props.route.params.Flag)
     
     if(this.state.mapflag == false){
-      this.props.navigation.navigate('StateTime', {Appointment_Date: date._d, int_id : this.state.interpreter_id, Flag: this.state.mapflag, I_Token: this.state.i_token, U_Token: this.state.u_token});
+      this.props.navigation.navigate('StateTime', {Appointment_Date: date._d, int_id : this.state.interpreter_id, 
+        Flag: this.state.mapflag, I_Token: this.state.i_token, U_Token: this.state.u_token
+        ,Username: this.state.username, I_Username: this.state.I_username});
     }
     else{
-      this.props.navigation.navigate('Map', {Appointment_Date: date._d, int_id : this.state.interpreter_id, Flag: this.state.mapflag, I_Token: this.state.i_token, U_Token: this.state.u_token});
+      this.props.navigation.navigate('Map', {Appointment_Date: date._d, int_id : this.state.interpreter_id, 
+        Flag: this.state.mapflag, I_Token: this.state.i_token, U_Token: this.state.u_token
+        ,Username: this.state.username, I_Username: this.state.I_username});
     }
   }
   

screens/main/Cita.js

@@ -19,6 +19,7 @@ export function Cita({route, navigation}) {
    console.log("ID", route.params);
    const [appointments, setAppointments] = useState([]); 
 
+   const[interpreter, setState] = useState();
 
 
  useEffect(() => { 
@@ -68,13 +69,36 @@ export function Cita({route, navigation}) {
     
 
   
+  function check_user_type_INT(){ 
+
+    firebase.firestore()
+    .collection("Interprete")
+    .doc(firebase.auth().currentUser.uid)
+    .get()
+    .then((snapshot) => {
+      if(snapshot.exists){
+        setState(true);
+      }
+      else{
+        setState(false);
+      }
+    })
+
+    if(loading){
+      setLoading(false);
+    }
+
+  }
   
+  check_user_type_INT();
 
   const dimensions = Dimensions.get('window');
   const screenWidth = dimensions.width;
 
+  console.log("Inter: ", interpreter)
+
   const Pin = route.params.Pin;
-  
+  if(interpreter == true){
   return (
       <ImageBackground style={styles.stdcontainer} source={require('../../assets/yellow-white.jpg')}>
         <FlatList style={{
@@ -110,7 +134,99 @@ export function Cita({route, navigation}) {
         onPress={async () => {
           console.log("cita")
         }}
-        >
+        > 
+        <List.Item
+          title='Usuario:'
+          description={item.User}
+          titleNumberOfLines={1}
+          titleStyle={styles.listTitle}
+          descriptionStyle={styles.listDescription}
+          descriptionNumberOfLines={1}
+          />
+          <List.Item
+            title='Mes:'
+            description={item.Month}
+            titleNumberOfLines={1}
+            titleStyle={styles.listTitle}
+            descriptionStyle={styles.listDescription}
+            descriptionNumberOfLines={1}
+          />
+          <List.Item
+            title='Día'
+            description={item.Day}
+            titleNumberOfLines={1}
+            titleStyle={styles.listTitle}
+            descriptionStyle={styles.listDescription}
+            descriptionNumberOfLines={1}
+          />
+          <List.Item
+            title='Hora:'
+            description={item.Time}
+            titleNumberOfLines={1}
+            titleStyle={styles.listTitle}
+            descriptionStyle={styles.listDescription}
+            descriptionNumberOfLines={1}
+          />
+        </TouchableOpacity>
+      )}
+          />
+      <Button
+        title ='Ver mapa'
+        onPress= {() => navigation.navigate('Map', {View_Only: true, Pin: Pin})}
+      />
+      <Button
+        title ='Logout'
+        onPress= {() => firebase.auth().signOut()}
+      />
+        </ImageBackground>
+    );
+    }
+
+    else{
+    return (
+      <ImageBackground style={styles.stdcontainer} source={require('../../assets/yellow-white.jpg')}>
+        <FlatList style={{
+             flex: 1,
+             width: screenWidth,
+         }}
+          data={threads}
+          keyExtractor = {item => item._id}
+          ItemSeparatorComponent={() => <Divider />}
+          renderItem = {({item}) => (
+          <TouchableOpacity
+            onPress={() => navigation.navigate('Room', {thread: item})}
+          >
+            <List.Item
+              title={item.name}
+              titleNumberOfLines={1}
+              titleStyle={styles.listTitle}
+              descriptionStyle={styles.listDescription}
+              descriptionNumberOfLines={1}
+            />
+          </TouchableOpacity>
+        )}
+        />
+        <FlatList style={{
+           flex: 1,
+           width: screenWidth,
+       }}
+        data={appointments}
+        keyExtractor = {item => item._id}
+        ItemSeparatorComponent={() => <Divider />}
+        renderItem = {({item}) => (
+        <TouchableOpacity
+        onPress={async () => {
+          console.log("cita")
+        }}
+        > 
+        <List.Item
+          title='Interprete:'
+          description={item.Interpreter}
+          titleNumberOfLines={1}
+          titleStyle={styles.listTitle}
+          descriptionStyle={styles.listDescription}
+          descriptionNumberOfLines={1}
+          />
           <List.Item
             title='Mes:'
             description={item.Month}
@@ -148,6 +264,7 @@ export function Cita({route, navigation}) {
       />
         </ImageBackground>
     );
+    }
   }
 
 
@@ -158,3 +275,4 @@ const mapDispatchProps = (dispatch) => bindActionCreators({fetchUser}, dispatch)
 
 export default connect(mapStateToProps, mapDispatchProps)(Cita);
 
+

screens/main/Confirm.js

@@ -154,7 +154,7 @@ export function Confirm({navigation}) {
         />
        <Button
         title ='Ver mapa'
-        onPress= {() => navigation.navigate('Map')}
+        onPress= {() => navigation.navigate('Map',{View_Only: true, Confirm_Flag: true, Pin: appointments})}
       />
       <FlatList style={{
              flex: 1,

screens/main/Home_page.js

@@ -31,6 +31,8 @@ export function Home_page({navigation}) {
   const [appointments, setAppointments] = useState([]); 
 
   const[interpreter, setState] = useState();
+  const [Iuser, setIUser] = useState({})
+  const [Uuser, setUser] = useState({})
 
   const [expoPushToken, setExpoPushToken] = useState('');
   const [notification, setNotification] = useState(false);
@@ -54,6 +56,47 @@ export function Home_page({navigation}) {
       } 
     });
 
+    const user_email = firebase.auth().currentUser.email;
+
+  const Iuser_data = firebase.firestore()
+  .collection('Interprete')
+  .where("email", "==", user_email)
+  .onSnapshot(snapShot => {
+    const user = snapShot.docs.map(docSnap => {
+      return{
+        _id:docSnap.id,
+        email:'',
+        username:'',
+        ...docSnap.data()
+      };
+    });
+      setIUser(user)
+
+      if(loading){
+        setLoading(false);
+      }
+  });
+
+  const user_data = firebase.firestore()
+  .collection('Users')
+  .where("email", "==", user_email)
+  .onSnapshot(snapShot => {
+    const user = snapShot.docs.map(docSnap => {
+      return{
+        _id:docSnap.id,
+        email:'',
+        username:'',
+        ...docSnap.data()
+      };
+    });
+      setUser(user)
+
+      if(loading){
+        setLoading(false);
+      }
+  });
+
+
     const fire = firebase.firestore()
     .collection('THREADS')
     .where("members", "array-contains", firebase.auth().currentUser.uid)
@@ -77,6 +120,8 @@ export function Home_page({navigation}) {
       const appointments = snapShot.docs.map(docSnap => {
         return{
           _id:docSnap.id,
+          User:'',
+          Interpreter:'',
           new:'',
           Day:'',
           Month:'',
@@ -97,6 +142,8 @@ export function Home_page({navigation}) {
       Notifications.removeNotificationSubscription(responseListener.current);
       fire();
       cita();
+      Iuser_data();
+      user_data();
     }
   }, []);
   
@@ -109,9 +156,7 @@ export function Home_page({navigation}) {
   const screenWidth = dimensions.width;
 
   
-  function check_user_type_INT(){
-
-    
+  function check_user_type_INT(){ 
 
     firebase.firestore()
     .collection("Interprete")
@@ -141,9 +186,13 @@ export function Home_page({navigation}) {
       })
   }
   
+
   check_user_type_INT();
   console.log("interpreter", interpreter);
+
+  
   if(interpreter == false){
+    const user_name = Uuser[0].username;
     return (
       <ImageBackground style={styles.stdcontainer} source={require('../../assets/yellow-white.jpg')}>
       <FlatList style={{
@@ -160,6 +209,14 @@ export function Home_page({navigation}) {
           navigation.navigate('Cita',{tag: item, Pin: item})
         }}
         >
+          <List.Item
+            title='Interprete: '
+            description={item.Interpreter}
+            titleNumberOfLines={1}
+            titleStyle={styles.listTitle}
+            descriptionStyle={styles.listDescription}
+            descriptionNumberOfLines={1}
+          />
            <List.Item
             title='Mes:'
             description={item.Month}
@@ -210,7 +267,7 @@ export function Home_page({navigation}) {
             />
         <Button
           title ='Hacer Busqueda'
-          onPress= {() => navigation.navigate('Search', {U_Token: expoPushToken})}
+          onPress= {() => navigation.navigate('Search', {U_Token: expoPushToken, Username: user_name})}
         />
         <Button
           title ='Logout'
@@ -220,6 +277,8 @@ export function Home_page({navigation}) {
       );
     }
     else{
+      //En caso de que se necesite el username del interprete que esta logged in.
+      //const user_name = Iuser[0].username;
       return (
         <ImageBackground style={styles.stdcontainer} source={require('../../assets/yellow-white.jpg')}>
         <FlatList style={{
@@ -232,11 +291,19 @@ export function Home_page({navigation}) {
           renderItem = {({item}) => (
           <TouchableOpacity
           onPress={async () => {
-            console.log("item._id, home, interpreter", item._id)
+            console.log("item._id, home, interpreter", item)
             navigation.navigate('Cita',{tag: item, Pin: item})
           }}
           >
           <List.Item
+            title='Usuario:'
+            description={item.User}
+            titleNumberOfLines={1}
+            titleStyle={styles.listTitle}
+            descriptionStyle={styles.listDescription}
+            descriptionNumberOfLines={1}
+          />
+          <List.Item
             title='Mes:'
             description={item.Month}
             titleNumberOfLines={1}
@@ -359,4 +426,5 @@ const mapStateToProps = (store) => ({
 })
 const mapDispatchProps = (dispatch) => bindActionCreators({fetchUser}, dispatch);
 
-export default connect(mapStateToProps, mapDispatchProps)(Home_page);
+export default connect(mapStateToProps, mapDispatchProps)(Home_page);
+

screens/main/Map.js

@@ -2,6 +2,7 @@ import * as React from 'react';
 import { useState } from 'react';
 import MapView, { Marker } from 'react-native-maps';
 import { Button, StyleSheet, Text, View, Dimensions, Pressable } from 'react-native';
+import { Confirm } from './Confirm';
 
 
 export default function Map({route, navigation} ) {
@@ -17,6 +18,9 @@ export default function Map({route, navigation} ) {
     mapflag = route.params.Flag, 
     i_token = route.params.I_Token,
     u_token =  route.params.U_Token,
+    username = route.params.Username,
+    I_username = route.params.I_Username,
+    Confirm_Flag = route.params.Confirm_Flag,
     View_Only = route.params.View_Only
     } = route.params
     
@@ -28,15 +32,39 @@ export default function Map({route, navigation} ) {
   if(View_Only == true){
 
     const Retrive_pin = route.params.Pin;
+    console.log("Retrieve lat", Retrive_pin)
 
-  console.log("Retrieve lat", Retrive_pin.Pin[0])
+    if(Confirm_Flag == true){
+      const [pin2, setPin2] = React.useState({
+        latitude: Retrive_pin[0].Pin[0],
+        longitude: Retrive_pin[0].Pin[1],
+      })
 
-  const [pin2, setPin2] = React.useState({
-    latitude: Retrive_pin.Pin[0],
-    longitude: Retrive_pin.Pin[1],
-  })
+      console.log("Pin2", pin2)
+  
+      return (
+        <View style={styles.container}>
+          <MapView style={styles.map}
+            initialRegion={{
+              latitude: pin2.latitude,
+              longitude: pin2.longitude,
+              latitudeDelta: 0.0922,
+              longitudeDelta: 0.0421,
+            }}
+            provider="google"
+          >
+            <Marker coordinate={pin2} />
+          </MapView>
+        </View>
+      );
+    }
 
-  console.log("Pin2", pin2)
+    else{
+      const [pin2, setPin2] = React.useState({
+      latitude: Retrive_pin.Pin[0],
+      longitude: Retrive_pin.Pin[1],
+      })
+    console.log("Pin2", pin2)
   
     return (
       <View style={styles.container}>
@@ -54,6 +82,7 @@ export default function Map({route, navigation} ) {
       </View>
     );
   }
+}
   else{
 
     const [pin1, setPin1] = React.useState({
@@ -82,7 +111,9 @@ export default function Map({route, navigation} ) {
           <Marker coordinate={pin1} />
         </MapView>
           <View style = {{position: 'absolute', bottom: '5%'}}>
-              <Button title= 'Confirm Location' onPress = {() => navigation.navigate('StateTime' , {Pin : pin1 , Appointment : Appointment, int_id : int_id, mapflag : mapflag, I_Token: i_token, U_Token: u_token})}/>
+              <Button title= 'Confirm Location' onPress = {() => navigation.navigate('StateTime' , {Pin : pin1 , Appointment : Appointment, int_id : int_id, 
+                mapflag : mapflag, I_Token: i_token, U_Token: u_token
+                ,Username: username, I_Username: I_username})}/>
           </View>
       </View>
       

screens/main/Search.js

@@ -84,6 +84,7 @@ const Days = [
 function Search({route, navigation }) {
 
   const u_token = route.params.U_Token;
+  const username = route.params.Username;
   console.log("U__token: ", u_token)
   
   const [users, setUsers] = useState([])
@@ -115,7 +116,7 @@ function Search({route, navigation }) {
       //check which tags where called in the search 
       if (tags[i].id === 'PL') {
         console.log('Presencial')
-        query = query.where('face_to_face', '==', true)
+        query = query.where('Modalidad.Presencial', '==', true)
         mapflag = true
       }
       if (tags[i].id == 'ON') {
@@ -250,9 +251,9 @@ function Search({route, navigation }) {
           return (
           <View>
             <View style={{ flexDirection: "row", paddingBottom: 20, paddingTop: 20,  justifyContent: "space-between" }}>
-              <Text>{item.data.name}</Text>
+              <Text>{item.data.username}</Text>
               <Text>{item.data.Precio}</Text>
-              <Button title='Buscar' onPress={() => { dothing(item.id, item.data.push_token, u_token) }}/>
+              <Button title='Buscar' onPress={() => { dothing(item.id, item.data.push_token, u_token, item.data.username) }}/>
             </View>
             <View style={{ borderBottomColor: 'black', borderBottomWidth: 1 }} />
           </View>
@@ -268,9 +269,9 @@ function Search({route, navigation }) {
     return (item) => setSelectedTags(xorBy(selectedTags, [item], 'id'))
   }
   
-  function dothing(item, i_token, u_token) {
+  function dothing(item, i_token, u_token, I_username) {
     console.log('This is the item id: ', item, "With i_token: ", i_token, " u_token : ", u_token)
-    navigation.navigate('Calendar', {Intereprete_id: item, Flag: mapflag, I_Token: i_token, U_Token: u_token})
+    navigation.navigate('Calendar', {Intereprete_id: item, Flag: mapflag, I_Token: i_token, U_Token: u_token, Username: username, I_Username: I_username})
   } 
 
 }

screens/main/StateTime.js

@@ -18,6 +18,8 @@ export default class Time extends Component{
       mapflag: this.props.route.params.mapflag,
       i_token: this.props.route.params.I_Token,
       u_token: this.props.route.params.U_Token,
+      username: this.props.route.params.Username,
+      I_username: this.props.route.params.I_Username,
       pin: this.props.route.params.Pin
     }
     console.log(" Time params: ",this.props.route.params)
@@ -125,6 +127,8 @@ export default class Time extends Component{
     console.log(this.state.u_token)
     const user = firebase.auth().currentUser;
     const uid = user.uid
+    const username = this.state.username;
+    const I_username = this.state.I_username;
     const u_token = this.state.u_token;
     const i_token = this.state.i_token;
     const date = this.state.Appointment
@@ -139,6 +143,8 @@ export default class Time extends Component{
     firebase.firestore()
     .collection('APPOINTMENTS')
     .add({ 
+      User: username,
+      Interpreter: I_username,
       participantes: [
       i_id,
       uid,