beta 5.3

Several New Features
Bug Fixes

Author: Arjun

db.sqlite3

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('qa', '0015_answer_votes'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='question',
+            name='reward',
+            field=models.IntegerField(default=0),
+            preserve_default=True,
+        ),
+    ]

qa/migrations/0016_question_reward.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('qa', '0016_question_reward'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='question',
+            name='user_data',
+            field=models.ForeignKey(default=5, to='qa.UserProfile'),
+            preserve_default=False,
+        ),
+    ]

qa/migrations/0017_question_user_data.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('qa', '0017_question_user_data'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='QVoter',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('question', models.ForeignKey(to='qa.Question')),
+                ('user', models.ForeignKey(to='qa.UserProfile')),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]

qa/migrations/0018_qvoter.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('qa', '0018_qvoter'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='question',
+            name='closed',
+            field=models.BooleanField(default=False),
+            preserve_default=True,
+        ),
+    ]

qa/migrations/0019_question_closed.py

@@ -9,15 +9,6 @@ def __str__(self):
     class Meta:
         ordering = ('slug',)
 
-class Question(models.Model):
-    question_text = models.CharField(max_length=200)
-    pub_date = models.DateTimeField('date published')
-    tags = models.ManyToManyField(Tag)
-    views = models.IntegerField(default=0)
-
-    def __str__(self):
-        return self.question_text
-
 from django.contrib.auth.models import User
 
 class UserProfile(models.Model):
@@ -35,6 +26,18 @@ def __unicode__(self):
 
 from django_markdown.models import MarkdownField
 
+class Question(models.Model):
+    question_text = models.CharField(max_length=200)
+    pub_date = models.DateTimeField('date published')
+    tags = models.ManyToManyField(Tag)
+    reward = models.IntegerField(default=0)
+    views = models.IntegerField(default=0)
+    user_data = models.ForeignKey(UserProfile)
+    closed = models.BooleanField(default=False)
+
+    def __str__(self):
+        return self.question_text
+
 class Answer(models.Model):
     question = models.ForeignKey(Question)
     answer_text = MarkdownField()
@@ -48,6 +51,10 @@ class Voter(models.Model):
     user = models.ForeignKey(UserProfile)
     answer = models.ForeignKey(Answer)
 
+class QVoter(models.Model):
+    user = models.ForeignKey(UserProfile)
+    question = models.ForeignKey(Question)
+
 class Comment(models.Model):
     answer = models.ForeignKey(Answer)
     comment_text = models.CharField(max_length=200)

qa/models.py

@@ -19,7 +19,7 @@ <h1><a href="/">Simple QA </a><small>Add Question</small></h1>
     <input class="input-lg" style="width:100%" placeholder="Enter your question....." type="text" name="question"/> <br/><br/>
 
     <input class="input-lg" style="width:100%" placeholder="Enter tags separates by comma!" type="text" name="tags"/> <br/><br/>
-
+    <input type="hidden" value="{{ user.id }}" name="user" />
     <input class="btn pull-right btn-success" type="submit" value="Submit Question" />
   </form>
   <p>Note. Question cannot be empty!</p>

qa/templates/qa/add.html

@@ -38,10 +38,28 @@ <h1><a href="/">Simple QA </a><small>Open Questions</small></h1>
 </div>
 {% endif %}
 
+{% if question.reward %}
+<div class="alert alert-info" role="alert">This question has been marked to be worth a reward of <b>{{ question.reward }}<b> points!
+  <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+  <span aria-hidden="true">&times;</span>
+</button>
+</div>
+{% endif %}
+
 <div class="jumbotron">
-  <p class="pull-right">{{ question.pub_date }}</p>
+  <small class="pull-right">Posted by {{ question.user_data.user.username }}, {{ question.pub_date }}</small>
   <h3><cool>Q: </cool>{{ question.question_text }}</h3>
-  <p><a class="btn btn-primary btn-sm pull-right" href="/answer/{{ question.id }}" role="button">Answer this Question!</a></p>
+  <p>
+    {% if user.is_authenticated %}
+  <a href="/thumb/{{ user.id }}/{{ question.id }}/0/" class="btn btn-success"><span class="glyphicon glyphicon-thumbs-up" aria-hidden="true"></span></a>
+  <a href="/thumb/{{ user.id }}/{{ question.id }}/1/" class="btn btn-danger"><span class="glyphicon glyphicon-thumbs-down" aria-hidden="true"></span></a>
+    {% endif %}
+    {% if question.closed %}
+    <p class="pull-right">This Question has been closed.</p>
+    {% else %}
+    <a class="btn btn-primary btn-sm pull-right" href="/answer/{{ question.id }}" role="button">Answer this Question!</a>
+    {% endif %}
+  </p>
 </div>
 
 {% if answers %}

