Revert "Calendar frontend (#313)" (#315)

This reverts commit ee127b8.

backend/Pipfile

@@ -10,16 +10,15 @@ flake8 = "*"
 flake8-absolute-import = "*"
 flake8-isort = "*"
 flake8-quotes = "*"
-django-debug-toolbar = "3.2.4"
+django-debug-toolbar = "*"
 django-extensions = "*"
 parameterized = "*"
 tblib = "*"
 
 [packages]
 dj-database-url = "*"
 djangorestframework = "*"
-psycopg2 = "==2.9.6"
-uvloop = "==0.17.0"
+psycopg2 = "*"
 sentry-sdk = "*"
 django = "==3.1.7"
 django-cors-headers = "*"
@@ -41,7 +40,7 @@ channels = "<3"
 channels-redis = "*"
 uvicorn = {extras = ["standard"],version = "*"}
 gunicorn = "*"
-django-schedules-ohq = "*"
+django-scheduler = "*"
 typing-extensions = "*"
 drf-excel = "*"
 

backend/ohq/permissions.py

@@ -453,7 +453,6 @@ def has_permission(self, request, view):
 
             course = Course.objects.get(pk=course_pk)
             membership = Membership.objects.filter(course=course, user=request.user).first()
-
             if membership is None:
                 return False
             return membership.is_ta

backend/ohq/serializers.py

@@ -481,7 +481,7 @@ class RuleSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Rule
-        fields = ("frequency", "params")
+        fields = ("frequency",)
 
 
 class EventSerializer(serializers.ModelSerializer):
@@ -491,7 +491,7 @@ class EventSerializer(serializers.ModelSerializer):
     All times are converted to UTC+0
     """
 
-    rule = RuleSerializer(allow_null=True, required=False)
+    rule = RuleSerializer(required=False)
     course_id = serializers.IntegerField(required=False)
 
     class Meta:
@@ -501,7 +501,6 @@ class Meta:
             "start",
             "end",
             "title",
-            "location",
             "description",
             "rule",
             "end_recurring_period",
@@ -526,43 +525,27 @@ def update(self, instance, validated_data):
             )
             or (
                 "rule" in validated_data
-                and (
-                    rule is None
-                    or validated_data["rule"] is None
-                    or rule.frequency != validated_data["rule"]["frequency"]
-                    or rule.params != validated_data["rule"]["params"]
-                )
+                and (rule is None or rule.frequency != validated_data["rule"]["frequency"])
             )
         ):
             if "rule" in validated_data:
-                if validated_data["rule"] is None:
-                    rule = None
-                else:
-                    rule, _ = Rule.objects.get_or_create(
-                        frequency=validated_data["rule"]["frequency"],
-                        params=validated_data["rule"]["params"],
-                    )
+                rule, _ = Rule.objects.get_or_create(frequency=validated_data["rule"]["frequency"])
                 validated_data.pop("rule")
+            Occurrence.objects.filter(event=instance).delete()
 
-        if "rule" in validated_data:
-            validated_data.pop("rule")
         # can never change course_id, client should create a new event instead
         validated_data.pop("course_id")
-
         super().update(instance, validated_data)
 
         instance.rule = rule
         instance.save()
-
-        Occurrence.objects.filter(event=instance).delete()
-
         return instance
 
     def create(self, validated_data):
         course = Course.objects.get(pk=validated_data["course_id"])
         rule = None
-        if "rule" in validated_data and validated_data["rule"] is not None:
-            rule, _ = Rule.objects.get_or_create(frequency=validated_data["rule"]["frequency"], params = validated_data["rule"]["params"])
+        if "rule" in validated_data:
+            rule, _ = Rule.objects.get_or_create(frequency=validated_data["rule"]["frequency"])
             validated_data.pop("rule")
 
         validated_data.pop("course_id")
@@ -590,4 +573,4 @@ class OccurrenceSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Occurrence
-        fields = ("id", "title", "description", "location", "start", "end", "cancelled", "event")
+        fields = ("id", "title", "description", "start", "end", "cancelled", "event")

backend/ohq/views.py

@@ -1,4 +1,3 @@
-from http.client import HTTPResponse
 import math
 import re
 from datetime import datetime, timedelta