Added Teams Page

corpus/accounts/admin.py

@@ -3,6 +3,8 @@
 
 from .models import ExecutiveMember
 from .models import User
+from .models import Faculty
+from .models import Core
 
 # Register your models here.
 
@@ -67,7 +69,7 @@ class ExecutiveMemberAdmin(admin.ModelAdmin):
         ),
         (
             "IEEE Related Details",
-            {"fields": ("ieee_number", "ieee_email")},
+            {"fields": ("ieee_number", "ieee_email", "profile_picture")},
         ),
         ("Socials", {"fields": ("linkedin", "github")}),
     )
@@ -81,6 +83,14 @@ class ExecutiveMemberAdmin(admin.ModelAdmin):
     )
     ordering = ("user",)
 
+class CoreAdmin(admin.ModelAdmin):
+    list_display = ("user", "sig", "post", "term_start")
+
+class FacultyAdmin(admin.ModelAdmin):
+    list_display = ("user", "sig", "post", "term_start")
+
 
 admin.site.register(User, CorpusUserAdmin)
 admin.site.register(ExecutiveMember, ExecutiveMemberAdmin)
+admin.site.register(Core, CoreAdmin)
+admin.site.register(Faculty, FacultyAdmin)

corpus/accounts/migrations/0003_executivemember_profile_picture_and_more.py

@@ -0,0 +1,104 @@
+# Generated by Django 4.2.7 on 2024-02-29 12:37
+import datetime
+
+import django.db.models.deletion
+import django.utils.timezone
+from django.conf import settings
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("config", "0004_sig_society_sigs"),
+        ("accounts", "0002_alter_user_email_alter_user_phone_no_executivemember"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="executivemember",
+            name="profile_picture",
+            field=models.ImageField(
+                blank=True, null=True, upload_to="execmember/profile_picture"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="executivemember",
+            name="date_joined",
+            field=models.DateTimeField(
+                default=datetime.datetime(2024, 2, 29, 18, 7, 3, 350454),
+                verbose_name="Date Joined",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="executivemember",
+            name="github",
+            field=models.CharField(
+                blank=True, max_length=200, null=True, verbose_name="GitHub Username"
+            ),
+        ),
+        migrations.CreateModel(
+            name="Faculty",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("post", models.CharField(max_length=100)),
+                ("term_start", models.DateField(default=django.utils.timezone.now)),
+                ("term_end", models.DateField(null=True)),
+                (
+                    "sig",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="config.sig"
+                    ),
+                ),
+                (
+                    "user",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name_plural": "faculties",
+            },
+        ),
+        migrations.CreateModel(
+            name="Core",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("post", models.CharField(max_length=100)),
+                ("term_start", models.DateField(default=django.utils.timezone.now)),
+                ("term_end", models.DateField(null=True)),
+                (
+                    "sig",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="config.sig"
+                    ),
+                ),
+                (
+                    "user",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+        ),
+    ]

corpus/accounts/models.py

@@ -4,6 +4,7 @@
 from django.contrib.auth.base_user import BaseUserManager
 from django.contrib.auth.models import AbstractUser
 from django.db import models
+from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 
 from .validators import validate_ieee_email
@@ -135,13 +136,16 @@ class ExecutiveMember(models.Model):
         blank=True, null=True, verbose_name="Linkedin Profile URL"
     )
 
+    profile_picture = models.ImageField(
+        blank=True, null=True, upload_to="accounts/executivemember/profile_picture"
+    )
     # TODO: Phase out with GitHub OAuth details
     github = models.CharField(
         max_length=200, blank=True, null=True, verbose_name="GitHub Username"
     )
     is_nep = models.BooleanField(default=False, verbose_name="Is NEP Member?")
     date_joined = models.DateTimeField(
-        default=datetime.now(), verbose_name="Date Joined"
+        verbose_name="Date Joined", default=datetime.now()
     )
 
     def save(self, *args, **kwargs):
@@ -151,3 +155,22 @@ def save(self, *args, **kwargs):
 
     def __str__(self):
         return f"{self.user.first_name} {self.user.last_name} [{self.sig.name}]"
