- Hello {% if mentor.user.first_name %}{{ mentor.user.first_name }}{% else %}there friend{% endif %}! + Hello {% if mentor.first_name %}{{ mentor.first_name }}{% else %}there friend{% endif %}!
We're super excited to have you join our ranks. Before you come to your first mentor session, we need to take care of a few things.
-
- {% if not mentor.user.first_name or not mentor.user.last_name %}
+ {% if not mentor.first_name or not mentor.last_name %}
- Enter full name. {% endif %} @@ -50,7 +50,7 @@
- {{ mentor.full_name }} +
Your Profile
{% if mentor.avatar and not mentor.avatar_approved %} Pending Approval {% endif %} -
+
diff --git a/accounts/tests.py b/accounts/tests.py
index 7ce503c2..a39b155a 100644
--- a/accounts/tests.py
+++ b/accounts/tests.py
@@ -1,3 +1 @@
-from django.test import TestCase
-
# Create your tests here.
diff --git a/accounts/urls.py b/accounts/urls.py
index 52226cb7..4cc97268 100644
--- a/accounts/urls.py
+++ b/accounts/urls.py
@@ -4,8 +4,8 @@
from .views import AccountHomeView, LoginView, SignupView
urlpatterns = [
- path('', AccountHomeView.as_view(), name='account_home'),
- path('login/', LoginView.as_view(), name='account_login'),
- path('signup/', SignupView.as_view(), name='account_signup'),
- path('', include('allauth.urls')),
+ path("", AccountHomeView.as_view(), name="account_home"),
+ path("login/", LoginView.as_view(), name="account_login"),
+ path("signup/", SignupView.as_view(), name="account_signup"),
+ path("", include("allauth.urls")),
]
diff --git a/accounts/views.py b/accounts/views.py
index 1c4900c4..138da6d7 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -11,14 +11,7 @@
from meta.views import MetadataMixin
from coderdojochi.forms import CDCModelForm, GuardianForm, MentorForm
-from coderdojochi.models import (
- Guardian,
- MeetingOrder,
- Mentor,
- MentorOrder,
- Order,
- Student,
-)
+from coderdojochi.models import Guardian, MeetingOrder, Mentor, MentorOrder, Order, Student
class SignupView(MetadataMixin, AllAuthSignupView):
@@ -50,7 +43,7 @@ class LoginView(MetadataMixin, AllAuthLoginView):
@method_decorator(login_required, name="dispatch")
class AccountHomeView(MetadataMixin, TemplateView):
title = "My Account | We All Code"
-
+
def dispatch(self, *args, **kwargs):
if not self.request.user.role:
if "next" in self.request.GET:
@@ -67,9 +60,10 @@ def dispatch(self, *args, **kwargs):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
- context["highlight"] = (
- self.request.GET["highlight"] if "highlight" in self.request.GET else False
- )
+ if "highlight" in self.request.GET:
+ context["highlight"] = self.request.GET["highlight"]
+ else:
+ context["highlight"] = False
context["user"] = self.request.user
@@ -85,16 +79,17 @@ def get_context_data_for_mentor(self):
mentor = get_object_or_404(Mentor, user=self.request.user)
orders = MentorOrder.objects.select_related().filter(
- is_active=True, mentor=mentor,
+ is_active=True,
+ mentor=mentor,
)
- upcoming_sessions = orders.filter(
- is_active=True, session__start_date__gte=timezone.now()
- ).order_by("session__start_date")
+ upcoming_sessions = orders.filter(is_active=True, session__start_date__gte=timezone.now()).order_by(
+ "session__start_date"
+ )
- past_sessions = orders.filter(
- is_active=True, session__start_date__lte=timezone.now()
- ).order_by("session__start_date")
+ past_sessions = orders.filter(is_active=True, session__start_date__lte=timezone.now()).order_by(
+ "session__start_date"
+ )
meeting_orders = MeetingOrder.objects.select_related().filter(mentor=mentor)
@@ -107,8 +102,8 @@ def get_context_data_for_mentor(self):
account_complete = False
if (
- mentor.user.first_name
- and mentor.user.last_name
+ mentor.first_name
+ and mentor.last_name
and mentor.avatar
and mentor.background_check
and past_sessions.count() > 0
@@ -119,7 +114,7 @@ def get_context_data_for_mentor(self):
"mentor": mentor,
"orders": orders,
"upcoming_sessions": upcoming_sessions,
- "past_sessions": upcoming_sessions,
+ "past_sessions": past_sessions,
"meeting_orders": meeting_orders,
"upcoming_meetings": upcoming_meetings,
"account_complete": account_complete,
@@ -128,16 +123,23 @@ def get_context_data_for_mentor(self):
def get_context_data_for_guardian(self):
guardian = get_object_or_404(Guardian, user=self.request.user)
- students = Student.objects.filter(is_active=True, guardian=guardian,)
+ students = Student.objects.filter(
+ is_active=True,
+ guardian=guardian,
+ )
- student_orders = Order.objects.filter(student__in=students,)
+ student_orders = Order.objects.filter(
+ student__in=students,
+ )
upcoming_orders = student_orders.filter(
- is_active=True, session__start_date__gte=timezone.now(),
+ is_active=True,
+ session__start_date__gte=timezone.now(),
).order_by("session__start_date")
past_orders = student_orders.filter(
- is_active=True, session__start_date__lte=timezone.now(),
+ is_active=True,
+ session__start_date__lte=timezone.now(),
).order_by("session__start_date")
return {
@@ -185,9 +187,7 @@ def post_for_mentor(self, **kwargs):
form = MentorForm(self.request.POST, self.request.FILES, instance=mentor)
- user_form = CDCModelForm(
- self.request.POST, self.request.FILES, instance=mentor.user
- )
+ user_form = CDCModelForm(self.request.POST, self.request.FILES, instance=mentor.user)
if form.is_valid() and user_form.is_valid():
form.save()
@@ -227,4 +227,3 @@ def post_for_guardian(self, **kwargs):
context["user_form"] = user_form
return render(self.request, "account/guardian/home.html", context)
-
diff --git a/coderdojochi/__init__.py b/coderdojochi/__init__.py
index 42934929..bd844805 100644
--- a/coderdojochi/__init__.py
+++ b/coderdojochi/__init__.py
@@ -1 +1 @@
-default_app_config = 'coderdojochi.apps.CoderDojoChiConfig'
+default_app_config = "coderdojochi.apps.CoderDojoChiConfig"
diff --git a/coderdojochi/admin.py b/coderdojochi/admin.py
index e7489342..3ea8de17 100644
--- a/coderdojochi/admin.py
+++ b/coderdojochi/admin.py
@@ -12,7 +12,7 @@
from import_export.admin import ImportExportActionModelAdmin, ImportExportMixin
from import_export.fields import Field
-from coderdojochi.models import (
+from .models import (
Course,
Donation,
Equipment,
@@ -36,68 +36,69 @@
@admin.register(User)
class UserAdmin(ImportExportActionModelAdmin):
list_display = [
- 'email',
- 'first_name',
- 'last_name',
- 'role_link',
- 'date_joined',
- 'last_login',
- 'is_active',
- 'is_staff',
- 'is_superuser',
+ "email",
+ "first_name",
+ "last_name",
+ "role_link",
+ "date_joined",
+ "last_login",
+ "is_active",
+ "is_staff",
+ "is_superuser",
]
list_filter = [
- 'role',
- 'is_active',
- 'is_staff',
- 'date_joined',
+ "role",
+ "is_active",
+ "is_staff",
+ "date_joined",
]
ordering = [
- '-date_joined',
+ "-date_joined",
]
- date_hierarchy = 'date_joined'
+ date_hierarchy = "date_joined"
search_fields = [
- 'first_name',
- 'last_name',
- 'email',
+ "first_name",
+ "last_name",
+ "email",
]
filter_horizontal = [
- 'groups',
- 'user_permissions',
+ "groups",
+ "user_permissions",
]
readonly_fields = [
- 'password',
- 'last_login',
+ "password",
+ "last_login",
]
view_on_site = False
- change_form_template = 'loginas/change_form.html'
+ change_form_template = "loginas/change_form.html"
def role_link(self, obj):
- if obj.role == 'mentor':
+ if obj.role == "mentor":
return format_html(
'{role}',
- url=reverse('admin:coderdojochi_mentor_changelist'),
+ url=reverse("admin:coderdojochi_mentor_changelist"),
query=obj.email,
role=obj.role,
)
- elif obj.role == 'guardian':
+ elif obj.role == "guardian":
return format_html(
'{role}',
- url=reverse('admin:coderdojochi_guardian_changelist'),
+ url=reverse("admin:coderdojochi_guardian_changelist"),
query=obj.email,
role=obj.role,
)
return obj.role
- role_link.short_description = 'Role'
+
+ role_link.short_description = "Role"
@admin.register(Mentor)
@@ -105,48 +106,48 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
list_per_page = 50
list_display = [
- 'first_name',
- 'last_name',
- 'user_link',
- 'mentor_count_link',
- 'created_at',
- 'updated_at',
- 'is_active',
- 'is_public',
- 'background_check',
- 'avatar_approved',
+ "first_name",
+ "last_name",
+ "user_link",
+ "mentor_count_link",
+ "created_at",
+ "updated_at",
+ "is_active",
+ "is_public",
+ "background_check",
+ "avatar_approved",
]
list_filter = [
- 'is_active',
- 'is_public',
- 'background_check',
- 'avatar_approved',
+ "is_active",
+ "is_public",
+ "background_check",
+ "avatar_approved",
]
list_select_related = [
- 'user',
+ "user",
]
ordering = [
- '-created_at',
+ "-created_at",
]
- date_hierarchy = 'created_at'
+ date_hierarchy = "created_at"
search_fields = [
- 'user__first_name',
- 'user__last_name',
- 'user__username',
- 'user__email',
+ "user__first_name",
+ "user__last_name",
+ "user__username",
+ "user__email",
]
readonly_fields = [
- 'mentor_count_link',
+ "mentor_count_link",
]
autocomplete_fields = [
- 'user',
+ "user",
]
def view_on_site(self, obj):
@@ -171,61 +172,58 @@ def get_queryset(self, request):
def mentor_count_link(self, obj):
return format_html(
'{count}',
- url=reverse('admin:coderdojochi_mentororder_changelist'),
+ url=reverse("admin:coderdojochi_mentororder_changelist"),
query=obj.id,
count=obj.mentororder__count,
)
- mentor_count_link.short_description = 'Orders'
- mentor_count_link.admin_order_field = 'mentororder__count'
+
+ mentor_count_link.short_description = "Orders"
+ mentor_count_link.admin_order_field = "mentororder__count"
def user_link(self, obj):
return format_html(
'{user}',
- url=reverse('admin:coderdojochi_cdcuser_change', args=(obj.user.id,)),
+ url=reverse("admin:coderdojochi_cdcuser_change", args=(obj.user.id,)),
user=obj.user,
)
- user_link.short_description = 'User'
+
+ user_link.short_description = "User"
class GuardianImportResource(resources.ModelResource):
- first_name = Field(attribute='first_name', column_name='first_name')
- last_name = Field(attribute='last_name', column_name='last_name')
- email = Field(attribute='email', column_name='email')
- phone = Field(attribute='phone', column_name='phone')
- zip = Field(attribute='zip', column_name='zip')
+ first_name = Field(attribute="first_name", column_name="first_name")
+ last_name = Field(attribute="last_name", column_name="last_name")
+ email = Field(attribute="email", column_name="email")
+ phone = Field(attribute="phone", column_name="phone")
+ zip = Field(attribute="zip", column_name="zip")
def get_or_init_instance(self, instance_loader, row):
"""
Either fetches an already existing instance or initializes a new one.
"""
try:
- instance = User.objects.get(email=row['email'])
+ instance = User.objects.get(email=row["email"])
except User.DoesNotExist:
return Guardian(user=User()), True
else:
return (Guardian.objects.get(user=instance), False)
def import_obj(self, obj, data, dry_run):
- first_name = data.get('first_name')
- last_name = data.get('last_name')
- email = data.get('email')
- zip = data.get('zip')
- phone = data.get('phone')
if obj.pk:
user = obj.user
else:
user = User(
- first_name=first_name,
- last_name=last_name,
- email=email,
- role='guardian',
- username=email,
+ first_name=data.get("first_name"),
+ last_name=data.get("last_name"),
+ email=data.get("email"),
+ role="guardian",
+ username=data.get("email"),
)
obj.user = user
obj.is_active = False
- obj.zip = zip
- obj.phone = phone
+ obj.zip = data.get("zip")
+ obj.phone = data.get("phone")
if not dry_run:
user.save()
obj.user = user
@@ -234,11 +232,11 @@ def import_obj(self, obj, data, dry_run):
class Meta:
model = Guardian
import_id_fields = [
- 'phone',
+ "phone",
]
fields = [
- 'phone',
- 'zip',
+ "phone",
+ "zip",
]
@@ -247,39 +245,39 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
list_per_page = 10
list_display = [
- 'first_name',
- 'last_name',
- 'student_count_link',
- 'user_link',
- 'created_at',
- 'updated_at',
+ "first_name",
+ "last_name",
+ "student_count_link",
+ "user_link",
+ "created_at",
+ "updated_at",
]
list_filter = [
- 'zip',
+ "zip",
]
list_select_related = [
- 'user',
+ "user",
]
search_fields = [
- 'user__first_name',
- 'user__last_name',
- 'user__username',
- 'user__email',
- 'phone',
+ "user__first_name",
+ "user__last_name",
+ "user__username",
+ "user__email",
+ "phone",
]
readonly_fields = [
- 'student_count_link',
+ "student_count_link",
]
autocomplete_fields = [
- 'user',
+ "user",
]
- date_hierarchy = 'created_at'
+ date_hierarchy = "created_at"
view_on_site = False
@@ -289,90 +287,85 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
def get_queryset(self, request):
qs = super(GuardianAdmin, self).get_queryset(request)
qs = qs.select_related()
- qs = qs.annotate(
- student_count=Count('student')
- ).order_by('-student_count')
+ qs = qs.annotate(student_count=Count("student")).order_by("-student_count")
return qs
def user_link(self, obj):
return format_html(
'{name}',
- url=reverse('admin:coderdojochi_cdcuser_change', args=(obj.user.id,)),
+ url=reverse("admin:coderdojochi_cdcuser_change", args=(obj.user.id,)),
name=obj.user,
)
- user_link.short_description = 'User'
+
+ user_link.short_description = "User"
def student_count_link(self, obj):
return format_html(
'{count}',
- url=reverse('admin:coderdojochi_student_changelist'),
+ url=reverse("admin:coderdojochi_student_changelist"),
query=obj.id,
count=obj.student_count,
)
- student_count_link.short_description = 'Students'
- student_count_link.admin_order_field = 'student_count'
+
+ student_count_link.short_description = "Students"
+ student_count_link.admin_order_field = "student_count"
class StudentResource(resources.ModelResource):
first_name = Field(
- attribute='first_name',
- column_name='first_name',
+ attribute="first_name",
+ column_name="first_name",
)
last_name = Field(
- attribute='last_name',
- column_name='last_name',
+ attribute="last_name",
+ column_name="last_name",
)
guardian_email = Field(
- attribute='guardian_email',
- column_name='guardian_email',
+ attribute="guardian_email",
+ column_name="guardian_email",
)
birthday = Field(
- attribute='birthday',
- column_name='birthday',
+ attribute="birthday",
+ column_name="birthday",
)
gender = Field(
- attribute='gender',
- column_name='gender',
+ attribute="gender",
+ column_name="gender",
)
school_name = Field(
- attribute='school_name',
- column_name='school_name',
+ attribute="school_name",
+ column_name="school_name",
)
school_type = Field(
- attribute='school_type',
- column_name='school_type',
+ attribute="school_type",
+ column_name="school_type",
)
photo_release = Field(
- attribute='photo_release',
- column_name='photo_release',
+ attribute="photo_release",
+ column_name="photo_release",
)
consent = Field(
- attribute='consent',
- column_name='consent',
+ attribute="consent",
+ column_name="consent",
)
def import_obj(self, obj, data, dry_run):
- guardian_email = data.get('guardian_email')
-
- obj.first_name = data.get('first_name')
- obj.last_name = data.get('last_name')
- obj.birthday = datetime.strptime(
- data.get('birthday', ''),
- '%m/%d/%Y'
- )
- obj.gender = data.get('gender', '')
- obj.school_name = data.get('school_name', '')
- obj.school_type = data.get('school_type', '')
- obj.photo_release = strtobool(data.get('photo_release', ''))
- obj.consent = strtobool(data.get('consent', ''))
+ guardian_email = data.get("guardian_email")
+
+ obj.first_name = data.get("first_name")
+ obj.last_name = data.get("last_name")
+ obj.birthday = datetime.strptime(data.get("birthday", ""), "%m/%d/%Y")
+ obj.gender = data.get("gender", "")
+ obj.school_name = data.get("school_name", "")
+ obj.school_type = data.get("school_type", "")
+ obj.photo_release = strtobool(data.get("photo_release", ""))
+ obj.consent = strtobool(data.get("consent", ""))
obj.is_active = True
try:
obj.guardian = Guardian.objects.get(user__email=guardian_email)
except Guardian.DoesNotExist:
- raise ImportError(
- f'guardian with email {guardian_email} not found'
- )
+ raise ImportError(f"guardian with email {guardian_email} not found")
if not dry_run:
obj.save()
@@ -380,12 +373,12 @@ def import_obj(self, obj, data, dry_run):
class Meta:
model = Student
import_id_fields = [
- 'first_name',
- 'last_name',
+ "first_name",
+ "last_name",
]
fields = [
- 'first_name',
- 'last_name',
+ "first_name",
+ "last_name",
]
@@ -394,40 +387,40 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
list_per_page = 10
list_display = [
- 'first_name',
- 'last_name',
- 'gender',
- 'get_clean_gender',
- 'guardian_link',
- 'order_count_link',
- 'get_age',
- 'is_active',
+ "first_name",
+ "last_name",
+ "gender",
+ "get_clean_gender",
+ "guardian_link",
+ "order_count_link",
+ "get_age",
+ "is_active",
]
list_filter = [
- 'gender',
+ "gender",
]
filter_horizontal = [
- 'race_ethnicity',
+ "race_ethnicity",
]
ordering = [
- 'guardian',
+ "guardian",
]
search_fields = [
- 'first_name',
- 'last_name',
- 'guardian__user__first_name',
- 'guardian__user__last_name',
+ "first_name",
+ "last_name",
+ "guardian__user__first_name",
+ "guardian__user__last_name",
]
autocomplete_fields = [
- 'guardian',
+ "guardian",
]
- date_hierarchy = 'created_at'
+ date_hierarchy = "created_at"
view_on_site = False
@@ -435,8 +428,8 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
resource_class = StudentResource
readonly_fields = [
- 'guardian_link',
- 'order_count_link',
+ "guardian_link",
+ "order_count_link",
]
def get_queryset(self, request):
@@ -459,22 +452,23 @@ def get_queryset(self, request):
def guardian_link(self, obj):
return format_html(
- '{first} {last}',
+ '{name}',
url=reverse("admin:coderdojochi_guardian_change", args=(obj.guardian.id,)),
- first=obj.guardian.user.first_name,
- last=obj.guardian.user.last_name,
+ name=obj.guardian.full_name,
)
- guardian_link.short_description = 'Guardian'
+
+ guardian_link.short_description = "Guardian"
def order_count_link(self, obj):
return format_html(
'{count}',
- url=reverse('admin:coderdojochi_order_changelist'),
+ url=reverse("admin:coderdojochi_order_changelist"),
student=obj.id,
count=obj.order__count,
)
- order_count_link.short_description = 'Orders'
- order_count_link.admin_order_field = 'order__count'
+
+ order_count_link.short_description = "Orders"
+ order_count_link.admin_order_field = "order__count"
@admin.register(Course)
@@ -482,29 +476,33 @@ class CourseAdmin(ImportExportMixin, ImportExportActionModelAdmin):
list_per_page = 50
list_display = [
- 'code',
- 'title',
- 'course_type',
- 'duration',
+ "code",
+ "title",
+ "course_type",
+ "duration",
]
list_filter = [
- 'is_active',
- 'code',
- 'course_type',
- 'duration',
+ "is_active",
+ "code",
+ "course_type",
+ "duration",
]
ordering = [
- 'code',
- 'created_at',
+ "code",
+ "created_at",
]
search_fields = [
- 'title',
- 'description',
+ "title",
+ "description",
]
+ prepopulated_fields = {
+ "slug": ("title",),
+ }
+
view_on_site = False
@@ -513,105 +511,113 @@ class SessionAdmin(ImportExportMixin, ImportExportActionModelAdmin):
list_per_page = 10
list_display = [
- '_course',
- 'start_date',
- # 'end_date',
- 'location',
- 'capacity',
- 'student_count_link',
- 'mentor_count_link',
- 'is_active',
- 'is_public',
- 'is_guardian_announced',
+ "_course",
+ "start_date",
+ "location",
+ "capacity",
+ "student_count_link",
+ "mentor_count_link",
+ "is_active",
+ "is_public",
+ "is_guardian_announced",
]
list_filter = [
- 'is_active',
- 'is_public',
- 'course__code',
- 'course__title',
- 'location',
+ "is_active",
+ "is_public",
+ "course__code",
+ "course__title",
+ "location",
]
list_select_related = [
- 'course',
- 'location',
- 'instructor',
+ "course",
+ "location",
+ "instructor",
]
ordering = [
- '-start_date',
+ "-start_date",
]
filter_horizontal = [
- 'waitlist_mentors',
- 'waitlist_students',
+ "waitlist_mentors",
+ "waitlist_students",
]
- autocomplete_fields = [
- # 'course',
- # 'location',
- # 'instructor',
- ]
+ # autocomplete_fields = [
+ # 'course',
+ # 'location',
+ # 'instructor',
+ # ]
- search_fields = [
- 'start_date'
- ]
+ search_fields = ["start_date"]
- date_hierarchy = 'start_date'
+ date_hierarchy = "start_date"
fieldsets = (
- (None, {
- # 'classes': ('collapse',),
- 'fields': (
- 'course',
- 'location',
- 'start_date',
- # 'old_end_date',
- # 'old_mentor_start_date',
- # 'old_mentor_end_date',
- 'capacity',
- 'mentor_capacity',
- 'instructor',
- 'is_active',
- 'is_public',
- ),
- }),
- ('Zoom', {
- 'fields': (
- 'online_video_link',
- 'online_video_meeting_id',
- 'online_video_meeting_password',
- # 'online_video_description',
- ),
- }),
- ('Overrides', {
- # 'classes': ('collapse',),
- 'fields': (
- 'override_minimum_age_limitation',
- 'override_maximum_age_limitation',
- 'gender_limitation',
- 'cost',
- 'minimum_cost',
- 'maximum_cost',
-
- )
- }),
- ('Advanced options', {
- 'classes': ('collapse',),
- 'fields': (
- 'password',
- 'partner_message',
- 'additional_info',
- 'external_enrollment_url',
- 'image_url',
- 'bg_image',
- 'announced_date_mentors',
- 'announced_date_guardians',
- 'mentors_week_reminder_sent',
- 'mentors_day_reminder_sent',
- ),
- }),
+ (
+ None,
+ {
+ # 'classes': ('collapse',),
+ "fields": (
+ "course",
+ "location",
+ "start_date",
+ # 'old_end_date',
+ # 'old_mentor_start_date',
+ # 'old_mentor_end_date',
+ "capacity",
+ "mentor_capacity",
+ "instructor",
+ "is_active",
+ "is_public",
+ ),
+ },
+ ),
+ (
+ "Zoom",
+ {
+ "fields": (
+ "online_video_link",
+ "online_video_meeting_id",
+ "online_video_meeting_password",
+ # 'online_video_description',
+ ),
+ },
+ ),
+ (
+ "Overrides",
+ {
+ # 'classes': ('collapse',),
+ "fields": (
+ "override_minimum_age_limitation",
+ "override_maximum_age_limitation",
+ "gender_limitation",
+ "cost",
+ "minimum_cost",
+ "maximum_cost",
+ )
+ },
+ ),
+ (
+ "Advanced options",
+ {
+ "classes": ("collapse",),
+ "fields": (
+ "password",
+ "partner_message",
+ "additional_info",
+ "external_enrollment_url",
+ "image_url",
+ "bg_image",
+ "announced_date_mentors",
+ "announced_date_guardians",
+ "mentors_week_reminder_sent",
+ "mentors_day_reminder_sent",
+ ),
+ },
+ ),
)
def view_on_site(self, obj):
@@ -619,8 +625,9 @@ def view_on_site(self, obj):
def _course(self, obj):
return obj.course.code
- _course.short_description = 'Course'
- _course.admin_order_field = 'course__code'
+
+ _course.short_description = "Course"
+ _course.admin_order_field = "course__code"
def mentor_count_link(self, obj):
return format_html(
@@ -629,6 +636,7 @@ def mentor_count_link(self, obj):
query=obj.id,
count=MentorOrder.objects.filter(session__id=obj.id, is_active=True).count(),
)
+
mentor_count_link.short_description = "Mentors"
mentor_count_link.admin_order_field = "mentor__count"
@@ -639,6 +647,7 @@ def student_count_link(self, obj):
query=obj.id,
count=obj.get_current_orders().count(),
)
+
student_count_link.short_description = "Students"
student_count_link.admin_order_field = "student__count"
@@ -662,45 +671,45 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
list_per_page = 50
list_display = [
- 'id',
- 'get_student_link',
- 'get_student_gender',
- 'get_student_age',
- 'get_guardian_link',
- 'get_session_link',
- '_created_at',
- 'is_checked_in',
- 'is_active',
+ "id",
+ "get_student_link",
+ "get_student_gender",
+ "get_student_age",
+ "get_guardian_link",
+ "get_session_link",
+ "_created_at",
+ "is_checked_in",
+ "is_active",
]
list_filter = [
- 'is_active',
- 'check_in',
- 'session',
+ "is_active",
+ "check_in",
+ "session",
]
list_select_related = [
- 'guardian',
- 'session',
- 'student',
+ "guardian",
+ "session",
+ "student",
]
search_fields = [
- 'student__first_name',
- 'student__last_name',
+ "student__first_name",
+ "student__last_name",
]
ordering = [
- 'created_at',
+ "created_at",
]
autocomplete_fields = [
- 'guardian',
- 'session',
- 'student',
+ "guardian",
+ "session",
+ "student",
]
- date_hierarchy = 'created_at'
+ date_hierarchy = "created_at"
view_on_site = False
@@ -712,18 +721,20 @@ class OrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
def get_student_link(self, obj):
return format_html(
'{student}',
- url=reverse('admin:coderdojochi_student_change', args=(obj.student.id,)),
+ url=reverse("admin:coderdojochi_student_change", args=(obj.student.id,)),
student=obj.student,
)
- get_student_link.short_description = 'Student'
+
+ get_student_link.short_description = "Student"
def get_guardian_link(self, obj):
return format_html(
'{guardian}',
- url=reverse('admin:coderdojochi_guardian_change', args=(obj.guardian.id,)),
+ url=reverse("admin:coderdojochi_guardian_change", args=(obj.guardian.id,)),
guardian=obj.guardian,
)
- get_guardian_link.short_description = 'Guardian'
+
+ get_guardian_link.short_description = "Guardian"
def get_session_link(self, obj):
return format_html(
@@ -731,11 +742,13 @@ def get_session_link(self, obj):
url=reverse("admin:coderdojochi_session_change", args=(obj.session.course.id,)),
course_code=obj.session.course.code,
)
- get_session_link.short_description = 'Session'
+
+ get_session_link.short_description = "Session"
def _created_at(self, obj):
return obj.created_at.strftime("%m/%d/%y %H:%M")
- _created_at.short_description = 'Created At'
+
+ _created_at.short_description = "Created At"
def mentor_check_in(modeladmin, request, queryset):
@@ -757,48 +770,48 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
list_per_page = 50
list_display = [
- 'mentor',
- 'session',
- 'ip',
- 'is_checked_in',
- 'is_active',
- 'week_reminder_sent',
- 'day_reminder_sent',
- 'created_at',
- 'updated_at',
+ "mentor",
+ "session",
+ "ip",
+ "is_checked_in",
+ "is_active",
+ "week_reminder_sent",
+ "day_reminder_sent",
+ "created_at",
+ "updated_at",
]
list_display_links = [
- 'mentor',
+ "mentor",
]
list_filter = [
- 'is_active',
- 'check_in',
- 'session',
+ "is_active",
+ "check_in",
+ "session",
]
list_select_related = [
- 'mentor',
- 'session',
+ "mentor",
+ "session",
]
ordering = [
- 'created_at',
+ "created_at",
]
search_fields = [
- 'mentor__user__first_name',
- 'mentor__user__last_name',
+ "mentor__user__first_name",
+ "mentor__user__last_name",
]
autocomplete_fields = [
- 'mentor',
- 'session',
+ "mentor",
+ "session",
]
readonly_fields = [
- 'ip',
+ "ip",
]
actions = [
@@ -806,7 +819,7 @@ class MentorOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
mentor_check_out,
]
- date_hierarchy = 'created_at'
+ date_hierarchy = "created_at"
view_on_site = False
@@ -829,41 +842,41 @@ class MeetingOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
list_per_page = 50
list_display = [
- 'mentor',
- 'meeting',
- 'ip',
- 'is_checked_in',
- 'is_active',
- 'week_reminder_sent',
- 'day_reminder_sent',
- 'created_at',
- 'updated_at',
+ "mentor",
+ "meeting",
+ "ip",
+ "is_checked_in",
+ "is_active",
+ "week_reminder_sent",
+ "day_reminder_sent",
+ "created_at",
+ "updated_at",
]
list_filter = [
- 'is_active',
- 'meeting',
- 'check_in',
- 'meeting__meeting_type',
+ "is_active",
+ "meeting",
+ "check_in",
+ "meeting__meeting_type",
]
list_select_related = [
- 'mentor',
- 'meeting',
+ "mentor",
+ "meeting",
]
ordering = [
- 'created_at',
+ "created_at",
]
search_fields = [
- 'mentor__user__first_name',
- 'mentor__user__last_name',
+ "mentor__user__first_name",
+ "mentor__user__last_name",
]
autocomplete_fields = [
- 'mentor',
- 'meeting',
+ "mentor",
+ "meeting",
]
actions = [
@@ -871,7 +884,7 @@ class MeetingOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
meeting_order_check_out,
]
- date_hierarchy = 'created_at'
+ date_hierarchy = "created_at"
view_on_site = False
@@ -881,19 +894,24 @@ class MeetingOrderAdmin(ImportExportMixin, ImportExportActionModelAdmin):
@admin.register(MeetingType)
class MeetingTypeAdmin(ImportExportMixin, ImportExportActionModelAdmin):
list_display = [
- 'code',
- 'title',
- 'slug',
+ "code",
+ "title",
+ "slug",
]
list_display_links = [
- 'title',
+ "title",
]
search_fields = [
- 'code',
- 'title',
+ "code",
+ "title",
]
+
+ prepopulated_fields = {
+ "slug": ("title",),
+ }
+
view_on_site = False
@@ -902,42 +920,40 @@ class MeetingAdmin(ImportExportMixin, ImportExportActionModelAdmin):
list_per_page = 10
list_display = [
- 'meeting_type',
- 'start_date',
- 'end_date',
- 'location',
- 'get_mentor_count',
- 'is_public',
- 'announced_date',
- 'created_at',
+ "meeting_type",
+ "start_date",
+ "end_date",
+ "location",
+ "get_mentor_count",
+ "is_public",
+ "announced_date",
+ "created_at",
]
list_filter = [
- 'is_active',
- 'is_public',
- 'location',
- 'meeting_type__title',
+ "is_active",
+ "is_public",
+ "location",
+ "meeting_type__title",
]
list_select_related = [
- 'meeting_type',
- 'location',
+ "meeting_type",
+ "location",
]
ordering = [
- '-start_date',
+ "-start_date",
]
- search_fields = [
- 'start_date'
- ]
+ search_fields = ["start_date"]
autocomplete_fields = [
- 'meeting_type',
- 'location',
+ "meeting_type",
+ "location",
]
- date_hierarchy = 'start_date'
+ date_hierarchy = "start_date"
def view_on_site(self, obj):
return obj.get_absolute_url()
@@ -951,42 +967,42 @@ class EquipmentTypeAdmin(ImportExportMixin, ImportExportActionModelAdmin):
@admin.register(Equipment)
class EquipmentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
list_display = [
- 'uuid',
- 'asset_tag',
- 'equipment_type',
- 'make',
- 'model',
- 'condition',
- 'last_system_update_check_in',
- 'last_system_update',
- 'force_update_on_next_boot',
+ "uuid",
+ "asset_tag",
+ "equipment_type",
+ "make",
+ "model",
+ "condition",
+ "last_system_update_check_in",
+ "last_system_update",
+ "force_update_on_next_boot",
]
list_filter = [
- 'condition',
- 'equipment_type',
- 'make',
- 'model',
+ "condition",
+ "equipment_type",
+ "make",
+ "model",
]
list_select_related = [
- 'equipment_type',
+ "equipment_type",
]
ordering = [
- 'uuid',
+ "uuid",
]
search_fields = [
- 'uuid',
- 'make',
- 'model',
- 'asset_tag',
+ "uuid",
+ "make",
+ "model",
+ "asset_tag",
]
readonly_fields = [
- 'last_system_update_check_in',
- 'last_system_update',
+ "last_system_update_check_in",
+ "last_system_update",
]
view_on_site = False
@@ -995,41 +1011,41 @@ class EquipmentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
@admin.register(Donation)
class DonationAdmin(ImportExportMixin, ImportExportActionModelAdmin):
list_display = [
- 'session',
- 'get_first_name',
- 'get_last_name',
- 'get_email',
- 'amount',
- 'is_verified',
- 'receipt_sent',
- 'created_at',
+ "session",
+ "get_first_name",
+ "get_last_name",
+ "get_email",
+ "amount",
+ "is_verified",
+ "receipt_sent",
+ "created_at",
]
list_filter = [
- 'session',
- 'user',
- 'is_verified',
- 'receipt_sent',
- 'amount',
- 'created_at',
+ "session",
+ "user",
+ "is_verified",
+ "receipt_sent",
+ "amount",
+ "created_at",
]
ordering = [
- '-created_at',
+ "-created_at",
]
search_fields = [
- 'get_first_name',
- 'get_last_name',
- 'get_email',
- 'session',
+ "get_first_name",
+ "get_last_name",
+ "get_email",
+ "session",
]
- date_hierarchy = 'created_at'
+ date_hierarchy = "created_at"
autocomplete_fields = [
- 'user',
- 'session',
+ "user",
+ "session",
]
view_on_site = False
@@ -1038,16 +1054,14 @@ class DonationAdmin(ImportExportMixin, ImportExportActionModelAdmin):
@admin.register(Location)
class LocationAdmin(ImportExportMixin, ImportExportActionModelAdmin):
list_display = [
- 'name',
- 'address',
- 'city',
- 'state',
- 'zip',
+ "name",
+ "address",
+ "city",
+ "state",
+ "zip",
]
- search_fields = [
- 'name'
- ]
+ search_fields = ["name"]
view_on_site = False
diff --git a/coderdojochi/apps.py b/coderdojochi/apps.py
index fccb6250..4ed172aa 100644
--- a/coderdojochi/apps.py
+++ b/coderdojochi/apps.py
@@ -2,7 +2,7 @@
class CoderDojoChiConfig(AppConfig):
- name = 'coderdojochi'
+ name = "coderdojochi"
verbose_name = "CoderDojoChi"
def ready(self):
diff --git a/coderdojochi/context_processors.py b/coderdojochi/context_processors.py
index 81897279..4d5bbe46 100644
--- a/coderdojochi/context_processors.py
+++ b/coderdojochi/context_processors.py
@@ -3,11 +3,11 @@
def main_config_processor(request):
return {
- 'DEBUG': settings.DEBUG,
- 'SITE_URL': settings.SITE_URL,
- 'STATIC_URL': settings.STATIC_URL,
- 'CONTACT_EMAIL': settings.CONTACT_EMAIL,
- 'SITE_PROTOCOL': settings.META_SITE_PROTOCOL,
- 'SITE_DOMAIN': settings.META_SITE_DOMAIN,
- 'SITE_NAME': settings.META_SITE_NAME,
+ "DEBUG": settings.DEBUG,
+ "SITE_URL": settings.SITE_URL,
+ "STATIC_URL": settings.STATIC_URL,
+ "CONTACT_EMAIL": settings.CONTACT_EMAIL,
+ "SITE_PROTOCOL": settings.META_SITE_PROTOCOL,
+ "SITE_DOMAIN": settings.META_SITE_DOMAIN,
+ "SITE_NAME": settings.META_SITE_NAME,
}
diff --git a/coderdojochi/cron.py b/coderdojochi/cron.py
index 04b3bff0..a3be15dc 100644
--- a/coderdojochi/cron.py
+++ b/coderdojochi/cron.py
@@ -1,7 +1,6 @@
from datetime import timedelta
from django.conf import settings
-from django.core.mail import get_connection
from django.utils import timezone
import arrow
@@ -12,10 +11,10 @@
class SendReminders(CronJobBase):
- RUN_AT_TIMES = ['10:00', '14:00']
+ RUN_AT_TIMES = ["10:00", "14:00"]
schedule = Schedule(run_at_times=RUN_AT_TIMES)
- code = 'coderdojochi.send_reminders'
+ code = "coderdojochi.send_reminders"
def do(self):
orders_within_a_week = Order.objects.filter(
@@ -48,40 +47,40 @@ def do(self):
recipients = []
for order in orders_within_a_week:
- recipients.append(order.guardian.user.email)
- merge_data[order.guardian.user.email] = {
- 'first_name': order.guardian.user.first_name,
- 'last_name': order.guardian.user.last_name,
- 'student_first_name': order.student.first_name,
- 'student_last_name': order.student.last_name,
- 'class_code': order.session.course.code,
- 'class_title': order.session.course.title,
- 'class_description': order.session.course.description,
- 'class_start_date': arrow.get(order.session.start_date).to('local').format('dddd, MMMM D, YYYY'),
- 'class_start_time': arrow.get(order.session.start_date).to('local').format('h:mma'),
- 'class_end_date': arrow.get(order.session.end_date).to('local').format('dddd, MMMM D, YYYY'),
- 'class_end_time': arrow.get(order.session.end_date).to('local').format('h:mma'),
- 'class_location_name': order.session.location.name,
- 'class_location_address': order.session.location.address,
- 'class_location_city': order.session.location.city,
- 'class_location_state': order.session.location.state,
- 'class_location_zip': order.session.location.zip,
- 'class_additional_info': order.session.additional_info,
- 'class_url': f"{settings.SITE_URL}{order.session.get_absolute_url()}",
- 'class_calendar_url': f"{settings.SITE_URL}{order.session.get_calendar_url()}",
- 'microdata_start_date': arrow.get(order.session.start_date).to('local').isoformat(),
- 'microdata_end_date': arrow.get(order.session.end_date).to('local').isoformat(),
- 'order_id': order.id,
- 'online_video_link': order.session.online_video_link,
- 'online_video_description': order.session.online_video_description,
+ recipients.append(order.guardian.email)
+ merge_data[order.guardian.email] = {
+ "first_name": order.guardian.first_name,
+ "last_name": order.guardian.last_name,
+ "student_first_name": order.student.first_name,
+ "student_last_name": order.student.last_name,
+ "class_code": order.session.course.code,
+ "class_title": order.session.course.title,
+ "class_description": order.session.course.description,
+ "class_start_date": arrow.get(order.session.start_date).to("local").format("dddd, MMMM D, YYYY"),
+ "class_start_time": arrow.get(order.session.start_date).to("local").format("h:mma"),
+ "class_end_date": arrow.get(order.session.end_date).to("local").format("dddd, MMMM D, YYYY"),
+ "class_end_time": arrow.get(order.session.end_date).to("local").format("h:mma"),
+ "class_location_name": order.session.location.name,
+ "class_location_address": order.session.location.address,
+ "class_location_city": order.session.location.city,
+ "class_location_state": order.session.location.state,
+ "class_location_zip": order.session.location.zip,
+ "class_additional_info": order.session.additional_info,
+ "class_url": f"{settings.SITE_URL}{order.session.get_absolute_url()}",
+ "class_calendar_url": f"{settings.SITE_URL}{order.session.get_calendar_url()}",
+ "microdata_start_date": arrow.get(order.session.start_date).to("local").isoformat(),
+ "microdata_end_date": arrow.get(order.session.end_date).to("local").isoformat(),
+ "order_id": order.id,
+ "online_video_link": order.session.online_video_link,
+ "online_video_description": order.session.online_video_description,
}
email(
- subject='Upcoming class reminder',
- template_name='class-reminder-guardian-one-week',
+ subject="Upcoming class reminder",
+ template_name="class_reminder_guardian_one_week",
merge_data=merge_data,
recipients=recipients,
- preheader='Your class is just a few days away!',
+ preheader="Your class is just a few days away!",
unsub_group_id=settings.SENDGRID_UNSUB_CLASSANNOUNCE,
)
@@ -94,40 +93,40 @@ def do(self):
recipients = []
for order in orders_within_a_day:
- recipients.append(order.guardian.user.email)
- merge_data[order.guardian.user.email] = {
- 'first_name': order.guardian.user.first_name,
- 'last_name': order.guardian.user.last_name,
- 'student_first_name': order.student.first_name,
- 'student_last_name': order.student.last_name,
- 'class_code': order.session.course.code,
- 'class_title': order.session.course.title,
- 'class_description': order.session.course.description,
- 'class_start_date': arrow.get(order.session.start_date).to('local').format('dddd, MMMM D, YYYY'),
- 'class_start_time': arrow.get(order.session.start_date).to('local').format('h:mma'),
- 'class_end_date': arrow.get(order.session.end_date).to('local').format('dddd, MMMM D, YYYY'),
- 'class_end_time': arrow.get(order.session.end_date).to('local').format('h:mma'),
- 'class_location_name': order.session.location.name,
- 'class_location_address': order.session.location.address,
- 'class_location_city': order.session.location.city,
- 'class_location_state': order.session.location.state,
- 'class_location_zip': order.session.location.zip,
- 'class_additional_info': order.session.additional_info,
- 'class_url': f"{settings.SITE_URL}{order.session.get_absolute_url()}",
- 'class_calendar_url': f"{settings.SITE_URL}{order.session.get_calendar_url()}",
- 'microdata_start_date': arrow.get(order.session.start_date).to('local').isoformat(),
- 'microdata_end_date': arrow.get(order.session.end_date).to('local').isoformat(),
- 'order_id': order.id,
- 'online_video_link': order.session.online_video_link,
- 'online_video_description': order.session.online_video_description,
+ recipients.append(order.guardian.email)
+ merge_data[order.guardian.email] = {
+ "first_name": order.guardian.first_name,
+ "last_name": order.guardian.last_name,
+ "student_first_name": order.student.first_name,
+ "student_last_name": order.student.last_name,
+ "class_code": order.session.course.code,
+ "class_title": order.session.course.title,
+ "class_description": order.session.course.description,
+ "class_start_date": arrow.get(order.session.start_date).to("local").format("dddd, MMMM D, YYYY"),
+ "class_start_time": arrow.get(order.session.start_date).to("local").format("h:mma"),
+ "class_end_date": arrow.get(order.session.end_date).to("local").format("dddd, MMMM D, YYYY"),
+ "class_end_time": arrow.get(order.session.end_date).to("local").format("h:mma"),
+ "class_location_name": order.session.location.name,
+ "class_location_address": order.session.location.address,
+ "class_location_city": order.session.location.city,
+ "class_location_state": order.session.location.state,
+ "class_location_zip": order.session.location.zip,
+ "class_additional_info": order.session.additional_info,
+ "class_url": f"{settings.SITE_URL}{order.session.get_absolute_url()}",
+ "class_calendar_url": f"{settings.SITE_URL}{order.session.get_calendar_url()}",
+ "microdata_start_date": arrow.get(order.session.start_date).to("local").isoformat(),
+ "microdata_end_date": arrow.get(order.session.end_date).to("local").isoformat(),
+ "order_id": order.id,
+ "online_video_link": order.session.online_video_link,
+ "online_video_description": order.session.online_video_description,
}
email(
- subject='Your class is coming up!',
- template_name='class-reminder-guardian-24-hour',
+ subject="Your class is coming up!",
+ template_name="class_reminder_guardian_24_hour",
merge_data=merge_data,
recipients=recipients,
- preheader='Your class is just hours away!',
+ preheader="Your class is just hours away!",
unsub_group_id=settings.SENDGRID_UNSUB_CLASSANNOUNCE,
)
@@ -143,40 +142,40 @@ def do(self):
recipients = []
for order in orders:
- recipients.append(order.mentor.user.email)
- merge_data[order.mentor.user.email] = {
- 'first_name': order.mentor.user.first_name,
- 'last_name': order.mentor.user.last_name,
- 'class_code': order.session.course.code,
- 'class_title': order.session.course.title,
- 'class_description': order.session.course.description,
- 'class_start_date': arrow.get(
- order.session.mentor_start_date
- ).to('local').format('dddd, MMMM D, YYYY'),
- 'class_start_time': arrow.get(order.session.mentor_start_date).to('local').format('h:mma'),
- 'class_end_date': arrow.get(order.session.mentor_end_date).to('local').format('dddd, MMMM D, YYYY'),
- 'class_end_time': arrow.get(order.session.mentor_end_date).to('local').format('h:mma'),
- 'class_location_name': order.session.location.name,
- 'class_location_address': order.session.location.address,
- 'class_location_city': order.session.location.city,
- 'class_location_state': order.session.location.state,
- 'class_location_zip': order.session.location.zip,
- 'class_additional_info': order.session.additional_info,
- 'class_url': f"{settings.SITE_URL}{order.session.get_absolute_url()}",
- 'class_calendar_url': f"{settings.SITE_URL}{order.session.get_calendar_url()}",
- 'microdata_start_date': arrow.get(order.session.start_date).to('local').isoformat(),
- 'microdata_end_date': arrow.get(order.session.end_date).to('local').isoformat(),
- 'order_id': order.id,
- 'online_video_link': order.session.online_video_link,
- 'online_video_description': order.session.online_video_description,
+ recipients.append(order.mentor.email)
+ merge_data[order.mentor.email] = {
+ "first_name": order.mentor.first_name,
+ "last_name": order.mentor.last_name,
+ "class_code": order.session.course.code,
+ "class_title": order.session.course.title,
+ "class_description": order.session.course.description,
+ "class_start_date": (
+ arrow.get(order.session.mentor_start_date).to("local").format("dddd, MMMM D, YYYY")
+ ),
+ "class_start_time": arrow.get(order.session.mentor_start_date).to("local").format("h:mma"),
+ "class_end_date": arrow.get(order.session.mentor_end_date).to("local").format("dddd, MMMM D, YYYY"),
+ "class_end_time": arrow.get(order.session.mentor_end_date).to("local").format("h:mma"),
+ "class_location_name": order.session.location.name,
+ "class_location_address": order.session.location.address,
+ "class_location_city": order.session.location.city,
+ "class_location_state": order.session.location.state,
+ "class_location_zip": order.session.location.zip,
+ "class_additional_info": order.session.additional_info,
+ "class_url": f"{settings.SITE_URL}{order.session.get_absolute_url()}",
+ "class_calendar_url": f"{settings.SITE_URL}{order.session.get_calendar_url()}",
+ "microdata_start_date": arrow.get(order.session.start_date).to("local").isoformat(),
+ "microdata_end_date": arrow.get(order.session.end_date).to("local").isoformat(),
+ "order_id": order.id,
+ "online_video_link": order.session.online_video_link,
+ "online_video_description": order.session.online_video_description,
}
email(
- subject='Your We All Code class is in less than a week!',
- template_name='class-reminder-mentor-one-week',
+ subject="Your We All Code class is in less than a week!",
+ template_name="class_reminder_mentor_one_week",
merge_data=merge_data,
recipients=recipients,
- preheader='The class is just a few days away!',
+ preheader="The class is just a few days away!",
unsub_group_id=settings.SENDGRID_UNSUB_CLASSANNOUNCE,
)
@@ -187,40 +186,40 @@ def do(self):
orders = MentorOrder.objects.filter(session=session)
for order in orders:
- recipients.append(order.mentor.user.email)
- merge_data[order.mentor.user.email] = {
- 'first_name': order.mentor.user.first_name,
- 'last_name': order.mentor.user.last_name,
- 'class_code': order.session.course.code,
- 'class_title': order.session.course.title,
- 'class_description': order.session.course.description,
- 'class_start_date': arrow.get(
- order.session.mentor_start_date
- ).to('local').format('dddd, MMMM D, YYYY'),
- 'class_start_time': arrow.get(order.session.mentor_start_date).to('local').format('h:mma'),
- 'class_end_date': arrow.get(order.session.mentor_end_date).to('local').format('dddd, MMMM D, YYYY'),
- 'class_end_time': arrow.get(order.session.mentor_end_date).to('local').format('h:mma'),
- 'class_location_name': order.session.location.name,
- 'class_location_address': order.session.location.address,
- 'class_location_city': order.session.location.city,
- 'class_location_state': order.session.location.state,
- 'class_location_zip': order.session.location.zip,
- 'class_additional_info': order.session.additional_info,
- 'class_url': f"{settings.SITE_URL}{order.session.get_absolute_url()}",
- 'class_calendar_url': f"{settings.SITE_URL}{order.session.get_calendar_url()}",
- 'microdata_start_date': arrow.get(order.session.start_date).to('local').isoformat(),
- 'microdata_end_date': arrow.get(order.session.end_date).to('local').isoformat(),
- 'order_id': order.id,
- 'online_video_link': order.session.online_video_link,
- 'online_video_description': order.session.online_video_description,
+ recipients.append(order.mentor.email)
+ merge_data[order.mentor.email] = {
+ "first_name": order.mentor.user.first_name,
+ "last_name": order.mentor.user.last_name,
+ "class_code": order.session.course.code,
+ "class_title": order.session.course.title,
+ "class_description": order.session.course.description,
+ "class_start_date": (
+ arrow.get(order.session.mentor_start_date).to("local").format("dddd, MMMM D, YYYY")
+ ),
+ "class_start_time": arrow.get(order.session.mentor_start_date).to("local").format("h:mma"),
+ "class_end_date": arrow.get(order.session.mentor_end_date).to("local").format("dddd, MMMM D, YYYY"),
+ "class_end_time": arrow.get(order.session.mentor_end_date).to("local").format("h:mma"),
+ "class_location_name": order.session.location.name,
+ "class_location_address": order.session.location.address,
+ "class_location_city": order.session.location.city,
+ "class_location_state": order.session.location.state,
+ "class_location_zip": order.session.location.zip,
+ "class_additional_info": order.session.additional_info,
+ "class_url": f"{settings.SITE_URL}{order.session.get_absolute_url()}",
+ "class_calendar_url": f"{settings.SITE_URL}{order.session.get_calendar_url()}",
+ "microdata_start_date": arrow.get(order.session.start_date).to("local").isoformat(),
+ "microdata_end_date": arrow.get(order.session.end_date).to("local").isoformat(),
+ "order_id": order.id,
+ "online_video_link": order.session.online_video_link,
+ "online_video_description": order.session.online_video_description,
}
email(
- subject='Your We All Code class is tomorrow!',
- template_name='class-reminder-mentor-24-hour',
+ subject="Your We All Code class is tomorrow!",
+ template_name="class_reminder_mentor_24_hour",
merge_data=merge_data,
recipients=recipients,
- preheader='The class is just a few hours away!',
+ preheader="The class is just a few hours away!",
unsub_group_id=settings.SENDGRID_UNSUB_CLASSANNOUNCE,
)
diff --git a/coderdojochi/emailtemplates/_email-base.html b/coderdojochi/emailtemplates/_email_base.html
similarity index 100%
rename from coderdojochi/emailtemplates/_email-base.html
rename to coderdojochi/emailtemplates/_email_base.html
diff --git a/coderdojochi/emailtemplates/avatar-changed-mentor.html b/coderdojochi/emailtemplates/avatar_changed_mentor.html
similarity index 98%
rename from coderdojochi/emailtemplates/avatar-changed-mentor.html
rename to coderdojochi/emailtemplates/avatar_changed_mentor.html
index d390bb8b..80c22805 100644
--- a/coderdojochi/emailtemplates/avatar-changed-mentor.html
+++ b/coderdojochi/emailtemplates/avatar_changed_mentor.html
@@ -1,4 +1,4 @@
-{% extends "_email-base.html" %}
+{% extends "_email_base.html" %}
{% block content %}
diff --git a/coderdojochi/emailtemplates/avatar-rejected-mentor.html b/coderdojochi/emailtemplates/avatar_rejected_mentor.html
similarity index 98%
rename from coderdojochi/emailtemplates/avatar-rejected-mentor.html
rename to coderdojochi/emailtemplates/avatar_rejected_mentor.html
index ed43e311..14c1f0d1 100644
--- a/coderdojochi/emailtemplates/avatar-rejected-mentor.html
+++ b/coderdojochi/emailtemplates/avatar_rejected_mentor.html
@@ -1,4 +1,4 @@
-{% extends "_email-base.html" %}
+{% extends "_email_base.html" %}
{% block content %}
diff --git a/coderdojochi/emailtemplates/class-announcement-guardian.html b/coderdojochi/emailtemplates/class_announcement_guardian.html
similarity index 99%
rename from coderdojochi/emailtemplates/class-announcement-guardian.html
rename to coderdojochi/emailtemplates/class_announcement_guardian.html
index f3284240..81ec9680 100644
--- a/coderdojochi/emailtemplates/class-announcement-guardian.html
+++ b/coderdojochi/emailtemplates/class_announcement_guardian.html
@@ -1,4 +1,4 @@
-{% extends "_email-base.html" %}
+{% extends "_email_base.html" %}
{% block content %}
diff --git a/coderdojochi/emailtemplates/class-announcement-mentor.html b/coderdojochi/emailtemplates/class_announcement_mentor.html
similarity index 99%
rename from coderdojochi/emailtemplates/class-announcement-mentor.html
rename to coderdojochi/emailtemplates/class_announcement_mentor.html
index 2464ffa5..d9266c36 100644
--- a/coderdojochi/emailtemplates/class-announcement-mentor.html
+++ b/coderdojochi/emailtemplates/class_announcement_mentor.html
@@ -1,4 +1,4 @@
-{% extends "_email-base.html" %}
+{% extends "_email_base.html" %}
{% block content %}
diff --git a/coderdojochi/emailtemplates/class-confirm-guardian.html b/coderdojochi/emailtemplates/class_confirm_guardian.html
similarity index 99%
rename from coderdojochi/emailtemplates/class-confirm-guardian.html
rename to coderdojochi/emailtemplates/class_confirm_guardian.html
index 2a02761d..779fd47d 100644
--- a/coderdojochi/emailtemplates/class-confirm-guardian.html
+++ b/coderdojochi/emailtemplates/class_confirm_guardian.html
@@ -1,4 +1,4 @@
-{% extends "_email-base.html" %}
+{% extends "_email_base.html" %}
{% block content %}
diff --git a/coderdojochi/emailtemplates/class-confirm-mentor.html b/coderdojochi/emailtemplates/class_confirm_mentor.html
similarity index 99%
rename from coderdojochi/emailtemplates/class-confirm-mentor.html
rename to coderdojochi/emailtemplates/class_confirm_mentor.html
index 8e2bf2ae..c43f615a 100644
--- a/coderdojochi/emailtemplates/class-confirm-mentor.html
+++ b/coderdojochi/emailtemplates/class_confirm_mentor.html
@@ -1,4 +1,4 @@
-{% extends "_email-base.html" %}
+{% extends "_email_base.html" %}
{% block content %}
diff --git a/coderdojochi/emailtemplates/class-reminder-guardian-24-hour.html b/coderdojochi/emailtemplates/class_reminder_guardian_24_hour.html
similarity index 99%
rename from coderdojochi/emailtemplates/class-reminder-guardian-24-hour.html
rename to coderdojochi/emailtemplates/class_reminder_guardian_24_hour.html
index 6eb4dbe0..a96babff 100644
--- a/coderdojochi/emailtemplates/class-reminder-guardian-24-hour.html
+++ b/coderdojochi/emailtemplates/class_reminder_guardian_24_hour.html
@@ -1,4 +1,4 @@
-{% extends "_email-base.html" %}
+{% extends "_email_base.html" %}
{% block content %}
diff --git a/coderdojochi/emailtemplates/class-reminder-guardian-one-week.html b/coderdojochi/emailtemplates/class_reminder_guardian_one_week.html
similarity index 99%
rename from coderdojochi/emailtemplates/class-reminder-guardian-one-week.html
rename to coderdojochi/emailtemplates/class_reminder_guardian_one_week.html
index 65204694..5d75f3a8 100644
--- a/coderdojochi/emailtemplates/class-reminder-guardian-one-week.html
+++ b/coderdojochi/emailtemplates/class_reminder_guardian_one_week.html
@@ -1,4 +1,4 @@
-{% extends "_email-base.html" %}
+{% extends "_email_base.html" %}
{% block content %}
diff --git a/coderdojochi/emailtemplates/class-reminder-mentor-24-hour.html b/coderdojochi/emailtemplates/class_reminder_mentor_24_hour.html
similarity index 99%
rename from coderdojochi/emailtemplates/class-reminder-mentor-24-hour.html
rename to coderdojochi/emailtemplates/class_reminder_mentor_24_hour.html
index f4ccbed7..f8bd1b6c 100644
--- a/coderdojochi/emailtemplates/class-reminder-mentor-24-hour.html
+++ b/coderdojochi/emailtemplates/class_reminder_mentor_24_hour.html
@@ -1,4 +1,4 @@
-{% extends "_email-base.html" %}
+{% extends "_email_base.html" %}
{% block content %}
diff --git a/coderdojochi/emailtemplates/class-reminder-mentor-one-week.html b/coderdojochi/emailtemplates/class_reminder_mentor_one_week.html
similarity index 99%
rename from coderdojochi/emailtemplates/class-reminder-mentor-one-week.html
rename to coderdojochi/emailtemplates/class_reminder_mentor_one_week.html
index e910b994..38eae0a6 100644
--- a/coderdojochi/emailtemplates/class-reminder-mentor-one-week.html
+++ b/coderdojochi/emailtemplates/class_reminder_mentor_one_week.html
@@ -1,4 +1,4 @@
-{% extends "_email-base.html" %}
+{% extends "_email_base.html" %}
{% block content %}
diff --git a/coderdojochi/emailtemplates/contact-email.html b/coderdojochi/emailtemplates/contact_email.html
similarity index 100%
rename from coderdojochi/emailtemplates/contact-email.html
rename to coderdojochi/emailtemplates/contact_email.html
diff --git a/coderdojochi/emailtemplates/donation-receipt.html b/coderdojochi/emailtemplates/donation_receipt.html
similarity index 98%
rename from coderdojochi/emailtemplates/donation-receipt.html
rename to coderdojochi/emailtemplates/donation_receipt.html
index 2984c72a..3c51b2f0 100644
--- a/coderdojochi/emailtemplates/donation-receipt.html
+++ b/coderdojochi/emailtemplates/donation_receipt.html
@@ -1,4 +1,4 @@
-{% extends "_email-base.html" %}
+{% extends "_email_base.html" %}
{% block content %}
diff --git a/coderdojochi/emailtemplates/meeting-confirm-mentor.html b/coderdojochi/emailtemplates/meeting_confirm_mentor.html
similarity index 99%
rename from coderdojochi/emailtemplates/meeting-confirm-mentor.html
rename to coderdojochi/emailtemplates/meeting_confirm_mentor.html
index 159e6415..6aced7dd 100644
--- a/coderdojochi/emailtemplates/meeting-confirm-mentor.html
+++ b/coderdojochi/emailtemplates/meeting_confirm_mentor.html
@@ -1,4 +1,4 @@
-{% extends "_email-base.html" %}
+{% extends "_email_base.html" %}
{% block content %}
diff --git a/coderdojochi/emailtemplates/waitlist-offer-guardian.html b/coderdojochi/emailtemplates/waitlist_offer_guardian.html
similarity index 94%
rename from coderdojochi/emailtemplates/waitlist-offer-guardian.html
rename to coderdojochi/emailtemplates/waitlist_offer_guardian.html
index 81ffe3a6..d84faea6 100644
--- a/coderdojochi/emailtemplates/waitlist-offer-guardian.html
+++ b/coderdojochi/emailtemplates/waitlist_offer_guardian.html
@@ -1,4 +1,4 @@
-{% extends "_email-base.html" %}
+{% extends "_email_base.html" %}
{% block content %}
diff --git a/coderdojochi/emailtemplates/welcome-mentor.html b/coderdojochi/emailtemplates/welcome_mentor.html
similarity index 97%
rename from coderdojochi/emailtemplates/welcome-mentor.html
rename to coderdojochi/emailtemplates/welcome_mentor.html
index 7ea70ebb..946452e0 100644
--- a/coderdojochi/emailtemplates/welcome-mentor.html
+++ b/coderdojochi/emailtemplates/welcome_mentor.html
@@ -1,4 +1,4 @@
-{% extends "_email-base.html" %}
+{% extends "_email_base.html" %}
{% block content %}
diff --git a/coderdojochi/factories.py b/coderdojochi/factories.py
index f4b53c63..196885a7 100644
--- a/coderdojochi/factories.py
+++ b/coderdojochi/factories.py
@@ -17,9 +17,9 @@ class Meta:
class LocationFactory(factory.DjangoModelFactory):
name = factory.Sequence(lambda n: f"Test Location {n}")
address = factory.Sequence(lambda n: f"{n} Street")
- city = 'Chicago'
- state = 'IL'
- zip = '60605'
+ city = "Chicago"
+ state = "IL"
+ zip = "60605"
class Meta:
model = Location
@@ -47,7 +47,7 @@ class SessionFactory(factory.DjangoModelFactory):
end_date = datetime.now(utc)
mentor_start_date = datetime.now(utc)
mentor_end_date = datetime.now(utc)
- password = ''
+ password = ""
instructor = factory.SubFactory(MentorFactory)
class Meta:
diff --git a/coderdojochi/forms.py b/coderdojochi/forms.py
index c6c5b171..d7c7d83a 100644
--- a/coderdojochi/forms.py
+++ b/coderdojochi/forms.py
@@ -1,5 +1,4 @@
import re
-from datetime import timedelta
from django import forms
from django.contrib.auth import get_user_model
@@ -14,15 +13,7 @@
import html5.forms.widgets as html5_widgets
from dateutil.relativedelta import relativedelta
-from coderdojochi.models import (
- CDCUser,
- Donation,
- Guardian,
- Mentor,
- RaceEthnicity,
- Session,
- Student,
-)
+from coderdojochi.models import CDCUser, Donation, Guardian, Mentor, RaceEthnicity, Session, Student
class CDCForm(Form):
@@ -32,11 +23,7 @@ def _clean_fields(self):
# value_from_datadict() gets the data from the data dictionaries.
# Each widget type knows how to retrieve its own data, because some
# widgets split data over several HTML fields.
- value = field.widget.value_from_datadict(
- self.data,
- self.files,
- self.add_prefix(name)
- )
+ value = field.widget.value_from_datadict(self.data, self.files, self.add_prefix(name))
try:
if isinstance(field, FileField):
@@ -65,11 +52,7 @@ def _clean_fields(self):
# value_from_datadict() gets the data from the data dictionaries.
# Each widget type knows how to retrieve its own data, because some
# widgets split data over several HTML fields.
- value = field.widget.value_from_datadict(
- self.data,
- self.files,
- self.add_prefix(name)
- )
+ value = field.widget.value_from_datadict(self.data, self.files, self.add_prefix(name))
try:
if isinstance(field, FileField):
@@ -79,8 +62,8 @@ def _clean_fields(self):
if isinstance(value, str):
# regex normalizes carriage return
# and cuts them to two at most
- value = re.sub(r'\r\n', '\n', value)
- value = re.sub(r'\n{3,}', '\n\n', value)
+ value = re.sub(r"\r\n", "\n", value)
+ value = re.sub(r"\n{3,}", "\n\n", value)
value = field.clean(value.strip())
else:
value = field.clean(value)
@@ -96,7 +79,7 @@ def _clean_fields(self):
class Meta:
model = CDCUser
- fields = ('first_name', 'last_name')
+ fields = ("first_name", "last_name")
class SignupForm(forms.Form):
@@ -107,89 +90,46 @@ class Meta:
model = get_user_model()
def save(self, user):
- user.first_name = self.cleaned_data['first_name']
- user.last_name = self.cleaned_data['last_name']
+ user.first_name = self.cleaned_data["first_name"]
+ user.last_name = self.cleaned_data["last_name"]
user.save()
class MentorForm(CDCModelForm):
bio = forms.CharField(
- widget=forms.Textarea(
- attrs={
- 'placeholder': 'Short Bio',
- 'class': 'form-control',
- 'rows': 4
- }
- ),
- label='Short Bio',
- required=False
+ widget=forms.Textarea(attrs={"placeholder": "Short Bio", "class": "form-control", "rows": 4}),
+ label="Short Bio",
+ required=False,
)
gender = forms.CharField(
- widget=forms.TextInput(
- attrs={
- 'placeholder': '',
- 'class': 'form-control'
- }
- ),
- label='Gender',
- required=True
+ widget=forms.TextInput(attrs={"placeholder": "", "class": "form-control"}), label="Gender", required=True
)
race_ethnicity = forms.ModelMultipleChoiceField(
- widget=forms.SelectMultiple,
- queryset=RaceEthnicity.objects.filter(is_visible=True),
- required=True
+ widget=forms.SelectMultiple, queryset=RaceEthnicity.objects.filter(is_visible=True), required=True
)
- birthday = forms.CharField(
- widget=html5_widgets.DateInput(
- attrs={
- 'class': 'form-control'
- }
- ),
- required=True
- )
+ birthday = forms.CharField(widget=html5_widgets.DateInput(attrs={"class": "form-control"}), required=True)
work_place = forms.CharField(
- widget=forms.TextInput(
- attrs={
- 'placeholder': '',
- 'class': 'form-control'
- }
- ),
- label='Work Place',
- required=False
+ widget=forms.TextInput(attrs={"placeholder": "", "class": "form-control"}), label="Work Place", required=False
)
phone = forms.CharField(
- widget=forms.TextInput(
- attrs={
- 'placeholder': '',
- 'class': 'form-control'
- }
- ),
- label='Phone',
- required=False
+ widget=forms.TextInput(attrs={"placeholder": "", "class": "form-control"}), label="Phone", required=False
)
home_address = forms.CharField(
- widget=forms.TextInput(
- attrs={
- 'placeholder': '',
- 'class': 'form-control'
- }
- ),
- label='Home Address',
- required=False
+ widget=forms.TextInput(attrs={"placeholder": "", "class": "form-control"}), label="Home Address", required=False
)
class Meta:
model = Mentor
- fields = ('bio', 'avatar', 'gender', 'race_ethnicity', 'birthday', 'phone', 'home_address', 'work_place')
+ fields = ("bio", "avatar", "gender", "race_ethnicity", "birthday", "phone", "home_address", "work_place")
def clean_avatar(self):
- avatar = self.cleaned_data['avatar']
+ avatar = self.cleaned_data["avatar"]
if avatar is None:
return avatar
@@ -200,102 +140,60 @@ def clean_avatar(self):
# validate dimensions
max_width = max_height = 1000
if w > max_width or h > max_height:
- raise forms.ValidationError(
- f'Please use an image that is {max_width} x {max_height}px or smaller.'
- )
+ raise forms.ValidationError(f"Please use an image that is {max_width} x {max_height}px or smaller.")
min_width = min_height = 500
if w < min_width or h < min_height:
- raise forms.ValidationError(
- f'Please use an image that is {min_width} x {min_height}px or larger.'
- )
+ raise forms.ValidationError(f"Please use an image that is {min_width} x {min_height}px or larger.")
# validate content type
- main, sub = avatar.content_type.split('/')
- if (
- not (
- main == 'image' and
- sub in ['jpeg', 'pjpeg', 'gif', 'png']
- )
- ):
- raise forms.ValidationError(
- 'Please use a JPEG, GIF or PNG image.'
- )
+ main, sub = avatar.content_type.split("/")
+ if not (main == "image" and sub in ["jpeg", "pjpeg", "gif", "png"]):
+ raise forms.ValidationError("Please use a JPEG, GIF or PNG image.")
# validate file size
if len(avatar) > (2000 * 1024):
- raise forms.ValidationError(
- 'Avatar file size may not exceed 2MB.'
- )
+ raise forms.ValidationError("Avatar file size may not exceed 2MB.")
except AttributeError:
"""
Handles case when we are updating the user profile
and do not supply a new avatar
"""
- pass
return avatar
class GuardianForm(CDCModelForm):
phone = forms.CharField(
- widget=forms.TextInput(
- attrs={
- 'placeholder': 'Phone Number',
- 'class': 'form-control'
- }
- ),
- label='Phone Number'
+ widget=forms.TextInput(attrs={"placeholder": "Phone Number", "class": "form-control"}), label="Phone Number"
)
zip = forms.CharField(
- widget=forms.TextInput(
- attrs={
- 'placeholder': 'Zip Code',
- 'class': 'form-control'
- }
- ),
- label='Zip Code'
+ widget=forms.TextInput(attrs={"placeholder": "Zip Code", "class": "form-control"}), label="Zip Code"
)
gender = forms.CharField(
- widget=forms.TextInput(
- attrs={
- 'placeholder': '',
- 'class': 'form-control'
- }
- ),
- label='Gender',
- required=True
+ widget=forms.TextInput(attrs={"placeholder": "", "class": "form-control"}), label="Gender", required=True
)
race_ethnicity = forms.ModelMultipleChoiceField(
- widget=forms.SelectMultiple,
- queryset=RaceEthnicity.objects.filter(is_visible=True),
- required=True
+ widget=forms.SelectMultiple, queryset=RaceEthnicity.objects.filter(is_visible=True), required=True
)
- birthday = forms.CharField(
- widget=html5_widgets.DateInput(
- attrs={
- 'class': 'form-control'
- }
- ),
- required=True
- )
+ birthday = forms.CharField(widget=html5_widgets.DateInput(attrs={"class": "form-control"}), required=True)
class Meta:
model = Guardian
- fields = ('phone', 'zip', 'gender', 'race_ethnicity', 'birthday')
+ fields = ("phone", "zip", "gender", "race_ethnicity", "birthday")
class StudentForm(CDCModelForm):
- PUBLIC = 'PU'
- CHARTER = 'CH'
- PRIVATE = 'PR'
- HOMESCHOOL = 'HM'
+ PUBLIC = "PU"
+ CHARTER = "CH"
+ PRIVATE = "PR"
+ HOMESCHOOL = "HM"
SCHOOL_TYPE_CHOICES = [
(PUBLIC, "Public"),
@@ -307,40 +205,40 @@ class StudentForm(CDCModelForm):
first_name = forms.CharField(
widget=forms.TextInput(
attrs={
- 'placeholder': 'Jane',
- 'class': 'form-control',
+ "placeholder": "Jane",
+ "class": "form-control",
},
),
- label='First Name',
+ label="First Name",
)
last_name = forms.CharField(
widget=forms.TextInput(
attrs={
- 'placeholder': 'Doe',
- 'class': 'form-control',
+ "placeholder": "Doe",
+ "class": "form-control",
},
),
- label='Last Name',
+ label="Last Name",
)
gender = forms.CharField(
widget=forms.TextInput(
attrs={
- 'placeholder': '',
- 'class': 'form-control',
+ "placeholder": "",
+ "class": "form-control",
},
),
- label='Gender',
+ label="Gender",
)
school_name = forms.CharField(
widget=forms.TextInput(
attrs={
- 'class': 'form-control',
+ "class": "form-control",
},
),
- label='School Name',
+ label="School Name",
required=False,
)
@@ -359,9 +257,9 @@ class StudentForm(CDCModelForm):
birthday = forms.CharField(
widget=html5_widgets.DateInput(
attrs={
- 'class': 'form-control',
- 'min': dateformat.format(timezone.now() - relativedelta(years=19), "Y-m-d"),
- 'max': dateformat.format(timezone.now() - relativedelta(years=5), "Y-m-d"),
+ "class": "form-control",
+ "min": dateformat.format(timezone.now() - relativedelta(years=19), "Y-m-d"),
+ "max": dateformat.format(timezone.now() - relativedelta(years=5), "Y-m-d"),
}
),
)
@@ -369,17 +267,15 @@ class StudentForm(CDCModelForm):
medications = forms.CharField(
widget=forms.Textarea(
attrs={
- 'placeholder': 'List any medications currently being taken.',
- 'class': 'form-control hidden',
- 'rows': 5,
+ "placeholder": "List any medications currently being taken.",
+ "class": "form-control hidden",
+ "rows": 5,
}
),
label=format_html(
"{0} {1}",
"Medications",
- mark_safe(
- ''
- ),
+ mark_safe(''),
),
required=False,
)
@@ -387,17 +283,15 @@ class StudentForm(CDCModelForm):
medical_conditions = forms.CharField(
widget=forms.Textarea(
attrs={
- 'placeholder': 'List any medical conditions.',
- 'class': 'form-control hidden',
- 'rows': 5,
+ "placeholder": "List any medical conditions.",
+ "class": "form-control hidden",
+ "rows": 5,
},
),
label=format_html(
"{0} {1}",
"Medical Conditions",
- mark_safe(
- ''
- ),
+ mark_safe(''),
),
required=False,
)
@@ -405,19 +299,19 @@ class StudentForm(CDCModelForm):
photo_release = forms.BooleanField(
widget=forms.CheckboxInput(
attrs={
- 'required': 'required',
+ "required": "required",
},
),
label=(
- 'I hereby give permission to We All Code to use the '
- 'student\'s image and/or likeness in promotional materials.'
+ "I hereby give permission to We All Code to use the "
+ "student's image and/or likeness in promotional materials."
),
)
consent = forms.BooleanField(
widget=forms.CheckboxInput(
attrs={
- 'required': 'required',
+ "required": "required",
},
),
label=format_lazy(
@@ -429,28 +323,21 @@ class StudentForm(CDCModelForm):
class Meta:
model = Student
- exclude = ('guardian', 'created_at', 'updated_at', 'is_active')
+ exclude = ("guardian", "created_at", "updated_at", "is_active")
class ContactForm(CDCForm):
- name = forms.CharField(max_length=100, label='Your name')
- email = forms.EmailField(max_length=200, label='Your email address')
- message = forms.CharField(widget=forms.Textarea, label='Your message')
+ name = forms.CharField(max_length=100, label="Your name")
+ email = forms.EmailField(max_length=200, label="Your email address")
+ message = forms.CharField(widget=forms.Textarea, label="Your message")
human = forms.CharField(max_length=100, label=False, required=False)
class DonationForm(ModelForm):
- session = forms.ModelChoiceField(
- queryset=Session.objects.all(),
- widget=forms.HiddenInput(),
- required=True
- )
- user = forms.ModelChoiceField(
- queryset=CDCUser.objects.all(),
- required=True
- )
- amount = forms.CharField(label='Amount (dollars)')
+ session = forms.ModelChoiceField(queryset=Session.objects.all(), widget=forms.HiddenInput(), required=True)
+ user = forms.ModelChoiceField(queryset=CDCUser.objects.all(), required=True)
+ amount = forms.CharField(label="Amount (dollars)")
class Meta:
model = Donation
- fields = ['session', 'user', 'amount']
+ fields = ["session", "user", "amount"]
diff --git a/coderdojochi/migrations/0037_auto_20210118_1808.py b/coderdojochi/migrations/0037_auto_20210118_1808.py
new file mode 100644
index 00000000..1d902a7a
--- /dev/null
+++ b/coderdojochi/migrations/0037_auto_20210118_1808.py
@@ -0,0 +1,61 @@
+# Generated by Django 3.1.5 on 2021-01-19 00:08
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('coderdojochi', '0036_auto_20210115_1624'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='course',
+ options={},
+ ),
+ migrations.AlterModelOptions(
+ name='donation',
+ options={},
+ ),
+ migrations.AlterModelOptions(
+ name='guardian',
+ options={},
+ ),
+ migrations.AlterModelOptions(
+ name='meeting',
+ options={},
+ ),
+ migrations.AlterModelOptions(
+ name='meetingorder',
+ options={},
+ ),
+ migrations.AlterModelOptions(
+ name='meetingtype',
+ options={},
+ ),
+ migrations.AlterModelOptions(
+ name='mentor',
+ options={},
+ ),
+ migrations.AlterModelOptions(
+ name='mentororder',
+ options={},
+ ),
+ migrations.AlterModelOptions(
+ name='order',
+ options={},
+ ),
+ migrations.AlterModelOptions(
+ name='partnerpasswordaccess',
+ options={},
+ ),
+ migrations.AlterModelOptions(
+ name='session',
+ options={},
+ ),
+ migrations.AlterModelOptions(
+ name='student',
+ options={},
+ ),
+ ]
diff --git a/coderdojochi/mixins.py b/coderdojochi/mixins.py
index 3ca9597c..6a52b23c 100644
--- a/coderdojochi/mixins.py
+++ b/coderdojochi/mixins.py
@@ -1,18 +1,14 @@
-import logging
-
from django.contrib import messages
-from django.shortcuts import get_object_or_404, redirect
+from django.shortcuts import redirect
from django.urls import reverse
-from coderdojochi.models import Session
-
class RoleTemplateMixin(object):
def get_template_names(self):
if self.request.user.is_authenticated:
- if self.request.user.role == 'mentor':
+ if self.request.user.role == "mentor":
template_name = f"mentor/{self.template_name}"
- elif self.request.user.role == 'guardian':
+ elif self.request.user.role == "guardian":
template_name = f"guardian/{self.template_name}"
else:
template_name = self.template_name
@@ -21,18 +17,17 @@ def get_template_names(self):
class RoleRedirectMixin(object):
-
def dispatch(self, request, *args, **kwargs):
- session_obj = kwargs.get('session_obj')
+ session_obj = kwargs.get("session_obj")
user = request.user
if user.is_authenticated and session_obj and not user.role:
- messages.warning(request, 'Please select one of the following options to continue.')
+ messages.warning(request, "Please select one of the following options to continue.")
next_url = f"{reverse('welcome')}?next={session_obj.get_absolute_url()}"
- if 'enroll' in request.GET:
- next_url += '&enroll=True'
+ if "enroll" in request.GET:
+ next_url += "&enroll=True"
return redirect(next_url)
diff --git a/coderdojochi/models.py b/coderdojochi/models.py
deleted file mode 100644
index defcea40..00000000
--- a/coderdojochi/models.py
+++ /dev/null
@@ -1,1448 +0,0 @@
-import os
-from datetime import timedelta
-
-from django.contrib.auth.models import AbstractUser
-from django.contrib.contenttypes.models import ContentType
-from django.core.validators import MaxValueValidator, MinValueValidator
-from django.db import models
-from django.template.defaultfilters import slugify
-from django.urls import reverse
-from django.utils import formats, timezone
-from django.utils.functional import cached_property
-from django.utils.translation import ugettext as _
-
-from stdimage.models import StdImageField
-
-from .notifications import (
- NewMentorBgCheckNotification,
- NewMentorNotification,
- NewMentorOrderNotification,
-)
-
-
-class CDCUser(AbstractUser):
-
- MENTOR = 'mentor'
- GUARDIAN = 'guardian'
-
- ROLE_CHOICES = [
- (MENTOR, 'mentor'),
- (GUARDIAN, 'guardian'),
- ]
-
- role = models.CharField(
- choices=ROLE_CHOICES,
- max_length=10,
- blank=True,
- null=True,
- )
-
- admin_notes = models.TextField(
- blank=True,
- null=True,
- )
-
- @cached_property
- def name(self):
- return f"{self.first_name} {self.last_name}"
-
- def save(self, *args, **kwargs):
- if self.pk is None:
- self.last_login = timezone.now()
- super(CDCUser, self).save(*args, **kwargs)
-
- def get_absolute_url(self):
- return reverse('account_home')
-
-
-def generate_filename(instance, filename):
- # file will be uploaded to MEDIA_ROOT/avatar/
| {{ forloop.counter|stringformat:"02d" }} | -{{ order.mentor.user.first_name }} {{ order.mentor.user.last_name }} | +{{ order.mentor.first_name }} {{ order.mentor.last_name }} |
{% if not order.check_in %}
@@ -198,7 +198,7 @@ Cancelled {{ inactive_orders.count }}
{{ order.student | student_age:session.start_date }} |
{% if active_session %}
-
+
{% else %}
{% if order.alternate_guardian %}
{{ order.alternate_guardian }}
{% else %}
- {{ order.guardian.user.first_name }} {{ order.guardian.user.last_name }}
+ {{ order.guardian.full_name }}
{% endif %}
{% endif %}
|
- {{ order.guardian.user.email }} |
+ {{ order.guardian.email }} |
{{ order.guardian.phone }} |
{{ order.student.school_name }} |
@@ -273,7 +273,7 @@ |
No Shows {{ no_show_orders.count }} {{ order.student.first_name }} {{ order.student.last_name }}{{ order.student | student_age:session.start_date }} |
- {{ order.guardian.user.first_name }} {{ order.guardian.user.last_name }} |
+ {{ order.guardian.full_name }} |
{{ order.updated_at }} |
{{ order.num_attended }} |
{{ order.num_missed }} |
@@ -312,8 +312,8 @@ Cancelled Tickets {{ inactive_orders.count
{{ forloop.counter|stringformat:"02d" }} |
- {{ order.mentor.user.first_name }} {{ order.mentor.user.last_name }}
+ {{ order.mentor.first_name }} {{ order.mentor.last_name }}
|
- {{ order.mentor.user.email }} |
+ {{ order.mentor.email }} |
{{ order.mentor.phone }} |
- |
- |
@@ -145,8 +145,8 @@ No Shows {{ no_show_orders.count }}
{% for order in no_show_orders %}
{{ forloop.counter|stringformat:"02d" }} |
- {{ order.mentor.user.first_name }} {{ order.mentor.user.last_name }} |
- {{ order.mentor.user.email }} |
+ {{ order.mentor.first_name }} {{ order.mentor.last_name }} |
+ {{ order.mentor.email }} |
{{ order.mentor.phone }} |
- |
- |
@@ -180,7 +180,7 @@ Cancelled Tickets {{ inactive_orders.count
{{ forloop.counter|stringformat:"02d" }} |
- {{ order.mentor.user.first_name }} {{ order.mentor.user.last_name }}
+ {{ order.mentor.first_name }} {{ order.mentor.last_name }}
|
- |
- |
diff --git a/coderdojochi/templates/dashboard/session-donations.html b/coderdojochi/templates/dashboard/session_donations.html
similarity index 98%
rename from coderdojochi/templates/dashboard/session-donations.html
rename to coderdojochi/templates/dashboard/session_donations.html
index faea7c9a..bd361b31 100644
--- a/coderdojochi/templates/dashboard/session-donations.html
+++ b/coderdojochi/templates/dashboard/session_donations.html
@@ -1,4 +1,4 @@
-{% extends "_admin-base.html" %}
+{% extends "_admin_base.html" %}
{% load i18n bootstrap3 %}
diff --git a/coderdojochi/templates/dashboard/session-stats.html b/coderdojochi/templates/dashboard/session_stats.html
similarity index 97%
rename from coderdojochi/templates/dashboard/session-stats.html
rename to coderdojochi/templates/dashboard/session_stats.html
index fdeebd78..8531e8ec 100644
--- a/coderdojochi/templates/dashboard/session-stats.html
+++ b/coderdojochi/templates/dashboard/session_stats.html
@@ -101,7 +101,7 @@ All Students{% csrf_token %}{{ order.student.last_name }}, {{ order.student.first_name }} |
- {% if order.alternate_guardian %}{{ order.alternate_guardian }}{% else %}{{ order.guardian.user.first_name }} {{ order.guardian.user.last_name }}{% endif %} |
+ {% if order.alternate_guardian %}{{ order.alternate_guardian }}{% else %}{{ order.guardian.full_name }}{% endif %} |
{{ order.student | student_age:session.start_date }} |
{{ order.student.gender }} |
{% if order.check_in %}
diff --git a/coderdojochi/templates/guardian/session-detail.html b/coderdojochi/templates/guardian/session-detail.html
deleted file mode 100644
index bc1075c3..00000000
--- a/coderdojochi/templates/guardian/session-detail.html
+++ /dev/null
@@ -1,199 +0,0 @@
-{% extends "coderdojochi/_base.html" %}
-
-{% load static i18n humanize coderdojochi_extras %}
-
-{% block title %}{% if session.course.code %}{{ session.course.code }}: {% endif %}{{ session.course.title }} on {{ session.start_date|date }} | {{ block.super }}{% endblock %}
-{% block meta_facebook_title %}{% if session.course.code %}{{ session.course.code }}: {% endif %}{{ session.course.title }} on {{ session.start_date|date }} | {{ block.super }}{% endblock %}
-{% block meta_twitter_title %}{% if session.course.code %}{{ session.course.code }}: {% endif %}{{ session.course.title }} on {{ session.start_date|date }} | {{ block.super }}{% endblock %}
-
-{% block meta_description %}{{ session.course.description|striptags|safe }}{% endblock %}
-{% block meta_facebook_description %}{{ session.course.description|striptags|safe }}{% endblock %}
-{% block meta_twitter_description %}{{ session.course.description|striptags|safe }}{% endblock %}
-
-{% comment %} {% block meta_facebook_image %}{% endblock %} {% endcomment %}
-{% comment %} {% block meta_twitter_image %}{% endblock %} {% endcomment %}
-
-{% block body_class %}page-class-detail{% endblock %}
-
-{% block contained_content %}
-
-Class Details & Enrollment- -There are currently no available spots for this class. Please enroll in an upcoming class. - - {% else %} - - {% if students %} - - {% if spots_remaining > 0 %} - -Enroll Student{{ students|pluralize }} - - {% else %} - -There are currently no available spots for this class. Please join the waitlist below and/or find another upcoming class. - - {% endif %} - -
-
-
-{% if session.instructor %}
-
-
- {% if session.course.code %}{{ session.course.code }}: {% endif%}{{ session.course.title }}-{{ session.course.description|safe }} - - {% if session.additional_info %} -Additional Info: This will be a live online class via Zoom. - -Technical Requirements-Computer: PC (Windows XP or newer), Mac (OSX 10.7 or newer), or Chromebook with at least a 2GHz processor and 2GB of RAM (4GB of RAM is recommended). - -Internet: At least 1.2Mbps download and 600Kbps upload speeds. Go to fast.com to check your speed. - -Webcam: Many laptops have an integrated webcam. - -Microphone and Speakers: We highly recommend headphones with a built-in microphone, however any microphone and speakers will work in a quiet room. - -How To Join Online Class-About 10 minutes before class time, click the following link to join. -{{ session.online_video_link }} - -Meeting ID: {{ session.online_video_meeting_id }}
-
-{{ session.start_date|date }}-
- {{ session.start_date|time }} to {{ session.end_date|time }} {{ session.location.name }}- {% if session.location.address %} - - - - {% else %} - - - -Meeting ID: {{ session.online_video_meeting_id }} Who- {% if session.gender_limitation %} -This class is limited to {{ session.gender_limitation }}s only. - {% endif %} - - {% if session.gender_limitation %} -{{ session.gender_limitation|title }}s between {{ session.minimum_age }} and {{ session.maximum_age }} of age. No computer skills required. - {% else %} -Anyone between {{ session.minimum_age }} and {{ session.maximum_age }} of age. No computer skills required. - {% endif %} - - -Cost- {% if session.minimum_cost or session.maximm_cost %} -${{ session.minimum_cost | floatformat:-2 }} – ${{ session.maximim_cost | floatformat:-2 }} - {% elif session.cost > 0 %} -${{ session.cost | floatformat:-2 }} - {% else %} -Free to attend! - {% endif %} - -About the instructor-
-
-
-
- 
-
-
- {{ session.instructor }}-{{ session.instructor.bio|truncatechars_html:120 }} - -Meet the mentors-
- {% for mentor in active_mentors %}
- {% if mentor.is_public == True %}
-
-
- {% include "weallcode/snippets/team_member.html" with is_small=True name=mentor.full_name image=mentor.avatar.thumbnail %}
-
- {% endif %}
- {% endfor %}
- Class Details & Enrollment+ +There are currently no available spots for this class. Please enroll in an upcoming class. + + {% else %} + + {% if students %} + + {% if spots_remaining > 0 %} + +Enroll Student{{ students|pluralize }} + + {% else %} + +There are currently no available spots for this class. Please join the waitlist below and/or find another upcoming class. + + {% endif %} + +
+
+
+{% if object.instructor %}
+
+
+
+ {% if object.course.code %}{{ object.course.code }}: {% endif%}{{ object.course.title }}+{{ object.course.description|safe }} + + {% if object.additional_info %} +Additional Info: This will be a live online class via Zoom. + +Technical Requirements+Computer: PC (Windows XP or newer), Mac (OSX 10.7 or newer), or Chromebook with at least a 2GHz processor and 2GB of RAM (4GB of RAM is recommended). + +Internet: At least 1.2Mbps download and 600Kbps upload speeds. Go to fast.com to check your speed. + +Webcam: Many laptops have an integrated webcam. + +Microphone and Speakers: We highly recommend headphones with a built-in microphone, however any microphone and speakers will work in a quiet room. + +How To Join Online Class+About 10 minutes before class time, click the following link to join. +{{ object.online_video_link }} + +Meeting ID: {{ object.online_video_meeting_id }}
+
+{{ object.start_date|date }}+{{ object.start_date|time }} to {{ object.end_date|time }} + + +{{ object.location.name }}+ + {% if object.location.address %} + + + + {% else %} + + + +
+ Meeting ID: {{ object.online_video_meeting_id }} Who+ {% if object.gender_limitation %} +This class is limited to {{ object.gender_limitation }}s only. + {% endif %} + + {% if object.gender_limitation %} +{{ object.gender_limitation|title }}s between {{ object.minimum_age }} and {{ object.maximum_age }} of age. No computer skills required. + {% else %} +Anyone between {{ object.minimum_age }} and {{ object.maximum_age }} of age. No computer skills required. + {% endif %} + + +Cost+ {% if object.minimum_cost or object.maximm_cost %} +${{ object.minimum_cost | floatformat:-2 }} – ${{ object.maximim_cost | floatformat:-2 }} + {% elif object.cost > 0 %} +${{ object.cost | floatformat:-2 }} + {% else %} +Free to attend! + {% endif %} + +About the instructor+
+
+
+
+
+
+
+ {{ object.instructor }}+{{ object.instructor.bio|truncatechars_html:120 }} + +Meet the mentors+
+ {% for mentor in active_mentors %}
+ {% if mentor.is_public == True %}
+
+
+ {% include "weallcode/snippets/team_member.html" with is_small=True name=mentor.full_name image=mentor.get_avatar.thumbnail %}
+
+ {% endif %}
+ {% endfor %}
+
{% if user_signed_up %}
-
{% endfor %}
diff --git a/coderdojochi/templatetags/coderdojochi_extras.py b/coderdojochi/templatetags/coderdojochi_extras.py
index c37c15be..ae96e776 100644
--- a/coderdojochi/templatetags/coderdojochi_extras.py
+++ b/coderdojochi/templatetags/coderdojochi_extras.py
@@ -16,105 +16,64 @@ def subtract(value, arg):
@register.simple_tag(takes_context=False)
def student_session_order_count(student, session):
- orders_count = Order.objects.filter(
- student=student,
- session=session
- ).count()
+ orders_count = Order.objects.filter(student=student, session=session).count()
return orders_count
@register.simple_tag(takes_context=True)
def student_register_link(context, student, session):
- orders = Order.objects.filter(
- student=student,
- session=session,
- is_active=True
+ orders = Order.objects.filter(student=student, session=session, is_active=True)
+
+ url = reverse(
+ "session-sign-up",
+ kwargs={
+ "pk": session.id,
+ "student_id": student.id,
+ },
)
- url = reverse('session-sign-up', kwargs={'pk': session.id, 'student_id': student.id, })
-
- button_tag = 'a'
- button_modifier = ''
- button_additional_attributes = ''
- button_msg = 'Enroll'
- button_href = f'href={url}'
+ button_tag = "a"
+ button_modifier = ""
+ button_additional_attributes = ""
+ button_msg = "Enroll"
+ button_href = f"href={url}"
if orders.count():
button_modifier = "tertiary"
button_msg = "Can't make it"
- elif (
- not student.is_within_age_range(
- session.minimum_age,
- session.maximum_age,
- session.start_date
- ) or
- not student.is_within_gender_limitation(
- session.gender_limitation
- )
- ):
- button_modifier = 'btn-default'
- button_additional_attributes = 'disabled'
- button_tag = 'span'
-
- if (
- not student.is_within_age_range(
- session.minimum_age,
- session.maximum_age,
- session.start_date
- ) and
- not student.is_within_gender_limitation(
- session.gender_limitation
- )
- ):
+ elif not student.is_within_age_range(
+ session.minimum_age, session.maximum_age, session.start_date
+ ) or not student.is_within_gender_limitation(session.gender_limitation):
+ button_modifier = "btn-default"
+ button_additional_attributes = "disabled"
+ button_tag = "span"
+
+ if not student.is_within_age_range(
+ session.minimum_age, session.maximum_age, session.start_date
+ ) and not student.is_within_gender_limitation(session.gender_limitation):
title = "Limited event."
- message = (
- f"Sorry, this class is limited to {session.gender_limitation}s between {session.minimum_age} "
- f"and {session.maximum_age} this time around."
- )
-
- button_href = (
- 'data-trigger="hover" data-placement="top" data-toggle="popover" title="" '
- f'data-content="{message}" data-original-title="{title}"'
- )
-
- elif (
- not student.is_within_age_range(
- session.minimum_age,
- session.maximum_age,
- session.start_date
- )
- ):
+ message = f"Sorry, this class is limited to {session.gender_limitation}s between {session.minimum_age} and {session.maximum_age} this time around."
+
+ button_href = f'data-trigger="hover" data-placement="top" data-toggle="popover" title="" data-content="{message}" data-original-title="{title}"'
+
+ elif not student.is_within_age_range(session.minimum_age, session.maximum_age, session.start_date):
title = "Age-limited event."
- message = (
- f"Sorry, this class is limited to student between ages {session.minimum_age} and "
- f"{session.maximum_age} this time around."
- )
- button_href = (
- 'data-trigger="hover" data-placement="top" data-toggle="popover" title="" '
- f'data-content="{message}" data-original-title="{title}"'
- )
-
- elif (
- not student.is_within_gender_limitation(
- session.gender_limitation
- )
- ):
- title = "{gender}-only event.".format(
- gender='Girls' if session.gender_limitation == 'female' else 'Boys'
- )
+ message = f"Sorry, this class is limited to student between ages {session.minimum_age} and {session.maximum_age} this time around."
+
+ button_href = f'data-trigger="hover" data-placement="top" data-toggle="popover" title="" data-content="{message}" data-original-title="{title}"'
+
+ elif not student.is_within_gender_limitation(session.gender_limitation):
+ if session.gender_limitation == "female":
+ title = "Girls-only event."
+ else:
+ title = "Boys-only event."
+
message = f"Sorry, this class is limited to {session.gender_limitation}s this time around."
- button_href = (
- 'data-trigger="hover" data-placement="top" data-toggle="popover" title="" '
- f'data-content="{message}" data-original-title="{title}" '
- )
-
- form = (
- f"<{button_tag} {button_href} class='button small {button_modifier}' {button_additional_attributes}>"
- f"{button_msg}"
- f""
- )
+ button_href = f'data-trigger="hover" data-placement="top" data-toggle="popover" title="" data-content="{message}" data-original-title="{title}" '
+
+ form = f"<{button_tag} {button_href} class='button small {button_modifier}' {button_additional_attributes}>{button_msg}"
return Template(form).render(context)
@@ -125,10 +84,13 @@ def student_age(student, date):
@register.simple_tag(takes_context=True)
-def menu_is_active(context, pattern_or_urlname, css_class='active'):
+def menu_is_active(context, pattern_or_urlname, css_class="active"):
try:
- pattern = '^' + reverse(pattern_or_urlname)
+ pattern = "^" + reverse(pattern_or_urlname)
except NoReverseMatch:
pattern = pattern_or_urlname
- return css_class if re.search(pattern, context['request'].path) else ''
+ if re.search(pattern, context["request"].path):
+ return css_class
+ else:
+ return ""
diff --git a/coderdojochi/tests/test_mentor_updates.py b/coderdojochi/tests/test_mentor_updates.py
index 4804d215..8294a010 100644
--- a/coderdojochi/tests/test_mentor_updates.py
+++ b/coderdojochi/tests/test_mentor_updates.py
@@ -1,5 +1,3 @@
-from unittest import TestCase
-
from django.test import TransactionTestCase
import mock
@@ -8,7 +6,7 @@
class TestMentorAvatarUpdates(TransactionTestCase):
- @mock.patch('coderdojochi.signals_handlers.EmailMultiAlternatives')
+ @mock.patch("coderdojochi.signals_handlers.EmailMultiAlternatives")
def test_new_mentor_no_avatar(self, mock_email):
mentor = Mentor.objects.create()
self.fail()
diff --git a/coderdojochi/tests/test_password_session.py b/coderdojochi/tests/test_password_session.py
index a1b2c9d3..aeb8dc29 100644
--- a/coderdojochi/tests/test_password_session.py
+++ b/coderdojochi/tests/test_password_session.py
@@ -1,92 +1,62 @@
-# import mock
-# import sys
-
from django.contrib.auth import get_user_model
from django.http import HttpResponseRedirect
-# from django.test import RequestFactory
from django.test import Client, TestCase
from django.urls import reverse
from coderdojochi.factories import PartnerPasswordAccessFactory, SessionFactory
from coderdojochi.models import PartnerPasswordAccess
-# from coderdojochi.factories import CDCUserFactory
-# from coderdojochi.views import session_detail
-
-
User = get_user_model()
class TestPartnerSessionPassword(TestCase):
def setUp(self):
- self.partner_session = SessionFactory.create(password='124')
+ self.partner_session = SessionFactory.create(password="124")
self.url_kwargs = {
- 'year': self.partner_session.start_date.year,
- 'month': self.partner_session.start_date.month,
- 'day': self.partner_session.start_date.day,
- 'slug': self.partner_session.course.slug,
- 'session_id': self.partner_session.id
+ "year": self.partner_session.start_date.year,
+ "month": self.partner_session.start_date.month,
+ "day": self.partner_session.start_date.day,
+ "slug": self.partner_session.course.slug,
+ "session_id": self.partner_session.id,
}
self.client = Client()
- self.url = reverse('session_password', kwargs=self.url_kwargs)
+ self.url = reverse("session_password", kwargs=self.url_kwargs)
def test_session_password_invalid_password(self):
- response = self.client.post(self.url, data={'password': 'abc'})
- self.assertContains(response, 'Invalid password.')
+ response = self.client.post(self.url, data={"password": "abc"})
+ self.assertContains(response, "Invalid password.")
def test_session_password_no_password(self):
- response = self.client.post(self.url, data={'password': ''})
- self.assertContains(response, 'Must enter a password.')
+ response = self.client.post(self.url, data={"password": ""})
+ self.assertContains(response, "Must enter a password.")
def test_session_password_valid_password_unauthed(self):
- response = self.client.post(
- self.url,
- data={
- 'password': self.partner_session.password
- }
- )
+ response = self.client.post(self.url, data={"password": self.partner_session.password})
self.assertIsInstance(response, HttpResponseRedirect)
- detail_url = reverse('session_detail', kwargs=self.url_kwargs)
+ detail_url = reverse("session_detail", kwargs=self.url_kwargs)
self.assertEqual(response.url, detail_url)
password_access_count = PartnerPasswordAccess.objects.count()
self.assertEqual(password_access_count, 0)
- authed_sessions = self.client.session['authed_partner_sessions']
+ authed_sessions = self.client.session["authed_partner_sessions"]
self.assertFalse(str(self.partner_session.id) in authed_sessions)
def test_session_password_valid_password_authed(self):
- user = User.objects.create_user(
- 'user',
- email='email@email.com',
- password='pass123'
- )
- self.assertTrue(
- self.client.login(
- email='email@email.com',
- password='pass123'
- )
- )
-
- response = self.client.post(
- self.url,
- data={
- 'password': self.partner_session.password
- }
- )
+ user = User.objects.create_user("user", email="email@email.com", password="pass123")
+ self.assertTrue(self.client.login(email="email@email.com", password="pass123"))
+
+ response = self.client.post(self.url, data={"password": self.partner_session.password})
self.assertIsInstance(response, HttpResponseRedirect)
- detail_url = reverse('session_detail', kwargs=self.url_kwargs)
+ detail_url = reverse("session_detail", kwargs=self.url_kwargs)
self.assertEqual(response.url, detail_url)
- partner_password_access = PartnerPasswordAccess.objects.get(
- session=self.partner_session,
- user=user
- )
+ partner_password_access = PartnerPasswordAccess.objects.get(session=self.partner_session, user=user)
self.assertIsNotNone(partner_password_access)
- authed_sessions = self.client.session['authed_partner_sessions']
+ authed_sessions = self.client.session["authed_partner_sessions"]
self.assertTrue(str(self.partner_session.id) in authed_sessions)
@@ -94,61 +64,40 @@ class TestSessionDetail(TestCase):
def setUp(self):
super(TestSessionDetail, self).setUp()
self.client = Client()
- self.partner_session = SessionFactory.create(password='124')
+ self.partner_session = SessionFactory.create(password="124")
self.url_kwargs = {
- 'year': self.partner_session.start_date.year,
- 'month': self.partner_session.start_date.month,
- 'day': self.partner_session.start_date.day,
- 'slug': self.partner_session.course.slug,
- 'session_id': self.partner_session.id
+ "year": self.partner_session.start_date.year,
+ "month": self.partner_session.start_date.month,
+ "day": self.partner_session.start_date.day,
+ "slug": self.partner_session.course.slug,
+ "session_id": self.partner_session.id,
}
- self.url = reverse('session_detail', kwargs=self.url_kwargs)
+ self.url = reverse("session_detail", kwargs=self.url_kwargs)
def test_redirect_password_unauthed(self):
response = self.client.get(self.url)
self.assertIsInstance(response, HttpResponseRedirect)
- detail_url = reverse('session_password', kwargs=self.url_kwargs)
+ detail_url = reverse("session_password", kwargs=self.url_kwargs)
self.assertEqual(response.url, detail_url)
def test_redirect_password_authed(self):
- User.objects.create_user(
- 'user',
- email='email@email.com',
- password='pass123'
- )
- self.assertTrue(
- self.client.login(
- email='email@email.com',
- password='pass123'
- )
- )
+ User.objects.create_user("user", email="email@email.com", password="pass123")
+ self.assertTrue(self.client.login(email="email@email.com", password="pass123"))
response = self.client.get(self.url)
self.assertIsInstance(response, HttpResponseRedirect)
- detail_url = reverse('session_password', kwargs=self.url_kwargs)
+ detail_url = reverse("session_password", kwargs=self.url_kwargs)
self.assertEqual(response.url, detail_url)
def test_redirect_password_partner_password_access(self):
- user = User.objects.create_user(
- 'user',
- email='email@email.com',
- password='pass123'
- )
- self.assertTrue(
- self.client.login(
- email='email@email.com',
- password='pass123'
- )
- )
-
- PartnerPasswordAccessFactory.create(
- user=user,
- session=self.partner_session
- )
+ user = User.objects.create_user("user", email="email@email.com", password="pass123")
+ self.assertTrue(self.client.login(email="email@email.com", password="pass123"))
+
+ PartnerPasswordAccessFactory.create(user=user, session=self.partner_session)
response = self.client.get(self.url)
- detail_url = reverse('session_password', kwargs=self.url_kwargs)
+ detail_url = reverse("session_password", kwargs=self.url_kwargs)
# don't care what its doing as long as its not
# redirecting to the password url.
diff --git a/coderdojochi/urls.py b/coderdojochi/urls.py
index 4ce558c1..924c4cb8 100644
--- a/coderdojochi/urls.py
+++ b/coderdojochi/urls.py
@@ -1,32 +1,26 @@
from django.conf import settings
-from django.conf.urls import include, url
+from django.conf.urls import include
from django.conf.urls.static import static
from django.contrib import admin
-from django.contrib.auth import views as django_views
from django.http import HttpResponse
from django.urls import path
from django.views import defaults
from django.views.generic import RedirectView
-from loginas import views as loginas_views
-
from . import old_views
-from .views.meetings import (
+from .views import ( # SessionDetailView,
MeetingCalendarView,
MeetingDetailView,
MeetingsView,
- meeting_announce,
- meeting_sign_up,
-)
-from .views.mentor import MentorDetailView, MentorListView
-from .views.profile import DojoMentorView
-from .views.sessions import (
PasswordSessionView,
SessionCalendarView,
SessionDetailView,
- SessionSignUpView
+ SessionSignUpView,
+ WelcomeView,
+ meeting_announce,
+ meeting_sign_up,
)
-from .views.welcome import WelcomeView
+from .views.public import MentorDetailView, MentorListView
admin.autodiscover()
@@ -35,151 +29,165 @@
# General Pages
urlpatterns += [
- path('', include('weallcode.urls')),
+ path("", include("weallcode.urls")),
]
# Accounts
urlpatterns += [
- path('account/', include('accounts.urls')),
+ path("account/", include("accounts.urls")),
]
# Old General
urlpatterns += [
-
- path('old/', include([
-
- # Meetings
- path('meetings/', include([
- # Meetings
- # /meetings/
- path('', MeetingsView.as_view(), name='meetings'),
-
- # Individual Meeting
- # /meeting/ID/
- path('{{ student.first_name }} {{ student.last_name }} can no longer make it to the "{{ session.course.title }}" class on {{ session.start_date|date }} from {{ session.start_date|time }} to {{ session.end_date|time }}.+{{ student.full_name }} can no longer make it to the "{{ session.course.title }}" class on {{ session.start_date|date }} from {{ session.start_date|time }} to {{ session.end_date|time }}. ')
+
member_image.allow_tags = True
list_display = [
- 'member_image',
- 'name',
- 'role',
- 'is_active',
+ "member_image",
+ "name",
+ "role",
+ "is_active",
]
list_filter = [
- 'is_active',
- 'role',
+ "is_active",
+ "role",
]
readonly_fields = [
- 'member_image',
- 'created_at',
- 'updated_at',
+ "member_image",
+ "created_at",
+ "updated_at",
]
- ordering = [
- 'name'
- ]
+ ordering = ["name"]
fieldsets = (
- (None, {
- 'fields': (
- 'name',
- 'role',
- 'description',
- 'linkedin',
- 'image',
- 'member_image',
- 'is_active',
- 'created_at',
- 'updated_at',
- ),
- }),
+ (
+ None,
+ {
+ "fields": (
+ "name",
+ "role",
+ "join_date",
+ "description",
+ "linkedin",
+ "image",
+ "member_image",
+ "is_active",
+ "created_at",
+ "updated_at",
+ ),
+ },
+ ),
)
@@ -53,88 +56,94 @@ def member_image(self, obj):
class BoardMemberAdmin(admin.ModelAdmin):
def member_image(self, obj):
return format_html(f'')
+
member_image.allow_tags = True
list_display = [
- 'member_image',
- 'name',
- 'role',
- 'is_active',
+ "member_image",
+ "name",
+ "role",
+ "is_active",
]
list_filter = [
- 'is_active',
- 'role',
+ "is_active",
+ "role",
]
readonly_fields = [
- 'member_image',
- 'created_at',
- 'updated_at',
+ "member_image",
+ "created_at",
+ "updated_at",
]
- ordering = [
- 'name'
- ]
+ ordering = ["name"]
fieldsets = (
- (None, {
- 'fields': (
- 'name',
- 'role',
- 'description',
- 'linkedin',
- 'image',
- 'member_image',
- 'is_active',
- 'created_at',
- 'updated_at',
- ),
- }),
+ (
+ None,
+ {
+ "fields": (
+ "name",
+ "role",
+ "join_date",
+ "description",
+ "linkedin",
+ "image",
+ "member_image",
+ "is_active",
+ "created_at",
+ "updated_at",
+ ),
+ },
+ ),
)
@admin.register(AssociateBoardMember)
class AssociateBoardMemberAdmin(admin.ModelAdmin):
-
def member_image(self, obj):
return format_html(f'')
+
member_image.allow_tags = True
list_display = [
- 'member_image',
- 'name',
- 'role',
- 'is_active',
+ "member_image",
+ "name",
+ "role",
+ "join_date",
+ "is_active",
]
list_filter = [
- 'is_active',
- 'role',
+ "is_active",
+ "role",
]
readonly_fields = [
- 'member_image',
- 'created_at',
- 'updated_at',
+ "member_image",
+ "created_at",
+ "updated_at",
]
- ordering = [
- 'name'
- ]
+ ordering = ["name"]
fieldsets = (
- (None, {
- 'fields': (
- 'name',
- 'role',
- 'description',
- 'linkedin',
- 'image',
- 'member_image',
- 'is_active',
- 'created_at',
- 'updated_at',
- ),
- }),
+ (
+ None,
+ {
+ "fields": (
+ "name",
+ "role",
+ "join_date",
+ "description",
+ "linkedin",
+ "image",
+ "member_image",
+ "is_active",
+ "created_at",
+ "updated_at",
+ ),
+ },
+ ),
)
diff --git a/weallcode/apps.py b/weallcode/apps.py
index 77a38dca..0c3b8aa7 100644
--- a/weallcode/apps.py
+++ b/weallcode/apps.py
@@ -1,7 +1,6 @@
from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
class WeAllCodeConfig(AppConfig):
- name = 'weallcode'
- verbose_name = _("We All Code")
+ name = "weallcode"
+ verbose_name = "We All Code"
diff --git a/weallcode/forms.py b/weallcode/forms.py
index 0893e1f4..46e01dbf 100644
--- a/weallcode/forms.py
+++ b/weallcode/forms.py
@@ -9,12 +9,12 @@
class ContactForm(forms.Form):
widths = (
- ('name', 'small-6'),
- ('email', 'small-6'),
- ('interest', 'small-6'),
- ('phone', 'small-6'),
- ('message', 'small-12'),
- ('captcha', ''),
+ ("name", "small-6"),
+ ("email", "small-6"),
+ ("interest", "small-6"),
+ ("phone", "small-6"),
+ ("message", "small-12"),
+ ("captcha", ""),
)
captcha = ReCaptchaField(
@@ -23,62 +23,62 @@ class ContactForm(forms.Form):
name = forms.CharField(
max_length=100,
- label='Full Name',
+ label="Full Name",
)
email = forms.EmailField(
max_length=200,
- label='Email Address',
+ label="Email Address",
widget=forms.TextInput(
attrs={
- 'type': 'email',
- 'placeholder': 'email@example.com',
+ "type": "email",
+ "placeholder": "email@example.com",
},
),
)
interest = forms.ChoiceField(
choices=[
- ('volunteer', 'Volunteer'),
- ('donate', 'Donate'),
- ('sponsor', 'Sponsor'),
- ('collaborate', 'Collaborate'),
- ('other', 'Other'),
+ ("volunteer", "Volunteer"),
+ ("donate", "Donate"),
+ ("sponsor", "Sponsor"),
+ ("collaborate", "Collaborate"),
+ ("other", "Other"),
],
- label='Topic of Interest',
+ label="Topic of Interest",
)
phone = forms.CharField(
max_length=20,
- label='Phone Number',
+ label="Phone Number",
widget=forms.TextInput(
attrs={
- 'type': 'tel',
- 'placeholder': '+1 555 555-5555',
- 'minlength': '10',
- 'maxlength': '20',
+ "type": "tel",
+ "placeholder": "+1 555 555-5555",
+ "minlength": "10",
+ "maxlength": "20",
},
),
)
message = forms.CharField(
- label='Message',
+ label="Message",
widget=forms.Textarea(
attrs={
- 'placeholder': 'Enter your message',
- 'minlength': 25,
- 'maxlength': 500,
+ "placeholder": "Enter your message",
+ "minlength": 25,
+ "maxlength": 500,
},
),
)
def as_grid(self):
- return ''.join([self.field_html(f[0], f[1]) for f in self.widths])
+ return "".join([self.field_html(f[0], f[1]) for f in self.widths])
def field_html(self, field_name, field_classes):
field = self[field_name]
- if field_classes == '':
+ if field_classes == "":
return f"{field}{field.errors}"
return f"{field.label_tag()}{field}{field.errors} "
@@ -90,10 +90,10 @@ def send_email(self):
subject=f"{data['name']} | We All Code Contact Form",
recipients=[settings.CONTACT_EMAIL],
reply_to=[f"{data['name']}<{data['email']}>"],
- template_name='contact-email',
+ template_name="contact_email",
merge_global_data={
- 'interest': data['interest'],
- 'message': data['message'],
- 'phone': data['phone'],
+ "interest": data["interest"],
+ "message": data["message"],
+ "phone": data["phone"],
},
)
diff --git a/weallcode/migrations/0007_auto_20201229_1542.py b/weallcode/migrations/0007_auto_20201229_1542.py
new file mode 100644
index 00000000..15e99992
--- /dev/null
+++ b/weallcode/migrations/0007_auto_20201229_1542.py
@@ -0,0 +1,44 @@
+# Generated by Django 3.1.2 on 2020-12-29 21:42
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('weallcode', '0006_auto_20200615_1451'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='associateboardmember',
+ options={},
+ ),
+ migrations.AlterModelOptions(
+ name='boardmember',
+ options={},
+ ),
+ migrations.AlterModelOptions(
+ name='staffmember',
+ options={},
+ ),
+ migrations.AddField(
+ model_name='associateboardmember',
+ name='join_date',
+ field=models.DateField(auto_now_add=True, default=django.utils.timezone.now, verbose_name='Join Date'),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='boardmember',
+ name='join_date',
+ field=models.DateField(auto_now_add=True, default=django.utils.timezone.now, verbose_name='Join Date'),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='staffmember',
+ name='join_date',
+ field=models.DateField(auto_now_add=True, default=django.utils.timezone.now, verbose_name='Join Date'),
+ preserve_default=False,
+ ),
+ ]
diff --git a/weallcode/models.py b/weallcode/models.py
deleted file mode 100644
index 1f9dc7f5..00000000
--- a/weallcode/models.py
+++ /dev/null
@@ -1,118 +0,0 @@
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-
-CHAIR = 'Chair'
-VICE_CHAIR = 'Vice Chair'
-SECRETARY = 'Secretary'
-TREASURER = 'Treasurer'
-DIRECTOR = 'Director'
-PRESIDENT = 'President'
-
-ROLE_CHOICES = [
- (CHAIR, 'Chair'),
- (VICE_CHAIR, 'Vice Chair'),
- (SECRETARY, 'Secretary'),
- (TREASURER, 'Treasurer'),
- (DIRECTOR, 'Director'),
- (PRESIDENT, 'President'),
-]
-
-
-class CommonInfo(models.Model):
-
- name = models.CharField(
- max_length=255,
- )
-
- role = models.CharField(
- choices=ROLE_CHOICES,
- max_length=255,
- default=DIRECTOR,
- )
-
- image = models.ImageField(
- upload_to='staff/',
- blank=True,
- null=True,
- )
-
- description = models.CharField(
- max_length=255,
- blank=True,
- null=True,
- )
-
- linkedin = models.URLField(
- max_length=200,
- blank=True,
- null=True,
- )
-
- # Active
- is_active = models.BooleanField(
- default=True,
- )
-
- # Auto create/update
- created_at = models.DateTimeField(
- auto_now_add=True,
- )
-
- updated_at = models.DateTimeField(
- auto_now=True,
- )
-
- class Meta:
- abstract = True
-
-
-class StaffMember(CommonInfo):
-
- role = models.CharField(
- max_length=255,
- )
-
- image = models.ImageField(
- upload_to='staff/',
- blank=True,
- null=True,
- )
-
- class Meta:
- verbose_name = _("Staff Member")
- verbose_name_plural = _("Staff Members")
-
- def __str__(self):
- return self.name
-
-
-class BoardMember(CommonInfo):
-
- image = models.ImageField(
- upload_to='board/',
- blank=True,
- null=True,
- )
-
- class Meta:
- verbose_name = _("Board Member")
- verbose_name_plural = _("Board Members")
-
- def __str__(self):
- return self.name
-
-
-class AssociateBoardMember(CommonInfo):
-
- image = models.ImageField(
- upload_to='associate-board/',
- blank=True,
- null=True,
- )
-
- class Meta:
- verbose_name = _("Associate Board Member")
- verbose_name_plural = _("Associate Board Members")
-
- def __str__(self):
- return self.name
diff --git a/weallcode/models/__init__.py b/weallcode/models/__init__.py
new file mode 100644
index 00000000..dca98aa4
--- /dev/null
+++ b/weallcode/models/__init__.py
@@ -0,0 +1,4 @@
+from .associate_board_member import *
+from .board_member import *
+from .common import *
+from .staff import *
diff --git a/weallcode/models/associate_board_member.py b/weallcode/models/associate_board_member.py
new file mode 100644
index 00000000..70fbd311
--- /dev/null
+++ b/weallcode/models/associate_board_member.py
@@ -0,0 +1,20 @@
+from collections import defaultdict
+from itertools import chain
+
+from django.db import models
+
+from .common import CommonBoardMemberManager, CommonInfo
+
+
+class AssociateBoardMember(CommonInfo):
+
+ image = models.ImageField(
+ upload_to="associate-board/",
+ blank=True,
+ null=True,
+ )
+
+ objects = CommonBoardMemberManager()
+
+ def __str__(self):
+ return self.name
diff --git a/weallcode/models/board_member.py b/weallcode/models/board_member.py
new file mode 100644
index 00000000..c4761487
--- /dev/null
+++ b/weallcode/models/board_member.py
@@ -0,0 +1,17 @@
+from django.db import models
+
+from .common import CommonBoardMemberManager, CommonInfo
+
+
+class BoardMember(CommonInfo):
+
+ image = models.ImageField(
+ upload_to="board/",
+ blank=True,
+ null=True,
+ )
+
+ objects = CommonBoardMemberManager()
+
+ def __str__(self):
+ return self.name
diff --git a/weallcode/models/common.py b/weallcode/models/common.py
new file mode 100644
index 00000000..a6599e18
--- /dev/null
+++ b/weallcode/models/common.py
@@ -0,0 +1,74 @@
+from collections import defaultdict
+from itertools import chain
+
+from django.db import models
+from django.db.models import Case, When
+
+CHAIR = "Chair"
+VICE_CHAIR = "Vice Chair"
+SECRETARY = "Secretary"
+TREASURER = "Treasurer"
+DIRECTOR = "Director"
+PRESIDENT = "President"
+
+ROLE_CHOICES = [
+ (CHAIR, "Chair"),
+ (VICE_CHAIR, "Vice Chair"),
+ (SECRETARY, "Secretary"),
+ (TREASURER, "Treasurer"),
+ (DIRECTOR, "Director"),
+ (PRESIDENT, "President"),
+]
+
+
+class CommonInfo(models.Model):
+ name = models.CharField(
+ max_length=255,
+ )
+ role = models.CharField(
+ choices=ROLE_CHOICES,
+ max_length=255,
+ default=DIRECTOR,
+ )
+ image = models.ImageField(
+ upload_to="staff/",
+ blank=True,
+ null=True,
+ )
+ description = models.CharField(
+ max_length=255,
+ blank=True,
+ null=True,
+ )
+ linkedin = models.URLField(
+ max_length=200,
+ blank=True,
+ null=True,
+ )
+ join_date = models.DateField("Join Date", auto_now_add=True)
+ is_active = models.BooleanField(
+ default=True,
+ )
+ created_at = models.DateTimeField(
+ auto_now_add=True,
+ )
+ updated_at = models.DateTimeField(
+ auto_now=True,
+ )
+
+ class Meta:
+ abstract = True
+
+
+class CommonBoardMemberManager(models.Manager):
+ def get_queryset(self):
+ return super().get_queryset().filter(is_active=True)
+
+ def get_sorted(self):
+ """
+ Reordering by role.
+ """
+
+ roles = [CHAIR, VICE_CHAIR, TREASURER, SECRETARY, DIRECTOR]
+ order = Case(*[When(role=role, then=pos) for pos, role in enumerate(roles)])
+ return self.get_queryset().filter(role__in=roles).order_by(order, "join_date", "name")
diff --git a/weallcode/models/staff.py b/weallcode/models/staff.py
new file mode 100644
index 00000000..9aedef43
--- /dev/null
+++ b/weallcode/models/staff.py
@@ -0,0 +1,26 @@
+from django.db import models
+
+from .common import CommonInfo
+
+
+class StaffMemberManager(models.Manager):
+ def get_queryset(self):
+ return super().get_queryset().filter(is_active=True)
+
+
+class StaffMember(CommonInfo):
+
+ role = models.CharField(
+ max_length=255,
+ )
+
+ image = models.ImageField(
+ upload_to="staff/",
+ blank=True,
+ null=True,
+ )
+
+ objects = StaffMemberManager()
+
+ def __str__(self):
+ return self.name
diff --git a/weallcode/templates/weallcode/_base.html b/weallcode/templates/weallcode/_base.html
index ca0dbaab..59c7bad0 100644
--- a/weallcode/templates/weallcode/_base.html
+++ b/weallcode/templates/weallcode/_base.html
@@ -89,6 +89,7 @@
ga('create', 'UA-78618586-1', 'auto');
ga('set', 'transport', 'beacon');
ga('send', 'pageview');
+
|
+ 
-