From 88b6ae796f0bdd578361da958c3185a1850622cb Mon Sep 17 00:00:00 2001
From: Jailson Dias <jcd2@cin.ufpe.br>
Date: Tue, 25 Apr 2017 00:43:17 -0300
Subject: [PATCH] fazendo ajustes no periodo de pesquisa de relatorios

---
 webpage/templates/webpages/relatorios.html |  5 ++---
 webpage/views.py                           | 12 ++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/webpage/templates/webpages/relatorios.html b/webpage/templates/webpages/relatorios.html
index f1310c3..ed82166 100644
--- a/webpage/templates/webpages/relatorios.html
+++ b/webpage/templates/webpages/relatorios.html
@@ -141,12 +141,12 @@
                 <form id="period-form" action="" method="get">
                     <div class="general-parameters-field">
                            <label class="form-field-report"> {% trans "Initial Date" %} </label>
-                           <input class="form-control date-picker" name="init_date" type="text" required="" value="{% if LANGUAGE_CODE == 'pt-br' %}{{init_date|date:'d/m/Y'}} {% else %} {{init_date|date:'m/d/Y'}} {% endif %}">
+                           <input class="form-control datetime-picker" name="init_date" type="text" required="" value="{% if LANGUAGE_CODE == 'pt-br' %}{{init_date|date:'d/m/Y H:i'}} {% else %} {{init_date|date:'m/d/Y H:i P'}} {% endif %}">
                    </div>
 
                    <div class="general-parameters-field">
                            <label class="form-field-report"> {% trans "Final Date" %} </label>
-                           <input id="inputdate" class="form-control date-picker" name="end_date" type="text" required="" value="{% if LANGUAGE_CODE == 'pt-br' %}{{end_date|date:'d/m/Y'}} {% else %} {{end_date|date:'m/d/Y'}} {% endif %}">
+                           <input id="inputdate" class="form-control datetime-picker" name="end_date" type="text" required="" value="{% if LANGUAGE_CODE == 'pt-br' %}{{end_date|date:'d/m/Y H:i'}} {% else %} {{end_date|date:'m/d/Y H:i P'}} {% endif %}">
                    </div>
                     <input type="submit" value="{% trans 'Search' %}" class="btn btn-success btn-raised">
                </form>
@@ -185,7 +185,6 @@
     </div>
     <script type="text/javascript">
         $('#period-form').submit(function(event) {
-            $("#inputdate").datepicker();
             $('<input />').attr('type', 'hidden')
               .attr('name', "language")
               .attr('value', '{{ LANGUAGE_CODE }}')
diff --git a/webpage/views.py b/webpage/views.py
index 39fe0a6..9e51a92 100644
--- a/webpage/views.py
+++ b/webpage/views.py
@@ -461,20 +461,20 @@ class StatisticsView(LoginRequiredMixin, LogMixin, generic.DetailView):
 
         slug = self.kwargs.get('slug')
         webpage = get_object_or_404(Webpage, slug = slug)
-
-        date_format = "%d/%m/%Y" if self.request.GET.get('language','') == 'pt-br' else "%m/%d/%Y"
+        print (self.request.GET.get('init_date',''))
+        date_format = "%d/%m/%Y %H:%M" if self.request.GET.get('language','') == 'pt-br' else "%m/%d/%Y %I:%M %p"
         if self.request.GET.get('language','') == "":
-            start_date = datetime.date.today() - datetime.timedelta(30)
-            end_date = datetime.date.today()
+            start_date = datetime.datetime.now() - datetime.timedelta(30)
+            end_date = datetime.datetime.now()
         else :
             start_date = datetime.datetime.strptime(self.request.GET.get('init_date',''),date_format)
             end_date = datetime.datetime.strptime(self.request.GET.get('end_date',''),date_format)
-
+        print (start_date,"     depois")
         context["init_date"] = start_date
         context["end_date"] = end_date
         alunos = webpage.students.all()
 
-        vis_ou = Log.objects.filter(context__contains={'webpage_id':webpage.id},resource="webpage",action="view",user_email__in=(aluno.email for aluno in alunos), datetime__range=(start_date,end_date))
+        vis_ou = Log.objects.filter(context__contains={'webpage_id':webpage.id},resource="webpage",action="view",user_email__in=(aluno.email for aluno in alunos), datetime__range=(start_date,end_date + datetime.timedelta(minutes = 1)))
         did,n_did,history = str(_("Users who viewed")),str(_("Users who did not viewed")),str(_("History"))
         re = []
         data_did, data_n_did,data_history = [],[],[]
--
libgit2 0.21.2