+
+
+class Core(models.Model):
+    user = models.OneToOneField(User, null=False, on_delete=models.CASCADE)
+    post = models.CharField(max_length=100, null=False)
+    sig = models.ForeignKey(SIG, null=False, on_delete=models.CASCADE)
+    term_start = models.DateField(default=now, null=False)
+    term_end = models.DateField(null=True)
+
+
+class Faculty(models.Model):
+    class Meta:
+        verbose_name_plural = "faculties"
+
+    user = models.OneToOneField(User, null=False, on_delete=models.CASCADE)
+    sig = models.ForeignKey(SIG, null=False, on_delete=models.CASCADE)
+    post = models.CharField(max_length=100, null=False)
+    term_start = models.DateField(default=now, null=False)
+    term_end = models.DateField(null=True)

corpus/corpus/urls.py

@@ -17,6 +17,8 @@
 from django.contrib import admin
 from django.urls import include
 from django.urls import path
+from django.conf import settings
+from django.conf.urls.static import static
 
 urlpatterns = [
     path("admin/", admin.site.urls),
@@ -28,3 +30,5 @@
     path("skyward_expedition/", include("skyward_expedition.urls")),
     path("robotrix/", include("robotrix.urls")),
 ]
+
+urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

corpus/pages/urls.py

@@ -6,4 +6,5 @@
     path("", views.index, name="index"),
     path("about_us/", views.about_us, name="about_us"),
     path("sig/<str:sig_name>/", views.sig, name="sig"),
+    path("team/", views.team, name="team"),
 ]

corpus/pages/views.py

@@ -1,5 +1,9 @@
+from accounts.models import Core
+from accounts.models import ExecutiveMember
+from accounts.models import Faculty
 from config.models import SIG
 from config.models import Society
+from django.db.models import Q
 from django.shortcuts import get_object_or_404
 from django.shortcuts import render
 
@@ -41,3 +45,38 @@ def sig(request, sig_name):
     }
 
     return render(request, "pages/sig.html", args)
+
+
+def team(request):
+    compsoc_members = ExecutiveMember.objects.filter(
+        (Q(core__isnull=True) | Q(core=None))
+        & (Q(user__faculty__isnull=True) | Q(user__faculty=None))
+        & Q(sig__name="CompSoc")
+    )
+    diode_members = ExecutiveMember.objects.filter(
+        (Q(core__isnull=True) | Q(core=None))
+        & (Q(user__faculty__isnull=True) | Q(user__faculty=None))
+        & Q(sig__name="Diode")
+    )
+    piston_members = ExecutiveMember.objects.filter(
+        (Q(core__isnull=True) | Q(core=None))
+        & (Q(user__faculty__isnull=True) | Q(user__faculty=None))
+        & Q(sig__name="Piston")
+    )
+    ieee_core = Core.objects.filter(sig__name="ExeCom").order_by("post")
+    compsoc_core = Core.objects.filter(sig__name="CompSoc").order_by("post")
+    diode_core = Core.objects.filter(sig__name="Diode").order_by("post")
+    piston_core = Core.objects.filter(sig__name="Piston").order_by("post")
+
+    faculty = Faculty.objects.all()
+    context = {
+        "compsoc_members": compsoc_members,
+        "diode_members": diode_members,
+        "piston_members": piston_members,
+        "ieee_core": ieee_core,
+        "compsoc_core": compsoc_core,
+        "diode_core": diode_core,
+        "piston_core": piston_core,
+        "faculty": faculty,
+    }
+    return render(request, "pages/team.html", context)

corpus/templates/components/navbar_large.html

@@ -9,6 +9,7 @@
     <div class="navbar-center">
         <a href="{% url 'index' %}" class="btn btn-ghost normal-case text-lg">Home</a>
         <a href="{% url 'about_us' %}" class="btn btn-ghost normal-case text-lg">About Us</a>
+        <a href="{% url 'team'%}" class="btn btn-ghost normal-case text-lg"> Team </a>
         <div class="dropdown">
             <label tabindex="0" class="btn btn-ghost normal-case text-lg">
                 SIGs