+
+
+
+ + {% block greeting %}{% endblock %} +
+ ++ {% block main_message %}{% endblock %} +
+ + {% block link %}{% endblock %} + ++ {% block conclusion %}{% endblock %} +
+
+ {{ description.0 }}
+
+ {{ description.1 }}
+
Currently all questions are based in Python 3.
++ Sorry! + No questions found matching the selected filters. +
+ {% endif %} + +{% endblock content %} + +{% block scripts %} + +{% endblock scripts %} diff --git a/codewof/templates/research/email/consent_confirm.html b/codewof/templates/research/email/consent_confirm.html new file mode 100644 index 000000000..5a5716e47 --- /dev/null +++ b/codewof/templates/research/email/consent_confirm.html @@ -0,0 +1,27 @@ +{% extends "email_template.html" %} + +{% block title %}CodeWOF Research Consent Confirmation{% endblock %} + +{% block header %}CodeWOF Research Consent Confirmation{% endblock %} + +{% block greeting %}Dear {{ user.first_name }},{% endblock %} + +{% block main_message %} + +Thank you for registering for the "{{ study.title }}" study. +Below is a copy of the information sheet, and your signed consent form.Dear {{ user.first_name }},
- -- Thank you for registering for the "{{ study.title }}" study. - Below is a copy of the information sheet, and your signed consent form. -
- - {{ study.description|safe }} - -- {% if field.value %} - I AGREE - {% else %} - I DO NOT AGREE - {% endif %} - - {{ field.label }} -
- {% endfor %} -- Email address: {{ user.email }} -
-- Date: {{ registration.datetime|time:"g:i A" }} {{ registration.datetime|date:"l j F Y" }} -
- -Thank you,
- -The codeWOF team
-{% endblock %} diff --git a/codewof/templates/users/create_invitations.html b/codewof/templates/users/create_invitations.html index 154ff38eb..0b00bc038 100644 --- a/codewof/templates/users/create_invitations.html +++ b/codewof/templates/users/create_invitations.html @@ -6,13 +6,49 @@ {% block title %}{% trans "Send Invitations" %}{% endblock %} {% block content %} -We recommend doing one or two questions per day, to maintain your programming skills over a long period of time.
- - {% if questions_to_do %} -You've solved {{ num_questions_answered }} question{{ num_questions_answered|pluralize }} in the last month!
+ View All Questions ++ You received this email because you opted into reminders. You can + + change your reminder settings here + . +
{% endblock %} diff --git a/codewof/templates/users/email_template.html b/codewof/templates/users/email_template.html deleted file mode 100644 index 43d0b3966..000000000 --- a/codewof/templates/users/email_template.html +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - -- {% block greeting %}{% endblock %} -
- -- {% block main_message %}{% endblock %} -
- - {% block link %}{% endblock %} - -
- Thanks,
- The Computer Science Education Research Group
-
Send me notifications on:
"), + HTML("Warning! Email reminders may end up in your " + "spam. Unmark the email as spam to prevent this.
"), + HTML("Send me reminders on:
"), 'remind_on_monday', 'remind_on_tuesday', 'remind_on_wednesday', @@ -127,7 +129,7 @@ def __init__(self, *args, **kwargs): 'timezone', ), ButtonHolder( - Submit('submit', 'Update', css_class='btn btn-primary') + Submit('submit', 'Update', css_class='btn btn-success') ), ) @@ -147,7 +149,11 @@ class Meta(auth.forms.UserChangeForm.Meta): """Metadata for UserAdminChangeForm class.""" model = User - fields = ('email', 'last_name', 'user_type') + fields = ( + 'email', + 'last_name', + 'user_type', + ) class UserAdminCreationForm(auth.forms.UserCreationForm): @@ -157,7 +163,12 @@ class Meta(auth.forms.UserCreationForm.Meta): """Metadata for UserAdminCreationForm class.""" model = User - fields = ('email', 'first_name', 'last_name', 'user_type') + fields = ( + 'email', + 'first_name', + 'last_name', + 'user_type', + ) class GroupCreateUpdateForm(forms.ModelForm): @@ -189,7 +200,10 @@ class GroupCreateUpdateForm(forms.ModelForm): feed_enabled = forms.BooleanField( label='Enable Feed?', - required=False + required=False, + help_text="The feed displays the latest successful (all tests passed) question attempts of members of the " + "group. Each feed entry includes the user's name, the question they answered, " + "and the date and time of submission. Members can also like feed entries." ) class Meta: diff --git a/codewof/users/management/commands/remove_expired_invitations.py b/codewof/users/management/commands/remove_expired_invitations.py index f485aa0c8..b17111bcf 100644 --- a/codewof/users/management/commands/remove_expired_invitations.py +++ b/codewof/users/management/commands/remove_expired_invitations.py @@ -7,7 +7,11 @@ class Command(BaseCommand): - """Required command class for the custom Django removed_expired_invitations command.""" + """ + Required command class for the custom Django removed_expired_invitations command. + + The script should run at least once a day. + """ def handle(self, *args, **options): """Get Invitations that have expired and delete them.""" diff --git a/codewof/users/management/commands/send_email_reminders.py b/codewof/users/management/commands/send_email_reminders.py index 9b0d45b86..b5752c13a 100644 --- a/codewof/users/management/commands/send_email_reminders.py +++ b/codewof/users/management/commands/send_email_reminders.py @@ -16,7 +16,11 @@ class Command(BaseCommand): - """Required command class for the custom Django send_email_reminders command.""" + """ + Required command class for the custom Django send_email_reminders command. + + The script should run once every hour, preferably near the beginning of the hour. + """ def handle(self, *args, **options): """ @@ -82,7 +86,7 @@ def build_email_html(self, username, message): return email_template.render( {"username": username, "message": message, "dashboard_url": settings.CODEWOF_DOMAIN + reverse('users:dashboard'), - "settings_url": settings.CODEWOF_DOMAIN + reverse('users:update')}) + "settings_url": settings.CODEWOF_DOMAIN + reverse('users:update'), "DOMAIN": settings.CODEWOF_DOMAIN}) def build_email_plain(self, username, message): """ @@ -92,11 +96,10 @@ def build_email_plain(self, username, message): :param message: The string message to insert in the template. :return: The string message. """ - return "Hi {},\n\n{}\nLet's practice!: {}\n\nThanks,\nThe Computer Science Education Research " \ - "Group\n\nYou received this email because you opted into reminders. You can change " \ - "your reminder settings here: {}."\ + return "Hi {},\n\n{}\n\nLet's practice!: {}\n\nThanks,\nThe CodeWOF team\n\nYou received this email because " \ + "you opted into reminders. You can change your reminder settings here: {}.\n\n{}" \ .format(username, message, settings.CODEWOF_DOMAIN + reverse('users:dashboard'), - settings.CODEWOF_DOMAIN + reverse('users:update')) + settings.CODEWOF_DOMAIN + reverse('users:update'), settings.CODEWOF_DOMAIN) def get_users_to_email(self): """ diff --git a/codewof/users/migrations/0006_emailreminder.py b/codewof/users/migrations/0006_emailreminder.py new file mode 100644 index 000000000..8c45b615e --- /dev/null +++ b/codewof/users/migrations/0006_emailreminder.py @@ -0,0 +1,24 @@ +# Generated by Django 3.2.6 on 2021-09-13 04:14 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0005_alter_invitation_date_expires'), + ] + + operations = [ + migrations.CreateModel( + name='EmailReminder', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('datetime', models.DateTimeField(default=django.utils.timezone.now)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + ] diff --git a/codewof/users/migrations/0007_alter_user_timezone.py b/codewof/users/migrations/0007_alter_user_timezone.py new file mode 100644 index 000000000..830af6457 --- /dev/null +++ b/codewof/users/migrations/0007_alter_user_timezone.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.11 on 2022-04-15 03:15 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0006_emailreminder'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='timezone', + field=models.CharField(choices=[('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmara', 'Africa/Asmara'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar es Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao Tome'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/Buenos_Aires', 'America/Argentina/Buenos Aires'), ('America/Argentina/Catamarca', 'America/Argentina/Catamarca'), ('America/Argentina/Cordoba', 'America/Argentina/Cordoba'), ('America/Argentina/Jujuy', 'America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'America/Argentina/La Rioja'), ('America/Argentina/Mendoza', 'America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Atikokan', 'America/Atikokan'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Cambridge_Bay', 'America/Cambridge Bay'), ('America/Campo_Grande', 'America/Campo Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Costa_Rica', 'America/Costa Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El Salvador'), ('America/Fort_Nelson', 'America/Fort Nelson'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace Bay'), ('America/Goose_Bay', 'America/Goose Bay'), ('America/Grand_Turk', 'America/Grand Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Indianapolis', 'America/Indiana/Indianapolis'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Louisville', 'America/Kentucky/Louisville'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/Kralendijk', 'America/Kralendijk'), ('America/La_Paz', 'America/La Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los Angeles'), ('America/Lower_Princes', 'America/Lower Princes'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Marigot', 'America/Marigot'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New York'), ('America/Nipigon', 'America/Nipigon'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North Dakota/New Salem'), ('America/Nuuk', 'America/Nuuk'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Pangnirtung', 'America/Pangnirtung'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port of Spain'), ('America/Porto_Velho', 'America/Porto Velho'), ('America/Puerto_Rico', 'America/Puerto Rico'), ('America/Punta_Arenas', 'America/Punta Arenas'), ('America/Rainy_River', 'America/Rainy River'), ('America/Rankin_Inlet', 'America/Rankin Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio Branco'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo Domingo'), ('America/Sao_Paulo', 'America/Sao Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Sitka', 'America/Sitka'), ('America/St_Barthelemy', 'America/St Barthelemy'), ('America/St_Johns', 'America/St Johns'), ('America/St_Kitts', 'America/St Kitts'), ('America/St_Lucia', 'America/St Lucia'), ('America/St_Thomas', 'America/St Thomas'), ('America/St_Vincent', 'America/St Vincent'), ('America/Swift_Current', 'America/Swift Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Thunder_Bay', 'America/Thunder Bay'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('America/Yellowknife', 'America/Yellowknife'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Arctic/Longyearbyen', 'Arctic/Longyearbyen'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Choibalsan', 'Asia/Choibalsan'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Ho_Chi_Minh', 'Asia/Ho Chi Minh'), ('Asia/Hong_Kong', 'Asia/Hong Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Kathmandu', 'Asia/Kathmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Kolkata', 'Asia/Kolkata'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yangon', 'Asia/Yangon'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape Verde'), ('Atlantic/Faroe', 'Atlantic/Faroe'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South Georgia'), ('Atlantic/St_Helena', 'Atlantic/St Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken Hill'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Sydney', 'Australia/Sydney'), ('Canada/Atlantic', 'Canada/Atlantic'), ('Canada/Central', 'Canada/Central'), ('Canada/Eastern', 'Canada/Eastern'), ('Canada/Mountain', 'Canada/Mountain'), ('Canada/Newfoundland', 'Canada/Newfoundland'), ('Canada/Pacific', 'Canada/Pacific'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Bratislava', 'Europe/Bratislava'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Busingen', 'Europe/Busingen'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Guernsey', 'Europe/Guernsey'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Isle_of_Man', 'Europe/Isle of Man'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Jersey', 'Europe/Jersey'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kiev', 'Europe/Kiev'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/Ljubljana', 'Europe/Ljubljana'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Mariehamn', 'Europe/Mariehamn'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Podgorica', 'Europe/Podgorica'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/San_Marino', 'Europe/San Marino'), ('Europe/Sarajevo', 'Europe/Sarajevo'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Skopje', 'Europe/Skopje'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Uzhgorod', 'Europe/Uzhgorod'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vatican', 'Europe/Vatican'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zagreb', 'Europe/Zagreb'), ('Europe/Zaporozhye', 'Europe/Zaporozhye'), ('Europe/Zurich', 'Europe/Zurich'), ('GMT', 'GMT'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Chuuk', 'Pacific/Chuuk'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Kanton', 'Pacific/Kanton'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Pohnpei', 'Pacific/Pohnpei'), ('Pacific/Port_Moresby', 'Pacific/Port Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis'), ('US/Alaska', 'US/Alaska'), ('US/Arizona', 'US/Arizona'), ('US/Central', 'US/Central'), ('US/Eastern', 'US/Eastern'), ('US/Hawaii', 'US/Hawaii'), ('US/Mountain', 'US/Mountain'), ('US/Pacific', 'US/Pacific'), ('UTC', 'UTC')], default='Pacific/Auckland', max_length=32), + ), + ] diff --git a/codewof/users/migrations/0008_auto_20220927_1543.py b/codewof/users/migrations/0008_auto_20220927_1543.py new file mode 100644 index 000000000..d983690a2 --- /dev/null +++ b/codewof/users/migrations/0008_auto_20220927_1543.py @@ -0,0 +1,21 @@ +# Generated by Django 3.2.15 on 2022-09-27 02:43 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0007_alter_user_timezone'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='timezone', + field=models.CharField(choices=[('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmara', 'Africa/Asmara'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar es Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao Tome'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/Buenos_Aires', 'America/Argentina/Buenos Aires'), ('America/Argentina/Catamarca', 'America/Argentina/Catamarca'), ('America/Argentina/Cordoba', 'America/Argentina/Cordoba'), ('America/Argentina/Jujuy', 'America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'America/Argentina/La Rioja'), ('America/Argentina/Mendoza', 'America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Atikokan', 'America/Atikokan'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Cambridge_Bay', 'America/Cambridge Bay'), ('America/Campo_Grande', 'America/Campo Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Costa_Rica', 'America/Costa Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El Salvador'), ('America/Fort_Nelson', 'America/Fort Nelson'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace Bay'), ('America/Goose_Bay', 'America/Goose Bay'), ('America/Grand_Turk', 'America/Grand Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Indianapolis', 'America/Indiana/Indianapolis'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Louisville', 'America/Kentucky/Louisville'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/Kralendijk', 'America/Kralendijk'), ('America/La_Paz', 'America/La Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los Angeles'), ('America/Lower_Princes', 'America/Lower Princes'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Marigot', 'America/Marigot'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New York'), ('America/Nipigon', 'America/Nipigon'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North Dakota/New Salem'), ('America/Nuuk', 'America/Nuuk'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Pangnirtung', 'America/Pangnirtung'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port of Spain'), ('America/Porto_Velho', 'America/Porto Velho'), ('America/Puerto_Rico', 'America/Puerto Rico'), ('America/Punta_Arenas', 'America/Punta Arenas'), ('America/Rainy_River', 'America/Rainy River'), ('America/Rankin_Inlet', 'America/Rankin Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio Branco'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo Domingo'), ('America/Sao_Paulo', 'America/Sao Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Sitka', 'America/Sitka'), ('America/St_Barthelemy', 'America/St Barthelemy'), ('America/St_Johns', 'America/St Johns'), ('America/St_Kitts', 'America/St Kitts'), ('America/St_Lucia', 'America/St Lucia'), ('America/St_Thomas', 'America/St Thomas'), ('America/St_Vincent', 'America/St Vincent'), ('America/Swift_Current', 'America/Swift Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Thunder_Bay', 'America/Thunder Bay'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('America/Yellowknife', 'America/Yellowknife'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Arctic/Longyearbyen', 'Arctic/Longyearbyen'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Choibalsan', 'Asia/Choibalsan'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Ho_Chi_Minh', 'Asia/Ho Chi Minh'), ('Asia/Hong_Kong', 'Asia/Hong Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Kathmandu', 'Asia/Kathmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Kolkata', 'Asia/Kolkata'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yangon', 'Asia/Yangon'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape Verde'), ('Atlantic/Faroe', 'Atlantic/Faroe'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South Georgia'), ('Atlantic/St_Helena', 'Atlantic/St Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken Hill'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Sydney', 'Australia/Sydney'), ('Canada/Atlantic', 'Canada/Atlantic'), ('Canada/Central', 'Canada/Central'), ('Canada/Eastern', 'Canada/Eastern'), ('Canada/Mountain', 'Canada/Mountain'), ('Canada/Newfoundland', 'Canada/Newfoundland'), ('Canada/Pacific', 'Canada/Pacific'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Bratislava', 'Europe/Bratislava'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Busingen', 'Europe/Busingen'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Guernsey', 'Europe/Guernsey'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Isle_of_Man', 'Europe/Isle of Man'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Jersey', 'Europe/Jersey'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Kyiv', 'Europe/Kyiv'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/Ljubljana', 'Europe/Ljubljana'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Mariehamn', 'Europe/Mariehamn'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Podgorica', 'Europe/Podgorica'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/San_Marino', 'Europe/San Marino'), ('Europe/Sarajevo', 'Europe/Sarajevo'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Skopje', 'Europe/Skopje'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Uzhgorod', 'Europe/Uzhgorod'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vatican', 'Europe/Vatican'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zagreb', 'Europe/Zagreb'), ('Europe/Zaporozhye', 'Europe/Zaporozhye'), ('Europe/Zurich', 'Europe/Zurich'), ('GMT', 'GMT'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Chuuk', 'Pacific/Chuuk'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Kanton', 'Pacific/Kanton'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Pohnpei', 'Pacific/Pohnpei'), ('Pacific/Port_Moresby', 'Pacific/Port Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis'), ('US/Alaska', 'US/Alaska'), ('US/Arizona', 'US/Arizona'), ('US/Central', 'US/Central'), ('US/Eastern', 'US/Eastern'), ('US/Hawaii', 'US/Hawaii'), ('US/Mountain', 'US/Mountain'), ('US/Pacific', 'US/Pacific'), ('UTC', 'UTC')], default='Pacific/Auckland', max_length=32), + ), + migrations.DeleteModel( + name='EmailReminder', + ), + ] diff --git a/codewof/users/migrations/0009_alter_user_timezone.py b/codewof/users/migrations/0009_alter_user_timezone.py new file mode 100644 index 000000000..f6da3e220 --- /dev/null +++ b/codewof/users/migrations/0009_alter_user_timezone.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.15 on 2022-09-27 02:44 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0008_auto_20220927_1543'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='timezone', + field=models.CharField(choices=[('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmara', 'Africa/Asmara'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar es Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao Tome'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/Buenos_Aires', 'America/Argentina/Buenos Aires'), ('America/Argentina/Catamarca', 'America/Argentina/Catamarca'), ('America/Argentina/Cordoba', 'America/Argentina/Cordoba'), ('America/Argentina/Jujuy', 'America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'America/Argentina/La Rioja'), ('America/Argentina/Mendoza', 'America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Atikokan', 'America/Atikokan'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Cambridge_Bay', 'America/Cambridge Bay'), ('America/Campo_Grande', 'America/Campo Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Costa_Rica', 'America/Costa Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El Salvador'), ('America/Fort_Nelson', 'America/Fort Nelson'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace Bay'), ('America/Goose_Bay', 'America/Goose Bay'), ('America/Grand_Turk', 'America/Grand Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Indianapolis', 'America/Indiana/Indianapolis'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Louisville', 'America/Kentucky/Louisville'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/Kralendijk', 'America/Kralendijk'), ('America/La_Paz', 'America/La Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los Angeles'), ('America/Lower_Princes', 'America/Lower Princes'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Marigot', 'America/Marigot'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New York'), ('America/Nipigon', 'America/Nipigon'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North Dakota/New Salem'), ('America/Nuuk', 'America/Nuuk'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Pangnirtung', 'America/Pangnirtung'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port of Spain'), ('America/Porto_Velho', 'America/Porto Velho'), ('America/Puerto_Rico', 'America/Puerto Rico'), ('America/Punta_Arenas', 'America/Punta Arenas'), ('America/Rainy_River', 'America/Rainy River'), ('America/Rankin_Inlet', 'America/Rankin Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio Branco'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo Domingo'), ('America/Sao_Paulo', 'America/Sao Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Sitka', 'America/Sitka'), ('America/St_Barthelemy', 'America/St Barthelemy'), ('America/St_Johns', 'America/St Johns'), ('America/St_Kitts', 'America/St Kitts'), ('America/St_Lucia', 'America/St Lucia'), ('America/St_Thomas', 'America/St Thomas'), ('America/St_Vincent', 'America/St Vincent'), ('America/Swift_Current', 'America/Swift Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Thunder_Bay', 'America/Thunder Bay'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('America/Yellowknife', 'America/Yellowknife'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Arctic/Longyearbyen', 'Arctic/Longyearbyen'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Choibalsan', 'Asia/Choibalsan'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Ho_Chi_Minh', 'Asia/Ho Chi Minh'), ('Asia/Hong_Kong', 'Asia/Hong Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Kathmandu', 'Asia/Kathmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Kolkata', 'Asia/Kolkata'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yangon', 'Asia/Yangon'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape Verde'), ('Atlantic/Faroe', 'Atlantic/Faroe'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South Georgia'), ('Atlantic/St_Helena', 'Atlantic/St Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken Hill'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Sydney', 'Australia/Sydney'), ('Canada/Atlantic', 'Canada/Atlantic'), ('Canada/Central', 'Canada/Central'), ('Canada/Eastern', 'Canada/Eastern'), ('Canada/Mountain', 'Canada/Mountain'), ('Canada/Newfoundland', 'Canada/Newfoundland'), ('Canada/Pacific', 'Canada/Pacific'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Bratislava', 'Europe/Bratislava'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Busingen', 'Europe/Busingen'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Guernsey', 'Europe/Guernsey'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Isle_of_Man', 'Europe/Isle of Man'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Jersey', 'Europe/Jersey'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Kyiv', 'Europe/Kyiv'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/Ljubljana', 'Europe/Ljubljana'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Mariehamn', 'Europe/Mariehamn'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Podgorica', 'Europe/Podgorica'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/San_Marino', 'Europe/San Marino'), ('Europe/Sarajevo', 'Europe/Sarajevo'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Skopje', 'Europe/Skopje'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Uzhgorod', 'Europe/Uzhgorod'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vatican', 'Europe/Vatican'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zagreb', 'Europe/Zagreb'), ('Europe/Zaporozhye', 'Europe/Zaporozhye'), ('Europe/Zurich', 'Europe/Zurich'), ('GMT', 'GMT'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Chuuk', 'Pacific/Chuuk'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Kanton', 'Pacific/Kanton'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Pohnpei', 'Pacific/Pohnpei'), ('Pacific/Port_Moresby', 'Pacific/Port Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis'), ('US/Alaska', 'US/Alaska'), ('US/Arizona', 'US/Arizona'), ('US/Central', 'US/Central'), ('US/Eastern', 'US/Eastern'), ('US/Hawaii', 'US/Hawaii'), ('US/Mountain', 'US/Mountain'), ('US/Pacific', 'US/Pacific'), ('UTC', 'UTC')], default='Pacific/Auckland', max_length=100), + ), + ] diff --git a/codewof/users/models.py b/codewof/users/models.py index 071e4bc39..76394954e 100644 --- a/codewof/users/models.py +++ b/codewof/users/models.py @@ -61,7 +61,7 @@ class User(AbstractUser): remind_on_sunday = models.BooleanField(default=False) # Determine when to send the email reminder - timezone = models.CharField(max_length=32, choices=TIMEZONES, default='Pacific/Auckland') + timezone = models.CharField(max_length=100, choices=TIMEZONES, default='Pacific/Auckland') REMINDER_DAYS = [remind_on_monday, remind_on_tuesday, remind_on_wednesday, remind_on_thursday, remind_on_friday, remind_on_saturday, remind_on_sunday] diff --git a/codewof/users/serializers.py b/codewof/users/serializers.py index 2e02a644f..53c479920 100644 --- a/codewof/users/serializers.py +++ b/codewof/users/serializers.py @@ -1,7 +1,7 @@ """Serializers for user models.""" from rest_framework import serializers -from users.models import User, UserType +from users.models import User, UserType, Group, Membership, GroupRole, Invitation class UserSerializer(serializers.ModelSerializer): @@ -17,6 +17,14 @@ class Meta: 'first_name', 'last_name', 'user_type', + 'remind_on_monday', + 'remind_on_tuesday', + 'remind_on_wednesday', + 'remind_on_thursday', + 'remind_on_friday', + 'remind_on_saturday', + 'remind_on_sunday', + 'timezone', ) @@ -31,3 +39,73 @@ class Meta: 'pk', 'name', ) + + +class GroupSerializer(serializers.ModelSerializer): + """Serializer for codeWOF groups.""" + + class Meta: + """Meta settings for serializer.""" + + model = Group + fields = ( + 'pk', + 'name', + 'description', + 'date_created', + 'feed_enabled', + 'users' + ) + + +class GroupRoleSerializer(serializers.ModelSerializer): + """Serializer for codeWOF group roles.""" + + class Meta: + """Meta settings for serializer.""" + + model = GroupRole + fields = ( + 'pk', + 'name' + ) + + +class MembershipSerializer(serializers.ModelSerializer): + """Serializer for codeWOF group memberships.""" + + user = serializers.ReadOnlyField(source='user.pk') + group = serializers.ReadOnlyField(source='group.pk') + role = serializers.StringRelatedField() + + class Meta: + """Meta settings for serializer.""" + + model = Membership + fields = ( + 'pk', + 'user', + 'group', + 'role', + 'date_joined' + ) + + +class InvitationSerializer(serializers.ModelSerializer): + """Serializer for codeWOF group invitations.""" + + group = serializers.ReadOnlyField(source='user.pk') + inviter = serializers.ReadOnlyField(source='inviter.pk') + + class Meta: + """Meta settings for serializer.""" + + model = Invitation + fields = ( + 'pk', + 'group', + 'inviter', + 'email', + 'date_sent', + 'date_expires' + ) diff --git a/codewof/users/urls.py b/codewof/users/urls.py index 359cd174e..577ab505c 100644 --- a/codewof/users/urls.py +++ b/codewof/users/urls.py @@ -1,14 +1,20 @@ """URL routing for users application.""" from django.urls import path +from django.conf import settings from rest_framework import routers from . import views app_name = "users" router = routers.SimpleRouter() -router.register(r'users/users', views.UserAPIViewSet) -router.register(r'users/user-types', views.UserTypeAPIViewSet) +if not settings.PRODUCTION_ENVIRONMENT: + router.register(r'users/users', views.UserAPIViewSet) + router.register(r'users/user-types', views.UserTypeAPIViewSet) + router.register(r'users/groups', views.GroupAPIViewSet) + router.register(r'users/memberships', views.MembershipAPIViewSet) + router.register(r'users/group-roles', views.GroupRoleAPIViewSet) + router.register(r'users/invitations', views.InvitationAPIViewSet) urlpatterns = [ diff --git a/codewof/users/utils.py b/codewof/users/utils.py index 8cee09159..4bb6f490d 100644 --- a/codewof/users/utils.py +++ b/codewof/users/utils.py @@ -50,8 +50,9 @@ def create_invitation_plaintext(user_exists, invitee_name, inviter_name, group_n if user_exists: url = settings.CODEWOF_DOMAIN + reverse('users:dashboard') plaintext = "Hi {},\n\n{} has invited you to join the Group '{}'. Click the link below to sign in. You will "\ - "see your invitation in the dashboard, where you can join the group.\n\n{}\n\nThanks,\nThe "\ - "Computer Science Education Research Group".format(invitee_name, inviter_name, group_name, url) + "see your invitation in the dashboard, where you can join the group.\n\nSign In: {}\n\nThanks,\n" \ + "The CodeWOF team\n\n{}"\ + .format(invitee_name, inviter_name, group_name, url, settings.CODEWOF_DOMAIN) else: url = settings.CODEWOF_DOMAIN + reverse('account_signup') plaintext = "Hi,\n\n{} has invited you to join the Group '{}'. CodeWOF helps you maintain your programming "\ @@ -59,8 +60,8 @@ def create_invitation_plaintext(user_exists, invitee_name, inviter_name, group_n "and track your programming fitness over time. Click the link below to make an account, using "\ "the email {}. You will see your invitation in the dashboard, where you can join the group. "\ "If you already have a CodeWOF account, then add {} to your profile to make the invitation "\ - "appear.\n\n{}\n\nThanks,\nThe Computer Science Education Research Group"\ - .format(inviter_name, group_name, email, email, url) + "appear.\n\nSign Up: {}\n\nThanks,\nThe CodeWOF team\n\n{}"\ + .format(inviter_name, group_name, email, email, url, settings.CODEWOF_DOMAIN) return plaintext @@ -81,8 +82,7 @@ def create_invitation_html(user_exists, invitee_name, inviter_name, group_name, "see your invitation in the dashboard, where you can join the group."\ .format(inviter_name, group_name) url = settings.CODEWOF_DOMAIN + reverse('users:dashboard') - html = email_template.render({"user_exists": user_exists, "invitee_name": invitee_name, "message": message, - "url": url, "button_text": "Sign In"}) + button_text = "Sign In" else: message = "{} has invited you to join the Group '{}'. CodeWOF helps you maintain your "\ "programming fitness with short daily programming exercises. With a free account you can save your "\ @@ -91,6 +91,9 @@ def create_invitation_html(user_exists, invitee_name, inviter_name, group_name, "If you already have a CodeWOF account, then add {} to your profile to make the invitation appear."\ .format(inviter_name, group_name, email, email) url = settings.CODEWOF_DOMAIN + reverse('account_signup') - html = email_template.render({"user_exists": user_exists, "invitee_name": invitee_name, "message": message, - "url": url, "button_text": "Sign Up"}) + button_text = "Sign Up" + + # Retrieve logo source here instead of template to avoid the domain being set to the one for MailHog + html = email_template.render({"user_exists": user_exists, "invitee_name": invitee_name, "message": message, + "url": url, "button_text": button_text, "DOMAIN": settings.CODEWOF_DOMAIN}) return html diff --git a/codewof/users/views.py b/codewof/users/views.py index 92b285378..3e685445d 100644 --- a/codewof/users/views.py +++ b/codewof/users/views.py @@ -1,35 +1,35 @@ """Views for users application.""" import json import logging -from random import Random from django.db import transaction from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render -from django.utils import timezone from django.contrib.auth import get_user_model from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.decorators import login_required from django.contrib import messages from django.urls import reverse -from django.db.models import Q from django.core.exceptions import ObjectDoesNotExist, PermissionDenied from django.views.generic import DetailView, RedirectView, UpdateView, CreateView, DeleteView from django.views.decorators.http import require_http_methods from django.http import JsonResponse +from django.db.models.functions import Lower from rest_framework import viewsets from rest_framework.permissions import IsAdminUser from users.serializers import ( UserSerializer, UserTypeSerializer, + GroupSerializer, + MembershipSerializer, + GroupRoleSerializer, + InvitationSerializer, ) -from programming import settings as programming_settings from users.forms import UserChangeForm, GroupCreateUpdateForm, GroupInvitationsForm from functools import wraps from allauth.account.admin import EmailAddress from programming.models import ( - Question, Attempt, Achievement ) @@ -41,6 +41,7 @@ UserType, ) from programming.codewof_utils import get_questions_answered_in_past_month, backdate_user +from programming.question_recommendations import get_recommended_questions, get_recommendation_descriptions from users.mixins import AdminRequiredMixin, AdminOrMemberRequiredMixin, SufficientAdminsMixin, \ RequestUserIsMembershipUserMixin from users.utils import send_invitation_email @@ -77,49 +78,21 @@ def get_object(self): def get_context_data(self, **kwargs): """Get additional context data for template.""" user = self.request.user + context = super().get_context_data(**kwargs) if not user.profile.has_backdated: backdate_user(user.profile) - context = super().get_context_data(**kwargs) - now = timezone.now() - today = now.date() - - # Get questions not attempted before today - questions = Question.objects.all() - - # TODO: Also filter by questions added before today - questions = questions.filter( - Q(attempt__isnull=True) - | (Q(attempt__passed_tests=False) & Q(attempt__datetime__date__lte=today)) - | (Q(attempt__passed_tests=True) & Q(attempt__datetime__date=today)) - ).order_by('pk').distinct('pk').select_subclasses() - questions = list(questions) - - # Randomly pick 3 based off seed of todays date - if len(questions) > 0: - random_seeded = Random('{}{}'.format(user.pk, today)) - number_to_do = min(len(questions), programming_settings.QUESTIONS_PER_DAY) - todays_questions = random_seeded.sample(questions, number_to_do) - all_complete = True - for question in todays_questions: - question.completed = Attempt.objects.filter( - profile=user.profile, - question=question, - passed_tests=True, - ).exists() - if all_complete and not question.completed: - all_complete = False - else: - todays_questions = list() - all_complete = False - - context['questions_to_do'] = todays_questions - context['all_complete'] = all_complete memberships = user.membership_set.all().order_by('group__name') groups = memberships.values('group').distinct() - emails = EmailAddress.objects.filter(user=user, verified=True) - invitations = Invitation.objects.filter(email__in=emails.values('email')).exclude(group__in=groups)\ + emails = EmailAddress.objects.annotate(email_lower=Lower('email')).filter(user=user, verified=True) + invitations = Invitation.objects.filter(email__in=emails.values('email_lower')).exclude(group__in=groups)\ .order_by('group__pk', '-date_sent').distinct('group__pk') + recommendation_descriptions = get_recommendation_descriptions() + recommended_questions = get_recommended_questions(user.profile) + if len(recommendation_descriptions) == len(recommended_questions): + context['recommendations'] = [(description, question) for description, question in zip( + recommendation_descriptions, recommended_questions + )] context['memberships'] = memberships context['invitations'] = invitations context['codewof_profile'] = self.object.profile @@ -361,20 +334,22 @@ def create_invitations(request, pk, group): skipped = [] for email in emails: - email = email.strip() + email = email.lower().strip() if len(Invitation.objects.filter(email=email, group=group)) > 0: skipped.append(email) continue try: - user = EmailAddress.objects.get(email=email).user - invitee_emails = EmailAddress.objects.filter(user=user) + user = EmailAddress.objects.annotate(email_lower=Lower('email')).get(email_lower=email).user + invitee_emails = EmailAddress.objects.annotate(email_lower=Lower('email')).filter(user=user) except EmailAddress.DoesNotExist: user = None + # If user with that email exists and they are already a member or an invitation has been sent to one of + # their other emails. if user is not None and (len(Membership.objects.filter(user=user, group=group)) > 0 - or len(Invitation.objects.filter(email__in=invitee_emails.values('email'), - group=group)) > 0): + or len(Invitation.objects.filter( + email__in=invitee_emails.values('email_lower'), group=group)) > 0): skipped.append(email) continue @@ -418,8 +393,8 @@ def invitee_required(f): @wraps(f) def g(request, *args, **kwargs): - emails = EmailAddress.objects.filter(user=request.user, verified=True) - if Invitation.objects.filter(pk=kwargs['pk'], email__in=emails.values('email')): + emails = EmailAddress.objects.annotate(email_lower=Lower('email')).filter(user=request.user, verified=True) + if Invitation.objects.filter(pk=kwargs['pk'], email__in=emails.values('email_lower')): return f(request, *args, **kwargs) else: raise PermissionDenied() @@ -431,14 +406,18 @@ def g(request, *args, **kwargs): @login_required() @invitee_required def accept_invitation(request, pk): - """View for accepting an invitation and creating a membership.""" + """ + View for accepting an invitation and creating a membership. + + Removes any duplicate invitations as well. + """ invitation = Invitation.objects.get(pk=pk) membership_role = GroupRole.objects.get(name="Member") if not Membership.objects.filter(user=request.user, group=invitation.group).exists(): Membership(user=request.user, group=invitation.group, role=membership_role).save() - emails = EmailAddress.objects.filter(user=request.user) - Invitation.objects.filter(email__in=emails.values('email'), group=invitation.group).delete() + emails = EmailAddress.objects.annotate(email_lower=Lower('email')).filter(user=request.user) + Invitation.objects.filter(email__in=emails.values('email_lower'), group=invitation.group).delete() return HttpResponse() @@ -447,10 +426,14 @@ def accept_invitation(request, pk): @login_required() @invitee_required def reject_invitation(request, pk): - """View for rejecting an invitation.""" + """ + View for rejecting an invitation. + + Removes any duplicate invitations as well. + """ invitation = Invitation.objects.get(pk=pk) - emails = EmailAddress.objects.filter(user=request.user) - Invitation.objects.filter(email__in=emails.values('email'), group=invitation.group).delete() + emails = EmailAddress.objects.annotate(email_lower=Lower('email')).filter(user=request.user) + Invitation.objects.filter(email__in=emails.values('email_lower'), group=invitation.group).delete() return HttpResponse() @@ -462,3 +445,35 @@ def get_group_emails(request, pk, group): """View for obtaining the email addresses of the members of the group.""" emails_list = list(group.users.values_list('email', flat=True)) return JsonResponse({"emails": emails_list}) + + +class GroupAPIViewSet(viewsets.ReadOnlyModelViewSet): + """API endpoint that allows groups to be viewed.""" + + permission_classes = [IsAdminUser] + queryset = Group.objects.all() + serializer_class = GroupSerializer + + +class MembershipAPIViewSet(viewsets.ReadOnlyModelViewSet): + """API endpoint that allows group memberships to be viewed.""" + + permission_classes = [IsAdminUser] + queryset = Membership.objects.all().select_related('user', 'group', 'role') + serializer_class = MembershipSerializer + + +class GroupRoleAPIViewSet(viewsets.ReadOnlyModelViewSet): + """API endpoint that allows group roles to be viewed.""" + + permission_classes = [IsAdminUser] + queryset = GroupRole.objects.all() + serializer_class = GroupRoleSerializer + + +class InvitationAPIViewSet(viewsets.ReadOnlyModelViewSet): + """API endpoint that allows group invitations to be viewed.""" + + permission_classes = [IsAdminUser] + queryset = Invitation.objects.all().select_related('group', 'inviter') + serializer_class = InvitationSerializer diff --git a/codewof/utils/LoaderFactory.py b/codewof/utils/LoaderFactory.py index ca5a620e5..cd79a00da 100644 --- a/codewof/utils/LoaderFactory.py +++ b/codewof/utils/LoaderFactory.py @@ -1,11 +1,26 @@ """Factory for creating loader objects.""" from programming.management.commands._QuestionsLoader import QuestionsLoader +from programming.management.commands._DifficultiesLoader import DifficultiesLoader +from programming.management.commands._ProgrammingConceptsLoader import ProgrammingConceptsLoader +from programming.management.commands._QuestionContextsLoader import QuestionContextsLoader class LoaderFactory: """Factory for creating loader objects.""" + def difficulty_levels_loader(self, **kwargs): + """Difficulty levels loader.""" + return DifficultiesLoader(**kwargs) + + def programming_concepts_loader(self, **kwargs): + """Programming concepts loader.""" + return ProgrammingConceptsLoader(**kwargs) + + def question_contexts_loader(self, **kwargs): + """Question contexts loader.""" + return QuestionContextsLoader(**kwargs) + def create_questions_loader(self, **kwargs): """Create questions loader.""" return QuestionsLoader(**kwargs) diff --git a/dev b/dev index 4ed368d4a..a4fbee3bb 100755 --- a/dev +++ b/dev @@ -41,7 +41,7 @@ defhelp help 'View all help.' # Start development environment cmd_start() { echo "Creating systems..." - docker-compose -f docker-compose.local.yml up -d + docker compose -f docker-compose.local.yml up -d # Alert user that system is ready echo -e "\n${SUCCESS}System is up!${NC}" echo -e "Run the command ${CODE}./dev update${NC} to load content." @@ -51,12 +51,12 @@ defhelp start 'Start development environment.' # Stop development environment cmd_end() { echo "Stopping systems..." - docker-compose -f docker-compose.local.yml down + docker compose -f docker-compose.local.yml down --remove-orphans } defhelp end 'Stop development environment.' cmd_restart() { - docker-compose -f docker-compose.local.yml restart "$@" + docker compose -f docker-compose.local.yml restart "$@" } defhelp restart 'Restart container.' @@ -82,7 +82,7 @@ defhelp update 'Update system ready for use.' # Run in exising container to use existing volumes cmd_makemigrations() { echo "Creating database migrations..." - docker-compose -f docker-compose.local.yml exec django python ./manage.py makemigrations --no-input + docker compose -f docker-compose.local.yml exec django python ./manage.py makemigrations --no-input } defhelp makemigrations 'Run Django makemigrations command.' @@ -90,7 +90,7 @@ defhelp makemigrations 'Run Django makemigrations command.' # Run in exising container to access new migration files cmd_migrate() { echo "Applying database migrations..." - docker-compose -f docker-compose.local.yml exec django python ./manage.py migrate + docker compose -f docker-compose.local.yml exec django python ./manage.py migrate } defhelp migrate 'Run Django migrate command.' @@ -98,61 +98,61 @@ defhelp migrate 'Run Django migrate command.' # Run update_data command cmd_update_data() { - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py update_data + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py update_data } defhelp update_data "Update all required data." # Run load_user_types command cmd_load_user_types() { - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py load_user_types + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py load_user_types } defhelp load_user_types "Load user types." # Run load_questions command cmd_load_questions() { - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py load_questions + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py load_questions } defhelp load_questions "Load questions." # Run load_style_errors command cmd_load_style_errors() { - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py load_style_errors + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py load_style_errors } defhelp load_style_errors "Load style errors." # Run load_achievements command cmd_load_achievements() { - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py load_achievements + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py load_achievements } defhelp load_achievements "Load achievements." cmd_createsuperuser() { - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py createsuperuser + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py createsuperuser } defhelp createsuperuser "Create superuser in Django system." cmd_sample_data() { - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py sample_data $1 + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py sample_data $1 } defhelp sample_data "Add sample data to website." cmd_send_email_reminders() { - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py send_email_reminders + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py send_email_reminders } defhelp send_email_reminders "Send an email reminder to all users who opted to receive one today." cmd_raise_backdate_flags() { - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py raise_backdate_flags + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py raise_backdate_flags } defhelp raise_backdate_flags 'Raise a flag on all user profiles, requiring a backdate be done on them.' cmd_remove_expired_invitations() { - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py remove_expired_invitations + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py remove_expired_invitations } defhelp remove_expired_invitations "Remove all Invitation objects where date_expires is before the current datetime." cmd_backdate() { - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py backdate_points_and_achievements --ignore_flags + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py backdate_points_and_achievements --ignore_flags } defhelp backdate 'Re-calculate points and achievements earned for all user profiles.' @@ -161,7 +161,7 @@ defhelp backdate 'Re-calculate points and achievements earned for all user profi # Build static files cmd_static() { echo "Building static files..." - docker-compose -f docker-compose.local.yml run --rm node npm run dev + docker compose -f docker-compose.local.yml run --rm node npm run generate-assets } defhelp static 'Build static files.' @@ -169,7 +169,7 @@ defhelp static 'Build static files.' cmd_collect_static() { echo echo "Collecting static files..." - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python manage.py collectstatic --no-input --clear + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python manage.py collectstatic --no-input --clear } defhelp collect_static "Collecting static files." @@ -186,31 +186,31 @@ defhelp update_static 'Update static files.' # Build Docker images cmd_build() { echo "Building Docker images..." - docker-compose -f docker-compose.local.yml build + docker compose -f docker-compose.local.yml build } defhelp build 'Build or rebuild Docker images.' # Run exec cmd_exec() { - docker-compose -f docker-compose.local.yml exec "$@" + docker compose -f docker-compose.local.yml exec "$@" } defhelp exec "Execute command in given container." # View Docker logs cmd_logs() { echo "Building Docker images..." - docker-compose -f docker-compose.local.yml logs --timestamps "$@" + docker compose -f docker-compose.local.yml logs --timestamps "$@" } defhelp logs 'View logs.' # Run style checks cmd_style() { echo "Running PEP8 style checker..." - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django flake8 + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django flake8 pep8_status=$? echo echo "Running Python docstring checker..." - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django pydocstyle --count --explain + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django pydocstyle --count --explain pydocstyle_status=$? ! (( pep8_status || pydocstyle_status )) } @@ -219,27 +219,27 @@ defhelp style 'Run style checks.' # Run test suite cmd_test_suite() { echo "Running test suite..." - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django coverage run --rcfile=./.coveragerc ./manage.py test --settings=config.settings.testing --pattern "test_*.py" -v 3 --nomigrations + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django coverage run --rcfile=./.coveragerc ./manage.py test --settings=config.settings.testing --pattern "test_*.py" -v 3 --nomigrations } defhelp test_suite 'Run test suite with code coverage.' # Run specific test suite cmd_test_specific() { echo "Running specific test suite..." - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py test --settings=config.settings.testing "${1}" -v 3 --nomigrations + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py test --settings=config.settings.testing "${1}" -v 3 --nomigrations } defhelp test_specific 'Run specific test suite. Pass in parameter of Python test module.' # Display test coverage table cmd_test_coverage() { echo "Displaying test suite coverage..." - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django coverage xml -i - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django coverage report -m --skip-covered + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django coverage xml -i + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django coverage report -m --skip-covered } defhelp test_coverage 'Display code coverage report.' cmd_createsuperuser() { - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py createsuperuser + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django python ./manage.py createsuperuser } defhelp createsuperuser "Create superuser in Django system." @@ -247,7 +247,7 @@ defhelp createsuperuser "Create superuser in Django system." # For use in GitHub Actions environment cmd_ci() { - docker network create uccser-development-proxy + docker network create uccser-development-stack cmd_start local cmd="$1" shift @@ -267,7 +267,7 @@ cmd_ci() { } cmd_test_general() { - docker-compose -f docker-compose.local.yml run --rm --label traefik.enable=false django coverage run --rcfile=./.coveragerc ./manage.py test --settings=config.settings.testing --pattern "test_*.py" -v 3 --exclude-tag=resource --exclude-tag=management --nomigrations + docker compose -f docker-compose.local.yml run --rm --label traefik.enable=false django coverage run --rcfile=./.coveragerc ./manage.py test --settings=config.settings.testing --pattern "test_*.py" -v 3 --exclude-tag=resource --exclude-tag=management --nomigrations } # --- Core script logic ------------------------------------------------------- diff --git a/dev.old b/dev.old deleted file mode 100755 index 9353ad765..000000000 --- a/dev.old +++ /dev/null @@ -1,370 +0,0 @@ -#!/bin/bash -# Helper script for commands related to this repository. -# -# Notes: -# - Changes to template only require user to refresh browser. -# - Changes to static files require the 'static' command to be run. -# - Changes to Python code are detected by gunicorn and should take effect -# on the server after a few seconds. - -set -e - -RED='\033[0;31m' -GREEN='\033[0;32m' -NC='\033[0m' # No Color - -cmd_helps=() -dev_cmd_helps=() - -defhelp() { - local command="${1?}" - local text="${2?}" - local help_str - help_str="$(printf ' %-28s %s' "$command" "$text")" - cmd_helps+=("$help_str") -} - -# Print out help information -cmd_help() { - echo "Script for performing tasks related to the codeWOF repository." - echo - echo "Usage: ./dev [COMMAND]" - echo "Replace [COMMAND] with a word from the list below." - echo - echo "COMMAND list:" - for str in "${cmd_helps[@]}"; do - echo -e "$str" - done -} - -defhelp help 'View all help.' -defhelp 'dev [DEV_COMMAND]' 'Run a developer command.' - -# Start development environment -cmd_start() { - echo "Creating systems..." - docker-compose up -d - echo "" - # Alert user that system is ready - echo -e "\n${GREEN}System is up!${NC}" - echo "Run the command ./dev update to load content." -} - -defhelp start 'Start development environment.' - -# Stop development environment -cmd_end() { - echo "Stopping systems... (takes roughly 10 to 20 seconds)" - docker-compose down - echo - echo "Deleting system volumes..." - volumes=($(docker volume ls -qf dangling=true )) - for volume in "${volumes[@]}"; do - docker volume rm "${volume}" - done -} -defhelp end 'Stop development environment.' - -cmd_restart() { - cmd_end - cmd_start -} -defhelp restart 'Stop and then restart development environment.' - -# Run Django migrate and updatedata commands -cmd_update() { - cmd_static - - echo "" - cmd_migrate - - echo "" - cmd_load_questions - cmd_load_style_errors - - echo "" - cmd_collect_static - echo "" - echo -e "\n${GREEN}Content is loaded!${NC}" - echo "Open your preferred web browser to the URL 'localhost:83'" -} -defhelp update 'Update system ready for use.' - -# Collecting static files -cmd_collect_static() { - echo - echo "Collecting static files..." - docker-compose exec django /docker_venv/bin/python3 ./manage.py collectstatic --no-input --clear -} -defhelp collect_static "Collecting static files." - -# Run Django flush command -cmd_flush() { - docker-compose exec django /docker_venv/bin/python3 ./manage.py flush -} -defhelp flush 'Run Django flush command.' - -# Run Django makemigrations command -cmd_makemigrations() { - echo "Creating database migrations..." - docker-compose exec django /docker_venv/bin/python3 ./manage.py makemigrations -} -defhelp makemigrations 'Run Django makemigrations command.' - -# Run Django migrate command -cmd_migrate() { - echo "Applying database migrations..." - docker-compose exec django /docker_venv/bin/python3 ./manage.py migrate -} -defhelp migrate 'Run Django migrate command.' - -# Build Docker images -cmd_build() { - echo "Building Docker images..." - docker-compose build - echo - echo "Deleting untagged images..." - untagged_images=($(docker images --no-trunc | grep '