final sprint 1 commit

.gitignore

@@ -8,6 +8,7 @@ client/CompanionApp*.key
 client/CompanionApp*.mobileprovision
 client/CompanionApp*.orig.*
 client/CompanionAppweb-build/
+server/restful
 
 # macOS
 client/CompanionApp.DS_Store

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "git.ignoreLimitWarning": true
+}

Miupi Parser/Ciencias_Militares.json

@@ -1 +0,0 @@
-[{"Curso": "CIMI3011", "Seccion": "001", "Profesor": "MCGEE, SHANNON ", "Creditos": "2", "Nombre": "CURSO BASIC C. MILIT I", "Dias": ["LW"], "Horario": ["01:00PM-01:50PM"], "Salones": ["DM-001"], "Info_Extra": ""}, {"Curso": "CIMI3021", "Seccion": "001", "Profesor": "MEYERS, JOSHUA ", "Creditos": "2", "Nombre": "CURS BASIC C.MILIT III", "Dias": ["LW"], "Horario": ["10:30AM-11:20AM"], "Salones": ["DM-002"], "Info_Extra": ""}, {"Curso": "CIMI4011", "Seccion": "001", "Profesor": "MEYERS, JOSHUA ", "Creditos": "4", "Nombre": "COM Y PSIC EN LID MILITAR", "Dias": ["LW"], "Horario": ["08:00PM-09:50PM"], "Salones": ["DM-001"], "Info_Extra": ""}, {"Curso": "CIMI4021", "Seccion": "001", "Profesor": "ROJAS, ORLANDO ", "Creditos": "4", "Nombre": "LID Y ADM OPERACIONES MIL", "Dias": ["MJ"], "Horario": ["06:30AM-08:50AM"], "Salones": [], "Info_Extra": ""}, {"Curso": "ESAE3001", "Seccion": "001", "Profesor": "TORRES, C. ", "Creditos": "2", "Nombre": "LA FUERZA AEREA DE HOY", "Dias": ["L", "V"], "Horario": ["09:00AM-09:50AM", "09:00AM-10:50AM"], "Salones": ["DM-001", "DM-001"], "Info_Extra": ""}, {"Curso": "ESAE3001", "Seccion": "002", "Profesor": "TORRES, C. ", "Creditos": "2", "Nombre": "LA FUERZA AEREA DE HOY", "Dias": ["D"], "Horario": ["TBA"], "Salones": [], "Info_Extra": ""}, {"Curso": "ESAE3011", "Seccion": "002", "Profesor": "NIEVES,RICARDO ", "Creditos": "2", "Nombre": "DESARR DEL PODERIO AEREO", "Dias": ["W", "V"], "Horario": ["09:00AM-09:50AM", "09:00AM-10:50AM"], "Salones": [], "Info_Extra": ""}, {"Curso": "ESAE4001", "Seccion": "001", "Profesor": "MENDOZA, JOEL ", "Creditos": "4", "Nombre": "GER,LID EN LA FUERZA AERE", "Dias": ["LW", "V"], "Horario": ["10:00AM-11:20AM", "09:00AM-10:50AM"], "Salones": [], "Info_Extra": ""}, {"Curso": "ESAE4011", "Seccion": "001", "Profesor": "NIEVES, RICARDO", "Creditos": "4", "Nombre": "SEG NAC SOC AMER CONTEMP", "Dias": ["LW", "V"], "Horario": ["10:00AM-11:20AM", "09:00AM-10:50AM"], "Salones": [], "Info_Extra": ""}]

Miupi Parser/Comunicaciones_Grad.json

