Merge Suazo Branch

.gitignore

@@ -8,6 +8,10 @@ client/CompanionApp*.key
 client/CompanionApp*.mobileprovision
 client/CompanionApp*.orig.*
 client/CompanionAppweb-build/
+<<<<<<< HEAD
+=======
+server/restful
+>>>>>>> Suazo
 
 # macOS
 client/CompanionApp.DS_Store

.vscode/settings.json

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

server/CompanionApp/matricula.py

@@ -0,0 +1,33 @@
+import os
+import sys
+import json
+
+path = "C:/Users/danie/Documents/Projects/Companion App/server/Matricula Parse"
+
+dirsem = os.listdir(path)
+
+
+def orderFiles(files):
+    i = 1
+    for file in dirsem:
+        if file.endswith('.json'):
+            files.append({'file': file, 'num': i})
+        i += 1
+    return files
+
+
+files = orderFiles([])
+
+
+# for file in files3:
+#     check = file['file'].split('.')
+#     path = "C:/Users/diego/Documents/companion_app/segundo_sem" if check[0][-1] == '2' else "C:/Users/diego/Documents/companion_app/primer_sem"
+#     with open(path + '/' + file['file']) as f:
+#         data = json.load(f)
+#         fac_id = file['num']
+#         for key in data:
+#             if key != 'Horario ':
+#                 code = key
+#                 name = data[key][0]
+#                 creds = data[key][1]
+#                 print(code, name, creds, fac_id)

server/CompanionApp/migrations/0005_auto_20201103_1916.py

@@ -0,0 +1,37 @@
+# Generated by Django 3.1.2 on 2020-11-03 23:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('CompanionApp', '0004_auto_20201025_1252'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='matricula',
+            old_name='salon',
+            new_name='days',
+        ),
+        migrations.RenameField(
+            model_name='matricula',
+            old_name='horario',
+            new_name='hours',
+        ),
+        migrations.RemoveField(
+            model_name='matricula',
+            name='dias',
+        ),
+        migrations.RemoveField(
+            model_name='matricula',
+            name='semestre',
+        ),
+        migrations.AddField(
+            model_name='matricula',
+            name='rooms',
+            field=models.CharField(default='', max_length=30),
+            preserve_default=False,
+        ),
+    ]

server/CompanionApp/migrations/0006_auto_20201104_1251.py

@@ -0,0 +1,39 @@
+# Generated by Django 3.1.2 on 2020-11-04 16:51
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('CompanionApp', '0005_auto_20201103_1916'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='matricula',
+            name='days',
+        ),
+        migrations.RemoveField(
+            model_name='matricula',
+            name='hours',
+        ),
+        migrations.RemoveField(
+            model_name='matricula',
+            name='rooms',
+        ),
+        migrations.CreateModel(
+            name='ProximoSemestre',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('section', models.CharField(max_length=5)),
+                ('prof', models.CharField(max_length=150)),
+                ('grade', models.CharField(max_length=3)),
+                ('hours', models.CharField(max_length=50)),
+                ('days', models.CharField(max_length=12)),
+                ('rooms', models.CharField(max_length=30)),
+                ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='CompanionApp.curso')),
+            ],
+        ),
+    ]

server/CompanionApp/migrations/0007_remove_proximosemestre_grade.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.1.2 on 2020-11-04 16:53
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('CompanionApp', '0006_auto_20201104_1251'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='proximosemestre',
+            name='grade',
+        ),
+    ]

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

@@ -20,7 +20,19 @@ class Matricula(models.Model):
     section = models.CharField(max_length=5)
     prof = models.CharField(max_length=150)
     grade = models.CharField(max_length=3)
+<<<<<<< HEAD
     semestre = models.IntegerField(default=0)
     horario = models.CharField(max_length=50)
     dias = models.CharField(max_length=10)
     salon = models.CharField(max_length=12)
