addded link to view claims in 'view task' page .

4 files changed, 22 insertions, 5 deletions

diff --git a/taskapp/admin.py b/taskapp/admin.py
index 709b1df..62dc766 100644
--- a/taskapp/admin.py
+++ b/taskapp/admin.py
@@ -1,8 +1,9 @@
 from django.contrib import admin
 
-from pytask.taskapp.models import Profile, Task, Credit, Comment
+from pytask.taskapp.models import Profile, Task, Credit, Comment, Claim
 
 admin.site.register(Profile)
 admin.site.register(Task)
 admin.site.register(Comment)
 admin.site.register(Credit)
+admin.site.register(Claim)
diff --git a/taskapp/forms/task.py b/taskapp/forms/task.py
index 852109a..b4303e3 100644
--- a/taskapp/forms/task.py
+++ b/taskapp/forms/task.py
@@ -1,5 +1,5 @@
 from django import forms
-from pytask.taskapp.models import Task
+from pytask.taskapp.models import Task, Claim
 
 class TaskCreateForm(forms.ModelForm):
     class Meta:
@@ -15,7 +15,7 @@ def AddMentorForm(choices,instance=None):
     form = myform(instance=instance) if instance else myform()
     return form
 
-def ClaimTaskForm(models.ModelForm):
+class ClaimTaskForm(forms.ModelForm):
     class Meta:
         model = Claim
         fields = ['message']
diff --git a/taskapp/models.py b/taskapp/models.py
index 0aa61f3..986f65d 100644
--- a/taskapp/models.py
+++ b/taskapp/models.py
@@ -14,7 +14,7 @@ STATUS_CHOICES = (
     ("LO", "Locked"),
 	("CL", "Claimed"),
 	("AS", "Assigned"),
-    ("RO", "Reopened"),
+    ("RE", "Reopened"),
     ("CD", "Closed"),
     ("DL", "Deleted"),
     ("CM", "Completed"))
diff --git a/taskapp/views/task.py b/taskapp/views/task.py
index 99c02d2..f08a82f 100644
--- a/taskapp/views/task.py
+++ b/taskapp/views/task.py
@@ -3,7 +3,7 @@ from datetime import datetime
 from django.http import HttpResponse
 from django.shortcuts import render_to_response, redirect
 
-from pytask.taskapp.models import User, Task, Comment
+from pytask.taskapp.models import User, Task, Comment, Claim
 from pytask.taskapp.forms.task import TaskCreateForm, AddMentorForm 
 from pytask.taskapp.events.task import createTask, addMentor, publishTask, addSubTask
 from pytask.taskapp.views.user import show_msg
@@ -38,12 +38,16 @@ def view_task(request, tid):
     is_guest = True if not user.is_authenticated() else False
     is_mentor = True if user in task.mentors.all() else False
     
+    task_claimable = True if task.status in ["OP", "RE"] else False
+    user_can_view_claim = True if ( task_claimable and not ( is_guest or is_mentor ) ) else False
+    
     context = {'user':user,
                'task':task,
                'comments':comments,
                'mentors':mentors,
                'is_guest':is_guest,
                'is_mentor':is_mentor,
+               'user_can_view_claim':user_can_view_claim,
                'errors':errors,
                }
     
@@ -171,8 +175,20 @@ def claim_task(request, tid):
     
     user = request.user
     task = Task.objects.get(id=tid)
+    claims = Claim.objects.filter(task=task)
     
+    is_guest = True if not user.is_authenticated() else False
+
+    task_claimable = True if task.status in ["OP", "RE"] else False
+    user_can_claim = True if ( task_claimable and not ( is_guest or is_mentor ) and ( user not in task.claimed_users.all() ) ) else False
     
+    if not is_guest:
+        if task_claimable:
+            pass
+        else:
+            return show_msg('You are not logged in to view claims for this task', task_url, 'view the task')
+    else:
+        return show_msg('You are not logged in to view claims for this task', task_url, 'view the task')