@@ -1 +0,0 @@
-[{"Curso": "COPU6500", "Seccion": "2U1", "Profesor": "ROCHE,MARIO ", "Creditos": "3", "Nombre": "TEORIAS DE LA COMUNICACIO", "Dias": ["M"], "Horario": ["06:00PM-08:50PM"], "Salones": ["PLAZU-4112"], "Info_Extra": "* Curso no se ofrecer\u00e1 en el 2DO SEM *"}, {"Curso": "COPU6517", "Seccion": "2U1", "Profesor": "RAMIREZ,RUBEN ", "Creditos": "3", "Nombre": "CULT Y ESTRUC MEDIATICAS", "Dias": ["W"], "Horario": ["06:00PM-08:50PM"], "Salones": ["PLAZU-4112"], "Info_Extra": "* Curso no se ofrecer\u00e1 en el 2DO SEM *"}, {"Curso": "COPU6667", "Seccion": "2U1", "Profesor": "COLON,ELISEO ", "Creditos": "3", "Nombre": "PERSP Y METOD INV EN COM", "Dias": ["L"], "Horario": ["06:00PM-08:50PM"], "Salones": ["PLAZU-4088"], "Info_Extra": "* Curso no se ofrecer\u00e1 en el 2DO SEM *"}, {"Curso": "COPU6698", "Seccion": "0U1", "Profesor": "COLON,ELISEO ", "Creditos": "0", "Nombre": "CONT EXP INVEST DIV MODS", "Dias": ["J"], "Horario": ["06:00PM-08:50PM"], "Salones": [], "Info_Extra": ""}, {"Curso": "COPU6707", "Seccion": "001", "Profesor": "COLON,ELISEO ", "Creditos": "3", "Nombre": "SEMINAR COMUNICACION III", "Dias": ["M"], "Horario": ["06:00PM-08:50PM"], "Salones": ["PLAZU-4110"], "Info_Extra": ""}, {"Curso": "COPU6707", "Seccion": "002", "Profesor": "ALVARADO, G. ", "Creditos": "3", "Nombre": "SEMINAR COMUNICACION III", "Dias": ["L"], "Horario": ["06:00PM-08:50PM"], "Salones": ["PLAZU-4110"], "Info_Extra": ""}, {"Curso": "COPU6726", "Seccion": "2U1", "Profesor": "ROCHE,MARIO ", "Creditos": "3", "Nombre": "SEMINARION EN PERIOD II", "Dias": ["J"], "Horario": ["06:00PM-08:50PM"], "Salones": ["PLAZU-4110"], "Info_Extra": "* Curso no se ofrecer\u00e1 en el 2DO SEM *"}]

Miupi Parser/Planificacion.json

