From 1681ab8fee15a84d0a0f15764bd25752c8487595 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 29 Feb 2016 20:35:53 +0000
Subject: [PATCH 1/4] Allowed linking to specific views/dates on the calendar -
 closes #153

---
 RIGS/rigboard.py                  |  6 +++++
 RIGS/templates/RIGS/calendar.html | 37 ++++++++++++++++++++++++++++++-
 RIGS/urls.py                      |  2 ++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/RIGS/rigboard.py b/RIGS/rigboard.py
index 42a79b3b..a6ccde09 100644
--- a/RIGS/rigboard.py
+++ b/RIGS/rigboard.py
@@ -37,6 +37,12 @@ class RigboardIndex(generic.TemplateView):
 class WebCalendar(generic.TemplateView):
     template_name = 'RIGS/calendar.html'
 
+    def get_context_data(self, **kwargs):
+        context = super(WebCalendar, self).get_context_data(**kwargs)
+        context['view'] = kwargs.get('view','')
+        context['date'] = kwargs.get('date','')
+        return context
+
 class EventDetail(generic.DetailView):
     model = models.Event
 
diff --git a/RIGS/templates/RIGS/calendar.html b/RIGS/templates/RIGS/calendar.html
index 23a0b1b8..f6891d84 100644
--- a/RIGS/templates/RIGS/calendar.html
+++ b/RIGS/templates/RIGS/calendar.html
@@ -14,8 +14,28 @@
     <script src="{% static "js/moment.min.js" %}"></script>
     <script src="{% static "js/fullcalendar.js" %}"></script>
     <script>
+
+        function getUrlVars() {
+            var vars = {};
+            var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) {
+            vars[key] = value;
+            });
+            return vars;
+        }
+
         $(document).ready(function() {
 
+            viewToUrl = {
+                'agendaWeek':'week',
+                'agendaDay':'day',
+                'month':'month'
+            }
+            viewFromUrl = {
+                'week':'agendaWeek',
+                'day':'agendaDay',
+                'month':'month'
+            }
+
             $('#calendar').fullCalendar({
                 editable: false,
                 eventLimit: true, // allow "more" link when too many events
@@ -114,8 +134,11 @@
                             $('#day-button').addClass('active');
                             break;
                     }
-
+                    history.replaceState(null,null,'{% url 'web_calendar' %}'+viewToUrl[view.name]+'/'+view.intervalStart.format('YYYY-MM-DD')+'/');
                 }
+
+
+
             });
           
             // set some button listeners
@@ -146,6 +169,18 @@
                 }
             });
 
+            
+            // Go to the initial settings, if they're valid
+            view = viewFromUrl['{{view}}'];
+            $('#calendar').fullCalendar( 'changeView', view);
+
+            day = moment('{{date}}');
+            if(day.isValid()){
+                $('#calendar').fullCalendar( 'gotoDate', day);
+            }else{
+                console.log('Supplied date is invalid - using default')
+            }
+            
         });
 
     </script>
diff --git a/RIGS/urls.py b/RIGS/urls.py
index 93028bb2..4338df08 100644
--- a/RIGS/urls.py
+++ b/RIGS/urls.py
@@ -69,6 +69,8 @@ urlpatterns = patterns('',
                        # Rigboard
                        url(r'^rigboard/$', login_required(rigboard.RigboardIndex.as_view()), name='rigboard'),
                        url(r'^rigboard/calendar/$', login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
+                       url(r'^rigboard/calendar/(?P<view>(month|week|day))/$', login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
+                       url(r'^rigboard/calendar/(?P<view>(month|week|day))/(?P<date>(\d{4}-\d{2}-\d{2}))/$', login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
                        url(r'^rigboard/archive/$', RedirectView.as_view(permanent=True,pattern_name='event_archive')),
                        url(r'^rigboard/activity/$',
                            permission_required_with_403('RIGS.view_event')(versioning.ActivityTable.as_view()),

From 8279bec4bfeb41935089d9e2d73d96eb202f03fe Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 10 Mar 2016 11:46:28 +0000
Subject: [PATCH 2/4] Removed warning message at top - closes #203

---
 templates/base.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index 8bf8b62c..23476432 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -144,10 +144,6 @@
             {% endif %}
         {% endblock %}
 
-        <div class="col-sm-12 text-center">
-            Reminder: Please consider carefully before booking rigs at this moment
-        </div>
-
         {% block content %}{% endblock %}
     </div>
 

From ed552b402a1fadfaa362b74cab656946bb44c3c4 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Thu, 10 Mar 2016 11:56:09 +0000
Subject: [PATCH 3/4] Based on event with no MIC - closes #163

---
 RIGS/templates/RIGS/event_detail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/RIGS/event_detail.html
index b5fd1b7a..e68e73bf 100644
--- a/RIGS/templates/RIGS/event_detail.html
+++ b/RIGS/templates/RIGS/event_detail.html
@@ -151,7 +151,7 @@
                             <a href="{% url 'event_detail' pk=object.based_on.pk %}">
                                 {% if object.based_on.is_rig %}N{{ object.based_on.pk|stringformat:"05d" }}{% else %}
                                     {{ object.based_on.pk }}{% endif %}
-                                {{ object.base_on.name }} by {{ object.based_on.mic.name }}
+                                {{ object.base_on.name }} {% if object.based_on.mic %}by {{ object.based_on.mic.name }}{% endif %}
                             </a>
                         {% endif %}
                     </dd>

From c6b45da72c980df39a08aed475d6103c847bceaf Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 16 Mar 2016 12:49:42 +0000
Subject: [PATCH 4/4] Made tests more reliable - wait for success page to load
 before checking item exists in database

---
 RIGS/test_functional.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/RIGS/test_functional.py b/RIGS/test_functional.py
index 7fad8fc0..f37bf0bc 100644
--- a/RIGS/test_functional.py
+++ b/RIGS/test_functional.py
@@ -420,8 +420,9 @@ class EventTest(LiveServerTestCase):
         e.send_keys(Keys.ENTER)
 
         # See redirected to success page
+        successTitle = self.browser.find_element_by_xpath('//h1').text
         event = models.Event.objects.get(name='Test Event Name')
-        self.assertIn("N0000%d | Test Event Name"%event.pk, self.browser.find_element_by_xpath('//h1').text)
+        self.assertIn("N0000%d | Test Event Name"%event.pk, successTitle)
 
     def testEventDuplicate(self):
         testEvent = models.Event.objects.create(name="TE E1", status=models.Event.PROVISIONAL, start_date=date.today() + timedelta(days=6), description="start future no end") 
@@ -608,9 +609,10 @@ class EventTest(LiveServerTestCase):
         save.click()
         
         # See redirected to success page
+        successTitle = self.browser.find_element_by_xpath('//h1').text
         event = models.Event.objects.get(name='Test Event Name')
-        self.assertIn("N0000%d | Test Event Name"%event.pk, self.browser.find_element_by_xpath('//h1').text)
-
+        self.assertIn("N0000%d | Test Event Name"%event.pk, successTitle)
+        
     def testRigNonRig(self):
         self.browser.get(self.live_server_url + '/event/create/')
         # Gets redirected to login and back