Skip to content

Commit 857f3ff

Browse files
sks444pradyunsg
sks444
authored and
pradyunsg
committed
Lint the code
1 parent 1ce7ce9 commit 857f3ff

File tree

71 files changed

+3020
-1189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+3020
-1189
lines changed

‎junction/base/models.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import absolute_import, unicode_literals
33

4-
# Third Party Stuff
54
from django.contrib.auth.models import User
65
from django.db import models
76

87

98
class TimeAuditModel(models.Model):
109
"""To track when the record was created and last modified
1110
"""
11+
1212
created_at = models.DateTimeField(auto_now_add=True, verbose_name="Created At")
1313
modified_at = models.DateTimeField(auto_now=True, verbose_name="Last Modified At")
1414

@@ -19,22 +19,28 @@ class Meta:
1919
class UserAuditModel(models.Model):
2020
""" To track who created and last modified the record
2121
"""
22+
2223
created_by = models.ForeignKey(
23-
User, related_name='created_%(class)s_set',
24-
null=True, blank=True, verbose_name="Created By",
25-
on_delete=models.SET_NULL
24+
User,
25+
related_name="created_%(class)s_set",
26+
null=True,
27+
blank=True,
28+
verbose_name="Created By",
29+
on_delete=models.SET_NULL,
2630
)
2731
modified_by = models.ForeignKey(
28-
User, related_name='updated_%(class)s_set',
29-
null=True, blank=True, verbose_name="Modified By",
30-
on_delete=models.SET_NULL
32+
User,
33+
related_name="updated_%(class)s_set",
34+
null=True,
35+
blank=True,
36+
verbose_name="Modified By",
37+
on_delete=models.SET_NULL,
3138
)
3239

3340
class Meta:
3441
abstract = True
3542

3643

3744
class AuditModel(TimeAuditModel, UserAuditModel):
38-
3945
class Meta:
4046
abstract = True

‎junction/conferences/migrations/0001_initial.py

Lines changed: 201 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import unicode_literals
33

4+
import django.db.models.deletion
45
import django_extensions.db.fields
56
from django.conf import settings
67
from django.db import migrations, models
7-
import django.db.models.deletion
88

99

1010
class Migration(migrations.Migration):
@@ -15,61 +15,220 @@ class Migration(migrations.Migration):
1515

