everything is updated part 2

client/Screens/AddTakenCourse.js

@@ -34,7 +34,7 @@ const AddTakenCourse = () => {
   const [grade, setGrade] = useState('A')
   const [year, setYear] = useState('1')
   const [semester, setSemester] = useState('1')
-  const [animating, setAnimating] = useState('')
+  const [animating, setAnimating] = useState(false)
 
   const toggle = ()=>{
     setModalVisible(!modalVisible)
@@ -52,7 +52,7 @@ const AddTakenCourse = () => {
 
       let response = await axios({
         method: 'POST',
-        url: 'http://da0406585426.ngrok.io/api/add_taken_course',
+        url: 'http://7f9219a069f7.ngrok.io/api/add_taken_course',
         headers: {
           'content-type': 'application/json',
           Authorization: `Token ${token}`
@@ -92,7 +92,7 @@ const AddTakenCourse = () => {
       const token = await SecureStore.getItemAsync('token')
       const response = await axios({
           method: 'GET',
-          url: `http://da0406585426.ngrok.io/api/find_course?code=${text}`,
+          url: `http://7f9219a069f7.ngrok.io/api/find_course?code=${text}`,
           headers: {
             'content-type': 'application/json',
             Authorization: `Token ${token}`
@@ -121,7 +121,7 @@ const AddTakenCourse = () => {
     );
   };
 
-
+  console.log(selectedId)
   return (
     <View style={{flex: 1, padding: 10}}>
        <TextInput

client/Screens/Agenda.js

@@ -0,0 +1,268 @@
+import React, {useState, useEffect} from 'react';
+import { StyleSheet, View, Text, ScrollView, RefreshControl } from 'react-native';
+import WeeklyCalendar from 'react-native-weekly-calendar';
+import * as SecureStore from 'expo-secure-store';
+import axios from 'axios'
+
+ 
+export default function App() {
+  const [data, setData] = useState('')
+  const [sampleEvents, setSampleEvents] = useState([])
+  const [refreshing, setRefreshing] = useState(false)
+  // const sampleEvents = [
+  //   { 'start': '2020-12-06 09:00:00', 'duration': '01:20:00', 'note': 'CCOM4120' },
+  //   { 'start': '2020-12-06 14:00:00', 'duration': '01:20:00', 'note': 'MATE3001' },
+  //   { 'start': '2020-12-06 17:00:00', 'duration': '00:30:00', 'note': 'INGL1001' },
+  //   { 'start': '2020-12-07 14:00:00', 'duration': '02:00:00', 'note': 'SICI3211' },
+  //   { 'start': '2020-12-07 10:00:00', 'duration': '02:00:00', 'note': 'BIOL3101' },
+  //   { 'start': '2020-12-08 09:00:00', 'duration': '01:20:00', 'note': 'CCOM4120' },
+  //   { 'start': '2020-12-08 14:00:00', 'duration': '01:20:00', 'note': 'MATE3001' },
+  //   { 'start': '2020-12-08 17:00:00', 'duration': '00:30:00', 'note': 'INGL1001' },
+  //   { 'start': '2020-12-09 14:00:00', 'duration': '02:00:00', 'note': 'SICI3211' },
+  //   { 'start': '2020-12-09 10:00:00', 'duration': '02:00:00', 'note': 'BIOL3101' },
+
+  // ]
+
+  const getMyCurriculum = async()=>{
+    const token = await SecureStore.getItemAsync('token')
+    let id = await SecureStore.getItemAsync('id')
+    let user_id = parseInt(id)
+
+    let response = await axios({
+      method: 'POST',
+      url: 'http://7f9219a069f7.ngrok.io/api/get_current_courses',
+      headers: {
+        'content-type': 'application/json',
+        Authorization: `Token ${token}`
+      },
+      data: {
+        user_id: user_id
+      }
+    })
+    // setSampleEvents([])
+    console.log(response.data.list, '------------------------------------------------------------------------------d')
+
+    if(response.data.msg){
+      setSampleEvents([])
+    }
+
+    else if(response.data.list[0].horarios === undefined){
+      setSampleEvents([])
+
+    }
+
+    else {
+        // courses
+        setData(response.data.list)  
+        console.log(data)
+
+        // Loop para ir curso por curso y a~adir a la agenda
+        let courses = []
+        data.map((course)=>{
+          // console.log(typeof(course.horarios))
+          
+          let horarios = course.horarios
+          let titulo = course.name
+          let horario_length = horarios.length
+          let horas = 0
+          let minutos = 0
+          let segundos = "00"
+          let dura = ""
+          let repetir = 0
+
+
+          let hora =""
+          let empieza= ""
+          let minuto = ""
+          // console.log(horario_length)
+          horarios = horarios.replace(/A/g,'')
+          horarios = horarios.replace(/M/g,'')
+          horarios = horarios.replace(/P/g,'')
+          horarios = horarios.replace(/-/g,':')
+          // console.log(horarios)
+
+          // Bregando con la DURACION
+          if(horario_length == 15){
+            horarios = horarios.split(':')
+            horas = horarios[2] - horarios[0]
+            minutos = horarios[3] - horarios[1]
+            minutos = minutos.toString()
+            horas = horas.toString()
+            horas = '0' + horas
+            // console.log("Horas: ", horas)
+            // console.log("Minutos: ", minutos)
+            // console.log("Segundos: ", segundos)
+            dura = horas + ":" + minutos + ":" + segundos
+            // console.log(dura)
+            // console.log(typeof(segundos))
+            // console.log(typeof(dura))
+          }
+          // Duracion para mas de un horario de una clase
+          else{
+            horarios = horarios.replace(/,/g,':')
+            horarios = horarios.split(':')
+            horario_length = horarios.length
+            console.log(horario_length)
+            repetir = horario_length/4
+            console.log("Repetir: ", repetir)
+            console.log(horarios)
+
+            horas = horarios[2] - horarios[0]
+            minutos = horarios[3] - horarios[1]
+            minutos = minutos.toString()
+            horas = horas.toString()
+            horas = '0' + horas
+            // console.log("Horas: ", horas)
+            // console.log("Minutos: ", minutos)
+            // console.log("Segundos: ", segundos)
+            dura = horas + ":" + minutos + ":" + segundos
+
+            // let horas2 = horarios[7] - horarios[5]
+            // let minutos2 = horarios[8] - horarios[6]
+            // minutos2 = minutos.toString()
+            // horas2 = horas.toString()
+            // horas2 = '0' + horas
+            // // console.log("Horas: ", horas)
+            // // console.log("Minutos: ", minutos)
+            // // console.log("Segundos: ", segundos)
+            // dura2 = horas2 + ":" + minutos2 + ":" + segundos
+          }
+
+          // Bregando con el START
+          if (horarios[0] < 7){
+            // console.log("Es menor: ", horarios[0])
+            hora = Number(horarios[0]) + 12
+          }
+          else{
+            hora = horarios[0]
+          }
+          minuto = horarios[1]
+          hora = hora.toString()
+          // console.log("Hora: ", hora)
+          // console.log(typeof(hora))
+          // console.log("Min: ", minuto)
+          // console.log(typeof(minuto))
+          empieza = hora + ":" + minuto + ":" + segundos
+
+          let date =""
+          let i = 0
+          let dias = course.dias
+          for (i = 0; i < dias.length; i++ ){
+            console.log("Esta es la letra ahora: ", dias[i])
+            let month_year = "2020-12"
+            let date_time = ""
+
+            if(dias[i] == "L"){
+              date = "-14 "
+              date_time = month_year + date + empieza
+              console.log()
+              console.log("Starts: ", date_time)
+              // console.log("Duracion: ", dura)
+              // console.log(typeof(empieza))
+              courses.push({start: date_time, duration: dura , note: course.code})
+              console.log(dias)
+            }
+
+            if(dias[i] == "M"){
+              date = "-15 "
+              date_time = month_year + date + empieza
+              console.log()
+              console.log("Starts: ", date_time)
+              // console.log("Duracion: ", dura)
+              // console.log(typeof(empieza))
+              courses.push({start: date_time, duration: dura , note: course.code})
+              console.log(dias)
+            }
+
+            if(dias[i] == "W"){
+              date = "-16 "
+              date_time = month_year + date + empieza
+              console.log()
+              console.log("Starts: ", date_time)
+              // console.log("Duracion: ", dura)
+              // console.log(typeof(empieza))
+              courses.push({start: date_time, duration: dura , note: course.code})
+              console.log(dias)
+            }
+
+            if(dias[i] == "J"){
+              date = "-17 "
+              date_time = month_year + date + empieza
+              console.log()
+              console.log("Starts: ", date_time)
+              // console.log("Duracion: ", dura)
+              // console.log(typeof(empieza))
+              courses.push({start: date_time, duration: dura , note: course.code})
+              console.log(dias)
+            }
+
+            if(dias[i] == "V"){
+              date = "-18 "
+              date_time = month_year + date + empieza
+              console.log()
+              console.log("Starts: ", date_time)
+              // console.log("Duracion: ", dura)
+              // console.log(typeof(empieza))
+              courses.push({start: date_time, duration: dura , note: course.code})
+              console.log(dias)
+            }
+          }
+        })
+
+        setSampleEvents(courses)
+  }
+
+    // console.log(courses)
+  }
+
+  const onRefresh = React.useCallback(async ()=>{
+    setRefreshing(true)
+    setSampleEvents([])
+    getMyCurriculum()
+    setRefreshing(false)
+
+}, [refreshing])
+
+  const renderCourses = ()=>{
+    console.log(sampleEvents, 'sampleevents')
+    if(sampleEvents.length > 0){
+      return (
+       <View>
+          <Text>AGENDA DE LA UNI</Text>
+          <WeeklyCalendar events={sampleEvents} style={{ height: 400 }} />
+       </View>
+      )
+    }
+    else{
+      return (
+        <View>
+          <Text>No tienes agenda porque todavía no has hecho matricula</Text>
+          {/* <WeeklyCalendar events={sampleEvents} style={{ height: 400 }} /> */}
+       </View>
+      )
+    }
+  }
+
+  useEffect(()=>{
+    getMyCurriculum()
+  }, [])
+  
+
+  return (
+
+    <ScrollView
+          refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh}/>}
+          >
+              {renderCourses()}
+    </ScrollView>    
+  );
+}
+ 
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#fff',
+    alignItems: 'center',
+    justifyContent: 'center',
+  }
+});

client/Screens/CurrentCourses.js

@@ -29,7 +29,7 @@ const CurrentCourses = () =>{
     const [courses, setCourses] = useState(null)
     const [refreshing, setRefreshing] = useState(false)
     const [selectedId, setSelectedId] = useState(null); // course_id
-    const [animating, setAnimating] = useState('')
+    const [animating, setAnimating] = useState(false)
     const [modalVisible, setModalVisible] = useState(false)
     const [code, setCode] = useState(null)
     const [days, setDays] = useState(null)
@@ -54,7 +54,7 @@ const CurrentCourses = () =>{
         let user_id = parseInt(id)
 
         try {
-            let response = await axios(`http://da0406585426.ngrok.io/api/get_current_courses`, {
+            let response = await axios(`http://7f9219a069f7.ngrok.io/api/get_current_courses`, {
                 method: 'POST',
                 headers: {
                     'content-type': 'application/json',
@@ -64,7 +64,7 @@ const CurrentCourses = () =>{
                     user_id: user_id
                 }
             })
-
+            console.log(response.data.list)
             
             if(response.data.list){
                 setCourses(response.data.list)
@@ -86,7 +86,7 @@ const CurrentCourses = () =>{
         console.log(year)
 
         try {
-            let response = await axios(`http://da0406585426.ngrok.io/api/delete_course`, {
+            let response = await axios(`http://7f9219a069f7.ngrok.io/api/delete_course`, {
                 method: 'DELETE',
                 headers: {
                     'content-type': 'application/json',

client/Screens/EditGrades.js

@@ -30,10 +30,10 @@ const CurrentCourses = () =>{
     const [courses, setCourses] = useState(null)
     const [refreshing, setRefreshing] = useState(false)
     const [selectedId, setSelectedId] = useState(null); // course_id
-    const [animating, setAnimating] = useState('')
+    const [animating, setAnimating] = useState(false)
     const [modalVisible, setModalVisible] = useState(false)
-    const [year, setYear] = useState(null)
-    const [semestre, setSemestre] = useState(null)
+    const [year, setYear] = useState(1)
+    const [semester, setSemester] = useState(1)
     const [grade, setGrade] = useState('A')
 
     
@@ -43,14 +43,14 @@ const CurrentCourses = () =>{
     }
 
 
-    const getAllMyCourses = async()=>{
+    const getCoursesBySemester = async()=>{
         const token = await SecureStore.getItemAsync('token')
         let id = await SecureStore.getItemAsync('id')
         let user_id = parseInt(id)
         console.log(user_id)
 
         try {
-            let response = await axios(`http://da0406585426.ngrok.io/api/get_all_courses_user_has_taken?user_id=${user_id}`, {
+            let response = await axios(`http://7f9219a069f7.ngrok.io/api/get_all_courses_by_semester?user_id=${user_id}&year=${year}&semestre=${semester}`, {
                 method: 'GET',
                 headers: {
                     'content-type': 'application/json',
@@ -72,7 +72,7 @@ const CurrentCourses = () =>{
         let user_id = parseInt(id)
 
         try {
-            let response = await axios(`http://da0406585426.ngrok.io/api/delete_course`, {
+            let response = await axios(`http://7f9219a069f7.ngrok.io/api/delete_course`, {
                 method: 'DELETE',
                 headers: {
                     'content-type': 'application/json',
@@ -82,7 +82,7 @@ const CurrentCourses = () =>{
                     user_id: user_id,
                     course_id: selectedId,
                     year: year,
-                    semestre: semestre
+                    semestre: semester
                 }
             })
 
@@ -99,7 +99,7 @@ const CurrentCourses = () =>{
                 Alert.alert(response.data.msg)
             }, 5000) 
 
-            getAllMyCourses() // get current courses again
+            getCoursesBySemester() // get current courses again
             
             
            
@@ -113,11 +113,11 @@ const CurrentCourses = () =>{
         const token = await SecureStore.getItemAsync('token')
         let id = await SecureStore.getItemAsync('id')
         let user_id = parseInt(id)
-        console.log(semestre)
+        console.log(semester)
         console.log(year)
 
         try {
-            let response = await axios(`http://da0406585426.ngrok.io/api/update_grade_and_gpa`, {
+            let response = await axios(`http://7f9219a069f7.ngrok.io/api/update_grade_and_gpa`, {
                 method: 'PATCH',
                 headers: {
                     'content-type': 'application/json',
@@ -127,7 +127,7 @@ const CurrentCourses = () =>{
                     user_id: user_id,
                     course_id: selectedId,
                     year: year,
-                    semestre: semestre,
+                    semestre: semester,
                     grade: grade
                 }
             })
@@ -145,7 +145,7 @@ const CurrentCourses = () =>{
                 Alert.alert(response.data.msg)
             }, 5000) 
 
-            getAllMyCourses() // get current courses again
+            getCoursesBySemester() // get current courses again
             
             
            
@@ -157,7 +157,7 @@ const CurrentCourses = () =>{
 
     const onRefresh = React.useCallback(async ()=>{
         setRefreshing(true)
-        getAllMyCourses()
+        getCoursesBySemester()
         setRefreshing(false)
 
     }, [refreshing])
@@ -166,8 +166,8 @@ const CurrentCourses = () =>{
 
 
     useEffect(()=>{
-        getAllMyCourses()
-    },[])
+        getCoursesBySemester()
+    },[year, semester])
 
     const renderItem = ({ item }) => {
         const backgroundColor = item.course_id === selectedId ? "#e60505" : "#fafbfc";
@@ -178,7 +178,7 @@ const CurrentCourses = () =>{
               setModalVisible(true)
               setSelectedId(item.course_id)
               setYear(item.year)
-              setSemestre(item.semestre)
+              setSemester(item.semestre)
               setGrade(item.grade)
             }}
             style={{ backgroundColor }}
@@ -226,6 +226,33 @@ const CurrentCourses = () =>{
                 <Button title="Close" onPress={toggle}/>
             </View>
         </Modal>
+        <View style={{flexDirection: 'row'}}>
+                <View style={{margin: 8}}>
+                    <Text>Year</Text>
+                    <Picker
+                            selectedValue={year}
+                            style={{ width: 50}}
+                            onValueChange={(itemValue, itemIndex) => setYear(itemValue) }>
+                            <Picker.Item label="1" value="1" />
+                            <Picker.Item label="2" value="2" />
+                            <Picker.Item label="3" value="3" />
+                            <Picker.Item label="4" value="4" />
+                            <Picker.Item label="5" value="5" />
+                            <Picker.Item label="6" value="6" />
+                    </Picker>
+                </View>
+                <View style={{margin: 8}}>
+                    <Text>Semester</Text>
+                    <Picker
+                            selectedValue={semester}
+                            style={{ width: 50}}
+                            onValueChange={(itemValue, itemIndex) => setSemester(itemValue) }>
+                            <Picker.Item label="1" value="1" />
+                            <Picker.Item label="2" value="2" />
+                            <Picker.Item label="3" value="3" />
+                    </Picker>
+            </View>
+        </View>
             
 
         </View>

client/Screens/EnrollNextSemester.js

@@ -30,7 +30,7 @@ const EnrollNextSemester = () => {
   const [selectedId, setSelectedId] = useState(null);
   const [data, setData] = useState([])
   const [modalVisible, setModalVisible] = useState(false)
-  const [animating, setAnimating] = useState('')
+  const [animating, setAnimating] = useState(false)
   const [isSummer, setIsSummer] = useState('false')
   const [code, setCode] = useState('')
   const [creditos, setCreditos] = useState('')
@@ -55,7 +55,7 @@ const EnrollNextSemester = () => {
 
       let response = await axios({
         method: 'POST',
-        url: 'http://da0406585426.ngrok.io/api/matricular_prox_semestre',
+        url: 'http://7f9219a069f7.ngrok.io/api/matricular_prox_semestre',
         headers: {
           'content-type': 'application/json',
           Authorization: `Token ${token}`
@@ -93,7 +93,7 @@ const EnrollNextSemester = () => {
       const token = await SecureStore.getItemAsync('token')
       const response = await axios({
           method: 'GET',
-          url: `http://da0406585426.ngrok.io/api/select_course_prox_semestre?code=${text}`,
+          url: `http://7f9219a069f7.ngrok.io/api/select_course_prox_semestre?code=${text}`,
           headers: {
             'content-type': 'application/json',
             Authorization: `Token ${token}`
@@ -116,6 +116,7 @@ const EnrollNextSemester = () => {
       <Item
         item={item}
         onPress={() => {
+          console.log('heyyyy')
           setSelectedId(item.id)
           setCourseName(item.name)
           setCode(item.code)

client/Screens/HomeScreen.js

@@ -12,7 +12,7 @@ function HomeScreen({ navigation }) {
     console.log(token, id)
 
     let response = await Axios({
-      url: 'http://da0406585426.ngrok.io/api/hello',
+      url: 'http://7f9219a069f7.ngrok.io/api/hello',
       method: 'GET',
       headers: {
           Authorization: `Token ${token}`

client/Screens/Login.js

@@ -17,12 +17,15 @@ import Logout from './Logout'
 import CurrentCourses from './CurrentCourses'
 import EditGrades from './EditGrades'
 import UpdateSemYear from './UpdateSemYear'
+import Agenda from './Agenda'
 
 
 const Drawer = createDrawerNavigator()
 
 const IOS_CLIENT_ID =
   "116415331974-tf6sehooctplmmn7j0gt831mdf1oqipl.apps.googleusercontent.com";
+const ANDROID_CLIENT_ID =
+  "116415331974-72n6g689k4me386dod763gi31vpuh71a.apps.googleusercontent.com";
 
 export default function Login() {
   const [hasToken, setHasToken] = useState(false)
@@ -31,6 +34,7 @@ export default function Login() {
     try {
       const result = await Google.logInAsync({
         iosClientId: IOS_CLIENT_ID,
+        androidClientId: ANDROID_CLIENT_ID,
         scopes: ["profile", "email"]
       })
 
@@ -39,7 +43,7 @@ export default function Login() {
 
         try {
           // login user in backend
-          let response = await fetch('http://da0406585426.ngrok.io/rest-auth/google/', {
+          let response = await fetch('http://7f9219a069f7.ngrok.io/rest-auth/google/', {
             method: 'POST',
             headers: {
               'content-type': 'application/json'
@@ -60,7 +64,7 @@ export default function Login() {
           const token = await SecureStore.getItemAsync('token')
 
           // storing our id
-          let id = await fetch('http://da0406585426.ngrok.io/api/get_user_id', {
+          let id = await fetch('http://7f9219a069f7.ngrok.io/api/get_user_id', {
             method: 'GET',
             headers: {
               'content-type': 'application/json',
@@ -102,6 +106,7 @@ export default function Login() {
     <Drawer.Navigator initialRouteName="Home">
       <Drawer.Screen name="Home" component={HomeScreen}/>
       <Drawer.Screen name="Notifications" component={NotificationsScreen} />
+      <Drawer.Screen name="Agenda" component={Agenda} />
       {/* <Drawer.Screen name="Settings" component={SettingScreen} /> */}
       <Drawer.Screen name="Add Taken Courses" component={AddTakenCourse} />
       <Drawer.Screen name="My Curriculum" component={MyCurriculum} />

client/Screens/Logout.js

@@ -1,12 +1,29 @@
 import * as React from 'react';
 import { Button, View } from 'react-native';
 import * as SecureStore from 'expo-secure-store';
+import Axios from 'axios';
 
 function Logout({ navigation }) {
+
+  const backendLogout = async()=>{
+      const token = await SecureStore.getItemAsync('token')
+      
+      let response = await Axios({
+        method: 'POST',
+        url: 'http://7f9219a069f7.ngrok.io/api/logout',
+        headers: {
+          'content-type': 'application/json',
+          Authorization: `Token ${token}`
+        }
+      })
+      console.log(response.data)
+  }
+
   return (
     <View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
       <Button onPress={
         ()=>{
+          backendLogout()
           SecureStore.deleteItemAsync('token')
           SecureStore.deleteItemAsync('id')
           navigation.push('Login')

client/Screens/MyCurriculum.js

@@ -20,7 +20,7 @@ const MyCurriculum = () =>{
         let user_id = parseInt(id)
 
         try {
-            let response = await axios('http://da0406585426.ngrok.io/api/see_gpa', {
+            let response = await axios('http://7f9219a069f7.ngrok.io/api/see_gpa', {
                 method: 'POST',
                 headers: {
                     Authorization: `Token ${token}`
@@ -43,7 +43,7 @@ const MyCurriculum = () =>{
         let numbers = []
 
         try {
-            let response = await axios(`http://da0406585426.ngrok.io/api/get_all_courses_by_semester?user_id=${user_id}&year=${year}&semestre=${semester}`, {
+            let response = await axios(`http://7f9219a069f7.ngrok.io/api/get_all_courses_by_semester?user_id=${user_id}&year=${year}&semestre=${semester}`, {
                 method: 'GET',
                 headers: {
                     'content-type': 'application/json',

client/Screens/UpdateSemYear.js

@@ -21,7 +21,7 @@ const UpdateSemYear = () => {
 
         let response = await axios({
         method: 'PATCH',
-        url: 'http://da0406585426.ngrok.io/api/update_year_and_semester',
+        url: 'http://7f9219a069f7.ngrok.io/api/update_year_and_semester',
         headers: {
             'content-type': 'application/json',
             Authorization: `Token ${token}`
@@ -48,7 +48,7 @@ const UpdateSemYear = () => {
 
       let response = await axios({
         method: 'POST',
-        url: 'http://da0406585426.ngrok.io/api/get_year_and_semester',
+        url: 'http://7f9219a069f7.ngrok.io/api/get_year_and_semester',
         headers: {
           'content-type': 'application/json',
           Authorization: `Token ${token}`

client/package-lock.json

@@ -1674,6 +1674,14 @@
       "resolved": "https://registry.npmjs.org/@react-native-community/cli-types/-/cli-types-4.10.1.tgz",
       "integrity": "sha512-ael2f1onoPF3vF7YqHGWy7NnafzGu+yp88BbFbP0ydoCP2xGSUzmZVw0zakPTC040Id+JQ9WeFczujMkDy6jYQ=="
     },
+    "@react-native-community/datetimepicker": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@react-native-community/datetimepicker/-/datetimepicker-2.3.2.tgz",
+      "integrity": "sha512-BbDmWVIaSYoYK2x5tRRuy/UWUVS6WtZ+3D210zYZgyD47yEVcTbaLFL9zFw7VxNMb8c/6BFcEpC6k18WTYplwA==",
+      "requires": {
+        "invariant": "^2.2.4"
+      }
+    },
     "@react-native-community/masked-view": {
       "version": "0.1.10",
       "resolved": "https://registry.npmjs.org/@react-native-community/masked-view/-/masked-view-0.1.10.tgz",
@@ -5570,6 +5578,11 @@
         "minimist": "^1.2.5"
       }
     },
+    "moment": {
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -6664,6 +6677,16 @@
         "react-timer-mixin": "^0.13.4"
       }
     },
+    "react-native-weekly-calendar": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/react-native-weekly-calendar/-/react-native-weekly-calendar-0.2.0.tgz",
+      "integrity": "sha512-F8nGekXSsKln+QbSSNFr5h1Qwz+m88baP8zu85gKzo0gkvOkj4TJoDHpa2/tI87RyUL/B1FahnK15r/F0WMbBA==",
+      "requires": {
+        "@react-native-community/datetimepicker": "~2.3.0",
+        "moment": "^2.24.0",
+        "prop-types": "^15.5.7"
+      }
+    },
     "react-refresh": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz",

client/package.json

@@ -28,7 +28,8 @@
     "react-native-safe-area-context": "3.1.4",
     "react-native-screens": "~2.10.1",
     "react-native-table-component": "^1.2.1",
-    "react-native-web": "~0.13.12"
+    "react-native-web": "~0.13.12",
+    "react-native-weekly-calendar": "^0.2.0"
   },
   "devDependencies": {
     "@babel/core": "~7.9.0"

segundo_sem/Humanidades_Grad2.json

@@ -1 +1 @@
-{"Horario ": ["Horario SEGUNDO SEMESTRE 2018-2019"], "ESHI6019": ["\"NOVELLA Y EL DISCURSO LEG", 3], "ESHI6105": ["LINGUSITICA HISPANICA", 3], "ESHI6546": ["ENSAYO ESPANOL GENER '98", 3], "ESHI6559": ["INVESTIGACION GRADUADA", 3], "ESHI6560": ["INVESTIGACION GRADUADA", 3], "ESHI6705": ["PROBLEMAS LITER PUERTORRIQ", 3], "ESHI6895": ["TESIS DE MAESTRIA", 0], "ESHI6896": ["CONT TESIS DE MAESTRIA", 0], "ESHI6900": ["EXAMEN GENERAL DE GRADO", 0], "ESHI8019": ["POESIA LUIS PALES MATOS", 3], "ESHI8663": ["JOSE MARTI", 3], "ESHI8701": ["INVESTIGACION AVANZADA", 3], "ESHI8702": ["INVESTIGACION AVANZADA", 3], "ESHI8890": ["EXAMEN DE GRADO", 0], "ESHI8891": ["TESIS DOCTORAL", 0], "ESHI8892": ["CONT TESIS DOCTORAL", 0], "ESHI8900": ["EXAMEN DE CANDIDATURA", 0], "ESIN6995": ["SEM INSTIT INVIERN HARVARD", 3], "FILO6026": ["POLITICA Y ETICA ANTIGUA", 1], "FILO6035": ["ETICA", 3], "FILO6302": ["BUDDHISMO Y FILOSOFIA II", 3], "FILO6606": ["INVEST DIRIGIDA FILO II", 3], "FILO6747": ["PSICOLOGIA FILOSOFICA", 3], "FILO6895": ["TESIS", 0], "FILO6896": ["CONTINUACION DE TESIS", 0], "FILO6900": ["EXAMEN GENERAL DE GRADO", 0], "GECU6205": ["ADM ESTRAT ORGANI CULTURAL", 3], "GECU6405": ["ARCHIVOS EN ACCION", 3], "GECU6901": ["PROPUES GESTION CULTURAL", 3], "GECU6902": ["PROYECTO DE CONCLUSION", 3], "GECU6993": ["GESTION ARTES VISUALES", 3], "GECU6994": ["RECAUDACION DE FONDOS", 3], "GECU6994_LAB": ["EVALUACION DE PROYECTOS", 1], "GECU6995": ["MANJ DAT MASIV:MIR ECOS CU", 3], "GECU6999": ["INTERNADO GEST Y ADM CULTU", 3], "HIST6025": ["SEMINARIO DE TESIS", 3], "HIST6029": ["DIPL HISPANOAM S.XIX-SS", 3], "HIST6052": ["HISTORIOG, CRITICA HIST", 3], "HIST6895": ["TESIS", 0], "HIST6896": ["CONTINUACION DE TESIS", 0], "HIST6900": ["EXAMEN GENERAL DE GRADO", 0], "HIST8005": ["SEM INV HIST DE P.R.-I", 3], "HIST8015": ["SEM LECT AMER LAT XIX-XX", 3], "HIST8035": ["SEM LECTURA SUPERV I", 3], "HIST8039": ["SEM TEMAS HIST DE AFRICA", 3], "HIST8045": ["SEM INVEST DIRIGIDA I", 3], "HIST8125": ["SEM HIST DE LA MUJER I", 3], "HIST8891": ["TESIS DOCTORAL", 0], "HIST8892": ["CONT TESIS DOCTORAL", 0], "HIST8900": ["PROPUESTA TESIS DOCTORAL", 3], "INGL6029": ["SEM:TEMAS ESP EN LITERATUR", 3], "INGL6067": ["LITERATURA Y CINE", 1], "INGL6415": ["SEM CRITICA LITE Y TEORIA", 3], "INGL6430": ["SHAKESPEARE:TEMA ESCOGID", 3], "INGL6439": ["ESTUDIOS EN LA POESIA", 3], "INGL6475": ["DIALECT DEL ANGLO-PARLAN", 3], "INGL6499": ["SEM FONOLOGIA DEL INGLES", 3], "INGL6891": ["ENSAYO INVEST LITERATURA I", 3], "INGL6892": ["ENSAYO INVEST LITE II", 0], "INGL6893": ["ENSAYO INVEST LINGUIST I", 3], "INGL6894": ["ENSAYO INVEST LINGUIST II", 0], "INGL6895": ["TESIS", 3], "INGL6896": ["CONTINUACION DE TESIS", 0], "INGL6900": ["EXAMEN GENERAL DE GRADO", 0], "INGL8007": ["SEM:NACI Y MUERTE LENGUAJE", 3], "INGL8020": ["NARRATIVA ESCRITO CARIBE", 3], "INGL8045": ["ESTUDIO INDEPENDIENTE", 3], "INGL8080": ["CARIB TEMA GLOB TEOR ANA", 3], "INGL8099": ["INVE LITE Y LINGUI CARIB", 0], "INGL8201": ["SEMINAR TRABAJO DE CAMPO", 3], "INGL8890": ["REDAC ENSAYO CRITICO DOC", 0], "INGL8891": ["DISERTACION I", 0], "INGL8892": ["CONTINUACION DISERTACION", 0], "LING6008": ["ESPA E.U.GRAMAT CONTACTO", 3], "LING6015": ["PRODUCCION DE TEXTOS", 3], "LING6020": ["METODOS INVEST LING MODE", 3], "LING6040": ["FONOLOGIA", 3], "LING6050": ["MORFOSINTAXIS", 3], "LING6590": ["SEM EN LING HISTORICA", 3], "LING6895": ["TESIS", 0], "LING6896": ["CONTINUACION DE TESIS", 0], "LING6920": ["EXAMEN GENERAL DE GRADO", 0], "LING6995": ["LINGUISTICA INTERDISCIPLIN", 1], "LITE6019": ["NOVELLA EUROPEA Y DISC LEG", 3], "LITE6465": ["ESTUD NARRATIVA: SIG XIX", 3], "LITE6895": ["TESIS", 0], "LITE6896": ["CONTINUACION DE TESIS", 0], "LITE6900": ["EXAMEN GENERAL DE GRADO", 0], "LITE6905": ["INV DIRIG LITE COMPAR 1", 3], "LITE6991": ["CUERPO, MEMORIA, ESCRITURA", 1], "TRAD6007": ["TRAD TXT PERIOD:ING A ESPN", 3], "TRAD6108": ["TRAD COMERC ESPA-INGL", 3], "TRAD6452": ["SINTAX SUPERIOR ESPAN II", 3], "TRAD6454": ["REDACCION Y ESTILO", 3], "TRAD6455": ["SEMIOTICA", 3], "TRAD6457": ["SINTAXIS INGLESA", 3], "TRAD6505": ["TRADUCCION A VISTA", 3], "TRAD6526": ["SEM REDACCION EN INGLES", 3], "TRAD6620": ["SEM:PRACT TRAD ESPAN A ING", 3], "TRAD6640": ["TRADUC PAR MUSEO:ESP A ING", 3], "TRAD6650": ["TRADUC Y DEPORT-INGL A ESP", 3], "TRAD6700": ["TRAD TEXT PERIOD ING-ESPAN", 3], "TRAD6895": ["TESIS", 0], "TRAD6896": ["CONTINUACION DE TESIS", 0], "TRAD6920": ["EXAMEN GENERAL DE GRADO", 0], "TRAD6990": ["REDAC,EDIC,REVS TRADUC ING", 3]}
+{"Horario ": ["Horario SEGUNDO SEMESTRE 2018-2019"], "ESHI6019": ["\"NOVELLA Y EL DISCURSO LEG", 3], "ESHI6105": ["LINGUSITICA HISPANICA", 3], "ESHI6546": ["ENSAYO ESPANOL GENER 98", 3], "ESHI6559": ["INVESTIGACION GRADUADA", 3], "ESHI6560": ["INVESTIGACION GRADUADA", 3], "ESHI6705": ["PROBLEMAS LITER PUERTORRIQ", 3], "ESHI6895": ["TESIS DE MAESTRIA", 0], "ESHI6896": ["CONT TESIS DE MAESTRIA", 0], "ESHI6900": ["EXAMEN GENERAL DE GRADO", 0], "ESHI8019": ["POESIA LUIS PALES MATOS", 3], "ESHI8663": ["JOSE MARTI", 3], "ESHI8701": ["INVESTIGACION AVANZADA", 3], "ESHI8702": ["INVESTIGACION AVANZADA", 3], "ESHI8890": ["EXAMEN DE GRADO", 0], "ESHI8891": ["TESIS DOCTORAL", 0], "ESHI8892": ["CONT TESIS DOCTORAL", 0], "ESHI8900": ["EXAMEN DE CANDIDATURA", 0], "ESIN6995": ["SEM INSTIT INVIERN HARVARD", 3], "FILO6026": ["POLITICA Y ETICA ANTIGUA", 1], "FILO6035": ["ETICA", 3], "FILO6302": ["BUDDHISMO Y FILOSOFIA II", 3], "FILO6606": ["INVEST DIRIGIDA FILO II", 3], "FILO6747": ["PSICOLOGIA FILOSOFICA", 3], "FILO6895": ["TESIS", 0], "FILO6896": ["CONTINUACION DE TESIS", 0], "FILO6900": ["EXAMEN GENERAL DE GRADO", 0], "GECU6205": ["ADM ESTRAT ORGANI CULTURAL", 3], "GECU6405": ["ARCHIVOS EN ACCION", 3], "GECU6901": ["PROPUES GESTION CULTURAL", 3], "GECU6902": ["PROYECTO DE CONCLUSION", 3], "GECU6993": ["GESTION ARTES VISUALES", 3], "GECU6994": ["RECAUDACION DE FONDOS", 3], "GECU6994_LAB": ["EVALUACION DE PROYECTOS", 1], "GECU6995": ["MANJ DAT MASIV:MIR ECOS CU", 3], "GECU6999": ["INTERNADO GEST Y ADM CULTU", 3], "HIST6025": ["SEMINARIO DE TESIS", 3], "HIST6029": ["DIPL HISPANOAM S.XIX-SS", 3], "HIST6052": ["HISTORIOG, CRITICA HIST", 3], "HIST6895": ["TESIS", 0], "HIST6896": ["CONTINUACION DE TESIS", 0], "HIST6900": ["EXAMEN GENERAL DE GRADO", 0], "HIST8005": ["SEM INV HIST DE P.R.-I", 3], "HIST8015": ["SEM LECT AMER LAT XIX-XX", 3], "HIST8035": ["SEM LECTURA SUPERV I", 3], "HIST8039": ["SEM TEMAS HIST DE AFRICA", 3], "HIST8045": ["SEM INVEST DIRIGIDA I", 3], "HIST8125": ["SEM HIST DE LA MUJER I", 3], "HIST8891": ["TESIS DOCTORAL", 0], "HIST8892": ["CONT TESIS DOCTORAL", 0], "HIST8900": ["PROPUESTA TESIS DOCTORAL", 3], "INGL6029": ["SEM:TEMAS ESP EN LITERATUR", 3], "INGL6067": ["LITERATURA Y CINE", 1], "INGL6415": ["SEM CRITICA LITE Y TEORIA", 3], "INGL6430": ["SHAKESPEARE:TEMA ESCOGID", 3], "INGL6439": ["ESTUDIOS EN LA POESIA", 3], "INGL6475": ["DIALECT DEL ANGLO-PARLAN", 3], "INGL6499": ["SEM FONOLOGIA DEL INGLES", 3], "INGL6891": ["ENSAYO INVEST LITERATURA I", 3], "INGL6892": ["ENSAYO INVEST LITE II", 0], "INGL6893": ["ENSAYO INVEST LINGUIST I", 3], "INGL6894": ["ENSAYO INVEST LINGUIST II", 0], "INGL6895": ["TESIS", 3], "INGL6896": ["CONTINUACION DE TESIS", 0], "INGL6900": ["EXAMEN GENERAL DE GRADO", 0], "INGL8007": ["SEM:NACI Y MUERTE LENGUAJE", 3], "INGL8020": ["NARRATIVA ESCRITO CARIBE", 3], "INGL8045": ["ESTUDIO INDEPENDIENTE", 3], "INGL8080": ["CARIB TEMA GLOB TEOR ANA", 3], "INGL8099": ["INVE LITE Y LINGUI CARIB", 0], "INGL8201": ["SEMINAR TRABAJO DE CAMPO", 3], "INGL8890": ["REDAC ENSAYO CRITICO DOC", 0], "INGL8891": ["DISERTACION I", 0], "INGL8892": ["CONTINUACION DISERTACION", 0], "LING6008": ["ESPA E.U.GRAMAT CONTACTO", 3], "LING6015": ["PRODUCCION DE TEXTOS", 3], "LING6020": ["METODOS INVEST LING MODE", 3], "LING6040": ["FONOLOGIA", 3], "LING6050": ["MORFOSINTAXIS", 3], "LING6590": ["SEM EN LING HISTORICA", 3], "LING6895": ["TESIS", 0], "LING6896": ["CONTINUACION DE TESIS", 0], "LING6920": ["EXAMEN GENERAL DE GRADO", 0], "LING6995": ["LINGUISTICA INTERDISCIPLIN", 1], "LITE6019": ["NOVELLA EUROPEA Y DISC LEG", 3], "LITE6465": ["ESTUD NARRATIVA: SIG XIX", 3], "LITE6895": ["TESIS", 0], "LITE6896": ["CONTINUACION DE TESIS", 0], "LITE6900": ["EXAMEN GENERAL DE GRADO", 0], "LITE6905": ["INV DIRIG LITE COMPAR 1", 3], "LITE6991": ["CUERPO, MEMORIA, ESCRITURA", 1], "TRAD6007": ["TRAD TXT PERIOD:ING A ESPN", 3], "TRAD6108": ["TRAD COMERC ESPA-INGL", 3], "TRAD6452": ["SINTAX SUPERIOR ESPAN II", 3], "TRAD6454": ["REDACCION Y ESTILO", 3], "TRAD6455": ["SEMIOTICA", 3], "TRAD6457": ["SINTAXIS INGLESA", 3], "TRAD6505": ["TRADUCCION A VISTA", 3], "TRAD6526": ["SEM REDACCION EN INGLES", 3], "TRAD6620": ["SEM:PRACT TRAD ESPAN A ING", 3], "TRAD6640": ["TRADUC PAR MUSEO:ESP A ING", 3], "TRAD6650": ["TRADUC Y DEPORT-INGL A ESP", 3], "TRAD6700": ["TRAD TEXT PERIOD ING-ESPAN", 3], "TRAD6895": ["TESIS", 0], "TRAD6896": ["CONTINUACION DE TESIS", 0], "TRAD6920": ["EXAMEN GENERAL DE GRADO", 0], "TRAD6990": ["REDAC,EDIC,REVS TRADUC ING", 3]}

server/CompanionApp/urls.py

@@ -26,7 +26,8 @@ urlpatterns = [
     url('api/update_grade_and_gpa', views.updateGradeAndGPA),
     url('api/delete_course', views.deleteCourse),
     url('api/get_year_and_semester', views.getSemesterAndYear),
-    url('api/update_year_and_semester', views.updateSemesterAndYear)
+    url('api/update_year_and_semester', views.updateSemesterAndYear),
+    url('api/logout', views.logout)
 
 ]
 

server/CompanionApp/views.py

@@ -195,7 +195,7 @@ def addTakenCourse(request):
         semester = int(request.data['semester'])
         repeating = False
         
-
+      
         # set point of grade
         points = 0
         if grade == 'A':
@@ -209,14 +209,14 @@ def addTakenCourse(request):
         elif grade == 'F':
             points = 0
         else:
-            return JsonResponse({'msg': 'Insert A, B, C, D or F' }, status=status.HTTP_406_NOT_ACCEPTABLE)
+            return JsonResponse({'msg': 'Insert A, B, C, D or F' }, status=status.HTTP_200_OK)
 
         # find course credits
         cursor = connection.cursor()
         cursor.execute(f'Select creditos from "CompanionApp_curso" where id = {course_id} ')
         course = cursor.fetchone()
         creditos = int(course[0])
-
+       
         # check if student already took that class in the same year and semester he/she is trying to post
         cursor = connection.cursor()
         cursor.execute(f'select semestre, year, grade, course_id_id from "CompanionApp_matricula" where semestre = {semester} and year = {year} and course_id_id = {course_id} and user_id_id = {user_id}')
@@ -224,12 +224,11 @@ def addTakenCourse(request):
         if check != None:
             check = list(check)
             if int(check[0]) == semester and int(check[1]) == year and check[3] == course_id:
-                return JsonResponse({'msg': 'You already took the course that year and semester.' }, status=status.HTTP_406_NOT_ACCEPTABLE)
+                return JsonResponse({'msg': 'You already took the course that year and semester.' }, status=status.HTTP_200_OK)
             elif int(check[1]) != year:
                 pass
             elif int(check[1] == year) and int(check[0]) != semester:
                 pass
-            
         # matricular al estudiante
         cursor = connection.cursor()
         cursor.execute(f'INSERT INTO "CompanionApp_matricula" (semestre, year, grade, user_id_id, course_id_id) VALUES ({semester}, {year}, \'{grade}\', {user_id}, {course_id})')
@@ -263,6 +262,7 @@ def addTakenCourse(request):
         gpa = float("{:.2f}".format(gpa))
         cursor = connection.cursor()
         cursor.execute(f'UPDATE "CompanionApp_user" set gpa = {gpa} where id={user_id}')
+        print('ya')
         
         return JsonResponse({'msg': 'Ok, you can see that course in your curriculum'}, status=status.HTTP_201_CREATED)
 
@@ -314,13 +314,13 @@ def getAllCoursesBySemester(request):
         year = int(request.query_params['year'])
         semestre = int(request.query_params['semestre'])
         cursor = connection.cursor()
-        cursor.execute(f'SELECT c.name, c.code, c.creditos, m.user_id_id, m.year, m.semestre, m.grade FROM "CompanionApp_curso" c INNER JOIN "CompanionApp_matricula" m ON (c.id = m.course_id_id) where m.user_id_id = {user_id} and m.year = {year} and m.semestre = {semestre} and m.grade <> \'N%\' ')
+        cursor.execute(f'SELECT c.name, c.code, c.creditos, m.user_id_id, m.year, m.semestre, m.grade, c.id FROM "CompanionApp_curso" c INNER JOIN "CompanionApp_matricula" m ON (c.id = m.course_id_id) where m.user_id_id = {user_id} and m.year = {year} and m.semestre = {semestre} and m.grade <> \'N%\' ')
         fetchCourses = cursor.fetchall()
         courses = []
 
         # convert courses to an array of objects
         for i in range(0, len(fetchCourses)):
-            dic = {'name': fetchCourses[i][0], 'code': fetchCourses[i][1], 'creditos': fetchCourses[i][2], 'year': fetchCourses[i][4], 'semestre': fetchCourses[i][5], 'grade': fetchCourses[i][6]}
+            dic = {'name': fetchCourses[i][0], 'code': fetchCourses[i][1], 'creditos': fetchCourses[i][2], 'year': fetchCourses[i][4], 'semestre': fetchCourses[i][5], 'grade': fetchCourses[i][6], 'course_id': fetchCourses[i][7]}
             courses.append(dic)
             
         return JsonResponse({'list': courses}, status=status.HTTP_200_OK)
@@ -411,13 +411,13 @@ def getMyCurrentCourses(request):
 
         # find current semester of student, based on the current_year
         cursor = connection.cursor()
-        cursor.execute(f'select max(semestre) from "CompanionApp_matricula" where year = {current_year}')
+        cursor.execute(f'select max(semestre) from "CompanionApp_matricula" where year = {current_year} and user_id_id = {user_id}')
         current_semester = cursor.fetchone()
         current_semester = int(current_semester[0])
 
         # find current courses based on current_semester and current_year
         cursor = connection.cursor()
-        cursor.execute(f'select c.id, c.name, c.code, m.year, m.semestre, m.section, m.prof, m.salones, m.horarios, m.dias from "CompanionApp_matricula" m INNER JOIN "CompanionApp_curso" c on c.id = m.course_id_id where m.year = {current_year} and m.semestre={current_semester}')
+        cursor.execute(f'select c.id, c.name, c.code, m.year, m.semestre, m.section, m.prof, m.salones, m.horarios, m.dias from "CompanionApp_matricula" m INNER JOIN "CompanionApp_curso" c on c.id = m.course_id_id where m.year = {current_year} and m.semestre={current_semester} and m.user_id_id={user_id}')
         fetchCourses = cursor.fetchall()
 
         # convert courses array into dictionary
@@ -591,8 +591,11 @@ def deleteCourse(request):
 
             new_credits_taken_score = credits_taken_score - (current_points * creditos)
             new_credits_taken = credits_taken - creditos
-            gpa = new_credits_taken_score / new_credits_taken 
-            gpa = float("{:.2f}".format(gpa))
+            if new_credits_taken == 0:
+                gpa = 0.00
+            else:
+                gpa = new_credits_taken_score / new_credits_taken 
+                gpa = float("{:.2f}".format(gpa))
             print(new_credits_taken, 'credits taken')
             print(new_credits_taken_score, 'credits taken score')
 
@@ -633,6 +636,10 @@ def getSemesterAndYear(request):
         return JsonResponse({'msg': {'year': year, 'semestre': semestre} }, status = status.HTTP_202_ACCEPTED)
         
 
+@api_view(['POST',])
+def logout(request):
+    request.user.auth_token.delete()
+    return JsonResponse({"success": "Successfully logged out."}, status=status.HTTP_200_OK)
 
 
 @api_view(['GET', 'POST'])