Fix daypicker URL

plonegovbr · Sep 25, 2018 · 6803e51 · 6803e51
1 parent d9372ec
commit 6803e51
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/brasil/gov/agenda/browser/mixin.py b/src/brasil/gov/agenda/browser/mixin.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from six.moves import range  # noqa: I001
+from brasil.gov.agenda.config import AGENDADIARIAFMT
 from datetime import timedelta
 from plone import api
 from zope.component import getMultiAdapter
@@ -44,15 +45,15 @@ def days(self):
             has_appointment = False
             if day == self.date:
                 cssclass.append('is-selected')
-            if self.agenda.get(day.strftime('%Y-%m-%d'), False):
+            if self.agenda.get(day.strftime(AGENDADIARIAFMT), False):
                 has_appointment = True
                 cssclass.append('has-appointment')
             # Weekday difference between datetime and DateTime objects
             strweek = self._translate(tool.day_msgid((day.weekday() + 1) % 7))
             weekdays.append({
                 'day': day.day,
+                'dayurl': day.strftime(AGENDADIARIAFMT),
                 'weekday': strweek[:3],
-                'iso': day.isoformat(),
                 'cssclass': ' '.join(cssclass),
                 'hasappointment': has_appointment,
             })

diff --git a/src/brasil/gov/agenda/browser/templates/agenda_macros.pt b/src/brasil/gov/agenda/browser/templates/agenda_macros.pt
@@ -28,9 +28,9 @@
     <ul class="daypicker"
         tal:condition="view/days">
       <tal:event repeat="day view/days">
-        <li tal:attributes="data-day day/iso;
+        <li tal:attributes="data-day day/dayurl;
                             class day/cssclass;">
-          <a tal:attributes="href string:${view/agenda/absolute_url}/${day/iso}"
+          <a tal:attributes="href string:${view/agenda/absolute_url}/${day/dayurl}"
              tal:omit-tag="not:day/hasappointment">
             <div class="daypicker-day"
                  tal:content="day/day" />