+=======
+
+
+class ProximoSemestre(models.Model):
+    course_id = models.ForeignKey(Curso, on_delete=models.CASCADE)
+    section = models.CharField(max_length=5)
+    prof = models.CharField(max_length=150)
+    hours = models.CharField(max_length=50)
+    days = models.CharField(max_length=12)
+    rooms = models.CharField(max_length=100)
+>>>>>>> Suazo

server/CompanionApp/serializers.py

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 from .models import Facultad, Curso, Matricula
+=======
+from .models import Facultad, Curso, Matricula, ProximoSemestre
+>>>>>>> Suazo
 from rest_framework import serializers
 
 
@@ -30,7 +34,11 @@ class CursoSerializer(serializers.ModelSerializer):
 
 class MatriculaSerializer(serializers.ModelSerializer):
     class Meta:
+<<<<<<< HEAD
         model = Curso
+=======
+        model = Matricula
+>>>>>>> Suazo
         fields = ('__all__')
 
     def create(self, validated_data):
@@ -39,3 +47,20 @@ class MatriculaSerializer(serializers.ModelSerializer):
         if(created == False):
             print('ya se creo')
         return validated_data
+<<<<<<< HEAD
+=======
+
+
+class ProximoSemestreSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ProximoSemestre
+        fields = ('__all__')
+
+    def create(self, validated_data):
+        instance, created = ProximoSemestre.objects.get_or_create(
+            **validated_data)
+        # print(instance, created)
+        if(created == False):
+            print('ya se creo')
+        return validated_data
+>>>>>>> Suazo

server/CompanionApp/urls.py

@@ -10,6 +10,11 @@ urlpatterns = [
     url(r'^api/insertar_fac$', views.insertarFacultades),
     url(r'^api/hello$', views.hello_world),
     url(r'^api/insertar_cursos$', views.insertarTodosLosCursos),
+<<<<<<< HEAD
     url(r'api/fetch_matricula', views.fetchMatricula),
     url(r'api/test_query', views.testQuery)
+=======
+    url(r'api/insert_matricula', views.insertarProximoSemestre),
+    url(r'api/fetch_matricula', views.fetchMatricula)
+>>>>>>> Suazo
 ]

server/CompanionApp/views.py

@@ -3,11 +3,20 @@ import sys
 from django.shortcuts import render
 from django.http.response import JsonResponse
 from rest_framework import status
+<<<<<<< HEAD
 from .models import Facultad, Curso, Matricula
 from rest_framework.decorators import api_view
 from rest_framework.parsers import JSONParser
 from .serializers import FacultadSerializer, CursoSerializer
 from .organizar import files3
+=======
+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
+from .organizar import files3
+from .matricula import files
+>>>>>>> Suazo
 
 
 # Create your views here.
@@ -31,6 +40,10 @@ def insertarFacultades(request):
 @api_view(['POST', ])
 def insertarTodosLosCursos(request):
     if request.method == 'POST':
+<<<<<<< HEAD
+=======
+        i = 1
+>>>>>>> Suazo
         for file in files3:
             check = file['file'].split('.')
             path = "C:/Users/danie/Documents/Projects/Companion App/server/segundo_sem" if check[
@@ -43,10 +56,26 @@ def insertarTodosLosCursos(request):
                         code = key
                         name = data[key][0]
                         creds = data[key][1]
+<<<<<<< HEAD
                         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
+>>>>>>> Suazo
         return JsonResponse({'message': 'se insertaron todos los cursos'}, status=status.HTTP_201_CREATED)
 
 
@@ -58,6 +87,7 @@ def hello_world(request):
 
 
 @api_view(['POST', ])
+<<<<<<< HEAD
 def fetchMatricula(request):
     if request.method == 'POST':
         json = []
@@ -73,4 +103,62 @@ def testQuery(request):
     for i in Curso.objects.all():
         json.append({"id": i.fac_id.id, "name": i.name,
                      "code": i.code, "credits": i.creditos})
+=======
+def insertarProximoSemestre(request):
+    if request.method == 'POST':
+        for file in files:
+            path = "C:/Users/danie/Documents/Projects/Companion App/server/Matricula Parse"
+            with open(path + '/' + file['file']) as f:
+                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"]
+                    days = ""
+                    for i in course["Dias"]:
+                        days += i
+                        days += " "
+
+                    hours = ""
+                    for i in course["Horario"]:
+                        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={'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")
+
+        return JsonResponse({'message': 'se insertaron todos los cursos'}, status=status.HTTP_201_CREATED)
+
+
+@api_view(['POST', ])
+def fetchMatricula(request):
+    json = []
+    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})
+>>>>>>> Suazo
     return JsonResponse(json, safe=False)

