Fixes old datesview

- Previous dates which are not booked won't be shown to coordinator and instructor
- Email sending to coordinator with attachments fixed
- Contact Us email changed in Homepage

4 files changed, 7 insertions, 12 deletions

diff --git a/workshop_app/send_mails.py b/workshop_app/send_mails.py
index a4e1e52..9c3e732 100644
--- a/workshop_app/send_mails.py
+++ b/workshop_app/send_mails.py
@@ -267,7 +267,7 @@ def send_email(	request, call_on,
 
 			subject = "FOSSEE Workshop booking confirmation  on {0}".\
 				format(workshop_date)
-			msg = EmailMultiAlternatives(subject, message, SENDER_EMAIL, [request.user.email])
+			msg = EmailMultiAlternatives(subject, message, SENDER_EMAIL, [other_email])
 
 			files = listdir(settings.MEDIA_ROOT)
 			for f in files:
@@ -344,9 +344,3 @@ def send_email(	request, call_on,
 				format(workshop_date), message=message,
 				other_email=request.user.email
 				)
-		
-	else:
-		message = "Issue at Workshop Booking App please check"
-		send_mail("Issue At Workshop Booking App Mailing", message, SENDER_EMAIL,
-				['your developer id'], fail_silently=False)
-		
diff --git a/workshop_app/templates/workshop_app/edit_profile.html b/workshop_app/templates/workshop_app/edit_profile.html
index 414b931..2c7aea3 100644
--- a/workshop_app/templates/workshop_app/edit_profile.html
+++ b/workshop_app/templates/workshop_app/edit_profile.html
@@ -8,7 +8,7 @@
   <nav class="navbar navbar-default navbar-custom">
     <div class="container-fluid">
       <div class="navbar-header">
-        <a class="navbar-brand" href="#">WebSiteName</a>
+        <a class="navbar-brand" href="#">Booking</a>
       </div>
       {% if request.user.profile.position == 'instructor' %}
           <ul class="nav navbar-nav">
diff --git a/workshop_app/templates/workshop_app/index.html b/workshop_app/templates/workshop_app/index.html
index ed34e4e..d8c1232 100644
--- a/workshop_app/templates/workshop_app/index.html
+++ b/workshop_app/templates/workshop_app/index.html
@@ -106,7 +106,7 @@
         
         Phone: (+91) 22 2576
         4133<br>
-        Email: info[at]fossee[dot]in 
+        Email: workshops[at]fossee[dot]in 
       </div>
     </div>
     
diff --git a/workshop_app/views.py b/workshop_app/views.py
index 0efaf54..dafe5f9 100644
--- a/workshop_app/views.py
+++ b/workshop_app/views.py
@@ -155,10 +155,10 @@ def book(request):
 			workshop_details = Workshop.objects.all()
 			
 			workshop_occurence_list = []
-
+			today = datetime.now()
 			for workshops in workshop_details:
 				dates = workshops.recurrences.between(
-					datetime(2017, 3, 12, 0, 0, 0),
+					today,
 		    		datetime(2040, 12, 31, 0, 0, 0), #Needs to be changed yearly
 		    		inc=True
 					)
@@ -335,9 +335,10 @@ def manage(request):
 													)
 
 				workshop_occurence_list = []
+				today = datetime.now()
 				for workshop in workshop_details:
 					workshop_occurence = workshop.recurrences.between(
-												datetime(2017, 3, 12, 0, 0, 0),
+												today,
 												datetime(2040, 12, 31, 0, 0, 0),
 												inc=True													
 												)