From 81458d0cd8e68a99cd2b429aaf38fa4f33d12e22 Mon Sep 17 00:00:00 2001
From: Akshen
Date: Wed, 21 Jun 2017 12:04:00 +0530
Subject: Changes Workshop Creation Date Limit

- Date limit set t0 2018 from 2040
- Help Text Added in Create Workshop Page
- Past Workshop redirected to fossee-stats
- Propose workshop date days set to 3
---
 workshop_app/templates/workshop_app/create_workshop.html  |  4 ++++
 workshop_app/templates/workshop_app/index.html            |  2 +-
 workshop_app/templates/workshop_app/my_workshops.html     |  2 +-
 workshop_app/templates/workshop_app/propose_workshop.html |  2 +-
 workshop_app/views.py                                     | 10 +++++-----
 5 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'workshop_app')

diff --git a/workshop_app/templates/workshop_app/create_workshop.html b/workshop_app/templates/workshop_app/create_workshop.html
index b89402c..3631bda 100644
--- a/workshop_app/templates/workshop_app/create_workshop.html
+++ b/workshop_app/templates/workshop_app/create_workshop.html
@@ -38,6 +38,10 @@
       {{ form.media }}
       {{ form.as_p }}
       <br><br>
+      <div class="alert alert-info">
+        <strong>Please Note:!</strong> While Making Recurring Workshops please also fill <strong>Repeat Until </strong> and while creating single event please set it <strong>4days after the current date.</strong>
+      </div>
+      <br>
       <button class="btn btn-success" type="submit">Save</button>
     </form>
   </div>
diff --git a/workshop_app/templates/workshop_app/index.html b/workshop_app/templates/workshop_app/index.html
index e13677c..aed85cc 100644
--- a/workshop_app/templates/workshop_app/index.html
+++ b/workshop_app/templates/workshop_app/index.html
@@ -44,7 +44,7 @@
             <div id="first-right">
                <div class="label-bar">
                <a href="http://python.fossee.in/about/"
-        target="_blank" >About </a>|<a href="{{ URL_ROOT }}/testimonials/"> Testimonials </a>| <a href="http://python.fossee.in/" target="_blank" > Past Workshops</a>
+        target="_blank" >About </a>|<a href="{{ URL_ROOT }}/testimonials/"> Testimonials </a>| <a href="http://fossee.in/fossee-stats" target="_blank" > Past Workshops</a>
         </div>
         <br> <br>
         <img src=" {{ URL_ROOT }}/static/workshop_app/img/img_1.png" ><br>
diff --git a/workshop_app/templates/workshop_app/my_workshops.html b/workshop_app/templates/workshop_app/my_workshops.html
index 3ab7387..92dc20f 100644
--- a/workshop_app/templates/workshop_app/my_workshops.html
+++ b/workshop_app/templates/workshop_app/my_workshops.html
@@ -278,7 +278,7 @@
 		<div class="container">
 			<div class="jumbotron">
 				<h1>Welcome Instructor</h1>      
-				<p>Your workshop related information will be shown here, Please navigate to <b>View Workshop list</b> and depending upon
+				<p>Your workshop related information will be shown here, Please navigate to <b>Workshop list</b> and depending upon
 				your expertise and availability create a workshop by going to
 				<b>Create Workshop</b>.</p>
 			</div>
diff --git a/workshop_app/templates/workshop_app/propose_workshop.html b/workshop_app/templates/workshop_app/propose_workshop.html
index 76f57ce..fb4c926 100644
--- a/workshop_app/templates/workshop_app/propose_workshop.html
+++ b/workshop_app/templates/workshop_app/propose_workshop.html
@@ -12,7 +12,7 @@
 
     <script>
     var dateToday = new Date();
-    dateToday.setDate(dateToday.getDate() + 2);
+    dateToday.setDate(dateToday.getDate() + 3);
       $(function() {
         $( ".datepicker" ).datepicker({
           changeMonth: true,
diff --git a/workshop_app/views.py b/workshop_app/views.py
index 6250ad4..09269e8 100644
--- a/workshop_app/views.py
+++ b/workshop_app/views.py
@@ -179,7 +179,7 @@ def book(request):
 			for workshops in workshop_details:
 				dates = workshops.recurrences.between(
 					today,
-		    		datetime(2040, 12, 31, 0, 0, 0), #Needs to be changed yearly
+		    		datetime(2018, 12, 31, 0, 0, 0), #Needs to be changed yearly
 		    		inc=True
 					)
 				
@@ -280,7 +280,7 @@ def book_workshop(request):
 		for workshop in workshops_list:
 			workshop_recurrence_list =  workshop.recurrences.between(
 										datetime(2017, 3, 12, 0, 0, 0),
-										datetime(2040, 12, 31, 0, 0, 0),
+										datetime(2018, 12, 31, 0, 0, 0), #Needs to be changed yearly
 										inc=True
 										)
 
@@ -356,11 +356,11 @@ def manage(request):
 													)
 
 				workshop_occurence_list = []
-				today = datetime.now()  + dt.timedelta(days=3)
+				today = datetime.now() + dt.timedelta(days=3)
 				for workshop in workshop_details:
 					workshop_occurence = workshop.recurrences.between(
 												today,
-												datetime(2040, 12, 31, 0, 0, 0),
+												datetime(2018, 12, 31, 0, 0, 0), #Needs to be changed yearly
 												inc=True													
 												)
 					for i in range(len(workshop_occurence)):
@@ -476,7 +476,7 @@ def my_workshops(request):
 					for workshop in workshops_list:
 						workshop_recurrence_list = workshop.recurrences.between(
 													datetime(2017, 3, 12, 0, 0, 0),
-													datetime(2040, 12, 31, 0, 0, 0),
+													datetime(2018, 12, 31, 0, 0, 0), #Needs to be changed yearly
 													inc=True
 													)
 
-- 
cgit