Merge pull request #513 from diwash007/revamp

Revamp to support extended timelines

Author: botanicvelious

Diff for: gsoc/admin.py

@@ -1,10 +1,12 @@
 from .models import *
 from .forms import (
+    GeneratorForm,
+    GsocEndDateStandardForm,
+    GsocStartDateForm,
     ArticleReviewForm,
     UserProfileForm,
     UserDetailsForm,
     RegLinkForm,
-    BlogPostDueDateForm,
     EventForm,
     GsocEndDateForm,
 )
@@ -351,8 +353,15 @@ class HiddenUserProfileAdmin(admin.ModelAdmin):
         "gsoc_year",
         "role",
         "github_handle",
+        "gsoc_end"
+    )
+    list_filter = (
+        "role",
+        "gsoc_invited",
+        "suborg_full_name",
+        "gsoc_end",
+        "gsoc_year"
     )
-    list_filter = ("role", "gsoc_invited", "suborg_full_name", "gsoc_year")
     readonly_fields = (
         "user",
         "role",
@@ -371,6 +380,7 @@ class HiddenUserProfileAdmin(admin.ModelAdmin):
                     "user",
                     "role",
                     "gsoc_year",
+                    "gsoc_end",
                     "accepted_proposal_pdf",
                     "proposal_confirmed",
                     "blog_link",
@@ -567,23 +577,57 @@ def short_data(self, obj):
 
 class BlogPostDueDateInline(admin.TabularInline):
     model = BlogPostDueDate
-    form = BlogPostDueDateForm
+    fields = ("title", "category", "date")
+    readonly_fields = ("title", "category", "date")
+
+    def has_add_permission(self, request, obj=None):
+        return False
+
+    def has_change_permission(self, request, obj=None):
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        return False
 
 
 class EventInline(admin.TabularInline):
     model = Event
     form = EventForm
+    extra = 1
 
 
 class GsocEndDateInline(admin.TabularInline):
     model = GsocEndDate
     form = GsocEndDateForm
 
 
+class GsocStartDateInline(admin.TabularInline):
+    model = GsocStartDate
+    form = GsocStartDateForm
+
+
+class GsocEndDateStandardInline(admin.TabularInline):
+    model = GsocEndDateDefault
+    form = GsocEndDateStandardForm
+
+
+class GeneratorInline(admin.TabularInline):
+    model = Generator
+    form = GeneratorForm
+    max_num = 2
+
+
 class TimelineAdmin(admin.ModelAdmin):
     list_display = ("gsoc_year",)
     exclude = ("calendar_id",)
-    inlines = (BlogPostDueDateInline, EventInline, GsocEndDateInline)
+    inlines = (
+        EventInline,
+        GsocStartDateInline,
+        GsocEndDateStandardInline,
+        GsocEndDateInline,
+        GeneratorInline,
+        BlogPostDueDateInline
+    )
 
 
 admin.site.register(Timeline, TimelineAdmin)

Diff for: gsoc/common/utils/build_tasks.py

@@ -1,11 +1,23 @@
+from datetime import datetime, timedelta
 import json
 import uuid
-
-from django.utils import timezone
 from django.conf import settings
 
-from gsoc.models import (Event, GsocEndDate, Timeline, UserProfile, GsocYear,
-                         BlogPostDueDate, Scheduler, ReaddUser)
+from django.utils import timezone
+from gsoc.settings import ADMINS
+
+from gsoc.models import (
+    DaysConf,
+    Event,
+    GsocEndDate,
+    GsocEndDateDefault,
+    GsocStartDate, Timeline,
+    UserProfile,
+    GsocYear,
+    BlogPostDueDate,
+    Scheduler,
+    ReaddUser
+)
 from gsoc.common.utils.tools import build_send_mail_json
 
 from googleapiclient.discovery import build
@@ -17,7 +29,11 @@ def build_pre_blog_reminders(builder):
         data = json.loads(builder.data)
         due_date = BlogPostDueDate.objects.get(pk=data["due_date_pk"])
         gsoc_year = GsocYear.objects.first()
-        profiles = UserProfile.objects.filter(gsoc_year=gsoc_year, role=3).all()
+        profiles = UserProfile.objects.filter(
+            gsoc_year=gsoc_year,
+            role=3,
+            gsoc_end__gte=due_date.date
+        ).all()
         categories = ((0, "Weekly Check-In"), (1, "Blog Post"))
         category = categories[due_date.category][1]
         for profile in profiles:
@@ -57,7 +73,11 @@ def build_post_blog_reminders(builder):
         category = categories[due_date.category][1]
 
         gsoc_year = GsocYear.objects.first()
-        profiles = UserProfile.objects.filter(gsoc_year=gsoc_year, role=3).all()
+        profiles = UserProfile.objects.filter(
+            gsoc_year=gsoc_year,
+            role=3,
+            gsoc_end__gte=due_date.date
+            ).all()
         for profile in profiles:
             if profile.current_blog_count > blogs_count and not (
                 profile.hidden or profile.reminder_disabled
@@ -67,13 +87,19 @@ def build_post_blog_reminders(builder):
                 suborg_admins = UserProfile.objects.filter(
                     suborg_full_name=suborg, role=1
                 )
+                POST_BLOG_REMINDER_FIRST = DaysConf.objects.get(title="POST_BLOG_REMINDER_FIRST")
+                POST_BLOG_REMINDER_SECOND = DaysConf.objects.get(title="POST_BLOG_REMINDER_SECOND")
 
                 activation_date = builder.activation_date.date()
 
-                if activation_date - due_date.date == timezone.timedelta(days=1):
+                if activation_date - due_date.date == timezone.timedelta(
+                    days=POST_BLOG_REMINDER_FIRST.days
+                ):
                     student_template = "first_post_blog_reminder_student.html"
 
-                elif activation_date - due_date.date == timezone.timedelta(days=3):
+                elif activation_date - due_date.date == timezone.timedelta(
+                    days=POST_BLOG_REMINDER_SECOND.days
+                ):
                     student_template = "second_post_blog_reminder_student.html"
 
                     mentors_emails = ["[email protected]"]
@@ -250,33 +276,189 @@ def build_add_event_to_calendar(builder):
 
 def build_add_end_to_calendar(builder):
     data = json.loads(builder.data)
-    try:
-        creds = getCreds()
-        if creds:
-            service = build("calendar", "v3", credentials=creds, cache_discovery=False)
-            event = {
-                "summary": data["title"],
-                "start": {"date": data["date"]},
-                "end": {"date": data["date"]},
-            }
-            cal_id = builder.timeline.calendar_id if builder.timeline else "primary"
-            if not data["event_id"]:
-                event = (
-                    service.events()
-                    .insert(calendarId=cal_id, body=event)
-                    .execute()
-                )
-                item = GsocEndDate.objects.get(id=data["id"])
-                item.event_id = event.get("id")
-                item.save()
-            else:
-                service.events().update(
-                    calendarId=cal_id, eventId=data["event_id"], body=event
-                ).execute()
+    creds = getCreds()
+    if creds:
+        service = build("calendar", "v3", credentials=creds, cache_discovery=False)
+        event = {
+            "summary": data["title"],
+            "start": {"date": data["date"]},
+            "end": {"date": data["date"]},
+        }
+        cal_id = builder.timeline.calendar_id if builder.timeline else "primary"
+        if not data["event_id"]:
+            event = (
+                service.events()
+                .insert(calendarId=cal_id, body=event)
+                .execute()
+            )
+            item = GsocEndDate.objects.get(id=data["id"])
+            item.event_id = event.get("id")
+            item.save()
         else:
-            raise Exception(
-                f"Please get the Access Token: " +
-                f"{settings.OAUTH_REDIRECT_URI + 'authorize'}"
+            service.events().update(
+                calendarId=cal_id, eventId=data["event_id"], body=event
+            ).execute()
+    else:
+        raise Exception(
+            f"Please get the Access Token: " +
+            f"{settings.OAUTH_REDIRECT_URI + 'authorize'}"
+        )
+
+
+def build_add_start_to_calendar(builder):
+    data = json.loads(builder.data)
+    creds = getCreds()
+    if creds:
+        service = build("calendar", "v3", credentials=creds, cache_discovery=False)
+        event = {
+            "summary": data["title"],
+            "start": {"date": data["date"]},
+            "end": {"date": data["date"]},
+        }
+        cal_id = builder.timeline.calendar_id if builder.timeline else "primary"
+        if not data["event_id"]:
+            event = (
+                service.events()
+                .insert(calendarId=cal_id, body=event)
+                .execute()
             )
-    except Exception as e:
-        return str(e)
+            item = GsocStartDate.objects.get(id=data["id"])
+            item.event_id = event.get("id")
+            item.save()
+        else:
+            service.events().update(
+                calendarId=cal_id, eventId=data["event_id"], body=event
+            ).execute()
+    else:
+        raise Exception(
+            f"Please get the Access Token: " +
+            f"{settings.OAUTH_REDIRECT_URI + 'authorize'}"
+        )
+
+
+def build_add_end_standard_to_calendar(builder):
+    data = json.loads(builder.data)
+    creds = getCreds()
+    if creds:
+        service = build("calendar", "v3", credentials=creds, cache_discovery=False)
+        event = {
+            "summary": data["title"],
+            "start": {"date": data["date"]},
+            "end": {"date": data["date"]},
+        }
+        cal_id = builder.timeline.calendar_id if builder.timeline else "primary"
+        if not data["event_id"]:
+            event = (
+                service.events()
+                .insert(calendarId=cal_id, body=event)
+                .execute()
+            )
+            item = GsocEndDateDefault.objects.get(id=data["id"])
+            item.event_id = event.get("id")
+            item.save()
+        else:
+            service.events().update(
+                calendarId=cal_id, eventId=data["event_id"], body=event
+            ).execute()
+    else:
+        raise Exception(
+            f"Please get the Access Token: " +
+            f"{settings.OAUTH_REDIRECT_URI + 'authorize'}"
+        )
+
+
+def build_evaluation_reminder(builder):
+    data = json.loads(builder.data)
+    gsoc_year = GsocYear.objects.latest('gsoc_year')
+    start_date = GsocStartDate.objects.latest('date')
+    start_date = start_date.date
+    exam_date = datetime.strptime(data["exam_date"], "%Y-%m-%d").date()
+    is_midterm = data["Midterm"]
+
+    gsoc_end = exam_date
+    if is_midterm:
+        gsoc_end = start_date + 2 * (exam_date - start_date) + timedelta(days=7-1)
+
+    # 4 days before
+    notify_date = exam_date - timedelta(days=4)
+
+    tl_users = UserProfile.objects.filter(
+        gsoc_year=gsoc_year,
+        role=3,
+        gsoc_end=gsoc_end
+    ).all()
+
+    tl_suborg = [user.suborg_full_name for user in tl_users]
+
+    profiles = UserProfile.objects.filter(
+        suborg_full_name__in=tl_suborg,
+        role__in=[1, 2]
+    )
+
+    for profile in profiles:
+        template_data = {
+            "date": str(exam_date),
+        }
+
+        scheduler_data = build_send_mail_json(
+            profile.user.email,
+            template="exam_reminder.html",
+            subject=f"Evaluation Due Reminder",
+            template_data=template_data,
+        )
+
+        Scheduler.objects.create(
+            command="send_email",
+            data=scheduler_data,
+            activation_date=notify_date
+        )
+
+    # 2 days before
+    notify_date = exam_date - timedelta(days=2)
+
+    tl_users = UserProfile.objects.filter(
+        gsoc_year=gsoc_year,
+        role=3,
+        gsoc_end=gsoc_end
+    ).all()
+
+    tl_suborg = [user.suborg_full_name for user in tl_users]
+
+    profiles = UserProfile.objects.filter(
+        suborg_full_name__in=tl_suborg,
+        role__in=[1, 2]
+    )
+
+    for profile in profiles:
+        template_data = {
+            "date": str(exam_date),
+        }
+
+        scheduler_data = build_send_mail_json(
+            profile.user.email,
+            template="exam_reminder.html",
+            subject=f"Evaluation Due Reminder",
+            template_data=template_data,
+        )
+
+        Scheduler.objects.create(
+            command="send_email",
+            data=scheduler_data,
+            activation_date=notify_date
+        )
+
+    template_data = {
+        "date": str(exam_date),
+    }
+
+    scheduler_data = build_send_mail_json(
+        ADMINS,
+        template="exam_reminder.html",
+        subject="Evaluation Due Reminder",
+        template_data=template_data,
+    )
+    Scheduler.objects.create(
+        command="send_email",
+        data=scheduler_data,
+        activation_date=notify_date
+    )