From c7e27e1f19a7b6f5938ad1b856bd250f358c97ab Mon Sep 17 00:00:00 2001 From: Paurush Kumar Gupta Date: Wed, 8 Jul 2020 22:04:40 +0530 Subject: [PATCH 1/8] solved issue no.14 and opened a portal to recieve request for new events to organise from the end user --- events/admin.py | 3 ++- events/forms.py | 7 ++++++- events/models.py | 10 ++++++++++ events/urls.py | 3 ++- events/views.py | 25 +++++++++++++++++++++---- templates/events.html | 17 ++++++++++++++--- 6 files changed, 55 insertions(+), 10 deletions(-) diff --git a/events/admin.py b/events/admin.py index 3b8cfed..867dc6f 100644 --- a/events/admin.py +++ b/events/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from .models import Event, EventParticipant +from .models import Event, EventParticipant, requestEvent admin.site.register(Event) admin.site.register(EventParticipant) +admin.site.register(requestEvent) diff --git a/events/forms.py b/events/forms.py index 3d91c68..7a4f0a8 100644 --- a/events/forms.py +++ b/events/forms.py @@ -1,5 +1,5 @@ from django.forms import ModelForm -from .models import EventParticipant +from .models import EventParticipant, requestEvent class ParticipantForm(ModelForm): @@ -7,3 +7,8 @@ class Meta: model = EventParticipant fields = ['title', 'student_name', 'email_id', 'mobile_number', 'roll_no', 'branch'] + +class requestEventForm(ModelForm): + class Meta: + model = requestEvent + fields = ['title', 'description', 'your_name','roll_no' ,'contact'] diff --git a/events/models.py b/events/models.py index 7b1dbef..5838126 100644 --- a/events/models.py +++ b/events/models.py @@ -53,3 +53,13 @@ class EventParticipant(TimeStampedModel): def __str__(self): return self.student_name + +class requestEvent(models.Model): + title = models.CharField(max_length=50, blank=False) + description = models.TextField(blank=False) + your_name = models.CharField(max_length=50, blank=False) + roll_no = models.CharField(max_length=15, blank=False) + contact = models.CharField(max_length=10, blank=False) + + def __str__(self): + return self.title diff --git a/events/urls.py b/events/urls.py index 4586823..8828ae6 100644 --- a/events/urls.py +++ b/events/urls.py @@ -1,7 +1,8 @@ from django.urls import path -from .views import events, register +from .views import events, register, requestEvent urlpatterns = [ path('', events, name='tech_events'), path('register/', register, name='register'), + path('requestEvent/', requestEvent, name='requestEvent'), ] diff --git a/events/views.py b/events/views.py index 5abf9ed..2770d76 100644 --- a/events/views.py +++ b/events/views.py @@ -2,14 +2,17 @@ from django.contrib import messages from django.shortcuts import render, redirect from django.views.generic import ListView -from .models import Event, EventParticipant -from .forms import ParticipantForm +from .models import Event, EventParticipant, requestEvent +from .forms import ParticipantForm, requestEventForm import csv def events(request): - events = Event.objects.all - return render(request, 'events.html', {'events': events}) + events = Event.objects.all() + #numberOfEvents = len(events) + #if (numberOfEvents) == 0: + # events = 0 + return render(request, 'events.html', {'events': events }) def register(request): @@ -45,3 +48,17 @@ def export_to_csv(request): error = "Please Enter a Valid Token" return render(request, 'download.html', {'error': error}) return render(request, 'download.html') + +def requestEvent(request): + if request.method == 'POST': + form = requestEventForm(request.POST) + if form.is_valid(): + form.save() + your_name = form.cleaned_data.get('your_name') + title = form.cleaned_data.get('title') + messages.success( + request, f'Thank you { your_name } for requesting to organise { title }, you will be contacted shortly!') + return redirect('homepage') + else: + form = requestEventForm() + return render(request, 'event_register.html', {'form': form}) diff --git a/templates/events.html b/templates/events.html index 0b44134..fed96d3 100644 --- a/templates/events.html +++ b/templates/events.html @@ -6,16 +6,27 @@

