From 9e164679671c03383f21cb0a2ccc72c6176dc074 Mon Sep 17 00:00:00 2001
From: hardythe1
Date: Thu, 28 Aug 2014 14:59:52 +0530
Subject: added status for sample disapproval

---
 tbc/models.py | 3 +++
 tbc/views.py  | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/tbc/models.py b/tbc/models.py
index 15daca9..c736515 100644
--- a/tbc/models.py
+++ b/tbc/models.py
@@ -41,7 +41,10 @@ ABOUT_PROJ = (("pythontbc website", "Python TBC Website"),
               
 PROPOSAL_STATUS = (("pending","Pending"),
                    ("samples","Samples"),
+                   ("sample disapproved", "Sample Disapproved"),
                    ("book alloted","Book Alloted"),
+                   ("codes submitted", "Codes Submitted"),
+                   ("codes disapproved", "Codes Disapproved"),
                    ("book completed","Book Completed"),
                    ("rejected","Rejected"))
 
diff --git a/tbc/views.py b/tbc/views.py
index b93a065..1fdf1bd 100755
--- a/tbc/views.py
+++ b/tbc/views.py
@@ -530,6 +530,7 @@ def DisapproveProposal(request, proposal_id=None):
         changes_required
         email_send(proposal.user.user.email, subject, message)
         context.update(csrf(request))
+        proposal.status = "sample disapproved"
         return HttpResponseRedirect("/book-review/?mail_notify=done")
     else:
         context['proposal'] = proposal
@@ -577,6 +578,7 @@ def SubmitSample(request, proposal_id=None, old_notebook_id=None):
             old_notebook.name = request.POST.get('ch_name_old')
             old_notebook.sample_notebook = request.FILES['old_notebook']
             old_notebook.save()
+            curr_proposal.status = "sample resubmitted"
             return HttpResponseRedirect('/?sample_notebook=done')
         else:
             sample_notebook = SampleNotebook()
@@ -822,6 +824,8 @@ def ApproveBook(request, book_id=None):
             book.approved = True
             book.save()
             proposal = Proposal.objects.get(accepted=book)
+            proposal.status = "book completed"
+            proposal.save()
             add_log(user, book, CHANGE, 'Book approved', proposal.id)
             file_path = os.path.abspath(os.path.dirname(__file__))
             zip_path = "/".join(file_path.split("/")[1:-2])
-- 
cgit