From bdc8792b6c273825df268993d8436ab91c3c37d6 Mon Sep 17 00:00:00 2001 From: Raffu Khondaker <2022rkhondak@tjhsst.edu> Date: Mon, 15 Jun 2020 19:08:58 -0400 Subject: [PATCH] serializere fix --- CLI/student.py | 2 +- Website/api/serializers.py | 2 +- Website/api/views.py | 4 ++-- skoolos.py | 7 ++++++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CLI/student.py b/CLI/student.py index 89985a8..5d6ad51 100644 --- a/CLI/student.py +++ b/CLI/student.py @@ -160,7 +160,7 @@ class Student: zero = datetime.timedelta(0,0) #check due ddate is in span range is now past date (- timdelta) if(diff < span and diff > zero): - print((now-due)) + print(a + " due in:" + str(now-due)) except Exception as e: print(e) diff --git a/Website/api/serializers.py b/Website/api/serializers.py index 6c3e8c9..9e8d9a7 100644 --- a/Website/api/serializers.py +++ b/Website/api/serializers.py @@ -41,7 +41,7 @@ class StudentSerializer(serializers.HyperlinkedModelSerializer): class Meta: model = Student # fields = ['url','first_name', 'last_name', 'grade','email','student_id', 'git','ion_user','Class','added_to','completed', 'repo','owner'] - fields = ['url','grade', 'ion_user','git','user','Class','added_to','completed', 'repo'] + fields = ['url','grade', 'ion_user','git','user','classes','added_to','completed', 'repo'] class TeacherSerializer(serializers.ModelSerializer): # Class = ClassSerializer(many=True, read_only=True,allow_null=True) diff --git a/Website/api/views.py b/Website/api/views.py index 8213adc..e5d877b 100644 --- a/Website/api/views.py +++ b/Website/api/views.py @@ -1,5 +1,5 @@ from .models import Student, Teacher, Class, Assignment, DefFiles -from .serializers import StudentSerializer, TeacherSerializer, ClassesSerializer, AssignmentSerializer, UserSerializer +from .serializers import StudentSerializer, TeacherSerializer, ClassSerializer, AssignmentSerializer, UserSerializer from rest_framework import generics, viewsets, permissions, response, status from django.http import Http404 from rest_framework.views import APIView @@ -43,7 +43,7 @@ class ClassViewSet(viewsets.ModelViewSet): API endpoint that allows users to be viewed or edited. """ queryset = Class.objects.all() - serializer_class = ClassesSerializer + serializer_class = ClassSerializer permission_Class = [permissions.IsAuthenticated, IsOwnerOrReadOnly] # def perform_create(self, serializer): diff --git a/skoolos.py b/skoolos.py index a5ce0e0..bec621e 100644 --- a/skoolos.py +++ b/skoolos.py @@ -12,6 +12,7 @@ from werkzeug.urls import url_decode import pprint from PyInquirer import prompt, print_json import json +import datetime import os import argparse import webbrowser @@ -84,7 +85,7 @@ def studentCLI(user, password): student.exitCLI() else: student.viewClass(course) - + student.getAssignments(course, datetime.datetime.now()) def teacherCLI(user, password): from CLI import teacher @@ -166,6 +167,10 @@ def getUser(ion_user, password): else: return None print(r.status_code) +def patchDB(data, url): + r = requests.patch(url = url, data=data, auth=('raffukhondaker','hackgroup1')) + print("PATH:" + str(r.status_code)) + return(r.json()) def getDB(url): r = requests.get(url = url, auth=('raffukhondaker','hackgroup1'))