1616
operations = [
1717
migrations.CreateModel(
18-
name='Conference',
18+
name="Conference",
1919
fields=[
20-
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
21-
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
22-
('modified_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
23-
('name', models.CharField(max_length=255, verbose_name='Conference Name')),
24-
('slug', django_extensions.db.fields.AutoSlugField(editable=False, populate_from=('name',), max_length=255, blank=True, unique=True)),
25-
('description', models.TextField(default='')),
26-
('start_date', models.DateField(verbose_name='Start Date')),
27-
('end_date', models.DateField(verbose_name='End Date')),
28-
('status', models.PositiveSmallIntegerField(verbose_name='Current Status', choices=[(1, b'Accepting Call for Proposals'), (2, b'Closed for Proposals'), (3, b'Accepting Votes'), (4, b'Schedule Published')])),
29-
('deleted', models.BooleanField(default=False, verbose_name='Is Deleted?')),
30-
('created_by', models.ForeignKey(related_name='created_conference_set', verbose_name='Created By', blank=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, null=True)),
31-
('modified_by', models.ForeignKey(related_name='updated_conference_set', verbose_name='Modified By', blank=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, null=True)),
20+
(
21+
"id",
22+
models.AutoField(
23+
verbose_name="ID",
24+
serialize=False,
25+
auto_created=True,
26+
primary_key=True,
27+
),
28+
),
29+
(
30+
"created_at",
31+
models.DateTimeField(auto_now_add=True, verbose_name="Created At"),
32+
),
33+
(
34+
"modified_at",
35+
models.DateTimeField(
36+
auto_now=True, verbose_name="Last Modified At"
37+
),
38+
),
39+
(
40+
"name",
41+
models.CharField(max_length=255, verbose_name="Conference Name"),
42+
),
43+
(
44+
"slug",
45+
django_extensions.db.fields.AutoSlugField(
46+
editable=False,
47+
populate_from=("name",),
48+
max_length=255,
49+
blank=True,
50+
unique=True,
51+
),
52+
),
53+
("description", models.TextField(default="")),
54+
("start_date", models.DateField(verbose_name="Start Date")),
55+
("end_date", models.DateField(verbose_name="End Date")),
56+
(
57+
"status",
58+
models.PositiveSmallIntegerField(
59+
verbose_name="Current Status",
60+
choices=[
61+
(1, b"Accepting Call for Proposals"),
62+
(2, b"Closed for Proposals"),
63+
(3, b"Accepting Votes"),
64+
(4, b"Schedule Published"),
65+
],
66+
),
67+
),
68+
(
69+
"deleted",
70+
models.BooleanField(default=False, verbose_name="Is Deleted?"),
71+
),
72+
(
73+
"created_by",
74+
models.ForeignKey(
75+
related_name="created_conference_set",
76+
verbose_name="Created By",
77+
blank=True,
78+
on_delete=django.db.models.deletion.CASCADE,
79+
to=settings.AUTH_USER_MODEL,
80+
null=True,
81+
),
82+
),
83+
(
84+
"modified_by",
85+
models.ForeignKey(
86+
related_name="updated_conference_set",
87+
verbose_name="Modified By",
88+
blank=True,
89+
on_delete=django.db.models.deletion.CASCADE,
90+
to=settings.AUTH_USER_MODEL,
91+
null=True,
92+
),
93+
),
3294
],
33-
options={
34-
'abstract': False,
35-
},
95+
options={"abstract": False,},
3696
bases=(models.Model,),
3797
),
3898
migrations.CreateModel(
39-
name='ConferenceModerator',
99+
name="ConferenceModerator",
40100
fields=[
41-
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
42-
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
43-
('modified_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
44-
('active', models.BooleanField(default=True, verbose_name='Is Active?')),
45-
('conference', models.ForeignKey(to='conferences.Conference', on_delete=django.db.models.deletion.CASCADE)),
46-
('created_by', models.ForeignKey(related_name='created_conferencemoderator_set', verbose_name='Created By', blank=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, null=True)),
47-
('moderator', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=django.db.models.deletion.CASCADE)),
48-
('modified_by', models.ForeignKey(related_name='updated_conferencemoderator_set', verbose_name='Modified By', blank=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, null=True)),
101+
(
102+
"id",
103+
models.AutoField(
104+
verbose_name="ID",
105+
serialize=False,
106+
auto_created=True,
107+
primary_key=True,
108+
),
109+
),
110+
(
111+
"created_at",
112+
models.DateTimeField(auto_now_add=True, verbose_name="Created At"),
113+
),
114+
(
115+
"modified_at",
116+
models.DateTimeField(
117+
auto_now=True, verbose_name="Last Modified At"
118+
),
119+
),
120+
(
121+
"active",
122+
models.BooleanField(default=True, verbose_name="Is Active?"),
123+
),
124+
(
125+
"conference",
126+
models.ForeignKey(
127+
to="conferences.Conference",
128+
on_delete=django.db.models.deletion.CASCADE,
129+
),
130+
),
131+
(
132+
"created_by",
133+
models.ForeignKey(
134+
related_name="created_conferencemoderator_set",
135+
verbose_name="Created By",
136+
blank=True,
137+
on_delete=django.db.models.deletion.CASCADE,
138+
to=settings.AUTH_USER_MODEL,
139+
null=True,
140+
),
141+
),
142+
(
143+
"moderator",
144+
models.ForeignKey(
145+
to=settings.AUTH_USER_MODEL,
146+
on_delete=django.db.models.deletion.CASCADE,
147+
),
148+
),
149+
(
150+
"modified_by",
151+
models.ForeignKey(
152+
related_name="updated_conferencemoderator_set",
153+
verbose_name="Modified By",
154+
blank=True,
155+
on_delete=django.db.models.deletion.CASCADE,
156+
to=settings.AUTH_USER_MODEL,
157+
null=True,
158+
),
159+
),
49160
],
50-
options={
51-
'abstract': False,
52-
},
161+
options={"abstract": False,},
53162
bases=(models.Model,),
54163
),
55164
migrations.CreateModel(
56-
name='ConferenceProposalReviewer',
165+
name="ConferenceProposalReviewer",
57166
fields=[
58-
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
59-
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created At')),
60-
('modified_at', models.DateTimeField(auto_now=True, verbose_name='Last Modified At')),
61-
('active', models.BooleanField(default=True, verbose_name='Is Active?')),
62-
('conference', models.ForeignKey(to='conferences.Conference', on_delete=django.db.models.deletion.CASCADE)),
63-
('created_by', models.ForeignKey(related_name='created_conferenceproposalreviewer_set', verbose_name='Created By', blank=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, null=True)),
64-
('modified_by', models.ForeignKey(related_name='updated_conferenceproposalreviewer_set', verbose_name='Modified By', blank=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, null=True)),
65-
('reviewer', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=django.db.models.deletion.CASCADE)),
167+
(
168+
"id",
169+
models.AutoField(
170+
verbose_name="ID",
171+
serialize=False,
172+
auto_created=True,
173+
primary_key=True,
174+
),
175+
),
176+
(
177+
"created_at",
178+
models.DateTimeField(auto_now_add=True, verbose_name="Created At"),
179+
),
180+
(
181+
"modified_at",
182+
models.DateTimeField(
183+
auto_now=True, verbose_name="Last Modified At"
184+
),
185+
),
186+
(
187+
"active",
188+
models.BooleanField(default=True, verbose_name="Is Active?"),
189+
),
190+
(
191+
"conference",
192+
models.ForeignKey(
193+
to="conferences.Conference",
194+
on_delete=django.db.models.deletion.CASCADE,
195+
),
196+
),
197+
(
198+
"created_by",
199+
models.ForeignKey(
200+
related_name="created_conferenceproposalreviewer_set",
201+
verbose_name="Created By",
202+
blank=True,
203+
on_delete=django.db.models.deletion.CASCADE,
204+
to=settings.AUTH_USER_MODEL,
205+
null=True,
206+
),
207+
),
208+
(
209+
"modified_by",
210+
models.ForeignKey(
211+
related_name="updated_conferenceproposalreviewer_set",
212+
verbose_name="Modified By",
213+
blank=True,
214+
on_delete=django.db.models.deletion.CASCADE,
215+
to=settings.AUTH_USER_MODEL,
216+
null=True,
217+
),
218+
),
219+
(
220+
"reviewer",
221+
models.ForeignKey(
222+
to=settings.AUTH_USER_MODEL,
223+
on_delete=django.db.models.deletion.CASCADE,
224+
),
225+
),
66226
],
67-
options={
68-
},
227+
options={},
69228
bases=(models.Model,),
70229
),
71230
migrations.AlterUniqueTogether(
72-
name='conferenceproposalreviewer',
73-
unique_together=set([('conference', 'reviewer')]),
231+
name="conferenceproposalreviewer",
232+
unique_together=set([("conference", "reviewer")]),
74233
),
75234
]

