Skip to content

Commit

Permalink
reformatted
Browse files Browse the repository at this point in the history
  • Loading branch information
Tyler Iams authored and Tyler Iams committed Aug 24, 2019
1 parent 304e2f2 commit b5c6db7
Show file tree
Hide file tree
Showing 11 changed files with 153 additions and 59 deletions.
6 changes: 5 additions & 1 deletion attendance/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@

urlpatterns = [
path("", views.attendance, name="attendance"),
path("take_attendance/<course_id>/<date>/", views.take_attendance, name="take_attendance"),
path(
"take_attendance/<course_id>/<date>/",
views.take_attendance,
name="take_attendance",
),
path(
"notify_absent_students/",
views.notify_absent_students,
Expand Down
5 changes: 1 addition & 4 deletions attendance/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@ def attendance(request):

@group_required_multiple(["staff", "teacher"])
def take_attendance(request, course_id, date):
context = take_attendance_context(
course_id,
date,
)
context = take_attendance_context(course_id, date)
return render(request, "attendance.html", context)


Expand Down
2 changes: 1 addition & 1 deletion context_processors.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


def user_groups(request):
user_groups = set(request.user.groups.all().values_list('name', flat=True))
user_groups = set(request.user.groups.all().values_list("name", flat=True))
return {"user_groups": user_groups}


Expand Down
4 changes: 2 additions & 2 deletions home/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class Meta:
"which_best_describes_your_ethnicity",
"race",
"gender",
"expected_graduation_year"
"expected_graduation_year",
]


Expand All @@ -94,7 +94,7 @@ class Meta:
"first_name",
"last_name",
"password1",
"password2"
"password2",
]


Expand Down
78 changes: 58 additions & 20 deletions home/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,27 @@ def register_as_student(request):
)
return redirect("login")
else:
return render(request, "home/register.html", {"user_form": user_form,
"contact_form": contact_form,
"registration_type": "student"})
return render(
request,
"home/register.html",
{
"user_form": user_form,
"contact_form": contact_form,
"registration_type": "student",
},
)
else:
user_form = UserRegisterForm()
contact_form = ContactRegisterForm()
return render(request, "home/register.html", {"user_form": user_form,
"contact_form": contact_form,
"registration_type": "student"})
return render(
request,
"home/register.html",
{
"user_form": user_form,
"contact_form": contact_form,
"registration_type": "student",
},
)


def register_as_volunteer(request):
Expand All @@ -133,15 +145,27 @@ def register_as_volunteer(request):
)
return redirect("login")
else:
return render(request, "home/register.html", {"user_form": user_form,
"contact_form": contact_form,
"registration_type": "volunteer"})
return render(
request,
"home/register.html",
{
"user_form": user_form,
"contact_form": contact_form,
"registration_type": "volunteer",
},
)
else:
user_form = UserRegisterForm()
contact_form = ContactRegisterForm()
return render(request, "home/register.html", {"user_form": user_form,
"contact_form": contact_form,
"registration_type": "volunteer"})
return render(
request,
"home/register.html",
{
"user_form": user_form,
"contact_form": contact_form,
"registration_type": "volunteer",
},
)


def register_as_donor(request):
Expand All @@ -157,15 +181,27 @@ def register_as_donor(request):
)
return redirect("login")
else:
return render(request, "home/register.html", {"user_form": user_form,
"contact_form": contact_form,
"registration_type": "donor"})
return render(
request,
"home/register.html",
{
"user_form": user_form,
"contact_form": contact_form,
"registration_type": "donor",
},
)
else:
user_form = UserRegisterForm()
contact_form = ContactRegisterForm()
return render(request, "home/register.html", {"user_form": user_form,
"contact_form": contact_form,
"registration_type": "donor"})
return render(
request,
"home/register.html",
{
"user_form": user_form,
"contact_form": contact_form,
"registration_type": "donor",
},
)


