Cambios hochos por Gilberto para traer los ExpoPushTokens de las partes en una cita y que la aplicación pueda eviar notificaciones a uno y otro.

screens/main/Calendar.js

@@ -10,6 +10,8 @@ export default class Calendario extends Component {
       selectedStartDate: null,
       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
     };
     this.onDateChange = this.onDateChange.bind(this);
     
@@ -23,10 +25,10 @@ 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});
+      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});
     }
     else{
-      this.props.navigation.navigate('Map', {Appointment_Date: date._d, int_id : this.state.interpreter_id, Flag: this.state.mapflag});
+      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});
     }
   }
   
@@ -58,4 +60,7 @@ const styles = StyleSheet.create({
     backgroundColor: '#FFFFFF',
     marginTop: 100,
   },
-});
+});
+   
+  
+

screens/main/Search.js

@@ -81,8 +81,10 @@ const Days = [
 
 
 
-function Search({ navigation }) {
+function Search({route, navigation }) {
 
+  const u_token = route.params.U_Token;
+  console.log("U__token: ", u_token)
   
   const [users, setUsers] = useState([])
   const [selectedTags, setSelectedTags] = useState([])
@@ -113,7 +115,7 @@ function Search({ 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') {
@@ -250,7 +252,7 @@ function Search({ navigation }) {
             <View style={{ flexDirection: "row", paddingBottom: 20, paddingTop: 20,  justifyContent: "space-between" }}>
               <Text>{item.data.name}</Text>
               <Text>{item.data.Precio}</Text>
-              <Button title='Buscar' onPress={() => { dothing(item.id) }}/>
+              <Button title='Buscar' onPress={() => { dothing(item.id, item.data.push_token, u_token) }}/>
             </View>
             <View style={{ borderBottomColor: 'black', borderBottomWidth: 1 }} />
           </View>
@@ -266,9 +268,9 @@ function Search({ navigation }) {
     return (item) => setSelectedTags(xorBy(selectedTags, [item], 'id'))
   }
   
-  function dothing(item) {
-    console.log('This is the item id: ', item)
-    navigation.navigate('Calendar', {Intereprete_id: item, Flag: mapflag})
+  function dothing(item, i_token, u_token) {
+    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})
   } 
 
 }

screens/main/StateTime.js

@@ -16,7 +16,9 @@ export default class Time extends Component{
       Appointment : this.props.route.params.Appointment_Date,
       int2_id : this.props.route.params.int_id,
       mapflag: this.props.route.params.mapflag,
-      Pin: this.props.route.params.Pin
+      Pin: this.props.route.params.Pin,
+      i_token: this.props.route.params.I_Token,
+      u_token: this.props.route.params.U_Token
     }
     console.log(this.props.route.params)
     this.time_assignment = this.time_assignment.bind(this);
@@ -119,11 +121,14 @@ export default class Time extends Component{
   
   
   if(this.state.mapflag == true){
-    console.log("Pin is: ")
-    console.log(this.state.Pin)
+    console.log("UToken is: ")
+    console.log(this.state.u_token)
     const user = firebase.auth().currentUser;
     const uid = user.uid;
-    const date = this.state.Appointment;
+    const u_token = this.state.u_token;
+    const i_token = this.state.i_token;
+    const date = moment(this.state.Appointment);
+    console.log("date: ", date)
     const month = date.month();
     const day = date.date();
     const _time_ = selectedTime;
@@ -145,6 +150,8 @@ export default class Time extends Component{
       Month : month,
       Day: day,
       Time: _time_,
+      u_token : u_token,
+      i_token : i_token,
       Pin: [
         lat,
         lon,
@@ -155,7 +162,9 @@ export default class Time extends Component{
   else{
     const user = firebase.auth().currentUser
     const uid = user.uid
-    const date = moment(this.state.Appointment)
+    const u_token = user.push_token
+    const i_token = this.state.i_token
+    const date = this.state.Appointment
     const month = date.month()
     const day = date.date()
     const _time_ = selectedTime
@@ -172,6 +181,8 @@ export default class Time extends Component{
       Month : month,
       Day: day,
       Time: _time_,
+      u_token : u_token,
+      i_token : i_token,
       })
 
   }