Merging el pull

screens/main/Calendar.js

@@ -27,16 +27,17 @@ export default class Calendario extends Component {
     this.setState({
       selectedStartDate: date,
     });
+    console.log(date)
     
     if(this.state.markedDates[date.dateString] != undefined){
       if(this.state.markedDates[date.dateString].selected == true){
         if(this.state.mapflag == false){
-          this.props.navigation.navigate('StateTime', {Appointment: date._d, int_id : this.state.interpreter_id, 
+          this.props.navigation.navigate('StateTime', {Day: date.day, Month: date.month, 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._d, int_id : this.state.interpreter_id, 
+          this.props.navigation.navigate('Map', {Day: date.day, Month: date.month, 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});
         }
@@ -75,3 +76,8 @@ const styles = StyleSheet.create({
 
   
 
+
+
+
+  
+

screens/main/Map.js

@@ -1,143 +1,145 @@
-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';
+    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} ) {
-    
-  console.log('In map params')
-  console.log(route.params)
-  
+    export default function Map({route, navigation} ) {
+        
+      console.log('In map params')
+      console.log(route.params)
+      
 
-    
-    const {
-    Appointment = route.params.Appointment_Date ,
-    int_id = route.params.int_id,
-    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
-    
+        
+        const {
+        Day = route.params.Day ,
+        Month = route.params.Month,
+        int_id = route.params.int_id,
+        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
+        
 
-    
+        
 
-  
+      
 
-  if(View_Only == true){
+      if(View_Only == true){
 
-    const Retrive_pin = route.params.Pin;
-    console.log("Retrieve lat", Retrive_pin)
+        const Retrive_pin = route.params.Pin;
+        console.log("Retrieve lat", Retrive_pin)
 
-    if(Confirm_Flag == true){
-      const [pin2, setPin2] = React.useState({
-        latitude: Retrive_pin[0].Pin[0],
-        longitude: Retrive_pin[0].Pin[1],
-      })
+        if(Confirm_Flag == true){
+          const [pin2, setPin2] = React.useState({
+            latitude: Retrive_pin[0].Pin[0],
+            longitude: Retrive_pin[0].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)
+      
+          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>
+          );
+        }
 
-    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}>
-        <MapView style={styles.map}
-          initialRegion={{
-            latitude: pin2.latitude,
-            longitude: pin2.longitude,
-            latitudeDelta: 0.0922,
-            longitudeDelta: 0.0421,
-          }}
-          provider="google"
-        >
-          <Marker coordinate={pin2} />
-        </MapView>
-      </View>
-    );
-  }
-}
-  else{
+        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}>
+            <MapView style={styles.map}
+              initialRegion={{
+                latitude: pin2.latitude,
+                longitude: pin2.longitude,
+                latitudeDelta: 0.0922,
+                longitudeDelta: 0.0421,
+              }}
+              provider="google"
+            >
+              <Marker coordinate={pin2} />
+            </MapView>
+          </View>
+        );
+      }
+    }
+      else{
 
-    const [pin1, setPin1] = React.useState({
-      latitude: 18.4655,
-      longitude: -66.1057,
-    })
+        const [pin1, setPin1] = React.useState({
+          latitude: 18.4655,
+          longitude: -66.1057,
+        })
 
-    return (
-      <View style={styles.container}>
-        <MapView style={styles.map}
-          initialRegion={{
-            latitude: 18.4655,
-            longitude: -66.1057,
-            latitudeDelta: 0.0922,
-            longitudeDelta: 0.0421,
-          }}
-          onPress={(e) => {
-            setPin1({
-              latitude: e.nativeEvent.coordinate.latitude,
-              longitude: e.nativeEvent.coordinate.longitude
-            })
-          }}
-          
-          provider="google"
-        >
-          <Marker coordinate={pin1} />
-        </MapView>
-          <View style = {{position: 'absolute', bottom: '5%'}}>
-              <Button title= 'Confirm Location' color = "#000000" 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})}/>
+        return (
+          <View style={styles.container}>
+            <MapView style={styles.map}
+              initialRegion={{
+                latitude: 18.4655,
+                longitude: -66.1057,
+                latitudeDelta: 0.0922,
+                longitudeDelta: 0.0421,
+              }}
+              onPress={(e) => {
+                setPin1({
+                  latitude: e.nativeEvent.coordinate.latitude,
+                  longitude: e.nativeEvent.coordinate.longitude
+                })
+              }}
+              
+              provider="google"
+            >
+              <Marker coordinate={pin1} />
+            </MapView>
+              <View style = {{position: 'absolute', bottom: '5%'}}>
+                  <Button title= 'Confirm Location' color = "#000000" onPress = {() => navigation.navigate('StateTime' , {Pin : pin1 , 
+                    Day : Day, Month: Month, int_id : int_id, 
+                    mapflag : mapflag, I_Token: i_token, U_Token: u_token
+                    ,Username: username, I_Username: I_username})}/>
+              </View>
           </View>
-      </View>
-      
-    );
-  }
+          
+        );
+      }
 
-    
-}
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    backgroundColor: '#fff',
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-  map: {
-    width: Dimensions.get('window').width,
-    height: Dimensions.get('window').height,
-  },
-  container2: {
-    flex: 1,
-    alignItems: 'center',
-    justifyContent: 'center',
-    backgroundColor: '#307ecc',
-    padding: 16,
-  },
-});
+        
+    }
+    const styles = StyleSheet.create({
+      container: {
+        flex: 1,
+        backgroundColor: '#fff',
+        alignItems: 'center',
+        justifyContent: 'center',
+      },
+      map: {
+        width: Dimensions.get('window').width,
+        height: Dimensions.get('window').height,
+      },
+      container2: {
+        flex: 1,
+        alignItems: 'center',
+        justifyContent: 'center',
+        backgroundColor: '#307ecc',
+        padding: 16,
+      },
+    });

