add taken courses front end

client/App.js

@@ -32,7 +32,7 @@ export default function App() {
 
         try {
           // login user in backend
-          let response = await fetch('http://ef32e7a10841.ngrok.io/rest-auth/google/', {
+          let response = await fetch('http://70eb11ac4839.ngrok.io/rest-auth/google/', {
             method: 'POST',
             headers: {
               'content-type': 'application/json'
@@ -53,7 +53,7 @@ export default function App() {
           const token = await SecureStore.getItemAsync('token')
 
           // storing our id
-          let id = await fetch('http://ef32e7a10841.ngrok.io/api/get_user_id', {
+          let id = await fetch('http://70eb11ac4839.ngrok.io/api/get_user_id', {
             method: 'GET',
             headers: {
               'content-type': 'application/json',

client/Screens/AddTakenCourse.js

@@ -1,7 +1,9 @@
 import axios from "axios";
 import React, { useState } from "react";
-import { FlatList, SafeAreaView, StatusBar, StyleSheet, Text, TouchableOpacity, TextInput, View } from "react-native";
+import { FlatList, StatusBar, StyleSheet, Text, TouchableOpacity, TextInput, View, Button, ActivityIndicator } from "react-native";
 import * as SecureStore from 'expo-secure-store';
+import Modal from 'react-native-modal';
+import {Picker} from '@react-native-community/picker';
 
 
 const Item = ({ item, onPress, style }) => (
@@ -28,6 +30,53 @@ const AddTakenCourse = () => {
   const [text, setText] = useState('')
   const [selectedId, setSelectedId] = useState(null);
   const [data, setData] = useState([])
+  const [modalVisible, setModalVisible] = useState(false)
+  const [grade, setGrade] = useState('A')
+  const [year, setYear] = useState('1')
+  const [semester, setSemester] = useState('1')
+  const [animating, setAnimating] = useState('')
+
+  const toggle = ()=>{
+    setModalVisible(!modalVisible)
+  }
+
+  const addCourse = async ()=>{
+      const token = await SecureStore.getItemAsync('token')
+      let id = await SecureStore.getItemAsync('id')
+      let user_id = parseInt(id)
+      console.log('year', year)
+      console.log('semester', semester)
+      console.log('grade', grade)
+
+
+      let response = await axios({
+        method: 'POST',
+        url: 'http://70eb11ac4839.ngrok.io/api/add_taken_course',
+        headers: {
+          'content-type': 'application/json',
+          Authorization: `Token ${token}`
+        },
+        data: {
+          semester: semester,
+          year: year,
+          user_id: user_id,
+          grade: grade,
+          course_id: selectedId
+        }
+      })
+
+      console.log(response.data)
+
+      setAnimating(true)
+
+      setTimeout(()=>{
+        setAnimating(false)
+        setModalVisible(false)
+        setSelectedId(null)
+        setData([])
+      }, 3000)
+  }
+
 
 
   const searchCourses = async(text)=>{
@@ -36,7 +85,7 @@ const AddTakenCourse = () => {
       const token = await SecureStore.getItemAsync('token')
       const response = await axios({
           method: 'GET',
-          url: `http://ef32e7a10841.ngrok.io/api/find_course?code=${text}`,
+          url: `http://70eb11ac4839.ngrok.io/api/find_course?code=${text}`,
           headers: {
             'content-type': 'application/json',
             Authorization: `Token ${token}`
@@ -56,16 +105,18 @@ const AddTakenCourse = () => {
     return (
       <Item
         item={item}
-        onPress={() => setSelectedId(item.id)}
+        onPress={() => {
+          setSelectedId(item.id)
+          setModalVisible(true)
+        }}
         style={{ backgroundColor }}
       />
     );
   };
 
 
-  console.log(selectedId)
   return (
-    <View style={{padding: 10}}>
+    <View style={{flex: 1, padding: 10}}>
        <TextInput
         style={styles.searchBar}
         placeholder="Search for a course that you've taken"
@@ -79,6 +130,59 @@ const AddTakenCourse = () => {
         extraData={selectedId}
         ItemSeparatorComponent={renderSeparator}
       />
+      <Modal isVisible={modalVisible} style={{
+            backgroundColor: 'white',
+            flexDirection: 'row',
+            borderRadius: 20,
+            margin: 50,
+            padding: 10,
+        }}>
+            <View style={styles.modalItem}>
+                <Text>Grade</Text>
+                <Picker
+                    selectedValue={grade}
+                    style={{ width: 50}}
+                    onValueChange={(itemValue, itemIndex) => setGrade(itemValue) }>
+                    <Picker.Item label="A" value="A" />
+                    <Picker.Item label="B" value="B" />
+                    <Picker.Item label="C" value="C" />
+                    <Picker.Item label="D" value="D" />
+                    <Picker.Item label="F" value="F" />
+                </Picker>
+            </View>
+            <View style={styles.modalItem}>
+                <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={styles.modalItem}>
+                <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>
+            </View>
+           <View style={{flex: 1, justifyContent: 'center'}}>
+                <ActivityIndicator size="large" color="0000ff" animating={animating}/>
+                <View>
+                    <Button title="Submit" onPress={addCourse}/>
+                    <Button title="Close" onPress={toggle}/>
+                </View>
+           </View>
+        </Modal>
+     
     </View>
   );
 };
@@ -101,7 +205,12 @@ const styles = StyleSheet.create({
     height: 40, 
     borderColor: '#000', 
     borderWidth: 1 
-  }
+  },
+  modalItem: {
+    // width: '30%', // is 30% of container width
+    margin: 8 // 300
+}
+  
 });
 
 export default AddTakenCourse;

client/Screens/HomeScreen.js

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

client/Screens/SettingScreen.js

@@ -15,7 +15,7 @@ export default function SettingScreen() {
         let user_id = parseInt(id)
 
        try {
-        let response = await axios(`http://ef32e7a10841.ngrok.io/api/get_faculty_name?id=${user_id}`, {
+        let response = await axios(`http://70eb11ac4839.ngrok.io/api/get_faculty_name?id=${user_id}`, {
             method: 'GET',
             headers: {
                 'content-type': 'application/json',
@@ -43,7 +43,7 @@ export default function SettingScreen() {
         try {
             let response = await axios({
                 method: 'PATCH',
-                url: 'http://ef32e7a10841.ngrok.io/api/update_faculty',
+                url: 'http://70eb11ac4839.ngrok.io/api/update_faculty',
                 headers: {
                     Authorization: `Token ${token}`
                 },

client/package-lock.json

@@ -6540,6 +6540,14 @@
         }
       }
     },
+    "react-native-animatable": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/react-native-animatable/-/react-native-animatable-1.3.3.tgz",
+      "integrity": "sha512-2ckIxZQAsvWn25Ho+DK3d1mXIgj7tITkrS4pYDvx96WyOttSvzzFeQnM2od0+FUMzILbdHDsDEqZvnz1DYNQ1w==",
+      "requires": {
+        "prop-types": "^15.7.2"
+      }
+    },
     "react-native-elements": {
       "version": "3.0.0-alpha.1",
       "resolved": "https://registry.npmjs.org/react-native-elements/-/react-native-elements-3.0.0-alpha.1.tgz",
@@ -6589,6 +6597,15 @@
       "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz",
       "integrity": "sha512-HOf0jzRnq2/aFUcdCJ9w9JGzN3gdEg0zFE4FyYlp4jtidqU03D5X7ZegGKfT1EWteR0gPBGp9ye5T5FvSWi9Yg=="
     },
+    "react-native-modal": {
+      "version": "11.5.6",
+      "resolved": "https://registry.npmjs.org/react-native-modal/-/react-native-modal-11.5.6.tgz",
+      "integrity": "sha512-APGNfbvgC4hXbJqcSADu79GLoMKIHUmgR3fDQ7rCGZNBypkStSP8imZ4PKK/OzIZZfjGU9aP49jhMgGbhY9KHA==",
+      "requires": {
+        "prop-types": "^15.6.2",
+        "react-native-animatable": "1.3.3"
+      }
+    },
     "react-native-ratings": {
       "version": "7.3.0",
       "resolved": "https://registry.npmjs.org/react-native-ratings/-/react-native-ratings-7.3.0.tgz",

client/package.json

@@ -23,6 +23,7 @@
     "react-native": "https://github.com/expo/react-native/archive/sdk-39.0.4.tar.gz",
     "react-native-elements": "^3.0.0-alpha.1",
     "react-native-gesture-handler": "~1.7.0",
+    "react-native-modal": "^11.5.6",
     "react-native-reanimated": "~1.13.0",
     "react-native-safe-area-context": "3.1.4",
     "react-native-screens": "~2.10.1",

server/CompanionApp/migrations/0009_remove_matricula_fecha.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.0.8 on 2020-11-17 20:42
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('CompanionApp', '0008_auto_20201114_1935'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='matricula',
+            name='fecha',
+        ),
+    ]

server/CompanionApp/migrations/0010_user_credits_taken_score.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.8 on 2020-11-17 22:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('CompanionApp', '0009_remove_matricula_fecha'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='credits_taken_score',
+            field=models.IntegerField(default=0),
+        ),
+    ]

server/CompanionApp/models.py

@@ -16,6 +16,7 @@ class User(AbstractUser):
     gpa = models.DecimalField(default = 0, max_digits = 3, decimal_places = 2)
     fac_id = models.ForeignKey(Facultad, on_delete=models.CASCADE, default=1)
     credits_taken = models.IntegerField(default=0)
+    credits_taken_score = models.IntegerField(default=0)
 
 class Matricula(models.Model):
     user_id = models.ForeignKey(User, on_delete=models.CASCADE, default=1)
@@ -24,7 +25,7 @@ class Matricula(models.Model):
     prof = models.CharField(max_length=150, null=True, blank=True)
     semestre = models.IntegerField(default=0, null=False, blank=False)
     year = models.IntegerField(default=0, null=False, blank=False)
-    fecha = models.CharField(max_length=150, null=False, blank=True)
+    # fecha = models.CharField(max_length=150, null=False, blank=True)
     grade = models.CharField(max_length=3, default = 'N')
     salones =models.CharField(max_length=100,blank=True, null=True) 
     horarios =models.CharField(max_length=150,blank=True, null=True) 

server/CompanionApp/views.py

@@ -107,13 +107,12 @@ def addTakenCourse(request):
     if request.method == 'POST':
         # request params
         user_id = int(request.data['user_id'])
-        course_code = request.data['code'].upper()
+        course_id = int(request.data['course_id'])
         grade = request.data['grade'].upper()
         year = int(request.data['year'])
         semester = int(request.data['semester'])
-        fecha = request.data['fecha']
         repeating = False
-        print(type(grade))
+        
 
         # set point of grade
         points = 0
@@ -130,46 +129,54 @@ def addTakenCourse(request):
         else:
             return JsonResponse({'msg': 'Insert A, B, C, D or F' }, status=status.HTTP_406_NOT_ACCEPTABLE)
 
-        # find course id and credits
+        # find course credits
         cursor = connection.cursor()
-        cursor.execute(f'Select id, creditos from "CompanionApp_curso" where code =\'{course_code}\' ')
+        cursor.execute(f'Select creditos from "CompanionApp_curso" where id = {course_id} ')
         course = cursor.fetchone()
-        course_id = int(course[0])
-        creditos = int(course[1])
+        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}')
         check = cursor.fetchone()
-        check = list(check)
-        print(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)
-        elif int(check[1]) != year:
-            pass
-        elif int(check[1] == year) and int(check[0]) != semester:
-            pass
-          
+        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)
+            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, fecha, grade, user_id_id, course_id_id) VALUES ({semester}, {year}, \'{fecha}\', \'{grade}\', {user_id}, {course_id})')
+        cursor.execute(f'INSERT INTO "CompanionApp_matricula" (semestre, year, grade, user_id_id, course_id_id) VALUES ({semester}, {year}, \'{grade}\', {user_id}, {course_id})')
 
         # find credits taken
         cursor = connection.cursor()
         cursor.execute(f'Select credits_taken from "CompanionApp_user" where id={user_id}')
         credits_taken = cursor.fetchone()
         credits_taken = int(credits_taken[0])
-        credits_taken += creditos
-        
+
+        # find last credits_taken_score
+        cursor = connection.cursor()
+        cursor.execute(f'Select credits_taken_score from "CompanionApp_user" where id={user_id}')
+        credits_taken_score = cursor.fetchone()
+        credits_taken_score = int(credits_taken_score[0])
+
         # update credits taken
+        credits_taken += creditos
         cursor = connection.cursor()
         cursor.execute(f'UPDATE "CompanionApp_user" set credits_taken = {credits_taken} where id ={user_id}')
 
-        credit_score = credits_taken * 4
-        credits_taken_score = credits_taken * points
-  
+        # update credits_taken_score
+        credits_taken_score = credits_taken_score + (creditos * points)
+        cursor = connection.cursor()
+        cursor.execute(f'UPDATE "CompanionApp_user" set credits_taken_score = {credits_taken_score} where id ={user_id}')
+
  
         # set GPA and insert it in user
+        credit_score = credits_taken * 4
         gpa = (credits_taken_score / credit_score) * 4.0
         gpa = float("{:.2f}".format(gpa))
         cursor = connection.cursor()