From ab12979bb69c81206e2b43a4997ec8e754f5eb10 Mon Sep 17 00:00:00 2001
From: sealion <sealion@charadeyouare.org>
Date: Mon, 3 Mar 2014 15:08:13 +0400
Subject: [PATCH] Calendar icon, initial values for date fields.

---
 app/cabotapp/views.py                      |  11 +++++++++--
 app/templates/cabotapp/service_detail.html |   7 ++++++-
 requirements.txt                           |   3 ++-
 static/theme/img/calendar.gif              | Bin 0 -> 269 bytes
 4 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 static/theme/img/calendar.gif

diff --git a/app/cabotapp/views.py b/app/cabotapp/views.py
index 04fdbae..ab718b2 100644
--- a/app/cabotapp/views.py
+++ b/app/cabotapp/views.py
@@ -1,5 +1,6 @@
 from django.template import RequestContext, loader
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, date
+from dateutil.relativedelta import relativedelta
 from django.http import HttpResponse, HttpResponseRedirect
 from django.core.urlresolvers import reverse_lazy
 from django.conf import settings
@@ -397,7 +398,13 @@ class ServiceDetailView(LoginRequiredMixin, DetailView):
 
     def get_context_data(self, **kwargs):
         context = super(ServiceDetailView, self).get_context_data(**kwargs)
-        context['report_form'] = StatusCheckReportForm(initial={'checks': self.object.status_checks.all(), 'service': self.object})
+        date_from = date.today() - relativedelta(day=1)
+        context['report_form'] = StatusCheckReportForm(initial={
+            'checks': self.object.status_checks.all(),
+            'service': self.object,
+            'date_from': date_from,
+            'date_to': date_from + relativedelta(months=1) - relativedelta(days=1)
+        })
         return context
 
 
diff --git a/app/templates/cabotapp/service_detail.html b/app/templates/cabotapp/service_detail.html
index b30d6d4..9e6781b 100644
--- a/app/templates/cabotapp/service_detail.html
+++ b/app/templates/cabotapp/service_detail.html
@@ -200,7 +200,12 @@ drawRickshaw = (data, labels, events = []) ->
 </script>
 <script type="text/javascript">
 $(function(){
-    $(':input.datepicker').datepicker({dateFormat: 'yy-mm-dd'});
+    $(':input.datepicker').datepicker({
+        dateFormat: 'yy-mm-dd',
+        buttonImage: '{{ STATIC_URL }}theme/img/calendar.gif',
+        buttonImageOnly: true,
+        showOn: 'button'
+    });
 });
 </script>
 {% endcompress %}
diff --git a/requirements.txt b/requirements.txt
index 1bdbe81..6a9edd4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,4 +29,5 @@ redis==2.9.0
 requests==0.14.2
 six==1.5.1
 twilio==3.4.1
-wsgiref==0.1.2
\ No newline at end of file
+wsgiref==0.1.2
+python-dateutil==2.1
diff --git a/static/theme/img/calendar.gif b/static/theme/img/calendar.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d0abaa7c0b892e781b6f553453a0027efea014b9
GIT binary patch
literal 269
zcmZ?wbhEHb6ky<I_`<-@v+BKN;k~G?=Z2Z*is!xm_wDQNhxh+}`uH|A?rw6-yWG_G
z#W{Q8B0p3WuZ#}=*j)Rmqv=y``{x;xzRaHXWzpQPtCyDt2Y%bI`uo<6e_y})|L4#D
zzkmOO0RtE){$ycfV31|d0r5a~GO%_%NbOu=+WTUu&74d7@(vkpE{qLz4Ga>oJ#dt%
zaYstuiRe5}O|8;NEA%ba6j)5k7TbN(gNwC&D)Y{1Cu2PhDy(ymnp7_1Ai(k{X>FbJ
zg$yQ1aX#U+v{)u7c4kS5=DdO;0Y*k<=8BdGnYaWYcOkak83LIJ0`39}`h<8zSFc^O
QT3n!+Z|k=0I}{nL0T`orxBvhE

literal 0
HcmV?d00001