@@ -1 +0,0 @@
-[{"Curso": "PLAN5005", "Seccion": "3U1", "Profesor": "YOEL VELAZQUEZ ", "Creditos": "4", "Nombre": "ECON ESTA Y MATE PLANIF", "Dias": ["S"], "Horario": ["09:00AM-01:00PM"], "Salones": ["PLAZU-7033"], "Info_Extra": ""}, {"Curso": "PLAN6006", "Seccion": "0U1", "Profesor": "IRIZARRY, R. ", "Creditos": "3", "Nombre": "INTERNADO DE PLANIFICACIO", "Dias": ["D"], "Horario": ["TBA"], "Salones": [], "Info_Extra": ""}, {"Curso": "PLAN6068", "Seccion": "013", "Profesor": "LUGO, J. ", "Creditos": "3", "Nombre": "PRESERV PATRIMON Y PLANIF", "Dias": ["J"], "Horario": ["05:30PM-08:20PM"], "Salones": ["PLAZU-7041"], "Info_Extra": ""}, {"Curso": "PLAN6075", "Seccion": "2U1", "Profesor": "IRIZARRY, R. ", "Creditos": "3", "Nombre": "PROYECTO DE INVESTIG II", "Dias": ["L"], "Horario": ["05:30PM-08:20PM"], "Salones": ["PLAZU-7034"], "Info_Extra": ""}, {"Curso": "PLAN6076", "Seccion": "2U1", "Profesor": "LAMBA DEEPAK ", "Creditos": "3", "Nombre": "HIST & TEORIA PLAN", "Dias": ["L"], "Horario": ["05:30PM-08:20PM"], "Salones": ["PLAZU-7033"], "Info_Extra": ""}, {"Curso": "PLAN6089", "Seccion": "2U1", "Profesor": "ENCARNACION, A.", "Creditos": "3", "Nombre": "PLANIF URB Y TERRITORIAL", "Dias": ["W"], "Horario": ["07:00PM-09:50PM"], "Salones": ["PLAZU-7041"], "Info_Extra": ""}, {"Curso": "PLAN6116", "Seccion": "2U1", "Profesor": "GONZALEZ VERON ", "Creditos": "3", "Nombre": "ORDEN JURIDICO PLAN", "Dias": ["J"], "Horario": ["05:30PM-08:20PM"], "Salones": ["PLAZU-7033"], "Info_Extra": ""}, {"Curso": "PLAN6117", "Seccion": "2U1", "Profesor": "CASTRO, A . ", "Creditos": "4", "Nombre": "APLIC COMPUTADOR EN PLAN", "Dias": ["W"], "Horario": ["05:30PM-09:20PM"], "Salones": ["PLAZU-6015"], "Info_Extra": ""}, {"Curso": "PLAN6135", "Seccion": "2U1", "Profesor": "ENCARNACION, A,", "Creditos": "3", "Nombre": "SOCIEDAD AMBIENTE Y PLAN", "Dias": ["L"], "Horario": ["05:30PM-08:20PM"], "Salones": ["PLAZU-7035"], "Info_Extra": ""}, {"Curso": "PLAN6513", "Seccion": "2U1", "Profesor": "IRIZARRY, R. ", "Creditos": "3", "Nombre": "SEM PROP PROYECTO PLANIFI", "Dias": ["D"], "Horario": ["TBA"], "Salones": [], "Info_Extra": ""}, {"Curso": "PLAN6602", "Seccion": "2U1", "Profesor": "CASTRO, A. ", "Creditos": "4", "Nombre": "SIG PARA PLANIFICACION", "Dias": ["MJ"], "Horario": ["05:30PM-07:20PM"], "Salones": ["PLAZU-6015"], "Info_Extra": ""}, {"Curso": "PLAN6603", "Seccion": "2U1", "Profesor": "NAVARRO, C. ", "Creditos": "3", "Nombre": "ELABORACION DE PLANES", "Dias": ["L"], "Horario": ["05:30PM-08:20PM"], "Salones": ["PLAZU-7041"], "Info_Extra": ""}, {"Curso": "PLAN6604", "Seccion": "2U1", "Profesor": "SANTIAGO, R. ", "Creditos": "3", "Nombre": "TEOR COMUNIDAD Y DES ECON", "Dias": ["J"], "Horario": ["05:30PM-08:20PM"], "Salones": ["PLAZU-7035"], "Info_Extra": ""}, {"Curso": "PLAN6614", "Seccion": "201", "Profesor": "BARRETO, M. ", "Creditos": "3", "Nombre": "PROYECTO DE PLANIFICACION", "Dias": ["D"], "Horario": ["TBA"], "Salones": [], "Info_Extra": ""}, {"Curso": "PLAN6614", "Seccion": "202", "Profesor": "NAVARRO, C. ", "Creditos": "3", "Nombre": "PROYECTO DE PLANIFICACION", "Dias": ["D"], "Horario": ["TBA"], "Salones": [], "Info_Extra": ""}, {"Curso": "PLAN6896", "Seccion": "201", "Profesor": "BARRETO, M. ", "Creditos": "0", "Nombre": "CONTINUACION PROY PLAN", "Dias": ["D"], "Horario": ["TBA"], "Salones": [], "Info_Extra": ""}, {"Curso": "PLAN6896", "Seccion": "202", "Profesor": "PENA, P. ", "Creditos": "0", "Nombre": "CONTINUACION PROY PLAN", "Dias": ["D"], "Horario": ["TBA"], "Salones": [], "Info_Extra": ""}, {"Curso": "PLAN6896", "Seccion": "203", "Profesor": "NAVARRO, C. ", "Creditos": "0", "Nombre": "CONTINUACION PROY PLAN", "Dias": ["D"], "Horario": ["TBA"], "Salones": [], "Info_Extra": ""}, {"Curso": "PLAN6995", "Seccion": "011", "Profesor": "MIRANDA, C. ", "Creditos": "1", "Nombre": "SEM: DESARROLLO PROPUESTA", "Dias": ["LMW", "S"], "Horario": ["05:30PM-08:20PM", "09:00AM-11:00AM"], "Salones": ["PLAZU-7036", "PLAZU-7036"], "Info_Extra": ""}, {"Curso": "PLAN6995", "Seccion": "013", "Profesor": "BARRETO MARITZA", "Creditos": "3", "Nombre": "RIESGOS Y PLANIFICACIONN", "Dias": ["W"], "Horario": ["05:30PM-08:20PM"], "Salones": ["PLAZU-7035"], "Info_Extra": ""}, {"Curso": "PLAN6996", "Seccion": "2U1", "Profesor": "NAVARRO, C. ", "Creditos": "5", "Nombre": "PRACTICA DE PLANIFICACION", "Dias": ["D"], "Horario": ["TBA"], "Salones": [], "Info_Extra": ""}]

