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

screens/main/Cita.js

@@ -276,3 +276,4 @@ const mapDispatchProps = (dispatch) => bindActionCreators({fetchUser}, dispatch)
 export default connect(mapStateToProps, mapDispatchProps)(Cita);
 
 
+

screens/main/Map.js

@@ -111,7 +111,7 @@ 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, 
+              <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})}/>
           </View>

screens/main/Search.js

@@ -44,40 +44,6 @@ const Tags = [
 ]
 
 
-const Days = [
-  {
-    item: 'Lunes',
-    id: 'L',
-  },
-  {
-    item: 'Martes',
-    id: 'M',
-  },
-  {
-    item: 'Miercoles',
-    id: 'W',
-  },
-  {
-    item: 'Jueves',
-    id: 'J',
-  },
-  {
-    item: 'Viernes',
-    id: 'V',
-  },
-  {
-    item: 'Sabado',
-    id: 'S',
-  },
-  {
-    item: 'Domingo',
-    id: 'D',
-  },
-  {
-    item: 'Feriados',
-    id: 'F',
-  }
-]
 
 
 
@@ -89,15 +55,14 @@ function Search({route, navigation }) {
   
   const [users, setUsers] = useState([])
   const [selectedTags, setSelectedTags] = useState([])
-  const [selectedDays, setSelectedDays] = useState([])
 
   
-  const fetchUsers = (tags, days) => {
+  const fetchUsers = (tags) => {
     
     //if the array that have the interpreter tags
     //and the day tags are empty we dont send the query seeing as the user
     //is not searching for anything yet 
-    if (tags.length === 0 && days.length === 0) {
+    if (tags.length === 0) {
       return
     }
 
@@ -135,32 +100,7 @@ function Search({route, navigation }) {
         query = query.where('english', '==', true)
       }
   }
-  for(let i = 0; i < days.length; i++) {
-    if (days[i].id === 'L') {
-      query = query.where('dias.Lunes', '==', true)
-    }
-    if (days[i].id === 'M') {
-      query = query.where('dias.Martes', '==', true)
-    }
-    if (days[i].id === 'W') {
-      query = query.where('dias.Miercoles', '==', true)
-    }
-    if (days[i].id === 'J') {
-      query = query.where('dias.Jueves', '==', true)
-    }
-    if (days[i].id === 'V') {
-      query = query.where('dias.Viernes', '==', true)
-    }
-    if (days[i].id === 'S') {
-      query = query.where('dias.Sabado', '==', true)
-    }
-    if (days[i].id === 'D') {
-      query = query.where('dias.Domingo', '==', true)
-    }
-    if (days[i].id === 'F') {
-      query = query.where('dias.Feriados', '==', true)
-    }
-  }
+  
     query.get().then(querySnapshot => {
       console.log('Total users: ', querySnapshot.size);
       //traverse the query snapshot
@@ -212,34 +152,9 @@ function Search({route, navigation }) {
         onTapClose={onMultiChange()}
         isMulti
       />
-      <Text style={{ fontSize: 20, paddingBottom: 10 }}>Dias Disponibles</Text>
-      <SelectBox
-      arrowIconColor='#E4CD05'
-      toggleIconColor='#E4CD05'
-      searchIconColor='#E4CD05'
-      multiOptionContainerStyle = {{
-        backgroundColor: '#E4CD05',
-        borderColor: '#E4CD05',
-        borderWidth: 1,
-        borderRadius: 5,
-        marginBottom: 10,
-        marginTop: 10,
-        padding: 10,
-      }}
-      multiOptionsLabelStyle = {{
-        color: '#000000',
-        fontSize: 20,
-      }}
-        label="Select multiple"
-        options={Days}
-        selectedValues={selectedDays}
-        onMultiSelect={(item) => setSelectedDays(xorBy(selectedDays, [item], 'id'))}
-        onTapClose={(item) => setSelectedDays(xorBy(selectedDays, [item], 'id'))}
-        isMulti
-      />
 
       {/* button that will fetch the users */}
-      <Button title='Buscar' onPress={() => fetchUsers(selectedTags, selectedDays)}/>
+      <Button title='Buscar' onPress={() => fetchUsers(selectedTags)}/>
 
 
       <FlatList
@@ -253,7 +168,7 @@ function Search({route, navigation }) {
             <View style={{ flexDirection: "row", paddingBottom: 20, paddingTop: 20,  justifyContent: "space-between" }}>
               <Text>{item.data.username}</Text>
               <Text>{item.data.precio}</Text>
-              <Button title='Buscar' onPress={() => { dothing(item.id, item.data.push_token, u_token, item.data.username) }}/>
+              <Button title='Buscar' onPress={() => { dothing(item.id, item.data.markedDates, item.data.push_token, u_token, item.data.username) }}/>
             </View>
             <View style={{ borderBottomColor: 'black', borderBottomWidth: 1 }} />
           </View>
@@ -269,9 +184,10 @@ function Search({route, navigation }) {
     return (item) => setSelectedTags(xorBy(selectedTags, [item], 'id'))
   }
   
-  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, Username: username, I_Username: I_username})
+  function dothing(item_id, item_dates, i_token, u_token, I_username) {
+    console.log('This is the item id: ', item_id, "With i_token: ", i_token, " u_token : ", u_token)
+    console.log('These are the marked dates', item_dates)
+    navigation.navigate('Calendar', {Intereprete_id: item_id, markedDates: item_dates, Flag: mapflag, I_Token: i_token, U_Token: u_token, Username: username, I_Username: I_username})
   } 
 
 }

screens/main/StateTime.js

@@ -149,7 +149,7 @@ export default class Time extends Component{
       i_id,
       uid, 
       ],
-      new: true,
+      new: 'true',
       Month : month,
       Day: day,
       Time: _time_,
@@ -182,7 +182,7 @@ export default class Time extends Component{
       i_id,
       uid, 
       ],
-      new: true,
+      new: 'true',
       Month : month,
       Day: day,
       Time: _time_,
@@ -214,4 +214,3 @@ export default class Time extends Component{
     );
   }
 }
-