screens/main/StateTime.js

@@ -13,7 +13,8 @@ export default class Time extends Component{
       this.endtime = 0,
       this.timesetter = 0,
     this.state = {
-      Appointment : this.props.route.params.Appointment,
+      Day : this.props.route.params.Day,
+      Month: this.props.route.params.Month,
       int2_id : this.props.route.params.int_id,
       mapflag: this.props.route.params.mapflag,
       i_token: this.props.route.params.I_Token,
@@ -131,10 +132,8 @@ export default class Time extends Component{
     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
-    const month = date.getMonth() + 1;
-    console.log("Month: ", month)
-    const day = date.getDate();
+    const month = this.state.Month;
+    const day = this.state.Day;
     const _time_ = selectedTime;
     const i_id = this.state.int2_id;
     const lat = this.state.pin.latitude; 
@@ -169,10 +168,8 @@ export default class Time extends Component{
     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
-    const month = date.getMonth() + 1;
-    console.log("Month: ", month)
-    const day = date.getDate();
+    const month = this.state.Month;
+    const day = this.state.Day;
     const _time_ = selectedTime;
     const i_id = this.state.int2_id;
     console.log('Params: ')
@@ -205,7 +202,7 @@ export default class Time extends Component{
     return(
       <TouchableWithoutFeedback style={styles.stdcontainer}>
         <ImageBackground style={styles.regcontainer} source={require('../../assets/yellow-white.jpg')}>
-          <Text style={styles.time_text}> Select the Start and End Time for the Appointment </Text>
+          <Text style={styles.qsttxt}> Select the Start and End Time for the Appointment </Text>
         <Button style={styles.cenregbutton} title="8:00am" onPress={() => this.time_set(1,)}/>
         <Button style={styles.cenregbutton} title="9:00am" onPress={() => this.time_set(2,)}/>
         <Button style={styles.cenregbutton} title="10:00am" onPress={() => this.time_set(3,)}/>
@@ -217,5 +214,15 @@ export default class Time extends Component{
         </ImageBackground>
       </TouchableWithoutFeedback>
     );
+<<<<<<< HEAD
     }
   }
+=======
+  }
+}
+
+
+
+
+
+>>>>>>> 41f4e392c1d11b10c3650da5122494623f10e2d6