mirror of
https://github.com/Rushilwiz/SkoolOS.git
synced 2025-04-16 02:10:19 -04:00
serializere fix
This commit is contained in:
parent
61200ae579
commit
bdc8792b6c
|
@ -160,7 +160,7 @@ class Student:
|
||||||
zero = datetime.timedelta(0,0)
|
zero = datetime.timedelta(0,0)
|
||||||
#check due ddate is in span range is now past date (- timdelta)
|
#check due ddate is in span range is now past date (- timdelta)
|
||||||
if(diff < span and diff > zero):
|
if(diff < span and diff > zero):
|
||||||
print((now-due))
|
print(a + " due in:" + str(now-due))
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(e)
|
print(e)
|
||||||
|
|
|
@ -41,7 +41,7 @@ class StudentSerializer(serializers.HyperlinkedModelSerializer):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Student
|
model = Student
|
||||||
# fields = ['url','first_name', 'last_name', 'grade','email','student_id', 'git','ion_user','Class','added_to','completed', 'repo','owner']
|
# 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 TeacherSerializer(serializers.ModelSerializer):
|
||||||
# Class = ClassSerializer(many=True, read_only=True,allow_null=True)
|
# Class = ClassSerializer(many=True, read_only=True,allow_null=True)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
from .models import Student, Teacher, Class, Assignment, DefFiles
|
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 rest_framework import generics, viewsets, permissions, response, status
|
||||||
from django.http import Http404
|
from django.http import Http404
|
||||||
from rest_framework.views import APIView
|
from rest_framework.views import APIView
|
||||||
|
@ -43,7 +43,7 @@ class ClassViewSet(viewsets.ModelViewSet):
|
||||||
API endpoint that allows users to be viewed or edited.
|
API endpoint that allows users to be viewed or edited.
|
||||||
"""
|
"""
|
||||||
queryset = Class.objects.all()
|
queryset = Class.objects.all()
|
||||||
serializer_class = ClassesSerializer
|
serializer_class = ClassSerializer
|
||||||
permission_Class = [permissions.IsAuthenticated, IsOwnerOrReadOnly]
|
permission_Class = [permissions.IsAuthenticated, IsOwnerOrReadOnly]
|
||||||
|
|
||||||
# def perform_create(self, serializer):
|
# def perform_create(self, serializer):
|
||||||
|
|
|
@ -12,6 +12,7 @@ from werkzeug.urls import url_decode
|
||||||
import pprint
|
import pprint
|
||||||
from PyInquirer import prompt, print_json
|
from PyInquirer import prompt, print_json
|
||||||
import json
|
import json
|
||||||
|
import datetime
|
||||||
import os
|
import os
|
||||||
import argparse
|
import argparse
|
||||||
import webbrowser
|
import webbrowser
|
||||||
|
@ -84,7 +85,7 @@ def studentCLI(user, password):
|
||||||
student.exitCLI()
|
student.exitCLI()
|
||||||
else:
|
else:
|
||||||
student.viewClass(course)
|
student.viewClass(course)
|
||||||
|
student.getAssignments(course, datetime.datetime.now())
|
||||||
|
|
||||||
def teacherCLI(user, password):
|
def teacherCLI(user, password):
|
||||||
from CLI import teacher
|
from CLI import teacher
|
||||||
|
@ -166,6 +167,10 @@ def getUser(ion_user, password):
|
||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
print(r.status_code)
|
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):
|
def getDB(url):
|
||||||
r = requests.get(url = url, auth=('raffukhondaker','hackgroup1'))
|
r = requests.get(url = url, auth=('raffukhondaker','hackgroup1'))
|
||||||
|
|
Loading…
Reference in New Issue
Block a user