server/Matricula Parse/Admi_Grad.json

@@ -0,0 +1,573 @@
+[
+    {
+        "Curso": "ADMI5500",
+        "Seccion": "2U1",
+        "Profesor": "CARDONA, R. ",
+        "Creditos": "1",
+        "Nombre": "FUNDAMENTOS GRAD ADM EMPR",
+        "Dias": [
+            "LMWJV"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "ADMI5600",
+        "Seccion": "0U1",
+        "Profesor": "RUIZ, A. ",
+        "Creditos": "1",
+        "Nombre": "HERRAMIENTAS GRAD ADM EMP",
+        "Dias": [
+            "D"
+        ],
+        "Horario": [
+            "TBA"
+        ],
+        "Salones": [],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "ADMI6510",
+        "Seccion": "2U1",
+        "Profesor": "AYALA, J. ",
+        "Creditos": "3",
+        "Nombre": "TOMA DE DECISIONES",
+        "Dias": [
+            "W"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6035"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "ADMI6531",
+        "Seccion": "2U1",
+        "Profesor": "ORENGO, K. ",
+        "Creditos": "3",
+        "Nombre": "GERENCIA Y LIDERAZGO",
+        "Dias": [
+            "L"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6032"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "ADMI6595",
+        "Seccion": "2U1",
+        "Profesor": "AYALA, J. ",
+        "Creditos": "3",
+        "Nombre": "GEREN ESTRATEGICA GLOBAL",
+        "Dias": [
+            "M"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6034"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "ADMI6637",
+        "Seccion": "2U1",
+        "Profesor": "QUINONES, V. ",
+        "Creditos": "3",
+        "Nombre": "ETICA EMPRESARIAL",
+        "Dias": [
+            "W"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6034"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "ADMI6990",
+        "Seccion": "2U1",
+        "Profesor": "PAUL, J. ",
+        "Creditos": "1",
+        "Nombre": "SEMINARIO ADMINIST EMPRES",
+        "Dias": [
+            "W"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6031"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "ADMI8005",
+        "Seccion": "2U1",
+        "Profesor": "AYALA, J. ",
+        "Creditos": "1",
+        "Nombre": "SEMINARIO DOCTORAL",
+        "Dias": [
+            "D"
+        ],
+        "Horario": [
+            "TBA"
+        ],
+        "Salones": [],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "ADMI8105",
+        "Seccion": "001",
+        "Profesor": "APONTE, M. ",
+        "Creditos": "4",
+        "Nombre": "DISERTACION DOCTORAL",
+        "Dias": [
+            "D"
+        ],
+        "Horario": [
+            "TBA"
+        ],
+        "Salones": [],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "ADMI8105",
+        "Seccion": "002",
+        "Profesor": "COLON DE, C. ",
+        "Creditos": "4",
+        "Nombre": "DISERTACION DOCTORAL",
+        "Dias": [
+            "D"
+        ],
+        "Horario": [
+            "TBA"
+        ],
+        "Salones": [],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "ADMI8105",
+        "Seccion": "003",
+        "Profesor": "RODRIGUEZ, J. ",
+        "Creditos": "4",
+        "Nombre": "DISERTACION DOCTORAL",
+        "Dias": [
+            "D"
+        ],
+        "Horario": [
+            "TBA"
+        ],
+        "Salones": [],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "ADMI8105",
+        "Seccion": "004",
+        "Profesor": "PAUL, J. ",
+        "Creditos": "4",
+        "Nombre": "DISERTACION DOCTORAL",
+        "Dias": [
+            "D"
+        ],
+        "Horario": [
+            "TBA"
+        ],
+        "Salones": [],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "ADMI8106",
+        "Seccion": "001",
+        "Profesor": "APONTE, M. ",
+        "Creditos": "1",
+        "Nombre": "CONTINUA DISERTAC DOCTORA",
+        "Dias": [
+            "D"
+        ],
+        "Horario": [
+            "TBA"
+        ],
+        "Salones": [],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "ADMI8106",
+        "Seccion": "002",
+        "Profesor": "COLON DE, C. ",
+        "Creditos": "1",
+        "Nombre": "CONTINUA DISERTAC DOCTORA",
+        "Dias": [
+            "D"
+        ],
+        "Horario": [
+            "TBA"
+        ],
+        "Salones": [],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "ADMI8106",
+        "Seccion": "003",
+        "Profesor": "ROSADO, A. ",
+        "Creditos": "1",
+        "Nombre": "CONTINUA DISERTAC DOCTORA",
+        "Dias": [
+            "D"
+        ],
+        "Horario": [
+            "TBA"
+        ],
+        "Salones": [],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "COIN6703",
+        "Seccion": "2U1",
+        "Profesor": "ORENGO, K. ",
+        "Creditos": "3",
+        "Nombre": "INV MERC NEGOC INTERNAC",
+        "Dias": [
+            "M"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6033"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "COIN6707",
+        "Seccion": "2U1",
+        "Profesor": "CASTRO, S. ",
+        "Creditos": "3",
+        "Nombre": "GERE LOGIS OPERA INTERNA",
+        "Dias": [
+            "J"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6032"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "COIN8016",
+        "Seccion": "2U1",
+        "Profesor": "APONTE, M. ",
+        "Creditos": "3",
+        "Nombre": "SISTEMAS NEGOCIOS COMPAR",
+        "Dias": [
+            "M"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6037"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "COIN8028",
+        "Seccion": "2U1",
+        "Profesor": "PAUL, J. ",
+        "Creditos": "3",
+        "Nombre": "ESTRATEGIAS MERC INTERNAC",
+        "Dias": [
+            "L"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6031"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "CONT6501",
+        "Seccion": "2U1",
+        "Profesor": "GONZALEZ, P. ",
+        "Creditos": "3",
+        "Nombre": "CONT PARA ANALIS,CONTROL",
+        "Dias": [
+            "L"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6033"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "CONT6701",
+        "Seccion": "3U1",
+        "Profesor": "GONZALEZ, P. ",
+        "Creditos": "3",
+        "Nombre": "TEORIA,PROB CONT FINA I",
+        "Dias": [
+            "S"
+        ],
+        "Horario": [
+            "09:00AM-11:50AM"
+        ],
+        "Salones": [
+            "PLAZU-6035"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "ECOG6567",
+        "Seccion": "2U1",
+        "Profesor": "LONGOBARDI, T. ",
+        "Creditos": "3",
+        "Nombre": "ECONOMIA GERENCIAL",
+        "Dias": [
+            "M"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6035"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "ESEM5005",
+        "Seccion": "0U1",
+        "Profesor": "APONTE, M. ",
+        "Creditos": "3",
+        "Nombre": "EVALUACION IDEAS NEGOCIOS",
+        "Dias": [
+            "LW"
+        ],
+        "Horario": [
+            "01:00PM-02:20PM"
+        ],
+        "Salones": [
+            "PLAZU-6030"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "ESTA5503",
+        "Seccion": "0U1",
+        "Profesor": "VEGA, J. ",
+        "Creditos": "3",
+        "Nombre": "ANALISIS MULTIVARIANT APL",
+        "Dias": [
+            "MJ"
+        ],
+        "Horario": [
+            "02:30PM-03:50PM"
+        ],
+        "Salones": [],
+        "Info_Extra": "* Curso no se ofrecer\u00e1 en el 2DO SEM *"
+    },
+    {
+        "Curso": "FINA5995",
+        "Seccion": "001",
+        "Profesor": "CARPENTER,C ",
+        "Creditos": "3",
+        "Nombre": "SEM:TEMAS CONTEM FINANZAS",
+        "Dias": [
+            "M"
+        ],
+        "Horario": [
+            "04:00PM-06:50PM"
+        ],
+        "Salones": [
+            "O-320"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "FINA5995",
+        "Seccion": "002",
+        "Profesor": "SCHINDLER, KURT",
+        "Creditos": "3",
+        "Nombre": "SEM:TEMAS CONTEM FINANZAS",
+        "Dias": [
+            "MJ"
+        ],
+        "Horario": [
+            "10:00AM-11:20AM"
+        ],
+        "Salones": [
+            "O-319"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "FING6501",
+        "Seccion": "2U1",
+        "Profesor": "COLON, C. ",
+        "Creditos": "3",
+        "Nombre": "FINANZA CORPORATIVA",
+        "Dias": [
+            "L"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6034"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "FING6703",
+        "Seccion": "2U1",
+        "Profesor": "GONZALEZ, P. ",
+        "Creditos": "3",
+        "Nombre": "FINANZA EMPRESARIAL AVAN",
+        "Dias": [
+            "W"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6033"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "FING6721",
+        "Seccion": "2U1",
+        "Profesor": "RODRIGUEZ, J. ",
+        "Creditos": "3",
+        "Nombre": "SEMINARIO DE FINANZAS",
+        "Dias": [
+            "M"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6032"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "FING8006",
+        "Seccion": "2U1",
+        "Profesor": "COLON DE, C. ",
+        "Creditos": "3",
+        "Nombre": "TEORIA FINANCIERA II",
+        "Dias": [
+            "W"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6030"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "FING8029",
+        "Seccion": "2U1",
+        "Profesor": "RODRIGUEZ, J. ",
+        "Creditos": "3",
+        "Nombre": "TEMAS CONTEM MERCAD FINA",
+        "Dias": [
+            "L"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6030"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "GEOP6539",
+        "Seccion": "2U1",
+        "Profesor": "AYALA, J. ",
+        "Creditos": "3",
+        "Nombre": "GERENCIA DE OPERACIONES",
+        "Dias": [
+            "L"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6035"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "MECU6551",
+        "Seccion": "2U1",
+        "Profesor": "LONGOBARDI, T. ",
+        "Creditos": "3",
+        "Nombre": "FUND DE ESTADISTICA",
+        "Dias": [
+            "J"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6035"
+        ],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "MERC5995",
+        "Seccion": "0U1",
+        "Profesor": "MARTINEZ, E. ",
+        "Creditos": "3",
+        "Nombre": "TEMAS CONTEMP EN MERCADEO",
+        "Dias": [
+            "L"
+        ],
+        "Horario": [
+            "01:00PM-03:50PM"
+        ],
+        "Salones": [],
+        "Info_Extra": ""
+    },
+    {
+        "Curso": "MERC6541",
+        "Seccion": "2U1",
+        "Profesor": "QUINONES, V. ",
+        "Creditos": "3",
+        "Nombre": "GERENCIA DE MERCADEO",
+        "Dias": [
+            "J"
+        ],
+        "Horario": [
+            "06:00PM-08:50PM"
+        ],
+        "Salones": [
+            "PLAZU-6034"
+        ],
+        "Info_Extra": ""
+    }
+]

server/Matricula Parse/Ciencias_Militares.json

@@ -0,0 +1 @@
+[{"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": ""}]

server/Matricula Parse/Comunicaciones_Grad.json

@@ -0,0 +1 @@
+[{"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 *"}]

server/Matricula Parse/Planificacion.json

@@ -0,0 +1 @@
+[{"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": ""}]

server/primer_sem/Admi_Grad.json

@@ -1 +1,122 @@
-{"ADMI5500": ["FUNDAMENTOS GRAD ADM EMPR ", "1"], "ADMI5600": ["HERRAMIENTAS GRAD ADM EMPR", "1"], "ADMI6510": ["TOMA DE DECISIONES ", "3"], "ADMI6531": ["GERENCIA Y LIDERAZGO ", "3"], "ADMI6595": ["GEREN ESTRATEGICA GLOBAL ", "3"], "ADMI6637": ["ETICA EMPRESARIAL ", "3"], "ADMI6990": ["SEMINARIO ADMINIST EMPRESA", "1"], "ADMI8005": ["SEMINARIO DOCTORAL ", "1"], "ADMI8105": ["DISERTACION DOCTORAL ", "4"], "ADMI8106": ["CONTINUA DISERTAC DOCTORAL", "1"], "COIN6703": ["INV MERC NEGOC INTERNAC ", "3"], "COIN6707": ["GERE LOGIS OPERA INTERNA ", "3"], "COIN8016": ["SISTEMAS NEGOCIOS COMPAR ", "3"], "COIN8028": ["ESTRATEGIAS MERC INTERNAC ", "3"], "CONT6501": ["CONT PARA ANALIS,CONTROL ", "3"], "CONT6701": ["TEORIA,PROB CONT FINA I ", "3"], "ECOG6567": ["ECONOMIA GERENCIAL ", "3"], "ESEM5005": ["EVALUACION IDEAS NEGOCIOS ", "3"], "ESTA5503": ["ANALISIS MULTIVARIANT APLC", "3"], "FINA5995": ["SEM:TEMAS CONTEM FINANZAS ", "3"], "FING6501": ["FINANZA CORPORATIVA ", "3"], "FING6703": ["FINANZA EMPRESARIAL AVAN ", "3"], "FING6721": ["SEMINARIO DE FINANZAS ", "3"], "FING8006": ["TEORIA FINANCIERA II ", "3"], "FING8029": ["TEMAS CONTEM MERCAD FINA ", "3"], "GEOP6539": ["GERENCIA DE OPERACIONES ", "3"], "MECU6551": ["FUND DE ESTADISTICA ", "3"], "MERC5995": ["TEMAS CONTEMP EN MERCADEO ", "3"], "MERC6541": ["GERENCIA DE MERCADEO ", "3"]}
+<<<<<<< HEAD
+{"ADMI5500": ["FUNDAMENTOS GRAD ADM EMPR ", "1"], "ADMI5600": ["HERRAMIENTAS GRAD ADM EMPR", "1"], "ADMI6510": ["TOMA DE DECISIONES ", "3"], "ADMI6531": ["GERENCIA Y LIDERAZGO ", "3"], "ADMI6595": ["GEREN ESTRATEGICA GLOBAL ", "3"], "ADMI6637": ["ETICA EMPRESARIAL ", "3"], "ADMI6990": ["SEMINARIO ADMINIST EMPRESA", "1"], "ADMI8005": ["SEMINARIO DOCTORAL ", "1"], "ADMI8105": ["DISERTACION DOCTORAL ", "4"], "ADMI8106": ["CONTINUA DISERTAC DOCTORAL", "1"], "COIN6703": ["INV MERC NEGOC INTERNAC ", "3"], "COIN6707": ["GERE LOGIS OPERA INTERNA ", "3"], "COIN8016": ["SISTEMAS NEGOCIOS COMPAR ", "3"], "COIN8028": ["ESTRATEGIAS MERC INTERNAC ", "3"], "CONT6501": ["CONT PARA ANALIS,CONTROL ", "3"], "CONT6701": ["TEORIA,PROB CONT FINA I ", "3"], "ECOG6567": ["ECONOMIA GERENCIAL ", "3"], "ESEM5005": ["EVALUACION IDEAS NEGOCIOS ", "3"], "ESTA5503": ["ANALISIS MULTIVARIANT APLC", "3"], "FINA5995": ["SEM:TEMAS CONTEM FINANZAS ", "3"], "FING6501": ["FINANZA CORPORATIVA ", "3"], "FING6703": ["FINANZA EMPRESARIAL AVAN ", "3"], "FING6721": ["SEMINARIO DE FINANZAS ", "3"], "FING8006": ["TEORIA FINANCIERA II ", "3"], "FING8029": ["TEMAS CONTEM MERCAD FINA ", "3"], "GEOP6539": ["GERENCIA DE OPERACIONES ", "3"], "MECU6551": ["FUND DE ESTADISTICA ", "3"], "MERC5995": ["TEMAS CONTEMP EN MERCADEO ", "3"], "MERC6541": ["GERENCIA DE MERCADEO ", "3"]}
+=======
+{
+    "ADMI5500": [
+        "FUNDAMENTOS GRAD ADM EMPR ",
+        "1"
+    ],
+    "ADMI5600": [
+        "HERRAMIENTAS GRAD ADM EMPR",
+        "1"
+    ],
+    "ADMI6510": [
+        "TOMA DE DECISIONES ",
+        "3"
+    ],
+    "ADMI6531": [
+        "GERENCIA Y LIDERAZGO ",
+        "3"
+    ],
+    "ADMI6595": [
+        "GEREN ESTRATEGICA GLOBAL ",
+        "3"
+    ],
+    "ADMI6637": [
+        "ETICA EMPRESARIAL ",
+        "3"
+    ],
+    "ADMI6990": [
+        "SEMINARIO ADMINIST EMPRESA",
+        "1"
+    ],
+    "ADMI8005": [
+        "SEMINARIO DOCTORAL ",
+        "1"
+    ],
+    "ADMI8105": [
+        "DISERTACION DOCTORAL ",
+        "4"
+    ],
+    "ADMI8106": [
+        "CONTINUA DISERTAC DOCTORAL",
+        "1"
+    ],
+    "COIN6703": [
+        "INV MERC NEGOC INTERNAC ",
+        "3"
+    ],
+    "COIN6707": [
+        "GERE LOGIS OPERA INTERNA ",
+        "3"
+    ],
+    "COIN8016": [
+        "SISTEMAS NEGOCIOS COMPAR ",
+        "3"
+    ],
+    "COIN8028": [
+        "ESTRATEGIAS MERC INTERNAC ",
+        "3"
+    ],
+    "CONT6501": [
+        "CONT PARA ANALIS,CONTROL ",
+        "3"
+    ],
+    "CONT6701": [
+        "TEORIA,PROB CONT FINA I ",
+        "3"
+    ],
+    "ECOG6567": [
+        "ECONOMIA GERENCIAL ",
+        "3"
+    ],
+    "ESEM5005": [
+        "EVALUACION IDEAS NEGOCIOS ",
+        "3"
+    ],
+    "ESTA5503": [
+        "ANALISIS MULTIVARIANT APLC",
+        "3"
+    ],
+    "FINA5995": [
+        "SEM:TEMAS CONTEM FINANZAS ",
+        "3"
+    ],
+    "FING6501": [
+        "FINANZA CORPORATIVA ",
+        "3"
+    ],
+    "FING6703": [
+        "FINANZA EMPRESARIAL AVAN ",
+        "3"
+    ],
+    "FING6721": [
+        "SEMINARIO DE FINANZAS ",
+        "3"
+    ],
+    "FING8006": [
+        "TEORIA FINANCIERA II ",
+        "3"
+    ],
+    "FING8029": [
+        "TEMAS CONTEM MERCAD FINA ",
+        "3"
+    ],
+    "GEOP6539": [
+        "GERENCIA DE OPERACIONES ",
+        "3"
+    ],
+    "MECU6551": [
+        "FUND DE ESTADISTICA ",
+        "3"
+    ],
+    "MERC5995": [
+        "TEMAS CONTEMP EN MERCADEO ",
+        "3"
+    ],
+    "MERC6541": [
+        "GERENCIA DE MERCADEO ",
+        "3"
+    ]
+}
+>>>>>>> Suazo