Team page #149

yukitya-1811 · 2024-05-08T18:35:27Z

Description

Add Team Page

Adding a team page to display faculty advisors, core members and executive members of all SIGs (including CompSoc, Diode, Piston and ExeCom)
Adding Core and Faculty model in accounts/models.py

(Closed PR for reference - #134)
(Closed PR for reference - #141)
Fixes #139

Type of Change

What types of changes does your code introduce?
Put an x in the boxes that apply

New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
This change requires a documentation update

… Members. Also added proper sequential loading of Core Members

This reverts commit 4cd43dd.

Co-authored-by: Nishant Nayak <66667161+nishant-nayak@users.noreply.github.com>

This reverts commit 61aba1f.

This reverts commit 829451d, reversing changes made to 61aba1f.

…sers

This reverts commit 7b08624.

render · 2024-05-08T18:35:31Z

Your Render PR Server URL is https://corpus-dev-pr-149.onrender.com.

Follow its progress at https://dashboard.render.com/web/srv-cotsbsgl6cac73cj0rng.

corpus/accounts/migrations/0004_alter_executivemember_date_joined.py

corpus/accounts/migrations/0005_alter_executivemember_date_joined_and_more.py

corpus/accounts/models.py

anirudhprabhakaran3 · 2024-05-09T03:35:48Z

corpus/accounts/models.py

+
+class Core(models.Model):
+
+    POST_CHOICES = (


As discussed on call, any reason for this? I think it'll be better to make another model or something called Post and have a ForeignKey linking to that table.

right, would the mapping remain the same for the core posts then? Like rn I'm having a POST_CHOICES which maps every core post to a number, according to which the core posts are fetched and displayed. So can I move this exact logic to the Post model when I create it?

anirudhprabhakaran3 · 2024-05-09T03:36:44Z

corpus/accounts/models.py

+    class Meta:
+        verbose_name_plural = "faculties"
+
+    FACULTY_POSTS = (


This could also go into the Post model. Then no need to differentiate by like faculty posts and stuff

Nope. I would like Faculty to be in a different model. Core members have to be Executive Members, Faculty will only be Users. The foreign key references will be different.

Also, access control in the future will be much easier if we have these models separate.

corpus/impulse/views.py

anirudhprabhakaran3 · 2024-05-09T03:50:26Z

corpus/pages/views.py

+
+def team(request):
+    compsoc_members = ExecutiveMember.objects.filter(
+        (Q(core__isnull=True) | Q(core=None))


I don't think you've made ExecutiveMember.core as an association right? I think this is what this query does?

I have made a Core.executivemember relation. Again since every Core member has a user model associated, i'm just checking that we do not fetch such users

anirudhprabhakaran3 · 2024-05-09T03:50:40Z

corpus/pages/views.py

+def team(request):
+    compsoc_members = ExecutiveMember.objects.filter(
+        (Q(core__isnull=True) | Q(core=None))
+        & (Q(user__faculty__isnull=True) | Q(user__faculty=None))


User does not have faculty

No but faculty can have a user, right? So I'm just checking that the user I'm fetching does not have a faculty linked to it

anirudhprabhakaran3 · 2024-05-09T03:51:12Z

corpus/pages/views.py

+        & (Q(user__faculty__isnull=True) | Q(user__faculty=None))
+        & Q(sig__name="Piston")
+    )
+    ieee_core = Core.objects.filter(sig__name="ExeCom").order_by("post")


We can't add ExeCom as a SIG, it is both wrong logically, and will mess up both current and future code

I'm not really sure how else to identify ExeCom members then.
As Executive Members, their SIG will only be one of CompSoc/Diode/Piston.
As Core Members, they can only be part of CompSoc/Diode/Piston/SAC/ExeCom. All these 5 categories have to be displayed separately.

Maybe sig isn't the best name for the attribute in the Core model, but this is logically correct.

What I have done in the newest changes is include 2 attributes. is_execom and is_sac which helps us pick out executive committee and sac members without compromising their actual sigs

anirudhprabhakaran3 · 2024-05-09T03:54:03Z

corpus/pages/views.py

+        & (Q(user__faculty__isnull=True) | Q(user__faculty=None))
+        & Q(sig__name="CompSoc")
+    )
+    diode_members = ExecutiveMember.objects.filter(


Two things you can do to solve this:

Duplicate core members in the members list. This is fine, as although they are in core, they are still members, so should be okay.

Get all the core posts, and then remove those from all the members in that SIG.

Also, you'll have to make sure that you query for this particular year. You can probably make a configuration where you define what the current academic year is, and then use that for queries to get "current" people.

Can I like check if their term_end is null or not? If term_end is null, then display, otherwise don't?

anirudhprabhakaran3 · 2024-05-09T03:55:11Z

I think we'll have to sit and rewrite the team page view function to make sure we cover all edge cases and stuff.

… (safety commit)

yukitya-1811 and others added 30 commits May 8, 2024 23:52

Added tab component and styled it appropriately

1b74e6e

Basic HTML for Team Page done

8444015

Added profile_picture to ExecutiveMember model

86d134d

Finalized HTML for Faculty and Member separation on each sig tab

b63753e

Finished section separation within each sig tab for Faculty, Core and…

21f06b0

… Members. Also added proper sequential loading of Core Members

Added logic to fetch coremember pfp from execmember

1cbbfcb

Fixed light mode colours

393a8b2

Finished layout for member cards and buttons

2b2c602

Fixed minor issue (Piston members being loaded in Diode members section)

2448232

Formatted code for better readability

1f25a8d

Fixed centering of tablist issue (Finally)

0957689

Added links to all Github and Linkedin buttons

0f96a94

Added proper verbose_name_plural for Faculty

f3d8796

After pre commit hooks

e540e5e

Revert "Added links to all Github and Linkedin buttons"

ec7265c

This reverts commit 4cd43dd.

Resolving conflicts #1

d831b7f

Add Team link to small navbar

301a96d

DB fix commit

7764e60

Made pre-commit changes

2394e7e

Added default pfp png

b44baa4

Made requested changes

f1debe5

Finished faculty website buttons

5b05494

Added checks for links belonging to Faculty model

c7bb70a

Cleaned up migrations

110917f

Changed upload folder for profile pictures to accounts/executivemember

6d446bd

Co-authored-by: Nishant Nayak <66667161+nishant-nayak@users.noreply.github.com>

Update corpus/pages/urls.py

1639e76

Co-authored-by: Nishant Nayak <66667161+nishant-nayak@users.noreply.github.com>

Revert "Added checks for links belonging to Faculty model"

bbd88ca

This reverts commit 61aba1f.

Revert "Fixed conflicts"

a00ee2c

This reverts commit 829451d, reversing changes made to 61aba1f.

Fixed html issues and query logic

98c6858

Fixed html indentation and member fetching query to exclude faculty u…

8ef8c1b

…sers

yukitya-1811 added 7 commits May 8, 2024 23:58

Change upload directory of profile pictures

e049df2

Add core post to string representation

90f109f

Minor change in path string for teampage

d3443fa

Squash migrations

11eea97

Add dummydata

8136437

Revert "Add dummydata"

90227bd

This reverts commit 7b08624.

Change migration dependencies

dc2db60

yukitya-1811 requested a review from anirudhprabhakaran3 May 8, 2024 18:35

anirudhprabhakaran3 requested changes May 9, 2024

View reviewed changes

yukitya-1811 added 5 commits May 13, 2024 23:05

Fix migration files

fb6707e

Add new migration file for Faculty, Core models

e56b127

Minor changes

49ea960

Change views.py logic and change models to facilitate better fetching…

228392c

… (safety commit)

Squash migrations

d51e36b

nishant-nayak self-requested a review May 27, 2024 15:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Team page #149

Team page #149

yukitya-1811 commented May 8, 2024

render bot commented May 8, 2024

anirudhprabhakaran3 May 9, 2024

yukitya-1811 May 13, 2024

anirudhprabhakaran3 May 9, 2024

nishant-nayak May 31, 2024

anirudhprabhakaran3 May 9, 2024

yukitya-1811 May 13, 2024

anirudhprabhakaran3 May 9, 2024

yukitya-1811 May 13, 2024

anirudhprabhakaran3 May 9, 2024

nishant-nayak May 31, 2024

yukitya-1811 May 31, 2024

anirudhprabhakaran3 May 9, 2024

yukitya-1811 May 13, 2024

anirudhprabhakaran3 commented May 9, 2024

Team page #149

Are you sure you want to change the base?

Team page #149

Conversation

yukitya-1811 commented May 8, 2024

Description

Type of Change

render bot commented May 8, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anirudhprabhakaran3 commented May 9, 2024