Sync with Salesforce#895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gregoriofs wants to merge 9 commits into
base:main
Choose a base branch
from
Open

Sync with Salesforce #895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b0e99b9
Student/Course migration using simple-salesforce
gregoriofs Jul 23, 2021
ea2777b
Formatting with black
karbassi Jul 23, 2021
046c43a
Student changes
gregoriofs Jul 23, 2021
fc3e677
Merge branch 'feature/simple-salesforce1' of https://github.com/grego…
gregoriofs Jul 23, 2021
d1b9e04
Cleaner test. Work on student
karbassi Jul 23, 2021
3c893ec
Added students,guardians and mentors to salesforce
gregoriofs Jul 27, 2021
83e8742
Core Models Complete
gregoriofs Jul 30, 2021
0f26077
Completed model migratiosn and tests
gregoriofs Aug 6, 2021
b837fed
Adjusted tests and code to sb4 sandbox
gregoriofs Aug 16, 2021
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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,19 @@ CONTACT_EMAIL=hello+local@weallcode.org
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
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand Up@@ -282,7 +282,7 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
]

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

date_hierarchy = "created_at"
Expand DownExpand 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
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions coderdojochi/forms.py
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
View file
Open in desktop
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Sync with Salesforce#895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

gregoriofs
wants to merge
9
commits into

base:main
Choose a base branch

from

 Open


Sync with Salesforce
#895
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b0e99b9

Student/Course migration using simple-salesforce


gregoriofs Jul 23, 2021
ea2777b

Formatting with black


karbassi Jul 23, 2021
046c43a

Student changes


gregoriofs Jul 23, 2021
fc3e677

Merge branch 'feature/simple-salesforce1' of https://github.com/grego…


gregoriofs Jul 23, 2021
d1b9e04

Cleaner test. Work on student


karbassi Jul 23, 2021
3c893ec

Added students,guardians and mentors to salesforce


gregoriofs Jul 27, 2021
83e8742

Core Models Complete


gregoriofs Jul 30, 2021
0f26077

Completed model migratiosn and tests


gregoriofs Aug 6, 2021
b837fed

Adjusted tests and code to sb4 sandbox


gregoriofs Aug 16, 2021

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,19 @@ CONTACT_EMAIL=hello+local@weallcode.org
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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand Up@@ -282,7 +282,7 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

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

 date_hierarchy = "created_at"
Expand DownExpand 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

View file


Open in desktop


Large diffs are not rendered by default.


10 changes: 5 additions & 5 deletions
coderdojochi/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Sync with Salesforce#895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

gregoriofs
wants to merge
9
commits into

base:main
Choose a base branch

from

 Open


Sync with Salesforce
#895
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b0e99b9

Student/Course migration using simple-salesforce


gregoriofs Jul 23, 2021
ea2777b

Formatting with black


karbassi Jul 23, 2021
046c43a

Student changes


gregoriofs Jul 23, 2021
fc3e677

Merge branch 'feature/simple-salesforce1' of https://github.com/grego…


gregoriofs Jul 23, 2021
d1b9e04

Cleaner test. Work on student


karbassi Jul 23, 2021
3c893ec

Added students,guardians and mentors to salesforce


gregoriofs Jul 27, 2021
83e8742

Core Models Complete


gregoriofs Jul 30, 2021
0f26077

Completed model migratiosn and tests


gregoriofs Aug 6, 2021
b837fed

Adjusted tests and code to sb4 sandbox


gregoriofs Aug 16, 2021

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,19 @@ CONTACT_EMAIL=hello+local@weallcode.org
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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand Up@@ -282,7 +282,7 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

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

 date_hierarchy = "created_at"
Expand DownExpand 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

View file


Open in desktop


Large diffs are not rendered by default.


10 changes: 5 additions & 5 deletions
coderdojochi/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Sync with Salesforce#895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

gregoriofs
wants to merge
9
commits into

base:main
Choose a base branch

from

 Open


Sync with Salesforce
#895
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b0e99b9

Student/Course migration using simple-salesforce


gregoriofs Jul 23, 2021
ea2777b

Formatting with black


karbassi Jul 23, 2021
046c43a

Student changes


gregoriofs Jul 23, 2021
fc3e677

Merge branch 'feature/simple-salesforce1' of https://github.com/grego…


gregoriofs Jul 23, 2021
d1b9e04

Cleaner test. Work on student


karbassi Jul 23, 2021
3c893ec

Added students,guardians and mentors to salesforce


gregoriofs Jul 27, 2021
83e8742

Core Models Complete


gregoriofs Jul 30, 2021
0f26077

Completed model migratiosn and tests


gregoriofs Aug 6, 2021
b837fed

Adjusted tests and code to sb4 sandbox


gregoriofs Aug 16, 2021

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,19 @@ CONTACT_EMAIL=hello+local@weallcode.org
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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand Up@@ -282,7 +282,7 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

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

 date_hierarchy = "created_at"
Expand DownExpand 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

View file


Open in desktop


Large diffs are not rendered by default.


10 changes: 5 additions & 5 deletions
coderdojochi/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Sync with Salesforce#895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

gregoriofs
wants to merge
9
commits into

base:main
Choose a base branch

from

 Open