Miupi Parser/parse.py

@@ -1,96 +0,0 @@
-import pandas as pd
-import json
-from os import remove
-
-
-def initial_parse(name, url):
-
-    table_MN = pd.read_html(url)
-    df = table_MN[0]
-    df.columns = ['Curso', 'Nombre', 'c', 'Dias', 'Hora', 'Salon']
-
-    upi = df[['Curso', 'Nombre', 'Dias', 'Hora', 'Salon']]
-    # print(upi.head())
-    # print(upi.to_json(orient='records'))
-
-    # puedes usar esta alternativa o la de la linea 17
-    # upi.to_json(r'C:\Users\diego\Documents\miupi_parse\soup\file.json')
-    upi.to_json(f'{name}_temp.json', orient='records')
-
-
-def final_parse(name):
-
-    with open(f"{name}_temp.json") as f_in:
-        data = json.load(f_in)
-
-    newdata = []
-
-    for item in data:
-        if(item["Curso"] == None):
-            pass
-        else:
-            course = {}
-
-            course["Curso"] = item["Curso"][0:8]
-            course["Seccion"] = item["Curso"][9:12]
-
-            info = item["Nombre"].split("Profesor: ")
-            if((profesor := info[1][0:-11]) != ""):
-                course["Profesor"] = profesor
-            else:
-                course["Profesor"] = "TBA"
-            
-            course["Creditos"] = info[1][-1]
-            course["Nombre"] = info[0][0:-1]
-            course["Dias"] = item["Dias"].split(" ")
-
-            horario = []
-            if(item["Hora"] != None):
-                for i in range(len(course["Dias"])):
-                    horario.append(item["Hora"][15*i:15*(i+1)])
-            else:
-                horario.append("TBA")
-            course["Horario"] = horario
-
-            salones_raw = item["Salon"].split("Edificio: ")
-            salones = []
-            for i in salones_raw:
-                if(i != "-" and i != "- " and i != ""):
-                    salones.append(i[:-1])
-            course["Salones"] = salones
-
-            course["Info_Extra"] = item["Curso"][13:-1]
-
-            newdata.append(course)
-
-    with open(f'{name}.json', 'w') as f_out:
-        json.dump(newdata, f_out)
-
-
-if __name__ == "__main__":
-    faculty_urls = {"Asuntos_Aca": "https://miupi.uprrp.edu/horarios/RBA120_AA.HTML",
-                    "Admi": "https://miupi.uprrp.edu/horarios/RBA120_AE.HTML",
-                    "Admi_Grad": "https://miupi.uprrp.edu/horarios/RBA120_AE2.HTML",
-                    "Arqui": "https://miupi.uprrp.edu/horarios/RBA120_AQ.HTML",
-                    "Arqui_Grad": "https://miupi.uprrp.edu/horarios/RBA120_AQ2.HTML",
-                    "Ciencia_Tech_Info_Grad": "https://miupi.uprrp.edu/horarios/RBA120_CB.HTML",
-                    "Ciencias_Militares": "https://miupi.uprrp.edu/horarios/RBA120_CM.HTML",
-                    "Naturales": "https://miupi.uprrp.edu/horarios/RBA120_CN.HTML",
-                    "Naturales_Grad": "https://miupi.uprrp.edu/horarios/RBA120_CN2.HTML",
-                    "Comunicaciones": "https://miupi.uprrp.edu/horarios/RBA120_CP.HTML",
-                    "Comunicaciones_Grad": "https://miupi.uprrp.edu/horarios/RBA120_CP2.HTML",
-                    "Sociales": "https://miupi.uprrp.edu/horarios/RBA120_CS.HTML",
-                    "Sociales_Grad": "https://miupi.uprrp.edu/horarios/RBA120_CS2.HTML	",
-                    "Derecho": "https://miupi.uprrp.edu/horarios/RBA120_DE.HTML",
-                    "Educacion_Continua": "https://miupi.uprrp.edu/horarios/RBA120_EC.HTML",
-                    "Educacion": "https://miupi.uprrp.edu/horarios/RBA120_ED.HTML",
-                    "Educacion_Grad": "https://miupi.uprrp.edu/horarios/RBA120_ED2.HTML",
-                    "Generales": "https://miupi.uprrp.edu/horarios/RBA120_EG.HTML",
-                    "Humanidades": "https://miupi.uprrp.edu/horarios/RBA120_HU.HTML",
-                    "Humanidades_Grad": "https://miupi.uprrp.edu/horarios/RBA120_HU2.HTML",
-                    "Planificacion": "https://miupi.uprrp.edu/horarios/RBA120_PL.HTML"}
-    #initial_parse("Naturales", faculty_urls["Naturales"])
-    for key in faculty_urls:
-        initial_parse(key, faculty_urls[key])
-        final_parse(key)
-        remove(f"{key}_temp.json")