def create_django_user(request, form, group):
Expand All @@ -189,6 +225,8 @@ def create_contact(request, user_form, contact_form, title):
title=title,
owner=User.objects.filter(is_active=True).first(),
race=contact_form.cleaned_data.get("race"),
which_best_describes_your_ethnicity=contact_form.cleaned_data.get("which_best_describes_your_ethnicity"),
gender=contact_form.cleaned_data.get("gender")
which_best_describes_your_ethnicity=contact_form.cleaned_data.get(
"which_best_describes_your_ethnicity"
),
gender=contact_form.cleaned_data.get("gender"),
)
6 changes: 4 additions & 2 deletions missionbit/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@
TEMPLATES = [
{
"BACKEND": "django.template.backends.django.DjangoTemplates",
"DIRS": [os.path.join(BASE_DIR, 'static/html'),
os.path.join(BASE_DIR, "html/")],
"DIRS": [
os.path.join(BASE_DIR, "static/html"),
os.path.join(BASE_DIR, "html/"),
],
"APP_DIRS": True,
"OPTIONS": {
"context_processors": [
Expand Down
20 changes: 15 additions & 5 deletions staff/staff_views_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -518,14 +518,24 @@ def get_course_attendance_statistic(course_id):

def get_my_announcements(request, group):
return AnnouncementDistribution.objects.filter(
announcement__in=(Announcement.objects.filter(
recipient_groups__in=Group.objects.filter(name=group)
) | Announcement.objects.filter(recipient_classrooms__in=[get_classroom_by_django_user(request.user)])), dismissed=False
announcement__in=(
Announcement.objects.filter(
recipient_groups__in=Group.objects.filter(name=group)
)
| Announcement.objects.filter(
recipient_classrooms__in=[get_classroom_by_django_user(request.user)]
)
),
dismissed=False,
)


def get_my_forms(request, group):
return FormDistribution.objects.filter(
form__in=Form.objects.filter(recipient_groups__in=Group.objects.filter(name=group)) |
Form.objects.filter(recipient_classrooms__in=[get_classroom_by_django_user(request.user)])
form__in=Form.objects.filter(
recipient_groups__in=Group.objects.filter(name=group)
)
| Form.objects.filter(
recipient_classrooms__in=[get_classroom_by_django_user(request.user)]
)
)
8 changes: 6 additions & 2 deletions staff/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@
name="communication_manager",
),
path("curriculum/", views.curriculum, name="curriculum"),
path("modify_session/<date>/<classroom>", views.modify_session, name="modify_session"),
path(
"modify_session/<date>/<classroom>", views.modify_session, name="modify_session"
),
path("add_forum/", views.add_forum, name="add_forum"),
path("classroom_detail/<course_id>", views.classroom_detail, name="classroom_detail"),
path(
"classroom_detail/<course_id>", views.classroom_detail, name="classroom_detail"
),
]
59 changes: 45 additions & 14 deletions staff/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,13 @@ def classroom_management(request):
return render(
request,
"classroom_management.html",
{"classrooms": classroom_list, "class_dicts": class_dict,
"user_groups": set(request.user.groups.all().values_list('name', flat=True))},
{
"classrooms": classroom_list,
"class_dicts": class_dict,
"user_groups": set(
request.user.groups.all().values_list("name", flat=True)
),
},
)


Expand All @@ -80,11 +85,27 @@ def create_staff_user(request):
messages.add_message(request, messages.SUCCESS, "Staff User Created")
return redirect("staff")
else:
return render(request, "create_staff_user.html", {"form": form,
"user_groups": set(request.user.groups.all().values_list('name', flat=True))})
return render(
request,
"create_staff_user.html",
{
"form": form,
"user_groups": set(
request.user.groups.all().values_list("name", flat=True)
),
},
)
form = CreateStaffForm()
return render(request, "create_staff_user.html", {"form": form,
"user_groups": set(request.user.groups.all().values_list('name', flat=True))})
return render(
request,
"create_staff_user.html",
{
"form": form,
"user_groups": set(
request.user.groups.all().values_list("name", flat=True)
),
},
)


@group_required("staff")
Expand Down Expand Up @@ -139,8 +160,7 @@ def create_classroom(request):
if form.is_valid():
setup_classroom(request, form)
messages.success(
request,
f'{form.cleaned_data.get("course")} Successfully Created',
request, f'{form.cleaned_data.get("course")} Successfully Created'
)
return redirect("staff")
else:
Expand Down Expand Up @@ -334,7 +354,9 @@ def create_esign(request):
created_by=DjangoUser.objects.get(id=request.user.id),
)
esign.save()
messages.add_message(request, messages.SUCCESS, "Esign Created Successfully")
messages.add_message(
request, messages.SUCCESS, "Esign Created Successfully"
)
return redirect("staff")
else:
return render(request, "create_esign.html", {"form": form})
Expand All @@ -357,7 +379,9 @@ def add_forum(request):
return redirect("staff")
else:
classroom = Classroom.objects.get(id=request.GET.get("classroom"))
return render(request, "add_forum.html", {"form": form, "classroom": classroom})
return render(
request, "add_forum.html", {"form": form, "classroom": classroom}
)
classroom = Classroom.objects.get(id=request.GET.get("classroom"))
form = AddForumForm()
return render(request, "add_forum.html", {"form": form, "classroom": classroom})
Expand Down Expand Up @@ -386,13 +410,20 @@ def modify_session(request, date=None, classroom=None):
classroom_id=request.GET.get("classroom"),
date=get_date_from_template_returned_string(request.GET.get("date")),
)
return render(request, "modify_session.html", {"form": form, "date": date, "classroom": classroom, "session": session})
return render(
request,
"modify_session.html",
{
"form": form,
"date": date,
"classroom": classroom,
"session": session,
},
)
form = AddCurriculumForm()
date = date
course = Classroom.objects.get(id=classroom)
session = Session.objects.get(
classroom=classroom,
date=date)
session = Session.objects.get(classroom=classroom, date=date)
return render(
request,
"modify_session.html",
Expand Down
16 changes: 12 additions & 4 deletions tests/test_home.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def create_valid_user_and_contact_form(
"title": "Staff",
"race": "White",
"which_best_describes_your_ethnicity": "Hispanic/Latinx",
"gender": "Female"
"gender": "Female",
}

def create_valid_contact_form(self):
Expand Down Expand Up @@ -208,7 +208,10 @@ def test_register_after_oauth(self):

def test_register_as_student_post(self):
self.client.force_login(self.create_user())
response = self.client.post(reverse("home-register_as_student"), self.create_valid_user_and_contact_form())
response = self.client.post(
reverse("home-register_as_student"),
self.create_valid_user_and_contact_form(),
)
Contact.objects.get(client_id="tesuse19010101").delete()
self.assertEqual(
DjangoUser.objects.filter(first_name="test").first().first_name, "test"
Expand All @@ -227,7 +230,10 @@ def test_register_as_volunteer(self):

def test_register_as_volunteer_post(self):
self.client.force_login(self.create_user())
response = self.client.post(reverse("home-register_as_volunteer"), self.create_valid_user_and_contact_form())
response = self.client.post(
reverse("home-register_as_volunteer"),
self.create_valid_user_and_contact_form(),
)
Contact.objects.get(client_id="tesuse19010101").delete()
self.assertEqual(
DjangoUser.objects.filter(first_name="test").first().first_name, "test"
Expand All @@ -246,7 +252,9 @@ def test_register_as_donor(self):

def test_register_as_donor_post(self):
self.client.force_login(self.create_user())
response = self.client.post(reverse("home-register_as_donor"), self.create_valid_user_and_contact_form())
response = self.client.post(
reverse("home-register_as_donor"), self.create_valid_user_and_contact_form()
)
Contact.objects.get(client_id="tesuse19010101").delete()
self.assertEqual(
DjangoUser.objects.filter(first_name="test").first().first_name, "test"
Expand Down
Loading

0 comments on commit b5c6db7

Please sign in to comment.