Sync with Salesforce
#895
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b0e99b9

Student/Course migration using simple-salesforce


gregoriofs Jul 23, 2021
ea2777b

Formatting with black


karbassi Jul 23, 2021
046c43a

Student changes


gregoriofs Jul 23, 2021
fc3e677

Merge branch 'feature/simple-salesforce1' of https://github.com/grego…


gregoriofs Jul 23, 2021
d1b9e04

Cleaner test. Work on student


karbassi Jul 23, 2021
3c893ec

Added students,guardians and mentors to salesforce


gregoriofs Jul 27, 2021
83e8742

Core Models Complete


gregoriofs Jul 30, 2021
0f26077

Completed model migratiosn and tests


gregoriofs Aug 6, 2021
b837fed

Adjusted tests and code to sb4 sandbox


gregoriofs Aug 16, 2021

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,19 @@ CONTACT_EMAIL=hello+local@weallcode.org
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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand Up@@ -282,7 +282,7 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

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

 date_hierarchy = "created_at"
Expand DownExpand 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

View file


Open in desktop


Large diffs are not rendered by default.


10 changes: 5 additions & 5 deletions
coderdojochi/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Sync with Salesforce#895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

gregoriofs
wants to merge
9
commits into

base:main
Choose a base branch

from

 Open


Sync with Salesforce
#895
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b0e99b9

Student/Course migration using simple-salesforce


gregoriofs Jul 23, 2021
ea2777b

Formatting with black


karbassi Jul 23, 2021
046c43a

Student changes


gregoriofs Jul 23, 2021
fc3e677

Merge branch 'feature/simple-salesforce1' of https://github.com/grego…


gregoriofs Jul 23, 2021
d1b9e04

Cleaner test. Work on student


karbassi Jul 23, 2021
3c893ec

Added students,guardians and mentors to salesforce


gregoriofs Jul 27, 2021
83e8742

Core Models Complete


gregoriofs Jul 30, 2021
0f26077

Completed model migratiosn and tests


gregoriofs Aug 6, 2021
b837fed

Adjusted tests and code to sb4 sandbox


gregoriofs Aug 16, 2021

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,19 @@ CONTACT_EMAIL=hello+local@weallcode.org
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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand Up@@ -282,7 +282,7 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

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

 date_hierarchy = "created_at"
Expand DownExpand 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

View file


Open in desktop


Large diffs are not rendered by default.


10 changes: 5 additions & 5 deletions
coderdojochi/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Sync with Salesforce#895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

gregoriofs
wants to merge
9
commits into

base:main
Choose a base branch

from

 Open


Sync with Salesforce
#895
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b0e99b9

Student/Course migration using simple-salesforce


gregoriofs Jul 23, 2021
ea2777b

Formatting with black


karbassi Jul 23, 2021
046c43a

Student changes


gregoriofs Jul 23, 2021
fc3e677

Merge branch 'feature/simple-salesforce1' of https://github.com/grego…


gregoriofs Jul 23, 2021
d1b9e04

Cleaner test. Work on student


karbassi Jul 23, 2021
3c893ec

Added students,guardians and mentors to salesforce


gregoriofs Jul 27, 2021
83e8742

Core Models Complete


gregoriofs Jul 30, 2021
0f26077

Completed model migratiosn and tests


gregoriofs Aug 6, 2021
b837fed

Adjusted tests and code to sb4 sandbox


gregoriofs Aug 16, 2021

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,19 @@ CONTACT_EMAIL=hello+local@weallcode.org
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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand Up@@ -282,7 +282,7 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

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

 date_hierarchy = "created_at"
Expand DownExpand 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

View file


Open in desktop


Large diffs are not rendered by default.


10 changes: 5 additions & 5 deletions
coderdojochi/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Sync with Salesforce#895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

gregoriofs
wants to merge
9
commits into

base:main
Choose a base branch

from

 Open


Sync with Salesforce
#895
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b0e99b9

Student/Course migration using simple-salesforce


gregoriofs Jul 23, 2021
ea2777b

Formatting with black


karbassi Jul 23, 2021
046c43a

Student changes


gregoriofs Jul 23, 2021
fc3e677

Merge branch 'feature/simple-salesforce1' of https://github.com/grego…


gregoriofs Jul 23, 2021
d1b9e04

Cleaner test. Work on student


karbassi Jul 23, 2021
3c893ec

Added students,guardians and mentors to salesforce


gregoriofs Jul 27, 2021
83e8742

Core Models Complete


gregoriofs Jul 30, 2021
0f26077

Completed model migratiosn and tests


gregoriofs Aug 6, 2021
b837fed

Adjusted tests and code to sb4 sandbox


gregoriofs Aug 16, 2021

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,19 @@ CONTACT_EMAIL=hello+local@weallcode.org
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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand Up@@ -282,7 +282,7 @@ class GuardianAdmin(ImportExportMixin, ImportExportActionModelAdmin):
 ]

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

 date_hierarchy = "created_at"
Expand DownExpand 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

View file


Open in desktop


Large diffs are not rendered by default.


10 changes: 5 additions & 5 deletions
coderdojochi/forms.py

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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

View file


Open in desktop

Original file line numberDiff line numberDiff 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