Adds login screen and very basic cfp rating system

Author: Bojan Jovanovic

pyconbalkan/cfp/const.py

@@ -0,0 +1,6 @@
+TALK = 1
+WORKSHOP = 2
+TYPE_CFP = (
+    (TALK, 'Talk'),
+    (WORKSHOP, 'Workshop'),
+)

pyconbalkan/cfp/forms.py

@@ -0,0 +1,50 @@
+from django import forms
+from django.conf import settings
+from django.forms import ModelForm
+
+from pyconbalkan.cfp.models import CFPRating
+from .models import Cfp
+from . import const
+
+
+class CfpForm(ModelForm):
+    name = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'Name', 'class': 'form-control'}),
+                           max_length=256, error_messages={'required': 'Please, enter your name.'}, label='')
+    company = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'Company', 'class': 'form-control'}),
+                              max_length=100, required=False, label='')
+    email = forms.EmailField(widget=forms.TextInput(attrs={'placeholder': 'Email', 'class': 'form-control'}),
+                             error_messages={'required': 'Please, enter a valid email address.',
+                                             'invalid': 'Please enter a valid email address.'}, label='')
+    personal_website = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'Personal Website (URL)', 'class': 'form-control'}),
+                                       max_length=100, required=False, label='')
+    linkedin = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'Linkedin (URL)', 'class': 'form-control'}),
+                               max_length=100, required=False, label='')
+    title = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'Title of your proposal', 'class': 'form-control'}),
+                            error_messages={'required': 'Please, enter the title.'}, label='')
+    duration = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'Duration (E.g. 2h, 30min, 1:30, etc.)', 'class': 'form-control'}),
+                               error_messages={'required': 'Please, enter the duration.'}, label='')
+    description= forms.CharField(widget=forms.Textarea(attrs={'placeholder': 'Description of your proposal', 'class': 'form-control'}),
+                              error_messages={'required': 'Please, enter the description of your proposal.'}, label='')
+    type = forms.ChoiceField(choices=const.TYPE_CFP, widget=forms.Select())
+
+    class Meta:
+        model = Cfp
+        fields = (
+            'name',
+            'company',
+            'email',
+            'personal_website',
+            'linkedin',
+            'title',
+            'duration',
+            'description',
+            'type',
+        )
+
+
+class RateForm(ModelForm):
+    class Meta:
+        model = CFPRating
+        fields = (
+            'mark',
+        )

pyconbalkan/cfp/migrations/0006_auto_20180807_0944.py