server/CompanionApp/migrations/0008_auto_20201105_1214.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.2 on 2020-11-05 16:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('CompanionApp', '0007_remove_proximosemestre_grade'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='proximosemestre',
+            name='rooms',
+            field=models.CharField(max_length=100),
+        ),
+    ]

server/CompanionApp/models.py

@@ -28,4 +28,4 @@ class ProximoSemestre(models.Model):
     prof = models.CharField(max_length=150)
     hours = models.CharField(max_length=50)
     days = models.CharField(max_length=12)
-    rooms = models.CharField(max_length=30)
+    rooms = models.CharField(max_length=100)

server/CompanionApp/serializers.py

@@ -30,7 +30,7 @@ class CursoSerializer(serializers.ModelSerializer):
 
 class MatriculaSerializer(serializers.ModelSerializer):
     class Meta:
-        model = Curso
+        model = Matricula
         fields = ('__all__')
 
     def create(self, validated_data):
@@ -43,7 +43,7 @@ class MatriculaSerializer(serializers.ModelSerializer):
 
 class ProximoSemestreSerializer(serializers.ModelSerializer):
     class Meta:
-        model = Curso
+        model = ProximoSemestre
         fields = ('__all__')
 
     def create(self, validated_data):

server/CompanionApp/urls.py

@@ -11,5 +11,5 @@ urlpatterns = [
     url(r'^api/hello$', views.hello_world),
     url(r'^api/insertar_cursos$', views.insertarTodosLosCursos),
     url(r'api/insert_matricula', views.insertarProximoSemestre),
-    url(r'api/test_query', views.testQuery)
+    url(r'api/fetch_matricula', views.fetchMatricula)
 ]

server/CompanionApp/views.py

@@ -3,7 +3,7 @@ import sys
 from django.shortcuts import render
 from django.http.response import JsonResponse
 from rest_framework import status
-from .models import Facultad, Curso, Matricula
+from .models import Facultad, Curso, Matricula, ProximoSemestre
 from rest_framework.decorators import api_view
 from rest_framework.parsers import JSONParser
 from .serializers import FacultadSerializer, CursoSerializer, MatriculaSerializer, ProximoSemestreSerializer