+ {% if events|length == 0 %} +
+
+

No Ongoing Events

+

Please review after sometime, to see latest ongoing Events!
THANK YOU!

+
+
+ + {% endif %} {% for event in events%}

{{ event.title }}

{{ event.description | linebreaksbr }}

- Register + Register for this Event

- {% endfor %} + {% endfor %} +
+
Request for any Event in your mind!
{% comment %} {% endcomment %} -{% endblock content %} \ No newline at end of file +{% endblock content %} From d0fe5cfae2bf44735a95885d6ac3162dab1bc448 Mon Sep 17 00:00:00 2001 From: Paurush Kumar Gupta Date: Fri, 7 Aug 2020 13:45:31 +0530 Subject: [PATCH 2/8] changes according to PEP8 conventions --- events/admin.py | 4 ++-- events/forms.py | 6 +++--- events/migrations/0008_requestevent.py | 24 ++++++++++++++++++++++++ events/models.py | 3 ++- events/urls.py | 4 ++-- events/views.py | 13 +++++-------- templates/event_register.html | 2 +- templates/events.html | 2 +- 8 files changed, 40 insertions(+), 18 deletions(-) create mode 100644 events/migrations/0008_requestevent.py diff --git a/events/admin.py b/events/admin.py index 867dc6f..4845bfd 100644 --- a/events/admin.py +++ b/events/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from .models import Event, EventParticipant, requestEvent +from .models import Event, EventParticipant, RequestEvent admin.site.register(Event) admin.site.register(EventParticipant) -admin.site.register(requestEvent) +admin.site.register(RequestEvent) diff --git a/events/forms.py b/events/forms.py index 7a4f0a8..62f7b9d 100644 --- a/events/forms.py +++ b/events/forms.py @@ -1,5 +1,5 @@ from django.forms import ModelForm -from .models import EventParticipant, requestEvent +from .models import EventParticipant, RequestEvent class ParticipantForm(ModelForm): @@ -8,7 +8,7 @@ class Meta: fields = ['title', 'student_name', 'email_id', 'mobile_number', 'roll_no', 'branch'] -class requestEventForm(ModelForm): +class RequestEventForm(ModelForm): class Meta: - model = requestEvent + model = RequestEvent fields = ['title', 'description', 'your_name','roll_no' ,'contact'] diff --git a/events/migrations/0008_requestevent.py b/events/migrations/0008_requestevent.py new file mode 100644 index 0000000..e87f49f --- /dev/null +++ b/events/migrations/0008_requestevent.py @@ -0,0 +1,24 @@ +# Generated by Django 2.2.9 on 2020-08-07 07:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0007_auto_20190924_1641'), + ] + + operations = [ + migrations.CreateModel( + name='RequestEvent', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=50)), + ('description', models.TextField()), + ('your_name', models.CharField(max_length=50)), + ('roll_no', models.CharField(max_length=15)), + ('contact', models.CharField(max_length=10)), + ], + ), + ] diff --git a/events/models.py b/events/models.py index 5838126..e593590 100644 --- a/events/models.py +++ b/events/models.py @@ -54,7 +54,8 @@ class EventParticipant(TimeStampedModel): def __str__(self): return self.student_name -class requestEvent(models.Model): + +class RequestEvent(models.Model): title = models.CharField(max_length=50, blank=False) description = models.TextField(blank=False) your_name = models.CharField(max_length=50, blank=False) diff --git a/events/urls.py b/events/urls.py index 8828ae6..7888de9 100644 --- a/events/urls.py +++ b/events/urls.py @@ -1,8 +1,8 @@ from django.urls import path -from .views import events, register, requestEvent +from .views import events, register, request_event urlpatterns = [ path('', events, name='tech_events'), path('register/', register, name='register'), - path('requestEvent/', requestEvent, name='requestEvent'), + path('request_event/', request_event, name='request_event'), ] diff --git a/events/views.py b/events/views.py index 2770d76..5c4bb3d 100644 --- a/events/views.py +++ b/events/views.py @@ -2,16 +2,13 @@ from django.contrib import messages from django.shortcuts import render, redirect from django.views.generic import ListView -from .models import Event, EventParticipant, requestEvent -from .forms import ParticipantForm, requestEventForm +from .models import Event, EventParticipant, RequestEvent +from .forms import ParticipantForm, RequestEventForm import csv def events(request): events = Event.objects.all() - #numberOfEvents = len(events) - #if (numberOfEvents) == 0: - # events = 0 return render(request, 'events.html', {'events': events }) @@ -49,9 +46,9 @@ def export_to_csv(request): return render(request, 'download.html', {'error': error}) return render(request, 'download.html') -def requestEvent(request): +def request_event(request): if request.method == 'POST': - form = requestEventForm(request.POST) + form = RequestEventForm(request.POST) if form.is_valid(): form.save() your_name = form.cleaned_data.get('your_name') @@ -60,5 +57,5 @@ def requestEvent(request): request, f'Thank you { your_name } for requesting to organise { title }, you will be contacted shortly!') return redirect('homepage') else: - form = requestEventForm() + form = RequestEventForm() return render(request, 'event_register.html', {'form': form}) diff --git a/templates/event_register.html b/templates/event_register.html index 3a350cf..84b10e4 100644 --- a/templates/event_register.html +++ b/templates/event_register.html @@ -8,7 +8,7 @@

