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/0004_executivemember_profile_picture_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.7 on 2024-01-26 20:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0003_alter_executivemember_date_joined'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='executivemember',
+            name='profile_picture',
+            field=models.ImageField(blank=True, null=True, upload_to=''),
+        ),
+        migrations.AlterField(
+            model_name='executivemember',
+            name='date_joined',
+            field=models.DateTimeField(verbose_name='Date Joined'),
+        ),
+    ]

corpus/accounts/models.py

@@ -135,13 +135,16 @@ class ExecutiveMember(models.Model):
         blank=True, null=True, verbose_name="Linkedin Profile URL"
     )
 
+    profile_picture = models.ImageField(
+        blank=True, null=True, upload_to="execmember/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 +154,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=datetime.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=datetime.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,8 +1,12 @@
 from config.models import SIG
 from config.models import Society
+from accounts.models import Core
+from accounts.models import Faculty
+from accounts.models import ExecutiveMember
 from django.shortcuts import get_object_or_404
 from django.shortcuts import render
-
+from django.db.models import Q
+from django.db.models import Case, When, Value, CharField
 
 def index(request):
     # Get all societies to render on landing page Societies section
@@ -41,3 +45,126 @@ def sig(request, sig_name):
     }
 
     return render(request, "pages/sig.html", args)
+
+
+def team(request):
+    members = ExecutiveMember.objects.filter(
+    Q(user__core__isnull=True) | Q(user__core=None)
+)
+    ieee_core_posts = [
+        "Convenor", 
+        "Chairperson", 
+        "Vice Chairperson",
+        "Secretary",
+        "Joint Secretary",
+        "Treasurer(Branch)",
+        "Treasurer(Institute)",
+        "Webmaster",
+        "Media Lead",
+        "Outreach Lead",
+        "Envision Lead",
+        "Labs Lead",  
+        ]
+
+
+    compsoc_core_posts = [
+        "CompSoc Chair",
+        "CompSoc Vice Chair",
+        "CompSoc Secretary",
+        "CompSoc Project Head",
+        "CompSoc Project Coordinator",
+        "CIS Chair",
+        "CIS Secretary",
+        "CIS Project Head",
+
+    ]
+
+    diode_core_posts = [
+        "Diode Chair",
+        "SPS Chair",
+        "SPS Vice Chair",
+        "SPS Secretary",
+        "CAS Chair",
+        "CAS Vice Chair",
+        "CAS Secretary",
+        "RAS Chair",
+        "RAS Secretary",
+    ]
+
+    piston_core_posts = [
+        "Piston Chair",
+        "Piston Vice Chair",
+        "Piston Secretary",
+        "Piston Project Head",
+        "IAS Chair",
+        "IAS Secretary",
+    ]
+
+    ieee_core = Core.objects.filter(post__in=ieee_core_posts).order_by(
+        Case(
+            When(post="Convenor", then=Value(1)),
+            When(post="Chairperson", then=Value(2)),
+            When(post="Vice Chairperson", then=Value(3)),
+            When(post="Secretary", then=Value(4)),
+            When(post="Joint Secretary", then=Value(5)),
+            When(post="Treasurer(Branch)", then=Value(6)),
+            When(post="Treasurer(Institute)", then=Value(7)),
+            When(post="Webmaster", then=Value(8)),
+            When(post="Media Lead", then=Value(9)),
+            When(post="Outreach Lead", then=Value(10)),
+            When(post="Envision Lead", then=Value(11)),
+            When(post="Labs Lead", then=Value(12)),
+            When(post="WiE Chair", then=Value(13)),
+        )
+    )
+
+    compsoc_core = Core.objects.filter(post__in=compsoc_core_posts).order_by(
+        Case(
+            When(post="CompSoc Chair", then=Value(1)),
+            When(post="CompSoc Vice Chair", then=Value(2)),
+            When(post="CompSoc Secretary", then=Value(3)),
+            When(post="CompSoc Project Head", then=Value(4)),
+            When(post="CompSoc Project Coordinator", then=Value(5)),
+            When(post="CIS Chair", then=Value(6)),
+            When(post="CIS Secretary", then=Value(7)),
+            When(post="CIS Project Head", then=Value(8)),
+            When(post="Webmaster", then=Value(9)),
+        )
+    )
+
+    diode_core = Core.objects.filter(post__in=diode_core_posts).order_by(
+        Case(
+            When(post="Diode Chair", then=Value(1)),
+            When(post="SPS Chair", then=Value(2)),
+            When(post="SPS Vice Chair", then=Value(3)),
+            When(post="SPS Secretary", then=Value(4)),
+            When(post="CAS Chair", then=Value(5)),
+            When(post="CAS Vice Chair", then=Value(6)),
+            When(post="CAS Secretary", then=Value(7)),
+            When(post="RAS Chair", then=Value(8)),
+            When(post="RAS Secretary", then=Value(9)),
+        )
+    )
+
+    piston_core = Core.objects.filter(post__in=piston_core_posts).order_by(
+        Case(
+            When(post="Piston Chair", then=Value(1)),
+            When(post="Piston Vice Chair", then=Value(2)),
+            When(post="Piston Secretary", then=Value(3)),
+            When(post="Piston Project Head", then=Value(4)),
+            When(post="IAS Chair", then=Value(5)),
+            When(post="IAS Secretary", then=Value(6)),
+        )
+    ) 
+
+
+    faculty = Faculty.objects.all()
+    context = {
+        "members":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