Download as
Browse Code »

Commit 88b6ae796f0bdd578361da958c3185a1850622cb

Authored by Jailson Dias
1 parent 995137de
Exists in master and in 2 other branches amadeus_univasf, refactoring

fazendo ajustes no periodo de pesquisa de relatorios

Showing 2 changed files with 8 additions and 9 deletions   Show diff stats
webpage/templates/webpages/relatorios.html
  Diff comments   View file @88b6ae7
... ... @@ -141,12 +141,12 @@
141 141 <form id="period-form" action="" method="get">
142 142 <div class="general-parameters-field">
143 143 <label class="form-field-report"> {% trans "Initial Date" %} </label>
144   - <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 %}">
  144 + <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 %}">
145 145 </div>
146 146  
147 147 <div class="general-parameters-field">
148 148 <label class="form-field-report"> {% trans "Final Date" %} </label>
149   - <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 %}">
  149 + <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 %}">
150 150 </div>
151 151 <input type="submit" value="{% trans 'Search' %}" class="btn btn-success btn-raised">
152 152 </form>
... ... @@ -185,7 +185,6 @@
185 185 </div>
186 186 <script type="text/javascript">
187 187 $('#period-form').submit(function(event) {
188   - $("#inputdate").datepicker();
189 188 $('<input />').attr('type', 'hidden')
190 189 .attr('name', "language")
191 190 .attr('value', '{{ LANGUAGE_CODE }}')
... ...
webpage/views.py
  Diff comments   View file @88b6ae7
... ... @@ -461,20 +461,20 @@ class StatisticsView(LoginRequiredMixin, LogMixin, generic.DetailView):
461 461  
462 462 slug = self.kwargs.get('slug')
463 463 webpage = get_object_or_404(Webpage, slug = slug)
464   -
465   - date_format = "%d/%m/%Y" if self.request.GET.get('language','') == 'pt-br' else "%m/%d/%Y"
  464 + print (self.request.GET.get('init_date',''))
  465 + date_format = "%d/%m/%Y %H:%M" if self.request.GET.get('language','') == 'pt-br' else "%m/%d/%Y %I:%M %p"
466 466 if self.request.GET.get('language','') == "":
467   - start_date = datetime.date.today() - datetime.timedelta(30)
468   - end_date = datetime.date.today()
  467 + start_date = datetime.datetime.now() - datetime.timedelta(30)
  468 + end_date = datetime.datetime.now()
469 469 else :
470 470 start_date = datetime.datetime.strptime(self.request.GET.get('init_date',''),date_format)
471 471 end_date = datetime.datetime.strptime(self.request.GET.get('end_date',''),date_format)
472   -
  472 + print (start_date," depois")
473 473 context["init_date"] = start_date
474 474 context["end_date"] = end_date
475 475 alunos = webpage.students.all()
476 476  
477   - 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))
  477 + 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)))
478 478 did,n_did,history = str(_("Users who viewed")),str(_("Users who did not viewed")),str(_("History"))
479 479 re = []
480 480 data_did, data_n_did,data_history = [],[],[]
... ...