qa/templates/qa/detail.html

@@ -15,6 +15,11 @@
   font-size: 20px;
 }
 
+reward {
+  font-size: 15px;
+  color: #FF4444;
+}
+
 .ans {
   height: 40px;
   width: 75px;
@@ -116,12 +121,23 @@
 </script>
 
 <div class="container">
-  
+
 <div class="page-header">
   <a class="btn btn-lg btn-warning pull-right" href="#search"><span class="glyphicon glyphicon-search" aria-hidden="true"></span> Find</a><a class="btn btn-lg btn-danger pull-right" href="/add/">Ask Question</a><h1><a href="/">Simple QA </a><small>Open Questions</small></h1>
 </div>
 
 <div class="col-md-8">
+
+  <ul class="nav nav-tabs nav-justified">
+    <li role="presentation" class="active"><a href="#latest" aria-controls="latest" role="tab" data-toggle="tab">Latest</a></li>
+    <li role="presentation"><a href="#unans" aria-controls="unans" role="tab" data-toggle="tab">Unanswered <span class="badge">{{ noans.count }}</span></a></li>
+    <li role="presentation"><a href="#reward" aria-controls="reward" role="tab" data-toggle="tab">Most Rewarding <span class="badge">{{ reward.count }}</span></a></li>
+  </ul>
+  <br/>
+
+
+<div class="tab-content">
+<div role="tabpanel" class="tab-pane active" id="latest">
 {% if questions %}
   {% for question in questions %}
   <div class="row">
@@ -156,9 +172,58 @@
 </div>
 
 {% else %}
-<p>No Questions are available.</p>
+<div class="alert alert-warning" role="alert">No Questions are available!</div>
+{% endif %}
+</div>
+
+<div role="tabpanel" class="tab-pane" id="unans">
+{% if noans %}
+  {% for question in noans %}
+  <div class="row">
+  <div class="col-sm-1 ans"><small><div class="ques">{{ question.answer_set.count }}</div>Answers</small></div>
+  <div class="col-sm-1 ans"><small><div class="ques">{{ question.views }}</div>Views</small></div>
+  <p>
+    {% if question.answer_set.count %}<span class="glyphicon glyphicon-fire" aria-hidden="true"></span>{% endif %} <a class="ques" href="/q/{{ question.id }}/">{{ question.question_text }}</a>
+    <br/>
+    {% for tag in question.tags.all %}
+    <tag>{{ tag.slug }}</tag>
+    {% endfor %}
+    <small> {{ question.pub_date}}</small>
+  </p>
+</div>
+<hr>
+  {% endfor %}
+
+{% else %}
+<div class="alert alert-warning" role="alert">No Questions are available!</div>
 {% endif %}
+</div>
 
+<div role="tabpanel" class="tab-pane" id="reward">
+{% if reward %}
+  {% for question in reward %}
+  <div class="row">
+  <div class="col-sm-1 ans"><small><div class="ques">{{ question.answer_set.count }}</div>Answers</small></div>
+  <div class="col-sm-1 ans"><small><div class="ques">{{ question.views }}</div>Views</small></div>
+  <p>
+    {% if question.answer_set.count %}<span class="glyphicon glyphicon-fire" aria-hidden="true"></span>{% endif %} <a class="ques" href="/q/{{ question.id }}/">{{ question.question_text }}</a>
+    <br/>
+    <reward>Earn <b>{{ question.reward }}</b> points</reward>
+    {% for tag in question.tags.all %}
+    <tag>{{ tag.slug }}</tag>
+    {% endfor %}
+    <small> {{ question.pub_date}}</small>
+  </p>
+</div>
+<hr>
+  {% endfor %}
+
+{% else %}
+<div class="alert alert-warning" role="alert">No Questions are available!</div>
+{% endif %}
+</div>
+
+  </div>
 </div>
 
 <div class="col-md-4">