Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

2022 cfp #1053

Merged
merged 25 commits into from
Feb 28, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
ed84718
feat(core/models.py): Add new fields in EventInfo
setmao Feb 20, 2022
bdf6695
feat(proposals/forms): Add new fields in proposal froms
setmao Feb 20, 2022
d0a5e24
feat(django.po): Update i18n
setmao Feb 20, 2022
05b3611
feat(all): Add 2022 config
setmao Feb 26, 2022
37e1313
style(css): Update style
setmao Feb 27, 2022
51aa33b
fix(proposals.py): Fix typo
setmao Feb 27, 2022
bfe7a52
feat(proposals): Remove remoting_policy
setmao Feb 27, 2022
f42c6a4
feat(core/models.py): Add talk_language
setmao Feb 27, 2022
a8c02b7
refactor(proposals/forms.py): Update text
setmao Feb 27, 2022
a23e2db
feat(migrations): Add migrations
setmao Feb 27, 2022
17ca233
feat(django.po): Update po
setmao Feb 27, 2022
a7d46ee
refactor(django.po): Update po
setmao Feb 27, 2022
02e0fcf
build(docker-compose.yml): Update container name to 2022
setmao Feb 27, 2022
4775794
build(docker-compose.yml): Update to 2022
setmao Feb 27, 2022
5e67b97
style(_proposals.scss): Fix background image
setmao Feb 27, 2022
9985ba9
style(nav_base.html): Fix nav bar
setmao Feb 27, 2022
52c33f5
feat(forms/proposals.py): Let talk language is not required
setmao Feb 28, 2022
7bcdc2d
style(_proposals.scss): Fix css
setmao Feb 28, 2022
009e816
feat(proposals/): Refine pre_recorded_policy
setmao Feb 28, 2022
108ea47
feat(django.po): Update po
setmao Feb 28, 2022
51bd4ad
fix(django.po): Update po
setmao Feb 28, 2022
4fe67e7
Merge branch 'master' of github.com:pycontw/pycon.tw into 2022_cfp
setmao Feb 28, 2022
d75d78a
fix(migrations/): Fix migrations
setmao Feb 28, 2022
9b0d299
test(tests/): Fix test
setmao Feb 28, 2022
e0fd6a1
test(tests/): Fix test
setmao Feb 28, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
feat(core/models.py): Add new fields in EventInfo
  • Loading branch information
setmao committed Feb 20, 2022
commit ed847180463f22b6914a5cba025617e9bf1bdb85
34 changes: 32 additions & 2 deletions src/core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ class EventInfo(models.Model):
('ENEN', _('English talk')),
('ZHEN', _('Chinese talk w. English slides')),
('ZHZH', _('Chinese talk w. Chinese slides')),
('TAI', _('Taiwanese Hokkien')),
)
language = models.CharField(
verbose_name=_('language'),
Expand Down Expand Up @@ -216,6 +215,38 @@ class EventInfo(models.Model):
choices=REMOTE_POLICY_CHOICES
)

PERFER_TIME_CHOICES = (
('DAY_ONE_MORNING', _('Day 1 morning')),
('DAY_ONE_AFTERNOON', _('Day 1 afternoon')),
('DAY_TWO_MORNING', _('Day 2 morning')),
('DAY_TWO_AFTERNOON', _('Day 2 afternoon')),
)
prefer_time = models.CharField(
verbose_name=_('prefer event time'),
max_length=32,
choices=PERFER_TIME_CHOICES,
)

LIVING_IN_TAIWAN_CHOICES = (
(True, _('Yes')),
(False, _('No'))
)
living_in_taiwan = models.BooleanField(
verbose_name=_('living in taiwan'),
default=False,
choices=REFERRING_POLICY_CHOICES,
)

PRE_RECORDED_POLICY_CHOICES = (
(True, _('Yes')),
(False, _('No'))
)
pre_recorded_policy = models.BooleanField(
verbose_name=_('agree pre-recorded proposal'),
default=False,
choices=REFERRING_POLICY_CHOICES,
)

class Meta:
abstract = True
ordering = ['-created_at']
Expand All @@ -228,7 +259,6 @@ def get_language_tag(self):
'ENEN': 'E',
'ZHEN': 'ZE',
'ZHZH': 'Z',
'TAI': 'T',
}[self.language]

