summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhardythe12015-01-12 13:31:39 +0530
committerhardythe12015-01-12 13:31:39 +0530
commitcc94a6250e8357e670b23fff0b860a698d7c5b28 (patch)
tree5d7091119a9b2d8c063681face6ee4b9b7f353cf
parent9b40244be612a6be04d4e337dc1c9862d059ef06 (diff)
downloadPython-TBC-Interface-cc94a6250e8357e670b23fff0b860a698d7c5b28.tar.gz
Python-TBC-Interface-cc94a6250e8357e670b23fff0b860a698d7c5b28.tar.bz2
Python-TBC-Interface-cc94a6250e8357e670b23fff0b860a698d7c5b28.zip
added mail notification for proposal approval & edited message for allocation of book
-rwxr-xr-xtbc/views.py24
1 files changed, 21 insertions, 3 deletions
diff --git a/tbc/views.py b/tbc/views.py
index ef389aa..cc48577 100755
--- a/tbc/views.py
+++ b/tbc/views.py
@@ -117,7 +117,10 @@ def Home(request):
books = Book.objects.filter(approved=True).order_by("-id")[0:6]
for book in books:
- images.append(ScreenShots.objects.filter(book=book)[0])
+ try:
+ images.append(ScreenShots.objects.filter(book=book)[0])
+ except:
+ return HttpResponse(book)
context['images'] = images
book_images = []
for i in range(len(books)):
@@ -563,6 +566,14 @@ def ReviewProposals(request, proposal_id=None, textbook_id=None):
proposal.accepted = new_book
proposal.save()
add_log(user, proposal, CHANGE, 'Proposal accepted', proposal.id)
+ subject = "Python-TBC: Proposal Reviewed"
+ message = """ Dear """+proposal.user.user.first_name+""",\n
+ "Your proposal has been reviewed and the book titled """
+ proposal.accepted.title+""" by """+proposal.accepted.author+""" has
+ been approved. You may now submit the sample notebook through the
+ link given below. Once the sample notebook is approved, the book
+ will be alloted to you."""
+ email_send(proposal.user.user.email, subject, message)
return HttpResponseRedirect("/proposal-review")
else:
new_proposals = Proposal.objects.filter(status="pending")
@@ -617,8 +628,15 @@ def AllotBook(request, proposal_id=None):
proposal.status = "book alloted"
proposal.save()
subject = "Python-TBC: Book Alloted"
- message = "Hi "+proposal.user.user.first_name+",\n"+\
- "The book has been alloted to you."
+ message = """Hi """+proposal.user.user.first_name+""",\n
+ The sample examples for the book '"""+proposal.accepted.title+"""' are correct.
+ Hence, the book is now allotted to you. A time period of 2 months from today
+ is allotted to you for completion of the book. Convert all the solved/worked
+ examples of all the chapters. You can get back to us for any queries.\n
+ Good Luck!\n\n
+
+ Regards,\n
+ FOSSEE, IIT Bombay"""
add_log(request.user, proposal, CHANGE, 'Book alloted', proposal_id)
email_send(proposal.user.user.email, subject, message)
return HttpResponseRedirect("/book-review/?book_alloted=done")