Skip to content

Commit d3ef406

Browse files
changed datetime fields to string, made almost all the fields as not required
1 parent ee4cc7c commit d3ef406

File tree

2 files changed

+20
-26
lines changed

2 files changed

+20
-26
lines changed

excel_2019_django_cms/api/models.py

+20-17
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
class Event(models.Model):
88
name = models.CharField(primary_key=True,max_length=100)
9-
codename = models.CharField(max_length=50, null=True)
9+
codename = models.CharField(max_length=50, null=True, blank=True)
1010
img = models.CharField(max_length=100, null=True, blank=True)
1111
# img = models.ImageField(upload_to='media', null=True)
1212
description = models.TextField(null=True, blank=True)
1313
info = models.TextField(blank=True, null=True)
14-
type = models.CharField(max_length=30, null=True)
15-
website = models.CharField(max_length=50, null=True)
14+
type = models.CharField(max_length=30, null=True, blank=True)
15+
website = models.CharField(max_length=50, null=True, blank=True)
1616
created_at = models.DateTimeField(default=datetime.now, blank=True, null=True)
1717
contributor = models.ForeignKey(User, null=True, on_delete=models.SET_NULL, blank=True)
1818

@@ -22,8 +22,8 @@ def __str__(self):
2222

2323
class Contact(models.Model):
2424
name = models.CharField(max_length=100)
25-
email = models.CharField(max_length=100, null=True)
26-
phone_number = models.CharField(max_length=100, null=True)
25+
email = models.CharField(max_length=100, null=True, blank=True)
26+
phone_number = models.CharField(max_length=100, null=True, blank=True)
2727
img = models.CharField(max_length=100, null=True, blank=True)
2828
# img = models.ImageField(upload_to='media', null=True, blank=True)
2929
created_at = models.DateTimeField(default=datetime.now, blank=True, null=True)
@@ -39,8 +39,10 @@ class Competition(models.Model):
3939
# img = models.ImageField(upload_to='media', null=True, blank=True)
4040
codename = models.CharField(max_length=100, null=True, blank=True)
4141
venue = models.CharField(max_length=100, null=True, blank=True)
42-
date = models.DateField(null=True, blank=True)
43-
time = models.TimeField(null=True, blank=True)
42+
# date = models.DateField(null=True, blank=True)
43+
# time = models.TimeField(null=True, blank=True)
44+
date = models.CharField(max_length=100, null=True, blank=True)
45+
time = models.CharField(max_length=100, null=True, blank=True)
4446
format = models.TextField(null=True, blank=True)
4547
rules = models.TextField(null=True, blank=True)
4648
active = models.BooleanField(default=True)
@@ -56,10 +58,10 @@ def __str__(self):
5658

5759
class CompetitionContactInfo(models.Model):
5860
name = models.CharField(max_length=100, null=True)
59-
designation = models.CharField(max_length=100, null=True)
60-
phone_number = models.CharField(max_length=100, null=True)
61+
designation = models.CharField(max_length=100, null=True, blank=True)
62+
phone_number = models.CharField(max_length=100, null=True, blank=True)
6163
created_at = models.DateTimeField(default=datetime.now, blank=True, null=True)
62-
competition = models.ForeignKey(Competition, null=True, related_name='contact_numbers', on_delete=models.CASCADE)
64+
competition = models.ForeignKey(Competition, null=True, related_name='contact_numbers', on_delete=models.CASCADE, blank=True)
6365
contributor = models.ForeignKey(User, null=True, on_delete=models.SET_NULL, blank=True)
6466

6567
def __str__(self):
@@ -74,8 +76,8 @@ class CompetitionButton(models.Model):
7476

7577
class EventContactInfo(models.Model):
7678
name = models.CharField(max_length=100, null=True)
77-
designation = models.CharField(max_length=100, null=True)
78-
phone_number = models.CharField(max_length=100, null=True)
79+
designation = models.CharField(max_length=100, null=True, blank=True)
80+
phone_number = models.CharField(max_length=100, null=True, blank=True)
7981
created_at = models.DateTimeField(default=datetime.now, blank=True, null=True)
8082
event = models.ForeignKey(Event, null=True, related_name='contact_numbers', on_delete=models.CASCADE)
8183
contributor = models.ForeignKey(User, null=True, on_delete=models.SET_NULL, blank=True)
@@ -92,15 +94,16 @@ class EventButton(models.Model):
9294

9395
class Schedule(models.Model):
9496
name = models.CharField(max_length=100, null=True)
95-
venue = models.CharField(max_length=100, null=True)
96-
date = models.CharField(max_length=100, null=True, blank=True)
97+
venue = models.CharField(max_length=100, null=True, blank=True)
9798
# date = models.DateField(null=True)
98-
time = models.TimeField(null=True)
99+
# time = models.TimeField(null=True)
100+
date = models.CharField(max_length=100, null=True, blank=True)
101+
time = models.CharField(max_length=100, null=True, blank=True)
99102
img = models.CharField(max_length=100, null=True, blank=True)
100103
# img = models.ImageField(upload_to='media', null=True, blank=True)
101104
day = models.IntegerField(default=1)
102-
category = models.CharField(max_length=100, null=True)
103-
daytime = models.CharField(max_length=100, null=True, choices=[('Morning', 'Morning'), ('Afternoon', 'Afternoon'), ('Evening', 'Evening')])
105+
category = models.CharField(max_length=100, null=True, blank=True)
106+
daytime = models.CharField(max_length=100, null=True, choices=[('Morning', 'Morning'), ('Afternoon', 'Afternoon'), ('Evening', 'Evening')], blank=True)
104107
created_at = models.DateTimeField(default=datetime.now, blank=True, null=True)
105108
contributor = models.ForeignKey(User, null=True, on_delete=models.SET_NULL, blank=True)
106109

excel_2019_django_cms/api/serializers.py

-9
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,11 @@ class CompetitionSerializer(serializers.ModelSerializer):
6363
contributor = UserSerializer()
6464
contact_numbers = CompetitionContactInfoSerializer(many=True)
6565
buttons = CompetitionButtonSerializer(many=True)
66-
date = serializers.SerializerMethodField()
67-
time = serializers.SerializerMethodField()
6866

6967
class Meta:
7068
model = Competition
7169
fields = '__all__'
7270

73-
def get_date(self, obj):
74-
# return "testing"
75-
return obj.date.strftime("%B-%d")
76-
77-
def get_time(slef, obj):
78-
return obj.time.strftime("%I:%M %p")
79-
8071

8172
class ContactSerializer(serializers.ModelSerializer):
8273
contributor = UserSerializer()

0 commit comments

Comments
 (0)