Skip to content

Commit 48a0c6a

Browse files
Resolved issues with PR
1 parent 4a27547 commit 48a0c6a

23 files changed

Lines changed: 32 additions & 391 deletions

docker-compose.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# version: "3.4"
2-
31
services:
42
hackathon-app:
53
image: hackathon-app

hackathon/forms.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -232,25 +232,21 @@ class EventForm(forms.ModelForm):
232232
label="Description",
233233
widget=forms.Textarea(attrs={'rows': 4, 'class': 'form-control'})
234234
)
235-
isReadOnly = forms.BooleanField(
236-
label="Read Only",
237-
required=False,
238-
widget=forms.CheckboxInput(attrs={'class': 'form-check-input'})
239-
)
240235
webinar_link = forms.URLField(
241236
label="Webinar Link",
242237
required=False,
243238
widget=forms.URLInput(attrs={'class': 'form-control'})
244239
)
245240
webinar_code = forms.CharField(
246241
label="Webinar Join Code",
242+
required=False,
247243
widget=forms.Textarea(attrs={'rows': 1, 'class': 'form-control'})
248244
)
249245
class Meta:
250246
model = Event
251247
fields = [
252-
'title', 'start', 'end', 'body',
253-
'isReadOnly', 'webinar_link',
248+
'title', 'start', 'end', 'body',
249+
'webinar_link',
254250
'webinar_code',
255251
]
256252

hackathon/migrations/0049_event.py

Lines changed: 0 additions & 23 deletions
This file was deleted.

hackathon/migrations/0050_auto_20240510_1722.py

Lines changed: 0 additions & 18 deletions
This file was deleted.

hackathon/migrations/0051_auto_20240510_1728.py

Lines changed: 0 additions & 42 deletions
This file was deleted.

hackathon/migrations/0052_auto_20240516_1847.py

Lines changed: 0 additions & 23 deletions
This file was deleted.

hackathon/migrations/0053_auto_20240516_1850.py

Lines changed: 0 additions & 31 deletions
This file was deleted.

hackathon/migrations/0054_event.py

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Generated by Django 3.1.13 on 2024-10-04 15:52
2+
3+
from django.db import migrations, models
4+
import django.db.models.deletion
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('hackathon', '0053_auto_20240912_1527'),
11+
]
12+
13+
operations = [
14+
migrations.CreateModel(
15+
name='Event',
16+
fields=[
17+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
18+
('title', models.CharField(max_length=200)),
19+
('start', models.DateTimeField()),
20+
('end', models.DateTimeField()),
21+
('body', models.TextField(default='', max_length=500)),
22+
('isReadOnly', models.BooleanField(default=True)),
23+
('webinar_link', models.URLField(blank=True, null=True)),
24+
('webinar_code', models.CharField(blank=True, max_length=50, null=True)),
25+
('hackathon', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='events', to='hackathon.hackathon')),
26+
],
27+
),
28+
]

hackathon/migrations/0054_event_category.py

Lines changed: 0 additions & 18 deletions
This file was deleted.

hackathon/migrations/0055_auto_20240516_2100.py

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)