@@ -0,0 +1,33 @@
+# Generated by Django 2.0.5 on 2018-08-07 09:44
+
+from django.conf import settings
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+import taggit.managers
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('taggit', '0002_auto_20150616_2121'),
+        ('cfp', '0005_auto_20180629_1257'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CFPRating',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('mark', models.IntegerField(validators=[django.core.validators.MaxValueValidator(10, 'Maximum rating is 10'), django.core.validators.MinValueValidator(0, 'Minimum Rating is 10')])),
+                ('cfp', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ratings', to='cfp.Cfp')),
+                ('tags', taggit.managers.TaggableManager(help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.AlterUniqueTogether(
+            name='cfprating',
+            unique_together={('user', 'cfp')},
+        ),
+    ]

pyconbalkan/cfp/models.py

@@ -1,18 +1,16 @@
 import random
 import string
+from statistics import median, StatisticsError
 
+from django.conf import settings
+from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
-from django import forms
-from django.forms import ModelForm
+from django.db.models import CASCADE
 from markdownx.models import MarkdownxField
 from slugify import slugify
+from taggit.managers import TaggableManager
+from . import const
 
-TALK = 1
-WORKSHOP = 2
-TYPE_CFP = (
-    (TALK, 'Talk'),
-    (WORKSHOP, 'Workshop'),
-)
 
 class Cfp(models.Model):
     name = models.CharField(max_length=256)
@@ -24,9 +22,16 @@ class Cfp(models.Model):
     description = MarkdownxField()
     accepted = models.BooleanField(default=False)
     slug = models.CharField(unique=True, blank=True, max_length=100)
-    type = models.IntegerField(choices=TYPE_CFP, default=TALK)
+    type = models.IntegerField(choices=const.TYPE_CFP, default=const.TALK)
     duration = models.CharField(max_length=100, null=True)
 
+    @property
+    def rating(self):
+        try:
+            return median(self.ratings.all().values_list('mark'))
+        except StatisticsError:
+            return "N/A"
+
     def __str__(self):
         return '{}: "{}" by {} - [{}]'.format(self.get_type_display(), self.title, self.name, 'Accepted' if self.accepted else 'Pending')
 
@@ -38,36 +43,12 @@ def save(self, *args, **kwargs):
         super(Cfp, self).save(*args, **kwargs)
 
 
-class CfpForm(ModelForm):
-    name = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'Name', 'class': 'form-control'}),
-                           max_length=256, error_messages={'required': 'Please, enter your name.'}, label='')
-    company = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'Company', 'class': 'form-control'}),
-                              max_length=100, required=False, label='')
-    email = forms.EmailField(widget=forms.TextInput(attrs={'placeholder': 'Email', 'class': 'form-control'}),
-                             error_messages={'required': 'Please, enter a valid email address.',
-                                             'invalid': 'Please enter a valid email address.'}, label='')
-    personal_website = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'Personal Website (URL)', 'class': 'form-control'}),
-                                       max_length=100, required=False, label='')
-    linkedin = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'Linkedin (URL)', 'class': 'form-control'}),
-                               max_length=100, required=False, label='')
-    title = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'Title of your proposal', 'class': 'form-control'}),
-                            error_messages={'required': 'Please, enter the title.'}, label='')
-    duration = forms.CharField(widget=forms.TextInput(attrs={'placeholder': 'Duration (E.g. 2h, 30min, 1:30, etc.)', 'class': 'form-control'}),
-                               error_messages={'required': 'Please, enter the duration.'}, label='')
-    description= forms.CharField(widget=forms.Textarea(attrs={'placeholder': 'Description of your proposal', 'class': 'form-control'}),
-                              error_messages={'required': 'Please, enter the description of your proposal.'}, label='')
-    type = forms.ChoiceField(choices=TYPE_CFP, widget=forms.Select())
+class CFPRating(models.Model):
+    mark = models.IntegerField(validators=[MaxValueValidator(10, "Maximum rating is 10"), MinValueValidator(0, "Minimum Rating is 10")])
+    cfp = models.ForeignKey(Cfp, related_name="ratings", on_delete=CASCADE)
+    user = models.ForeignKey(getattr(settings, "AUTH_USER_MODEL"), on_delete=CASCADE)
+    tags = TaggableManager()
 
     class Meta:
-        model = Cfp
-        fields = (
-            'name',
-            'company',
-            'email',
-            'personal_website',
-            'linkedin',
-            'title',
-            'duration',
-            'description',
-            'type',
-        )
+        unique_together = (("user", "cfp",),)
+

pyconbalkan/cfp/templates/cfp_detail.html

@@ -14,6 +14,20 @@ <h2>by {{ cfp.name }} {% if cfp.company %}({{ cfp.company }}){% endif %}</h2>
             <p class="cfp__description">
                 {{ cfp.description|safe }}
             </p>
+
+        {% if success %}
+            <h2 class="success-message">
+                {{ success }}
+            </h2>
+        {% endif %}
+
+        <form class="form" action="{% url 'cfp_detail' cfp.slug %}" method="POST" enctype="multipart/form-data" novalidate>
+            <div class="form-group">
+                {% csrf_token %}
+                {{ form.as_p }}
+                <input class="button button--blue button--fullwidth mb-xs-40" type="submit" value="Submit" />
+            </div>
+        </form>
         </div>
     </div>
 

pyconbalkan/cfp/templates/cfp_list.html

@@ -10,7 +10,7 @@
         {% for cfp in cfps %}
             <li>
                 <a href="{% url 'cfp_detail' slug=cfp.slug %}">