-

Register

+

Request An Event

{% csrf_token %} {% bootstrap_form form %} {% buttons %} diff --git a/templates/events.html b/templates/events.html index fed96d3..a291de1 100644 --- a/templates/events.html +++ b/templates/events.html @@ -26,7 +26,7 @@

{{ event.title }}


{% endfor %}
-
Request for any Event in your mind!
+
Request for any Event in your mind!
{% comment %} {% endcomment %} {% endblock content %} From 5c9e4f954e5df22d5e0bc82262772a0932cdee76 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Fri, 7 Aug 2020 08:16:32 +0000 Subject: [PATCH 3/8] Restyled by autopep8 --- events/forms.py | 3 ++- events/migrations/0008_requestevent.py | 3 ++- events/models.py | 6 +++--- events/views.py | 5 +++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/events/forms.py b/events/forms.py index 62f7b9d..e5b099b 100644 --- a/events/forms.py +++ b/events/forms.py @@ -8,7 +8,8 @@ class Meta: fields = ['title', 'student_name', 'email_id', 'mobile_number', 'roll_no', 'branch'] + class RequestEventForm(ModelForm): class Meta: model = RequestEvent - fields = ['title', 'description', 'your_name','roll_no' ,'contact'] + fields = ['title', 'description', 'your_name', 'roll_no', 'contact'] diff --git a/events/migrations/0008_requestevent.py b/events/migrations/0008_requestevent.py index e87f49f..12bccea 100644 --- a/events/migrations/0008_requestevent.py +++ b/events/migrations/0008_requestevent.py @@ -13,7 +13,8 @@ class Migration(migrations.Migration): migrations.CreateModel( name='RequestEvent', fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('id', models.AutoField(auto_created=True, + primary_key=True, serialize=False, verbose_name='ID')), ('title', models.CharField(max_length=50)), ('description', models.TextField()), ('your_name', models.CharField(max_length=50)), diff --git a/events/models.py b/events/models.py index e593590..e1ef5bf 100644 --- a/events/models.py +++ b/events/models.py @@ -15,7 +15,7 @@ class Meta: abstract = True -class Event(TimeStampedModel): +class Event(TimeStampedModel): title = models.CharField(max_length=200, blank=False) description = models.TextField() @@ -53,7 +53,7 @@ class EventParticipant(TimeStampedModel): def __str__(self): return self.student_name - + class RequestEvent(models.Model): title = models.CharField(max_length=50, blank=False) @@ -61,6 +61,6 @@ class RequestEvent(models.Model): your_name = models.CharField(max_length=50, blank=False) roll_no = models.CharField(max_length=15, blank=False) contact = models.CharField(max_length=10, blank=False) - + def __str__(self): return self.title diff --git a/events/views.py b/events/views.py index 5c4bb3d..5e1abf9 100644 --- a/events/views.py +++ b/events/views.py @@ -9,7 +9,7 @@ def events(request): events = Event.objects.all() - return render(request, 'events.html', {'events': events }) + return render(request, 'events.html', {'events': events}) def register(request): @@ -45,7 +45,8 @@ def export_to_csv(request): error = "Please Enter a Valid Token" return render(request, 'download.html', {'error': error}) return render(request, 'download.html') - + + def request_event(request): if request.method == 'POST': form = RequestEventForm(request.POST) From 26dd067390101276d5f35e64eadc7d89028b6ae6 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Fri, 7 Aug 2020 08:16:34 +0000 Subject: [PATCH 4/8] Restyled by black --- events/forms.py | 12 +++-- events/migrations/0008_requestevent.py | 25 ++++++---- events/models.py | 33 +++++++------ events/urls.py | 6 +-- events/views.py | 64 +++++++++++++++++--------- 5 files changed, 85 insertions(+), 55 deletions(-) diff --git a/events/forms.py b/events/forms.py index e5b099b..65c71c5 100644 --- a/events/forms.py +++ b/events/forms.py @@ -5,11 +5,17 @@ class ParticipantForm(ModelForm): class Meta: model = EventParticipant - fields = ['title', 'student_name', - 'email_id', 'mobile_number', 'roll_no', 'branch'] + fields = [ + "title", + "student_name", + "email_id", + "mobile_number", + "roll_no", + "branch", + ] class RequestEventForm(ModelForm): class Meta: model = RequestEvent - fields = ['title', 'description', 'your_name', 'roll_no', 'contact'] + fields = ["title", "description", "your_name", "roll_no", "contact"] diff --git a/events/migrations/0008_requestevent.py b/events/migrations/0008_requestevent.py index 12bccea..fecefe2 100644 --- a/events/migrations/0008_requestevent.py +++ b/events/migrations/0008_requestevent.py @@ -6,20 +6,27 @@ class Migration(migrations.Migration): dependencies = [ - ('events', '0007_auto_20190924_1641'), + ("events", "0007_auto_20190924_1641"), ] operations = [ migrations.CreateModel( - name='RequestEvent', + name="RequestEvent", fields=[ - ('id', models.AutoField(auto_created=True, - primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=50)), - ('description', models.TextField()), - ('your_name', models.CharField(max_length=50)), - ('roll_no', models.CharField(max_length=15)), - ('contact', models.CharField(max_length=10)), + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("title", models.CharField(max_length=50)), + ("description", models.TextField()), + ("your_name", models.CharField(max_length=50)), + ("roll_no", models.CharField(max_length=15)), + ("contact", models.CharField(max_length=10)), ], ), ] diff --git a/events/models.py b/events/models.py index e1ef5bf..c0e88ef 100644 --- a/events/models.py +++ b/events/models.py @@ -8,6 +8,7 @@ class TimeStampedModel(models.Model): An abstract class model that provides self updating ``created`` and ``modified`` fields. """ + created_at = models.DateTimeField(auto_now_add=True) modified_at = models.DateTimeField(auto_now=True) @@ -24,21 +25,21 @@ def __str__(self): class EventParticipant(TimeStampedModel): - ELECTRONICS = 'ECE' - COMPUTER_SCIENCE = 'CSE' - IT = 'IT' - ELECTRICAL = 'EN' - MECHANICAL = 'ME' - CIVIL = 'CE' - BIOTECH = 'BT' + ELECTRONICS = "ECE" + COMPUTER_SCIENCE = "CSE" + IT = "IT" + ELECTRICAL = "EN" + MECHANICAL = "ME" + CIVIL = "CE" + BIOTECH = "BT" BRANCH_CHOICES = [ - (ELECTRONICS, 'Electronics'), - (COMPUTER_SCIENCE, 'Computer Science'), - (IT, 'IT'), - (ELECTRICAL, 'Electrical'), - (MECHANICAL, 'Mechanical'), - (CIVIL, 'Civil'), - (BIOTECH, 'Biotech'), + (ELECTRONICS, "Electronics"), + (COMPUTER_SCIENCE, "Computer Science"), + (IT, "IT"), + (ELECTRICAL, "Electrical"), + (MECHANICAL, "Mechanical"), + (CIVIL, "Civil"), + (BIOTECH, "Biotech"), ] title = models.ForeignKey(Event, on_delete=models.CASCADE) student_name = models.CharField(max_length=50, blank=False) @@ -46,9 +47,7 @@ class EventParticipant(TimeStampedModel): mobile_number = models.CharField(max_length=10, blank=False) roll_no = models.CharField(max_length=10, blank=False) branch = models.CharField( - max_length=3, - choices=BRANCH_CHOICES, - default=ELECTRONICS, + max_length=3, choices=BRANCH_CHOICES, default=ELECTRONICS, ) def __str__(self): diff --git a/events/urls.py b/events/urls.py index 7888de9..f15acde 100644 --- a/events/urls.py +++ b/events/urls.py @@ -2,7 +2,7 @@ from .views import events, register, request_event urlpatterns = [ - path('', events, name='tech_events'), - path('register/', register, name='register'), - path('request_event/', request_event, name='request_event'), + path("", events, name="tech_events"), + path("register/", register, name="register"), + path("request_event/", request_event, name="request_event"), ] diff --git a/events/views.py b/events/views.py index 5e1abf9..dc6bc25 100644 --- a/events/views.py +++ b/events/views.py @@ -9,54 +9,72 @@ def events(request): events = Event.objects.all() - return render(request, 'events.html', {'events': events}) + return render(request, "events.html", {"events": events}) def register(request): - if request.method == 'POST': + if request.method == "POST": form = ParticipantForm(request.POST) if form.is_valid(): form.save() - name = form.cleaned_data.get('student_name') + name = form.cleaned_data.get("student_name") messages.success( - request, f'Thank you {name} for registering yourself, you will be contacted shortly') - return redirect('homepage') + request, + f"Thank you {name} for registering yourself, you will be contacted shortly", + ) + return redirect("homepage") else: form = ParticipantForm() - return render(request, 'event_register.html', {'form': form}) + return render(request, "event_register.html", {"form": form}) def export_to_csv(request): - if (request.method == 'POST'): - token = request.POST.get('token') - if token == 'codeTronics': - response = HttpResponse(content_type='text/csv') - response['Content-Disposition'] = 'attachment; filename=participants.csv' + if request.method == "POST": + token = request.POST.get("token") + if token == "codeTronics": + response = HttpResponse(content_type="text/csv") + response["Content-Disposition"] = "attachment; filename=participants.csv" writer = csv.writer(response) - writer.writerow(['title', 'student_name', 'email_id', - 'mobile_number', 'roll_no', 'branch']) - participants = EventParticipant.objects.all().values_list('title__title', 'student_name', 'email_id', - 'mobile_number', 'roll_no', 'branch') + writer.writerow( + [ + "title", + "student_name", + "email_id", + "mobile_number", + "roll_no", + "branch", + ] + ) + participants = EventParticipant.objects.all().values_list( + "title__title", + "student_name", + "email_id", + "mobile_number", + "roll_no", + "branch", + ) for participant in participants: writer.writerow(participant) return response else: error = "Please Enter a Valid Token" - return render(request, 'download.html', {'error': error}) - return render(request, 'download.html') + return render(request, "download.html", {"error": error}) + return render(request, "download.html") def request_event(request): - if request.method == 'POST': + if request.method == "POST": form = RequestEventForm(request.POST) if form.is_valid(): form.save() - your_name = form.cleaned_data.get('your_name') - title = form.cleaned_data.get('title') + your_name = form.cleaned_data.get("your_name") + title = form.cleaned_data.get("title") messages.success( - request, f'Thank you { your_name } for requesting to organise { title }, you will be contacted shortly!') - return redirect('homepage') + request, + f"Thank you { your_name } for requesting to organise { title }, you will be contacted shortly!", + ) + return redirect("homepage") else: form = RequestEventForm() - return render(request, 'event_register.html', {'form': form}) + return render(request, "event_register.html", {"form": form}) From f8925d14e8bbd1878252a68662a00b30d8d72ef7 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Fri, 7 Aug 2020 08:16:35 +0000 Subject: [PATCH 5/8] Restyled by isort --- events/admin.py | 1 + events/forms.py | 1 + events/models.py | 2 +- events/urls.py | 1 + events/views.py | 10 ++++++---- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/events/admin.py b/events/admin.py index 4845bfd..9a88b2e 100644 --- a/events/admin.py +++ b/events/admin.py @@ -1,4 +1,5 @@ from django.contrib import admin + from .models import Event, EventParticipant, RequestEvent admin.site.register(Event) diff --git a/events/forms.py b/events/forms.py index 65c71c5..4af26df 100644 --- a/events/forms.py +++ b/events/forms.py @@ -1,4 +1,5 @@ from django.forms import ModelForm + from .models import EventParticipant, RequestEvent diff --git a/events/models.py b/events/models.py index c0e88ef..490c153 100644 --- a/events/models.py +++ b/events/models.py @@ -1,6 +1,6 @@ from django.db import models -from django.urls import reverse_lazy from django.shortcuts import redirect +from django.urls import reverse_lazy class TimeStampedModel(models.Model): diff --git a/events/urls.py b/events/urls.py index f15acde..e046b76 100644 --- a/events/urls.py +++ b/events/urls.py @@ -1,4 +1,5 @@ from django.urls import path + from .views import events, register, request_event urlpatterns = [ diff --git a/events/views.py b/events/views.py index dc6bc25..3a99264 100644 --- a/events/views.py +++ b/events/views.py @@ -1,10 +1,12 @@ -from django.http import HttpResponse +import csv + from django.contrib import messages -from django.shortcuts import render, redirect +from django.http import HttpResponse +from django.shortcuts import redirect, render from django.views.generic import ListView -from .models import Event, EventParticipant, RequestEvent + from .forms import ParticipantForm, RequestEventForm -import csv +from .models import Event, EventParticipant, RequestEvent def events(request): From 4930fd7f7121b0e72541c2224532957b43abffac Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Fri, 7 Aug 2020 08:16:36 +0000 Subject: [PATCH 6/8] Restyled by reorder-python-imports --- events/admin.py | 4 +++- events/forms.py | 3 ++- events/migrations/0008_requestevent.py | 4 ++-- events/urls.py | 4 +++- events/views.py | 10 +++++++--- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/events/admin.py b/events/admin.py index 9a88b2e..5e1ebff 100644 --- a/events/admin.py +++ b/events/admin.py @@ -1,6 +1,8 @@ from django.contrib import admin -from .models import Event, EventParticipant, RequestEvent +from .models import Event +from .models import EventParticipant +from .models import RequestEvent admin.site.register(Event) admin.site.register(EventParticipant) diff --git a/events/forms.py b/events/forms.py index 4af26df..94e12d1 100644 --- a/events/forms.py +++ b/events/forms.py @@ -1,6 +1,7 @@ from django.forms import ModelForm -from .models import EventParticipant, RequestEvent +from .models import EventParticipant +from .models import RequestEvent class ParticipantForm(ModelForm): diff --git a/events/migrations/0008_requestevent.py b/events/migrations/0008_requestevent.py index fecefe2..6f14b86 100644 --- a/events/migrations/0008_requestevent.py +++ b/events/migrations/0008_requestevent.py @@ -1,6 +1,6 @@ # Generated by Django 2.2.9 on 2020-08-07 07:54 - -from django.db import migrations, models +from django.db import migrations +from django.db import models class Migration(migrations.Migration): diff --git a/events/urls.py b/events/urls.py index e046b76..570d991 100644 --- a/events/urls.py +++ b/events/urls.py @@ -1,6 +1,8 @@ from django.urls import path -from .views import events, register, request_event +from .views import events +from .views import register +from .views import request_event urlpatterns = [ path("", events, name="tech_events"), diff --git a/events/views.py b/events/views.py index 3a99264..e1ae261 100644 --- a/events/views.py +++ b/events/views.py @@ -2,11 +2,15 @@ from django.contrib import messages from django.http import HttpResponse -from django.shortcuts import redirect, render +from django.shortcuts import redirect +from django.shortcuts import render from django.views.generic import ListView -from .forms import ParticipantForm, RequestEventForm -from .models import Event, EventParticipant, RequestEvent +from .forms import ParticipantForm +from .forms import RequestEventForm +from .models import Event +from .models import EventParticipant +from .models import RequestEvent def events(request): From 32027d51245915c728035226319cf1abdd6886f8 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Fri, 7 Aug 2020 08:16:36 +0000 Subject: [PATCH 7/8] Restyled by whitespace --- templates/event_register.html | 2 +- templates/events.html | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/event_register.html b/templates/event_register.html index 84b10e4..6df627c 100644 --- a/templates/event_register.html +++ b/templates/event_register.html @@ -18,4 +18,4 @@ {{ form.media }} {% comment %} {% endcomment %} -{% endblock content %} \ No newline at end of file +{% endblock content %} diff --git a/templates/events.html b/templates/events.html index a291de1..11d9684 100644 --- a/templates/events.html +++ b/templates/events.html @@ -13,8 +13,8 @@

No Ongoing Events

Please review after sometime, to see latest ongoing Events!
THANK YOU!

- - {% endif %} + + {% endif %} {% for event in events%}
@@ -24,9 +24,9 @@

{{ event.title }}


- {% endfor %} + {% endfor %}
-
Request for any Event in your mind!
+
Request for any Event in your mind!
{% comment %} {% endcomment %} {% endblock content %} From 4ebc2f066743a3a58b8b5b2726912e0b854de13c Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Fri, 7 Aug 2020 08:16:37 +0000 Subject: [PATCH 8/8] Restyled by yapf --- events/models.py | 4 +++- events/views.py | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/events/models.py b/events/models.py index 490c153..f808362 100644 --- a/events/models.py +++ b/events/models.py @@ -47,7 +47,9 @@ class EventParticipant(TimeStampedModel): mobile_number = models.CharField(max_length=10, blank=False) roll_no = models.CharField(max_length=10, blank=False) branch = models.CharField( - max_length=3, choices=BRANCH_CHOICES, default=ELECTRONICS, + max_length=3, + choices=BRANCH_CHOICES, + default=ELECTRONICS, ) def __str__(self): diff --git a/events/views.py b/events/views.py index e1ae261..db6ff9f 100644 --- a/events/views.py +++ b/events/views.py @@ -39,19 +39,18 @@ def export_to_csv(request): token = request.POST.get("token") if token == "codeTronics": response = HttpResponse(content_type="text/csv") - response["Content-Disposition"] = "attachment; filename=participants.csv" + response[ + "Content-Disposition"] = "attachment; filename=participants.csv" writer = csv.writer(response) - writer.writerow( - [ - "title", - "student_name", - "email_id", - "mobile_number", - "roll_no", - "branch", - ] - ) + writer.writerow([ + "title", + "student_name", + "email_id", + "mobile_number", + "roll_no", + "branch", + ]) participants = EventParticipant.objects.all().values_list( "title__title", "student_name",