screens/main/Cita.js

@@ -236,7 +236,7 @@ export function Cita({route, navigation}) {
             descriptionNumberOfLines={1}
           />
           <List.Item
-            title='Día'
+            title='Día:'
             description={item.Day}
             titleNumberOfLines={1}
             titleStyle={styles.listTitle}

screens/main/Confirm.js

@@ -24,7 +24,7 @@ Notifications.setNotificationHandler({
 });
 
 
-export function Confirm({navigation}) {
+export function Confirm({route, navigation}) {
   const [threads, setThreads] = useState([]);  
   const [loading, setLoading] = useState(true);
   const [appointments, setAppointments] = useState([]); 
@@ -45,7 +45,9 @@ export function Confirm({navigation}) {
       navigation.navigate('Search');
     });
 
-    const cita = firebase.firestore().collection('APPOINTMENTS').where("new", "==", 'true').onSnapshot(snapShot => {
+    //console.log("en confirm", route.params.tag.citaID);
+    //const cita = firebase.firestore().collection('APPOINTMENTS').where("new", "==", "true").onSnapshot(snapShot => {
+    const cita = firebase.firestore().collection('APPOINTMENTS').where("citaID", "==", route.params.x).onSnapshot(snapShot => {
       const appointments = snapShot.docs.map(docSnap => {
         return{
           _id:docSnap.id,
@@ -60,7 +62,7 @@ export function Confirm({navigation}) {
         };
       });
       setAppointments(appointments);
-      console.log("appointment", appointments);
+      console.log("appointment query de confirm", appointments);
     });
       
     return () => {
@@ -125,7 +127,7 @@ export function Confirm({navigation}) {
             console.log("date");
           }}
           >
-            <List.Item
+          <List.Item
             title='Usuario:'
             description={item.User}
             titleNumberOfLines={1}
@@ -142,7 +144,7 @@ export function Confirm({navigation}) {
             descriptionNumberOfLines={1}
           />
           <List.Item
-            title='Día'
+            title='Día:'
             description={item.Day}
             titleNumberOfLines={1}
             titleStyle={styles.listTitle}

screens/main/Home_page.js

@@ -24,6 +24,10 @@ Notifications.setNotificationHandler({
 });
 
 
+let x = "x";
+console.log(x);
+
+
 export function Home_page({navigation}) {
 
   const [threads, setThreads] = useState([]);  
@@ -47,9 +51,9 @@ export function Home_page({navigation}) {
     });
 
     responseListener.current = Notifications.addNotificationResponseReceivedListener(response => {
-      console.log("response", response);
       if (response.notification.request.content.body == 'Le solicitan una cita'){
-        navigation.navigate('Confirm');
+        console.log("response appointments ", appointments[0])
+        navigation.navigate('Confirm',{x})
       } 
     });
 
@@ -94,25 +98,6 @@ export function Home_page({navigation}) {
   });
 
 
-    const fire = firebase.firestore()
-    .collection('THREADS')
-    .where("members", "array-contains", firebase.auth().currentUser.uid)
-    .onSnapshot(querySnapshot => {
-      const threads = querySnapshot.docs.map(documentSnapshot => {
-        return{
-          _id:documentSnapshot.id,
-          name:'',
-          ...documentSnapshot.data()
-        };
-      });
-
-      setThreads(threads);
-
-      if(loading){
-        setLoading(false);
-      }
-    });
-
     const cita = firebase.firestore().collection('APPOINTMENTS').where("participantes", "array-contains", firebase.auth().currentUser.uid).onSnapshot(snapShot => {
       const appointments = snapShot.docs.map(docSnap => {
         return{
@@ -130,14 +115,13 @@ export function Home_page({navigation}) {
         };
       });
       setAppointments(appointments);
-      console.log("appointment", appointments);
+      //console.log("appointment", appointments);
     });
 
       
     return () => {
       Notifications.removeNotificationSubscription(notificationListener.current);
       Notifications.removeNotificationSubscription(responseListener.current);
-      fire();
       cita();
       Iuser_data();
       user_data();
@@ -185,7 +169,7 @@ export function Home_page({navigation}) {
   
 
   check_user_type_INT();
-  console.log("interpreter", interpreter);
+  //console.log("interpreter", interpreter);
 
   
   if(interpreter == false){
@@ -202,7 +186,7 @@ export function Home_page({navigation}) {
         renderItem = {({item}) => (
         <TouchableOpacity
         onPress={async () => {
-          console.log("item._id, home, client", item.Pin)
+          //console.log("item._id, home, client", item.Pin)
           navigation.navigate('Cita',{tag: item, Pin: item})
         }}
         >
@@ -223,7 +207,7 @@ export function Home_page({navigation}) {
             descriptionNumberOfLines={1}
           />
           <List.Item
-            title='Día'
+            title='Día:'
             description={item.Day}
             titleNumberOfLines={1}
             titleStyle={styles.listTitle}
@@ -256,6 +240,7 @@ export function Home_page({navigation}) {
               onPress={ async () => {
                 await sendPushNotification(item.i_token);
                 citaId(item._id);
+                x = item._id;
                 }
               }
             /> 
@@ -288,7 +273,7 @@ export function Home_page({navigation}) {
           renderItem = {({item}) => (
           <TouchableOpacity
           onPress={async () => {
-            console.log("item._id, home, interpreter", item)
+            //console.log("item._id, home, interpreter", item)
             navigation.navigate('Cita',{tag: item, Pin: item})
           }}
           >
@@ -309,7 +294,7 @@ export function Home_page({navigation}) {
             descriptionNumberOfLines={1}
           />
           <List.Item
-            title='Día'
+            title='Día:'
             description={item.Day}
             titleNumberOfLines={1}
             titleStyle={styles.listTitle}
@@ -326,31 +311,7 @@ export function Home_page({navigation}) {
           />
           </TouchableOpacity>
         )}
-            />
-
-
-            <FlatList style={{
-             flex: 1,
-             width: screenWidth,
-            }}
-            data={appointments}
-            keyExtractor = {item => item._id}
-            renderItem={({ item }) => {
-            if(item.new == 'true'){
-            return (
-              <Button
-                title ='Pedir Cita'
-                onPress={ async () => {
-                  await sendPushNotification(item.i_token);
-                  citaId(item._id);
-                  }
-                }
-              /> 
-            )
-            }}}
-            />
-
-
+        />
           <Button
           title ='Availability'
           onPress= {() => navigation.navigate('Availability')}
@@ -398,7 +359,7 @@ async function registerForPushNotificationsAsync() {
       return;
     }
     token = (await Notifications.getExpoPushTokenAsync()).data;
-    console.log('Token:', token)
+    //console.log('Token:', token)
   } else {
     alert('Must use physical device for Push Notifications');
   }

screens/main/StateTime.js

@@ -216,8 +216,3 @@ export default class Time extends Component{
     );
   }
 }
-
-
-
-
-