Mailing Done

ToDo multiple instructor workshops fetching and handling

2 files changed, 80 insertions, 40 deletions

diff --git a/workshop_app/send_mails.py b/workshop_app/send_mails.py
index 0d4173b..e81168c 100644
--- a/workshop_app/send_mails.py
+++ b/workshop_app/send_mails.py
@@ -9,51 +9,64 @@ from workshop_portal.settings import (
 
 def send_email(request, call_on,
 				user_position=None, workshop_date=None,
-				workshop_title=None, user_name=None
+				workshop_title=None, user_name=None,
+				other_email=None
 				):
 	'''
 	Email sending function while registration and 
 	booking confirmation.
 	'''
 
-	if call_on == 'Registration':
-		if user_position == 'instructor':
-			message = 'Thank You for Registering on this platform. \n \
+	if call_on == "Registration":
+		if user_position == "instructor":
+			message = "Thank You for Registering on this platform. \n \
 						Since you have ask for Instructor Profile, \n \
 						we will get back to you soon after verifying your \n \
 						profile. \
-						In case if you don\'t get any response within 3days, \
-						Please contact us at   '
+						In case if you don\t get any response within 3days, \
+						Please contact us at   "
 			send_mail(
-					'Welcome to FOSSEE', message, EMAIL_HOST_USER, 
+					"Welcome to FOSSEE", message, EMAIL_HOST_USER, 
 					[request.user.email], fail_silently=False
 					)
 			#Send a mail to admin as well as a notification.
 		else:
-			message = 'Thank You for Registering on this platform.\n \
+			message = "Thank You for Registering on this platform.\n \
 						Rules. \n \ If you face any issue during \
-						 your session please contact fossee.'
+						 your session please contact fossee."
 			send_mail(
-					'Welcome to FOSSEE', message, EMAIL_HOST_USER, 
+					"Welcome to FOSSEE", message, EMAIL_HOST_USER, 
 					[request.user.email], fail_silently=False
 					)
 
-	elif call_on == 'Booking':
-		if user_position == 'instructor':
-			message = 'You got a workshop booking request \
-						from ' + user_name + ' for \
-						' + workshop_title + ' on ' + workshop_date + ' please respond.'
+	elif call_on == "Booking":
+		if user_position == "instructor":
+			message = "You got a workshop booking request from "+user_name+" for "+workshop_title+" on "+workshop_date+" please respond."
 			send_mail(
-					'Python Workshop Booking | FOSSEE', message, EMAIL_HOST_USER, 
-					[request.user.email], fail_silently=False
+					"Python Workshop Booking | FOSSEE", message, EMAIL_HOST_USER, 
+					[other_email], fail_silently=False
 					)
 
 		else:
-			message = 'Thank You for Booking on this platform.\n \
-						' + user_name +' \
+			message = "Thank You for Booking on this platform.\
+					Here are your workshop details " +workshop_title+ "\
 					If you face any issue during your session please contact \
-					fossee.'
+					fossee."
 			send_mail(
-					'Python Workshop Booking | FOSSEE', message, EMAIL_HOST_USER, 
+					"Python Workshop Booking | FOSSEE", message, EMAIL_HOST_USER, 
 					[request.user.email], fail_silently=False
 					)
+
+	elif call_on == "Booking Confirmed":
+		if user_position == "instructor":
+			message = "You have confirmed the booking"
+			send_mail("Python Workshop Booking Confirmation", message, EMAIL_HOST_USER,
+				[request.user.email], fail_silently=False)
+		else:
+			message = "Your workshop for "+workshop_date+"request has been confirmed"
+			send_mail("Python Workshop Booking Confirmation", message, EMAIL_HOST_USER,
+				[other_email], fail_silently=False)
+	else:
+		message = "Issue at Workshop Booking App please check"
+		send_mail("Issue At Workshop Booking App", message, EMAIL_HOST_USER,
+				[doke.akshen@gmail.com, mahesh.p.gudi@gmail.com, aditya94palaparthy@gmail.com], fail_silently=False)
diff --git a/workshop_app/views.py b/workshop_app/views.py
index a603f6e..0930c10 100644
--- a/workshop_app/views.py
+++ b/workshop_app/views.py
@@ -129,7 +129,6 @@ def book(request):
 		requested_workshop = RequestedWorkshop.objects.all()
 		
 		for j in requested_workshop:
-			
 			j = j.requested_workshop_date.strftime("%d-%m-%Y")
 			for i in workshop_occurence:
 				if i[0] == j:
@@ -167,19 +166,6 @@ def book_workshop(request):
 		client_data = request.body.decode("utf-8").split("&")
 		client_data = client_data[0].split("%2C")
 		workshop_date = client_data[0][2:]
-		print(workshop_date)
-		send_email(request, call_on='Booking', 
-					   user_position='instructor', 
-					   workshop_date=workshop_date,
-					   workshop_title='ISCP',
-					   user_name='mahesh'
-					   )
-
-
-		send_email(request, call_on='Booking',
-				workshop_date=workshop_date,
-				workshop_title='ISCP',
-				user_name=str(request.user))
 
 		instructor_profile = Profile.objects.filter(user=client_data[1])
 		workshop_list = Workshop.objects.get(
@@ -190,14 +176,22 @@ def book_workshop(request):
 									datetime(2017, 12, 31, 0, 0, 0),
 									inc=True
 									)
+
+		rW_obj = RequestedWorkshop()
+
+		workshop_obj = Workshop.objects.get(
+								workshop_instructor=client_data[1], 
+								workshop_title_id=client_data[2]
+								)
+
 		for d in workshop_recurrence_list:
 			if workshop_date == (d.strftime("%d-%m-%Y")):
-				rW_obj = RequestedWorkshop()
+				# rW_obj = RequestedWorkshop()
 
-				workshop_obj = Workshop.objects.get(
-											workshop_instructor=client_data[1], 
-											workshop_title_id=client_data[2]
-											)
+				# workshop_obj = Workshop.objects.get(
+				# 							workshop_instructor=client_data[1], 
+				# 							workshop_title_id=client_data[2]
+				# 							)
 				rW_obj.requested_workshop_instructor = workshop_obj.workshop_instructor
 				rW_obj.requested_workshop_coordinator = request.user
 				rW_obj.requested_workshop_date = datetime.strptime(
@@ -205,6 +199,21 @@ def book_workshop(request):
 														)
 				rW_obj.requested_workshop_title = workshop_obj.workshop_title
 				rW_obj.save()
+
+		# Mail to instructor
+		send_email(request, call_on='Booking', 
+					   user_position='instructor', 
+					   workshop_date=workshop_date,
+					   workshop_title=workshop_obj.workshop_title.course_name,
+					   user_name=str(request.user),
+					   other_email=workshop_obj.workshop_instructor.email
+					   )
+
+		#Mail to coordinator
+		send_email(request, call_on='Booking',
+				workshop_date=workshop_date,
+				workshop_title=workshop_obj.workshop_title.course_name,
+				user_name=workshop_obj.workshop_instructor.username)
 				
 		return HttpResponse("Thank You, Please check your email for further \
 							information.")
@@ -291,6 +300,21 @@ def my_workshops(request):
 												)
 				workshop_status.status = client_data[-1]
 				workshop_status.save()
+				
+				#For Instructor
+				send_email(request, call_on='Booking Confirmed', 
+					user_position='instructor', 
+					workshop_date=str(client_data[1]),
+					workshop_title=workshop_status.requested_workshop_title.course_name,
+					user_name=str(request.user),
+					)
+
+				#For Coordinator
+				send_email(request, call_on='Booking Confirmed',  
+					workshop_date=str(client_data[1]),
+					workshop_title=workshop_status.requested_workshop_title.course_name,
+					other_email=workshop_status.requested_workshop_coordinator.email
+					)
 
 			workshop_occurence_list = RequestedWorkshop.objects.filter(
 									requested_workshop_instructor=user.id
@@ -308,6 +332,9 @@ def my_workshops(request):
 				#If page is out of range(e.g 999999), deliver last page.
 				workshop_occurences = paginator.page(paginator.num_pages)
 			template = 'workshop_app/my_workshops.html'
+
+			
+
 		else:
 			workshop_occurence_list = RequestedWorkshop.objects.filter(
 									requested_workshop_coordinator=user.id