‎junction/conferences/migrations/0002_auto_20150109_1527.py

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,50 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import unicode_literals
33

4-
from django.db import migrations, models
54
import django.db.models.deletion
5+
from django.db import migrations, models
66

77

88
class Migration(migrations.Migration):
99

1010
dependencies = [
11-
('conferences', '0001_initial'),
11+
("conferences", "0001_initial"),
1212
]
1313

1414
operations = [
1515
migrations.AlterModelOptions(
16-
name='conferencemoderator',
17-
options={'verbose_name': 'moderator', 'verbose_name_plural': 'moderators'},
16+
name="conferencemoderator",
17+
options={"verbose_name": "moderator", "verbose_name_plural": "moderators"},
1818
),
1919
migrations.AlterModelOptions(
20-
name='conferenceproposalreviewer',
21-
options={'verbose_name': 'proposals reviewer', 'verbose_name_plural': 'proposals reviewers'},
20+
name="conferenceproposalreviewer",
21+
options={
22+
"verbose_name": "proposals reviewer",
23+
"verbose_name_plural": "proposals reviewers",
24+
},
2225
),
2326
migrations.AlterField(
24-
model_name='conferencemoderator',
25-
name='conference',
26-
field=models.ForeignKey(related_name='moderators', to='conferences.Conference', on_delete=django.db.models.deletion.CASCADE),
27+
model_name="conferencemoderator",
28+
name="conference",
29+
field=models.ForeignKey(
30+
related_name="moderators",
31+
to="conferences.Conference",
32+
on_delete=django.db.models.deletion.CASCADE,
33+
),
2734
preserve_default=True,
2835
),
2936
migrations.AlterField(
30-
model_name='conferenceproposalreviewer',
31-
name='conference',
32-
field=models.ForeignKey(related_name='proposal_reviewers', to='conferences.Conference', on_delete=django.db.models.deletion.CASCADE),
37+
model_name="conferenceproposalreviewer",
38+
name="conference",
39+
field=models.ForeignKey(
40+
related_name="proposal_reviewers",
41+
to="conferences.Conference",
42+
on_delete=django.db.models.deletion.CASCADE,
43+
),
3344
preserve_default=True,
3445
),
3546
migrations.AlterUniqueTogether(
36-
name='conferencemoderator',
37-
unique_together=set([('conference', 'moderator')]),
47+
name="conferencemoderator",
48+
unique_together=set([("conference", "moderator")]),
3849
),
3950
]

0 commit comments

Comments
 (0)