cfp: add all reviwer's comment to cfp detail

Author: Kátia Nakamura

pyconbalkan/cfp/forms.py

@@ -43,7 +43,7 @@ class Meta:
 
 class RateForm(ModelForm):
     mark = forms.IntegerField(widget=forms.NumberInput(attrs={'placeholder': 'Rating: from 1 to 10', 'class': 'form-control', 'max': 10, 'min': 1}), label='', )
-    comment = forms.CharField(widget=forms.Textarea(attrs={'placeholder': 'Comment', 'class': 'form-control'}), label='')
+    comment = forms.CharField(widget=forms.Textarea(attrs={'placeholder': 'Comment', 'class': 'form-control'}), label='', required=False)
 
     class Meta:
         model = CFPRating

pyconbalkan/cfp/migrations/0009_auto_20180810_1859.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.0.5 on 2018-08-10 18:59
+
+from django.db import migrations
+import taggit.managers
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cfp', '0008_auto_20180809_1350'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='cfprating',
+            name='tags',
+            field=taggit.managers.TaggableManager(blank=True, help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags'),
+        ),
+    ]

pyconbalkan/cfp/models.py

@@ -7,6 +7,7 @@
 from django.db import models
 from django.db.models import CASCADE
 from markdownx.models import MarkdownxField
+from markdownx.utils import markdownify
 from slugify import slugify
 from taggit.managers import TaggableManager
 from . import const
@@ -48,8 +49,17 @@ class CFPRating(models.Model):
     cfp = models.ForeignKey(Cfp, related_name="ratings", on_delete=CASCADE)
     user = models.ForeignKey(getattr(settings, "AUTH_USER_MODEL"), on_delete=CASCADE)
     comment = MarkdownxField(blank=True, null=True)
-    tags = TaggableManager()
+    tags = TaggableManager(blank=True)
 
     class Meta:
         unique_together = (("user", "cfp",),)
 
+    @property
+    def formatted_markdown(self):
+        if self.comment:
+            return markdownify(self.comment)
+        return ''
+
+    def __str__(self):
+        return '[{}] by {}'.format(self.mark, self.user.first_name)
+

pyconbalkan/cfp/templates/cfp_detail.html

@@ -16,19 +16,33 @@ <h2>by {{ cfp.name }} {% if cfp.company %}({{ cfp.company }}){% endif %}</h2>
                 {{ 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>
+            {% 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>
+
+            <h2>Other comments:</h2>
+            {% for rating in ratings %}
+                {% if rating.comment %}
+                <hr class="line">
+                    <p class="cfp__comment">{{ rating.formatted_markdown|safe }}</p>
+                    <h4>by {{ rating.user.first_name }} </h4>
+                    {% if rating.tags.all %}
+                        <h3>Tags</h3> [{{ rating.tags.all | join:", "  }}]
+                    {% endif %}
+                <hr class="line">
+                {% endif %}
+            {% endfor %}
+
         <a class="button button--yellow" href="{% url 'cfp_list' %}" role="button">Back to CFP List</a>
         </div>
     </div>

pyconbalkan/cfp/views.py

@@ -54,8 +54,10 @@ def cfp_list(request):
 @login_required
 def cfp_detail(request, slug):
     cfp = get_object_or_404(Cfp, slug=slug)
+    ratings = CFPRating.objects.filter(cfp=cfp)
     context = {
         'cfp': cfp,
+        'ratings': ratings,
     }
     initial = {
         'user': request.user,

pyconbalkan/core/static/css/components/sponsors.css

@@ -1,6 +1,6 @@
 .catch {
     color: white;
-    margin: 30px 0 40px; 0;
+    margin: 30px 0 40px 0;
 }
 
 .catch p {
@@ -54,6 +54,14 @@
     padding: 20px;
 }
 
+    .cfp__description {
+        margin-bottom: 20px;
+    }
+
+    .cfp__comment {
+        margin-bottom: 0;
+    }
+
 @media (max-width: 767px) {
     .card__info {
         top: -170px;