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

screens/main/Calendar.js

@@ -1,12 +1,12 @@
 import React, { Component } from 'react';
 import {StyleSheet,View} from 'react-native';
-import CalendarPicker from 'react-native-calendar-picker';
-
+import { Calendar } from 'react-native-calendars';
 
 export default class Calendario extends Component {
   constructor(props) {
     super(props);
     this.state = {
+      markedDates: this.props.route.params.markedDates,
       selectedStartDate: null,
       interpreter_id : this.props.route.params.Intereprete_id,
       mapflag : this.props.route.params.Flag,
@@ -16,45 +16,49 @@ export default class Calendario extends Component {
       I_username: this.props.route.params.I_Username,
     };
     this.onDateChange = this.onDateChange.bind(this);
-    
   }
 
+  componentDidMount(){
+    this.forceUpdate();
+    this.setState({markedDates: this.props.route.params.markedDates});
+  };
+
   onDateChange(date) {
     this.setState({
       selectedStartDate: date,
     });
-    console.log(date)
-    console.log(this.props.route.params.Flag)
     
-    if(this.state.mapflag == false){
-      this.props.navigation.navigate('StateTime', {Appointment: 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
-        ,Username: this.state.username, I_Username: this.state.I_username});
+    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, 
+            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
+            ,Username: this.state.username, I_Username: this.state.I_username});
+        }
+      }
     }
   }
   
   render() {
     const { selectedStartDate } = this.state;
     const today = new Date();
-    console.log(today)
-    const appointment = selectedStartDate ? selectedStartDate.toString() : '';
-    console.log(this.props.route.params)
+    //const appointment = selectedStartDate ? selectedStartDate.toString() : '';
     return (
       <View style = {styles.container}>
-        <CalendarPicker
+        <Calendar
+          markedDates={this.state.markedDates}
           minDate={today}
-          onDateChange={this.onDateChange}
+          onDayPress={this.onDateChange}
           selectionMode="singleDay"
           scrollMode="oneMonth"
           monthsAfter={24}
           
-        />
-        
+        />   
         </View>
     );
   }
@@ -66,7 +70,4 @@ const styles = StyleSheet.create({
     backgroundColor: '#FFFFFF',
     marginTop: 100,
   },
-});
-   
-  
-
+});

screens/main/Confirm.js

@@ -127,6 +127,14 @@ export function Confirm({route, navigation}) {
             console.log("date");
           }}
           >
+            <List.Item
+            title='Usuario:'
+            description={item.User}
+            titleNumberOfLines={1}
+            titleStyle={styles.listTitle}
+            descriptionStyle={styles.listDescription}
+            descriptionNumberOfLines={1}
+          />
           <List.Item
             title='Usuario:'
             description={item.User}