From 86e0b947d7d8cf20cd354d6653b1c84c0e6d124f Mon Sep 17 00:00:00 2001
From: Akshen
Date: Wed, 16 Aug 2017 14:44:48 +0530
Subject: Adds RequestedWorkshop Data to ScheduledWorkshop Template

- Fetchs Accepted workshop data from requestedWorkshop and shows in scheduled workshop template
- changes content in send_mails
- updates scheduled_workshops with table for requestedworkshop data
---
 .../workshop_app/scheduled_workshops.html          | 37 ++++++++++++++++++----
 1 file changed, 31 insertions(+), 6 deletions(-)

(limited to 'workshop_app/templates')

diff --git a/workshop_app/templates/workshop_app/scheduled_workshops.html b/workshop_app/templates/workshop_app/scheduled_workshops.html
index 8ebb2e6..a9aedd6 100644
--- a/workshop_app/templates/workshop_app/scheduled_workshops.html
+++ b/workshop_app/templates/workshop_app/scheduled_workshops.html
@@ -25,7 +25,7 @@
 
 	<div class="container">
 	{% if scheduled_workshops %}
-	<h3>This Table Shows Scheduled Workshops Proposed By Coordinators</h3>
+	<h3>This Table Shows Scheduled Workshops which were Proposed By Coordinators</h3>
 	<br>
 		<table class="table table-hover">
 			<thead>
@@ -38,7 +38,7 @@
 				</tr>
 			</thead>
 			{% csrf_token %}
-			{% for workshop in accepted_workshops %}
+			{% for workshop in proposed_workshops %}
 				{% if workshop.status == 'ACCEPTED' %}
 						<tbody>
 							<tr>
@@ -52,13 +52,38 @@
 				{% endif %}
 			{% endfor %}
 		</table>
+	<h3>This Table Shows Scheduled  Workshops based on Instructors Approval </h3>
+	<br>
+		<table class="table table-hover">
+			<thead>
+				<tr>
+					<th>Coordinator Name</th>
+					<th>Institute Name</th>
+					<th>Instructor Name</th>
+					<th>Workshop Name</th>
+					<th>Workshop Date</th>
+				</tr>
+			</thead>
+			{% csrf_token %}
+			{% for workshop in requested_workshops %}
+				{% if workshop.status == 'ACCEPTED' %}
+						<tbody>
+							<tr>
+								<td>{{ workshop.requested_workshop_coordinator.get_full_name | capfirst }}</td>
+								<td>{{ workshop.requested_workshop_coordinator.profile.institute | capfirst }}</td>
+								<td>{{ workshop.requested_workshop_instructor.get_full_name }}</td>
+								<td>{{ workshop.requested_workshop_title.workshoptype_name }}</td>
+								<td>{{ workshop.requested_workshop_date | date}}</td>
+							</tr>
+						</tbody>
+				{% endif %}
+			{% endfor %}
+		</table>
+
 	{% else %}
 		<div class="jumbotron">
 				<h2>Permission to View Scheduled Workshops is set to False</h2>
 			</div>
 	{% endif %}
 	</div>
-	
-
-
-{% endblock %}
\ No newline at end of file
+{% endblock %}
-- 
cgit