-                    {{ cfp.get_type_display }}: {{ cfp.title }} by {{ cfp.name }}
+                    {{ cfp.get_type_display }}: {{ cfp.title }} by {{ cfp.name }} - {{ cfp.my_rating }} {% if request.user.is_superuser %} - {{ cfp.rating }}{% endif %}
                 </a>
             </li>
         {% endfor %}

pyconbalkan/cfp/views.py

@@ -1,10 +1,12 @@
 from django.contrib.auth.decorators import login_required
 from django.core.mail import EmailMessage
+from django.db.models import F, Subquery, OuterRef
 from django.shortcuts import render, get_object_or_404
 from rest_framework import viewsets
 from rest_framework.permissions import DjangoModelPermissions
 
-from pyconbalkan.cfp.models import Cfp, CfpForm
+from pyconbalkan.cfp.forms import CfpForm, RateForm
+from pyconbalkan.cfp.models import Cfp, CFPRating
 from pyconbalkan.cfp.serializers import CfpSerializer
 from pyconbalkan.conference.models import Conference
 
@@ -44,7 +46,10 @@ def cfp_view(request):
 @login_required
 def cfp_list(request):
     conference = Conference.objects.filter(active=True)
-    cfps = Cfp.objects.all()
+    cfps = Cfp.objects.annotate(
+        my_rating=Subquery(CFPRating.objects.filter(cfp=OuterRef('pk'), user=request.user).values('mark'))
+    )
+
     context = {
         'cfps': cfps,
         'conference': conference.first() if conference else None,
@@ -60,4 +65,24 @@ def cfp_detail(request, slug):
         'cfp': cfp,
         'conference': conference.first() if conference else None,
     }
+
+    initial = {
+        'user': request.user,
+        'cfp': cfp
+    }
+
+    try:
+        rating_instance = CFPRating.objects.get(**initial)
+    except CFPRating.DoesNotExist:
+        rating_instance = CFPRating(**initial)
+
+    if request.method == 'POST':
+        form = RateForm(request.POST, instance=rating_instance)
+        if form.is_valid():
+            form.save()
+    else:
+        form = RateForm(instance=rating_instance)
+
+    context['form'] = form
+
     return render(request, 'cfp_detail.html', context)

pyconbalkan/core/templates/registration/login.html

@@ -0,0 +1,39 @@
+{% extends "base.html" %}
+
+{% block main_content %}
+
+{% if form.errors %}
+  <p>Your username and password didn't match. Please try again.</p>
+{% endif %}
+
+{% if next %}
+  {% if user.is_authenticated %}
+    <p>Your account doesn't have access to this page. To proceed,
+    please login with an account that has access.</p>
+  {% else %}
+    <p>Please login to see this page.</p>
+  {% endif %}
+{% endif %}
+
+<form method="post" action="{% url 'login' %}">
+{% csrf_token %}
+
+<div>
+  <td>{{ form.username.label_tag }}</td>
+  <td>{{ form.username }}</td>
+</div>
+<div>
+  <td>{{ form.password.label_tag }}</td>
+  <td>{{ form.password }}</td>
+</div>
+
+<div>
+  <input type="submit" value="login" />
+  <input type="hidden" name="next" value="{{ next }}" />
+</div>
+</form>
+
+{# Assumes you setup the password_reset view in your URLconf #}
+<p><a href="{% url 'password_reset' %}">Lost password?</a></p>
+
+{% endblock %}

pyconbalkan/settings.py

@@ -73,6 +73,8 @@
 ]
 
 ROOT_URLCONF = 'pyconbalkan.urls'
+# Redirect to home URL after login (Default redirects to /accounts/profile/)
+LOGIN_REDIRECT_URL = '/cfps'
 
 TEMPLATES = [
     {

pyconbalkan/urls.py

@@ -58,3 +58,8 @@
     path('markdownx/', include(markdownx)),
     path('timetable/', timetable_view, name='timetable')
 ]
+
+# Add Django site authentication urls (for login, logout, password management)
+urlpatterns += [
+    path('accounts/', include('django.contrib.auth.urls')),
+]