def get_python_level_tag(self):
Expand Down
34 changes: 34 additions & 0 deletions src/events/migrations/0040_auto_20220220_1339.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Generated by Django 3.1.7 on 2022-02-20 05:39

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('events', '0039_auto_20210930_2150'),
]

operations = [
migrations.AddField(
model_name='sponsoredevent',
name='living_in_taiwan',
field=models.BooleanField(choices=[(True, 'Yes'), (False, 'No')], default=False, verbose_name='living in taiwan'),
),
migrations.AddField(
model_name='sponsoredevent',
name='pre_recorded_policy',
field=models.BooleanField(choices=[(True, 'Yes'), (False, 'No')], default=False, verbose_name='agree pre-recorded proposal'),
),
migrations.AddField(
model_name='sponsoredevent',
name='prefer_time',
field=models.CharField(choices=[('DAY_ONE_MORNING', 'Day 1 morning'), ('DAY_ONE_AFTERNOON', 'Day 1 afternoon'), ('DAY_TWO_MORNING', 'Day 2 morning'), ('DAY_TWO_AFTERNOON', 'Day 2 afternoon')], default='', max_length=32, verbose_name='prefer event time'),
preserve_default=False,
),
migrations.AlterField(
model_name='sponsoredevent',
name='language',
field=models.CharField(choices=[('ENEN', 'English talk'), ('ZHEN', 'Chinese talk w. English slides'), ('ZHZH', 'Chinese talk w. Chinese slides')], max_length=4, verbose_name='language'),
),
]
55 changes: 55 additions & 0 deletions src/proposals/migrations/0053_auto_20220220_1339.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Generated by Django 3.1.7 on 2022-02-20 05:39

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('proposals', '0052_auto_20210930_2108'),
]

operations = [
migrations.AddField(
model_name='talkproposal',
name='living_in_taiwan',
field=models.BooleanField(choices=[(True, 'Yes'), (False, 'No')], default=False, verbose_name='living in taiwan'),
),
migrations.AddField(
model_name='talkproposal',
name='pre_recorded_policy',
field=models.BooleanField(choices=[(True, 'Yes'), (False, 'No')], default=False, verbose_name='agree pre-recorded proposal'),
),
migrations.AddField(
model_name='talkproposal',
name='prefer_time',
field=models.CharField(choices=[('DAY_ONE_MORNING', 'Day 1 morning'), ('DAY_ONE_AFTERNOON', 'Day 1 afternoon'), ('DAY_TWO_MORNING', 'Day 2 morning'), ('DAY_TWO_AFTERNOON', 'Day 2 afternoon')], default='', max_length=32, verbose_name='prefer event time'),
preserve_default=False,
),
migrations.AddField(
model_name='tutorialproposal',
name='living_in_taiwan',
field=models.BooleanField(choices=[(True, 'Yes'), (False, 'No')], default=False, verbose_name='living in taiwan'),
),
migrations.AddField(
model_name='tutorialproposal',
name='pre_recorded_policy',
field=models.BooleanField(choices=[(True, 'Yes'), (False, 'No')], default=False, verbose_name='agree pre-recorded proposal'),
),
migrations.AddField(
model_name='tutorialproposal',
name='prefer_time',
field=models.CharField(choices=[('DAY_ONE_MORNING', 'Day 1 morning'), ('DAY_ONE_AFTERNOON', 'Day 1 afternoon'), ('DAY_TWO_MORNING', 'Day 2 morning'), ('DAY_TWO_AFTERNOON', 'Day 2 afternoon')], default='', max_length=32, verbose_name='prefer event time'),
preserve_default=False,
),
migrations.AlterField(
model_name='talkproposal',
name='language',
field=models.CharField(choices=[('ENEN', 'English talk'), ('ZHEN', 'Chinese talk w. English slides'), ('ZHZH', 'Chinese talk w. Chinese slides')], max_length=4, verbose_name='language'),
),
migrations.AlterField(
model_name='tutorialproposal',
name='language',
field=models.CharField(choices=[('ENEN', 'English talk'), ('ZHEN', 'Chinese talk w. English slides'), ('ZHZH', 'Chinese talk w. Chinese slides')], max_length=4, verbose_name='language'),
),
]