-
Notifications
You must be signed in to change notification settings - Fork 15
Smp Integration #219
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Smp Integration #219
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
20d1ed2
SMP model created
CodePokeX 0671e07
SMP model created
CodePokeX 7fc36b1
SMP module added
CodePokeX e33e49f
Merge branch 'main' into SMP
CodePokeX 686e9f6
SMP module added
CodePokeX 8246820
Merge branch 'SMP' of github.com:CodePokeX/corpus into SMP
CodePokeX f0bc1e6
SMP Admin Page added
CodePokeX 63baf53
Review changes made
CodePokeX 5c37e62
Review changes made
CodePokeX 9cad919
Review changes made
CodePokeX 9b33901
Review changes made
CodePokeX 918dc38
Program card view abstract removed
CodePokeX 85db03b
Admin privelage on Uploads added
CodePokeX File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| from django.contrib import admin | ||
| from smp.models import Program | ||
| from smp.models import ProgramMember | ||
| from smp.models import Submission | ||
| from smp.models import Upload | ||
|
|
||
| # Register your models here. | ||
| admin.site.register(Program) | ||
| admin.site.register(ProgramMember) | ||
| admin.site.register(Upload) | ||
| admin.site.register(Submission) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| from django.urls import path | ||
| from smp import admin_views as views | ||
|
|
||
| urlpatterns = [ | ||
| path("dashboard/", views.dashboard, name="smp_admin_dashboard"), | ||
| path( | ||
| "program/<int:program_id>/add_members/", | ||
| views.add_members, | ||
| name="smp_admin_add_members", | ||
| ), | ||
| path("<int:program_id>/manage/", views.manage, name="smp_admin_manage"), | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| from accounts.models import ExecutiveMember | ||
| from accounts.models import User | ||
| from config.models import SIG | ||
| from django.contrib import messages | ||
| from django.contrib.auth.decorators import login_required | ||
| from django.db import IntegrityError | ||
| from django.db.models import Count | ||
| from django.shortcuts import get_object_or_404 | ||
| from django.shortcuts import redirect | ||
| from django.shortcuts import render | ||
| from smp.forms import AdminProgramMemberForm | ||
| from smp.forms import ProgramFilterForm | ||
| from smp.forms import ProgramForm | ||
| from smp.models import Program | ||
| from smp.models import ProgramMember | ||
|
|
||
| from corpus.decorators import ensure_group_membership | ||
|
|
||
|
|
||
| @login_required | ||
| @ensure_group_membership(group_names=["smp_coordinator"]) | ||
| def dashboard(request): | ||
| programs = Program.objects.all().order_by("-pk") | ||
|
|
||
| if request.method == "POST": | ||
| program_id = int(request.POST.get("program_id")) | ||
| action = request.POST.get("action") | ||
| program = get_object_or_404(Program, pk=program_id) | ||
|
|
||
| if action == "hide_program": | ||
| if not program.hide_program: | ||
| program.hide_program = True | ||
| program.save() | ||
| messages.success(request, "Program has been hidden.") | ||
| elif action == "show_program": | ||
| if program.hide_program: | ||
| program.hide_program = False | ||
| program.save() | ||
| messages.success(request, "Program is now visible.") | ||
| elif action == "delete_program": | ||
| program.delete() | ||
| messages.success(request, "Program has been deleted.") | ||
|
|
||
| return redirect("smp_admin_dashboard") | ||
|
|
||
| form = ProgramFilterForm(request.GET) | ||
| if form.is_valid(): | ||
| try: | ||
| sig = int(form.cleaned_data.get("sig")) | ||
| if sig == -1: | ||
| programs = programs.annotate( | ||
| sig_count=Count( | ||
| "programmember__member__executivemember__sig", distinct=True | ||
| ) | ||
| ).filter(sig_count__gte=2) | ||
| elif sig != 0: | ||
| sig_obj = SIG.objects.filter(pk=sig).first() | ||
| if sig_obj: | ||
| programs = programs.annotate( | ||
| sig_count=Count( | ||
| "programmember__member__executivemember__sig", distinct=True | ||
| ) | ||
| ).filter( | ||
| sig_count=1, programmember__member__executivemember__sig=sig_obj | ||
| ) | ||
| except (ValueError, TypeError): | ||
| pass | ||
|
|
||
| programs = programs.distinct() | ||
| args = {"programs": programs, "form": form} | ||
|
|
||
| return render(request, "smp/admin/dashboard.html", args) | ||
|
|
||
|
|
||
| @login_required | ||
| @ensure_group_membership(group_names=["smp_coordinator"]) | ||
| def add_members(request, program_id): | ||
| program = Program.objects.get(pk=program_id) | ||
| mentors = program.mentors() | ||
| mentees = program.mentees() | ||
|
|
||
| form = AdminProgramMemberForm(initial={"program": program}) | ||
|
|
||
| if request.method == "POST": | ||
| if "add" in request.POST: | ||
| form = AdminProgramMemberForm(request.POST) | ||
| form.instance.program = program | ||
| if form.is_valid(): | ||
| member = form.cleaned_data["member"] | ||
| member_type = form.cleaned_data["member_type"] | ||
|
|
||
| if member_type == "Mentor": | ||
| if not ExecutiveMember.objects.filter(user=member).exists(): | ||
| messages.error( | ||
| request, "Only Executive Members can be added as mentors." | ||
| ) | ||
| return redirect("smp_admin_add_members", program_id=program.id) | ||
|
|
||
| try: | ||
| form.save() | ||
| except IntegrityError: | ||
| messages.error(request, "Member already added to the program.") | ||
| return redirect("smp_admin_add_members", program_id=program.id) | ||
|
|
||
| messages.success(request, "Member added to program.") | ||
| return redirect("smp_admin_add_members", program_id=program.id) | ||
| elif "edit" in request.POST: | ||
| program_id = int(request.POST.get("program_id")) | ||
| member_id = int(request.POST.get("member_id")) | ||
| program = Program.objects.get(pk=program_id) | ||
| member = User.objects.get(pk=member_id) | ||
|
|
||
| try: | ||
| program_member = ProgramMember.objects.get( | ||
| program=program, member=member | ||
| ) | ||
| program_member.delete() | ||
| except ProgramMember.DoesNotExist: | ||
| messages.error(request, "Member does not exist for this program.") | ||
| return redirect("smp_admin_add_members", program_id=program.id) | ||
|
|
||
| messages.success(request, "Members edited in program.") | ||
| return redirect("smp_admin_add_members", program_id=program.id) | ||
|
|
||
| args = { | ||
| "form": form, | ||
| "mentors": mentors, | ||
| "mentees": mentees, | ||
| "program": program, | ||
| } | ||
|
|
||
| return render(request, "smp/admin/add_members.html", args) | ||
|
|
||
|
|
||
| @login_required | ||
| @ensure_group_membership(group_names=["smp_coordinator"]) | ||
| def manage(request, program_id): | ||
| program = Program.objects.get(pk=program_id) | ||
| form = ProgramForm(instance=program) | ||
|
|
||
| if request.method == "POST": | ||
| form = ProgramForm(request.POST, request.FILES, instance=program) | ||
| if form.is_valid(): | ||
| form.save() | ||
| messages.success(request, "Program updated successfully!") | ||
| return redirect("smp_admin_dashboard") | ||
|
|
||
| is_smp_coordinator = request.user.groups.filter(name="smp_coordinator").exists() | ||
|
|
||
| args = { | ||
| "program": program, | ||
| "form": form, | ||
| "admin": is_smp_coordinator, | ||
| } | ||
|
|
||
| return render(request, "smp/mentors/edit_program.html", args) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| from django.apps import AppConfig | ||
|
|
||
|
|
||
| class SmpConfig(AppConfig): | ||
| default_auto_field = "django.db.models.BigAutoField" | ||
| name = "smp" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| from accounts.models import User | ||
| from config.models import SIG | ||
| from django import forms | ||
| from smp.models import Program | ||
| from smp.models import ProgramMember | ||
| from smp.models import Submission | ||
| from smp.models import Upload | ||
|
|
||
| from corpus.forms import CorpusForm | ||
| from corpus.forms import CorpusModelForm | ||
|
|
||
|
|
||
| class ProgramFilterForm(CorpusForm): | ||
| sig = forms.ChoiceField(choices=[]) | ||
| year = forms.ChoiceField(choices=[], required=False) | ||
|
|
||
| def __init__(self, *args, **kwargs): | ||
| super(ProgramFilterForm, self).__init__(*args, **kwargs) | ||
|
|
||
| sig_choices = [(0, "All SIGs"), (-1, "Inter-SIG")] + list( | ||
| SIG.objects.values_list("id", "name") | ||
| ) | ||
| year_choices = [(0, "All Years")] + [ | ||
| (x, x) | ||
| for x in list(Program.objects.values_list("year", flat=True).distinct()) | ||
| ] | ||
|
|
||
| self.fields["sig"].choices = sig_choices | ||
| self.fields["year"].choices = year_choices | ||
|
|
||
|
|
||
| class ProgramForm(CorpusModelForm): | ||
| class Meta: | ||
| model = Program | ||
| fields = [ | ||
| "title", | ||
| "abstract", | ||
| "thumbnail", | ||
| "year", | ||
| "description", | ||
| "hide_program", | ||
| ] | ||
|
|
||
|
|
||
| class ProgramMemberForm(CorpusModelForm): | ||
| class Meta: | ||
| model = ProgramMember | ||
| fields = ["member"] | ||
|
|
||
| def __init__(self, *args, **kwargs): | ||
| super().__init__(*args, **kwargs) | ||
| executive_users = User.objects.filter(executivemember__isnull=False).distinct() | ||
| self.fields["member"].queryset = executive_users | ||
|
|
||
|
|
||
| class UploadForm(CorpusModelForm): | ||
| class Meta: | ||
| model = Upload | ||
| fields = ["title", "upload_type", "content"] | ||
|
|
||
|
|
||
| class SubmissionForm(CorpusModelForm): | ||
| class Meta: | ||
| model = Submission | ||
| fields = ["title", "link"] | ||
|
|
||
|
|
||
| class AdminProgramMemberForm(CorpusModelForm): | ||
| class Meta: | ||
| model = ProgramMember | ||
| fields = ["member", "member_type"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| from django.urls import path | ||
| from smp import mentor_views as views | ||
|
|
||
| urlpatterns = [ | ||
| path("dashboard/", views.dashboard, name="smp_mentors_dashboard"), | ||
| path("program/new/", views.new_program, name="smp_mentors_new_program"), | ||
| path( | ||
| "program/<int:program_id>/edit/", | ||
| views.edit_program, | ||
| name="smp_mentors_edit_program", | ||
| ), | ||
| path( | ||
| "program/<int:program_id>/add_members/", | ||
| views.add_members, | ||
| name="smp_mentors_add_members", | ||
| ), | ||
| path( | ||
| "program/<int:program_id>/upload/", | ||
| views.uploads, | ||
| name="smp_mentors_add_upload", | ||
| ), | ||
| ] | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.