Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,19 @@ [email protected]
SENDGRID_API_KEY=CHANGEME
SENDGRID_UNSUB_CLASSANNOUNCE=1234567890

# Salesforce
SALESFORCE_TOKEN=
SALESFORCE_USER=
SALESFORCE_PASSWORD=

# AllAuth
ALLAUTH_GOOGLE_CLIENT_ID=
ALLAUTH_GOOGLE_SECRET=
ALLAUTH_FACEBOOK_CLIENT_ID=
ALLAUTH_FACEBOOK_SECRET=
ALLAUTH_LINKEDIN_CLIENT_ID=
ALLAUTH_LINKEDIN_SECRET=

# Slack
SLACK_ALERTS_CHANNEL=REPLACE_ME
SLACK_WEBHOOK_URL=REPLACE_ME
Expand Down
6 changes: 3 additions & 3 deletions coderdojochi/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ class MentorAdmin(ImportExportMixin, ImportExportActionModelAdmin):
]

filter_horizontal = [
"race_ethnicity",
# "race_ethnicity",
]

def view_on_site(self, obj):
Expand Down Expand Up @@ -282,7 +282,7 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
]

filter_horizontal = [
"race_ethnicity",
# "race_ethnicity",
]

date_hierarchy = "created_at"
Expand Down Expand Up @@ -410,7 +410,7 @@ class StudentAdmin(ImportExportMixin, ImportExportActionModelAdmin):
]

filter_horizontal = [
"race_ethnicity",
# "race_ethnicity",
]

ordering = [
Expand Down
455 changes: 240 additions & 215 deletions coderdojochi/cron.py

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions coderdojochi/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,11 +248,11 @@ class StudentForm(CDCModelForm):
required=False,
)

race_ethnicity = forms.ModelMultipleChoiceField(
widget=forms.CheckboxSelectMultiple,
queryset=RaceEthnicity.objects.filter(is_visible=True),
required=False,
)
# race_ethnicity = forms.ModelMultipleChoiceField(
# widget=forms.CheckboxSelectMultiple,
# queryset=RaceEthnicity.objects.filter(is_visible=True),
# required=False,
# )

birthday = forms.CharField(
widget=html5_widgets.DateInput(
Expand Down
27 changes: 27 additions & 0 deletions coderdojochi/migrations/0040_auto_20210722_1527.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Generated by Django 3.2.5 on 2021-07-22 20:27

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('coderdojochi', '0039_auto_20210611_1044'),
]

operations = [
migrations.RemoveField(
model_name='student',
name='race_ethnicity',
),
migrations.AddField(
model_name='student',
name='ethnicity',
field=models.CharField(choices=[('Hispanic', 'Hispanic'), ('Not Hispanic', 'Not Hispanic')], default='', max_length=255),
),
migrations.AddField(
model_name='student',
name='race',
field=models.CharField(default='', max_length=255),
),
]
26 changes: 26 additions & 0 deletions coderdojochi/migrations/0041_auto_20210723_1013.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Generated by Django 3.2.5 on 2021-07-23 15:13

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('coderdojochi', '0040_auto_20210722_1527'),
]

operations = [
migrations.RemoveField(
model_name='student',
name='ethnicity',
),
migrations.RemoveField(
model_name='student',
name='race',
),
migrations.AddField(
model_name='student',
name='race_ethnicity',
field=models.ManyToManyField(blank=True, to='coderdojochi.RaceEthnicity'),
),
]
55 changes: 55 additions & 0 deletions coderdojochi/migrations/0042_auto_20210727_0925.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Generated by Django 3.2.5 on 2021-07-27 14:25

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('coderdojochi', '0041_auto_20210723_1013'),
]

operations = [
migrations.RemoveField(
model_name='guardian',
name='race_ethnicity',
),
migrations.RemoveField(
model_name='mentor',
name='race_ethnicity',
),
migrations.RemoveField(
model_name='student',
name='race_ethnicity',
),
migrations.AddField(
model_name='guardian',
name='ethnicity',
field=models.CharField(choices=[('Hispanic', 'Hispanic'), ('Not Hispanic', 'Not Hispanic')], default='', max_length=12),
),
migrations.AddField(
model_name='guardian',
name='race',
field=models.CharField(choices=[('White', 'White'), ('Black', 'Black'), ('Asian', 'Asian'), ('American Indian', 'American Indian'), ('Native Hawaiin', 'Native Hawaiin'), ('Middle Eastern', 'Middle Eastern')], default='', max_length=15),
),
migrations.AddField(
model_name='mentor',
name='ethnicity',
field=models.CharField(choices=[('Hispanic', 'Hispanic'), ('Not Hispanic', 'Not Hispanic')], default='', max_length=12),
),
migrations.AddField(
model_name='mentor',
name='race',
field=models.CharField(choices=[('White', 'White'), ('Black', 'Black'), ('Asian', 'Asian'), ('American Indian', 'American Indian'), ('Native Hawaiin', 'Native Hawaiin'), ('Middle Eastern', 'Middle Eastern')], default='', max_length=15),
),
migrations.AddField(
model_name='student',
name='ethnicity',
field=models.CharField(choices=[('Hispanic', 'Hispanic'), ('Not Hispanic', 'Not Hispanic')], default='', max_length=12),
),
migrations.AddField(
model_name='student',
name='race',
field=models.CharField(choices=[('White', 'White'), ('Black', 'Black'), ('Asian', 'Asian'), ('American Indian', 'American Indian'), ('Native Hawaiin', 'Native Hawaiin'), ('Middle Eastern', 'Middle Eastern')], default='', max_length=15),
),
]
18 changes: 18 additions & 0 deletions coderdojochi/migrations/0043_session_title.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.5 on 2021-07-27 20:52

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('coderdojochi', '0042_auto_20210727_0925'),
]

operations = [
migrations.AddField(
model_name='session',
name='title',
field=models.TextField(blank=True, default='', null=True),
),
]
Loading