@@ -32,6 +32,7 @@ def insertarFacultades(request):
 @api_view(['POST', ])
 def insertarTodosLosCursos(request):
     if request.method == 'POST':
+        i = 1
         for file in files3:
             check = file['file'].split('.')
             path = "C:/Users/danie/Documents/Projects/Companion App/server/segundo_sem" if check[
@@ -44,10 +45,19 @@ def insertarTodosLosCursos(request):
                         code = key
                         name = data[key][0]
                         creds = data[key][1]
-                        curso_serializer = CursoSerializer(
-                            data={'name': name, 'code': code, 'creditos': creds, 'fac_id': fac_id})
-                        if curso_serializer.is_valid():
-                            curso_serializer.save()
+                        try:
+                            curso = Curso.objects.get(code=code)
+                        except Curso.DoesNotExist:
+                            curso = None
+
+                        if curso == None:
+                            curso_serializer = CursoSerializer(
+                                data={'name': name, 'code': code, 'creditos': creds, 'fac_id': fac_id})
+                            if curso_serializer.is_valid():
+                                curso_serializer.save()
+                        else:
+                            print('ya se creo', i)
+                            i += 1
         return JsonResponse({'message': 'se insertaron todos los cursos'}, status=status.HTTP_201_CREATED)
 
 
@@ -62,12 +72,13 @@ def hello_world(request):
 def insertarProximoSemestre(request):
     if request.method == 'POST':
         for file in files:
-            print(f"help {file['file']}")
             path = "C:/Users/danie/Documents/Projects/Companion App/server/Matricula Parse"
             with open(path + '/' + file['file']) as f:
-                print(f"opened {file['file']}")
                 data = json.load(f)
                 for course in data:
+                    print(course["Curso"])
+                    print(Curso.objects.filter(code=course["Curso"]))
+
                     code = Curso.objects.get(code=course["Curso"])
                     section = course["Seccion"]
                     prof = course["Profesor"]
@@ -81,27 +92,37 @@ def insertarProximoSemestre(request):
                         hours += i
                         hours += " "
 
+                    if hours == "":
+                        hours = "TBA"
+
                     rooms = ""
                     for i in course["Salones"]:
                         rooms += i
                         rooms += " "
 
+                    if rooms == "":
+                        rooms = "TBA"
+
+                    print(
+                        f"code {code.code}, section {section}, prof {prof}, hours {hours}, rooms {rooms}, days {days}")
+
                     # extra_info = course["Info_Extra"]
                     matricula_serializer = ProximoSemestreSerializer(
-                        data={'course_id': code, 'section': section, 'prof': prof, 'hours': hours, 'rooms': rooms, 'days': days})
-                    print(
-                        f"code {code}, section {section}, prof {prof}, hours {hours}, rooms {rooms}, days {days}")
+                        data={'code': code.code, 'name': code.name, 'fac_id': code.fac_id.pk, 'course_id': code.pk, 'section': section, 'prof': prof, 'hours': hours, 'rooms': rooms, 'days': days})
+
                     if matricula_serializer.is_valid(raise_exception=True):
                         matricula_serializer.save()
-                        print("inserted some data")
+                    print("inserted some data")
 
         return JsonResponse({'message': 'se insertaron todos los cursos'}, status=status.HTTP_201_CREATED)
 
 
-@api_view(['POST', 'GET'])
-def testQuery(request):
+@api_view(['POST', ])
+def fetchMatricula(request):
     json = []
-    for i in Curso.objects.all():
-        json.append({"id": i.fac_id.id, "name": i.name,
-                     "code": i.code, "credits": i.creditos})
+    for i in ProximoSemestre.objects.all():
+        json.append({"id": i.course_id.fac_id.id, "name": i.course_id.name,
+                     "code": i.course_id.code, "credits": i.course_id.creditos,
+                     "section": i.section, "prof": i.prof, "hours": i.hours,
+                     "days": i.days, "rooms": i.rooms})
     return JsonResponse(json, safe=False)