Improve voting further

scipost/models.py

@@ -292,7 +292,20 @@ class Remark(models.Model):
     date = models.DateTimeField()
     remark = models.TextField()
 
+    def __str__(self):
+        return (title_dict[self.contributor.title] + ' ' 
+                + self.contributor.user.first_name + ' '
+                + self.contributor.user.last_name + ' on ' 
+                + self.date.strftime("%Y-%m-%d"))
+
+    def as_li(self):
+        output = '<li>{{ by }}<p>{{ remark }}</p>'
+        context = Context({'by': str(self),
+                           'remark': self.remark})
+        template = Template(output)
+        return template.render(context)
 
+        
 ##################
 ## Invitations ###
 ##################

scipost/templatetags/scipost_extras.py

@@ -3,7 +3,22 @@ from django.contrib.auth.models import Group
 
 register = template.Library()
 
+
+#####################
+# General utilities #
+#####################
+
+@register.filter(name='sort_by')
+def sort_by(queryset, order):
+    return queryset.order_by(order)
+
+
+#######################
+# For scipost objects #
+#######################
+
 @register.filter(name='is_in_group')
 def is_in_group(user, group_name):
     group = Group.objects.get(name=group_name)
     return True if group in user.groups.all() else False
+

submissions/templates/submissions/pool.html

@@ -42,6 +42,14 @@ $(document).ready(function(){
 	<li>{{ rec.print_for_Fellows }}</li>
       </ul>
     </div>
+    {% if rec.remarks_during_voting.all %}
+    <h3>Remarks by Fellows:</h3>
+    <ul>
+      {% for remark in rec.remarks_during_voting.all|sort_by:'date' %}
+      {{ remark.as_li }}
+      {% endfor %}
+    </ul>
+    {% endif %}
 
     <h3>Fellows eligible to vote:</h3>
     <ul>