Merge pull request #46 from Akshen/develop

Add FOSSEE fellowship tag in registration form

8 files changed, 75 insertions, 9 deletions

diff --git a/statistics_app/templates/statistics_app/profile_stats.html b/statistics_app/templates/statistics_app/profile_stats.html
index 3c30ea0..2653d9d 100644
--- a/statistics_app/templates/statistics_app/profile_stats.html
+++ b/statistics_app/templates/statistics_app/profile_stats.html
@@ -111,6 +111,7 @@
 					{% csrf_token %}
 					{% for profile_data in coordinator_data %}
 						<tbody>
+					{% if profile_data.count > 0 %}
 							<tr>
 								<td>{{ forloop.counter }}</td>
 								<td>{{ profile_data.profile.user.first_name}} {{ profile_data.profile.user.last_name}}</td>
@@ -119,6 +120,7 @@
 								<td>{{ profile_data.profile.user.date_joined | date}}</td>
 								<td>{{ profile_data.count}}</td>
 							</tr>
+					{% endif %}
 						</tbody>
 					{% endfor %}
 				</table>
diff --git a/workshop_app/forms.py b/workshop_app/forms.py
index d17552a..29cedad 100644
--- a/workshop_app/forms.py
+++ b/workshop_app/forms.py
@@ -50,6 +50,7 @@ title = (
     )
 
 source = (
+    ("FOSSEE fellowship", "FOSSEE fellowship"),
     ("FOSSEE Email", "FOSSEE Email"),
     ("FOSSEE website", "FOSSEE website"),
     ("Google", "Google"),
diff --git a/workshop_app/models.py b/workshop_app/models.py
index 94b9f92..227f693 100644
--- a/workshop_app/models.py
+++ b/workshop_app/models.py
@@ -37,6 +37,7 @@ title = (
     )
 
 source = (
+    ("FOSSEE fellowship", "FOSSEE fellowship"),
     ("FOSSEE Email", "FOSSEE Email"),
     ("FOSSEE website", "FOSSEE website"),
     ("Google", "Google"),
diff --git a/workshop_app/send_mails.py b/workshop_app/send_mails.py
index 7e37230..81a7d50 100644
--- a/workshop_app/send_mails.py
+++ b/workshop_app/send_mails.py
@@ -93,6 +93,7 @@ def send_smtp_email(request=None, subject=None, message=None,
 
 def send_email(	request, call_on,
 			user_position=None, workshop_date=None,
+			new_workshop_date=None,
 			workshop_title=None, user_name=None,
 			other_email=None, phone_number=None,
 			institute=None, key=None
@@ -385,3 +386,48 @@ def send_email(	request, call_on,
 										SENDER_EMAIL, [eid])
 				else:
 					logging.warning("Invalid EmailId: %s ", eid)
+
+	elif call_on == 'Change Date':
+		if user_position == "instructor":
+			message = dedent("""\
+					Dear Instructor,
+
+					Your workshop date has been changed from {0} to {1}."""
+					.format(
+					workshop_date, new_workshop_date))
+
+			logging.info("Workshop Date Changed Done by {0} from {1} to {2}"
+						.format(request.user.email, 
+						new_workshop_date, workshop_date))
+			try:
+				send_mail(
+					"FOSSEE Python Workshop Date Changed",
+					message, SENDER_EMAIL, [request.user.email],
+					fail_silently=True
+					)
+			except Exception:
+				send_smtp_email(request=request,
+					subject="FOSSEE Python Workshop Date Changed",
+					message=message, other_email=other_email,
+					)
+		else:
+			message = dedent("""\
+					Dear Coordinator,
+
+					Your workshop has been rescheduled from {0} to {1}."""
+					.format(
+					workshop_date, new_workshop_date
+					))
+
+			try:
+				send_mail(
+					"FOSSEE Python Workshop Date Changed", 
+					message, SENDER_EMAIL,
+					[other_email], fail_silently=True
+					)
+			except Exception:
+				send_smtp_email(request=request,
+					subject="FOSSEE Python Workshop Date Changed",
+					message=message, other_email=request.user.email,
+					)
+
diff --git a/workshop_app/templates/workshop_app/my_workshops.html b/workshop_app/templates/workshop_app/my_workshops.html
index 7c0f625..9b90a7b 100644
--- a/workshop_app/templates/workshop_app/my_workshops.html
+++ b/workshop_app/templates/workshop_app/my_workshops.html
@@ -213,6 +213,7 @@
 				<tr>
 				{% if request.user.profile.position == 'instructor' %}
 					<th>Coordinator Name</th>
+					<th>Coordinator Institute Name</th>
 				{% else %}
 					<th>Instructor Name</th>
 				{% endif %}
@@ -228,6 +229,7 @@
 						{% if workshop.status == 'ACCEPTED' and workshop.requested_workshop_title %}
 							{% if request.user.profile.position == 'instructor' %}
 								<td>{{ workshop.requested_workshop_coordinator.get_full_name }}</td>
+								<td>{{ workshop.requested_workshop_coordinator.profile.institute }}</td>
 							{% else %}
 								<td>{{ workshop.requested_workshop_instructor.get_full_name }}</td>
 							{% endif %}
@@ -251,6 +253,7 @@
 						{% if workshop.status == 'ACCEPTED' and workshop.condition_one %}
 							{% if request.user.profile.position == 'instructor' %}
 								<td>{{ workshop.proposed_workshop_coordinator.get_full_name }}</td>
+								<td>{{ workshop.proposed_workshop_coordinator.profile.institute }}</td>
 							{% else %}
 								<td>{{ workshop.proposed_workshop_instructor.get_full_name }}</td>
 							{% endif %}
diff --git a/workshop_app/templates/workshop_app/self_workshop.html b/workshop_app/templates/workshop_app/self_workshop.html
index deb2667..6002edf 100644
--- a/workshop_app/templates/workshop_app/self_workshop.html
+++ b/workshop_app/templates/workshop_app/self_workshop.html
@@ -19,11 +19,6 @@
 	<div class="navbar-header">
 	  <a class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Workshops</a>
 	</div>
-
-	<ul class="nav navbar-nav navbar-right">
-	  <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li>
-	  <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
-	</ul>
   	</div>
   </nav>
   {% endblock %}
diff --git a/workshop_app/views.py b/workshop_app/views.py
index c342c44..2e6a8fd 100644
--- a/workshop_app/views.py
+++ b/workshop_app/views.py
@@ -583,6 +583,8 @@ def my_workshops(request):
                     workshop_date = datetime.strptime(
                                     client_data[3], "%Y-%m-%d"
                                     )
+
+                    cemail = User.objects.get(id=cid)
                     today = datetime.today()
                     if today > new_workshop_date:
                         return HttpResponse("Please Give proper Date!")
@@ -603,6 +605,20 @@ def my_workshops(request):
                             proposed_workshop_date=workshop_date).update(
                             proposed_workshop_date=new_workshop_date)
 
+                    #For Instructor
+                    send_email(request, call_on='Change Date',
+                        user_position='instructor',
+                        workshop_date=workshop_date.date(),
+                        new_workshop_date=str(new_workshop_date.date())
+                        )
+
+                    #For Coordinator
+                    send_email(request, call_on='Change Date',  
+                        new_workshop_date=str(new_workshop_date.date()),
+                        workshop_date=str(workshop_date.date()),
+                        other_email=cemail.email
+                        )
+
                     return HttpResponse("Date Changed")
 
                 else:
@@ -644,14 +660,17 @@ def my_workshops(request):
                         )
 
             workshops = []
+            today = datetime.today().date()
             workshop_occurence_list = RequestedWorkshop.objects.filter(
-                                    requested_workshop_instructor=user.id
+                                    requested_workshop_instructor=user.id,
+                                    requested_workshop_date__gt=today,
                                     ).order_by('-requested_workshop_date')
             for w in workshop_occurence_list:
                 workshops.append(w)
 
             proposed_workshop = ProposeWorkshopDate.objects.filter(
-                            proposed_workshop_instructor=user.id
+                            proposed_workshop_instructor=user.id,
+                            proposed_workshop_date__gt=today,
                             ).order_by('-proposed_workshop_date')
             for p in proposed_workshop:
                 workshops.append(p)
@@ -662,7 +681,6 @@ def my_workshops(request):
             for p in proposed_workshop_pending:
                 workshops.append(p)
 
-            today = datetime.today().date()
            
             #Show upto 12 Workshops per page
             paginator = Paginator(workshops, 12)
diff --git a/workshop_portal/settings.py b/workshop_portal/settings.py
index c6ca22e..9451a1f 100644
--- a/workshop_portal/settings.py
+++ b/workshop_portal/settings.py
@@ -166,7 +166,7 @@ EMAIL_TIMEOUT = 300
 SENDER_EMAIL = SENDER_EMAIL
 
 
-#EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
 #Change this to the production url
 PRODUCTION_URL = 'your_production_url'