Merge e19dd36 into dfbfbb9

CHANGES.rst

@@ -8,6 +8,9 @@ Changelog
     Este release atualiza as dependências do processamento de recursos estáticos.
     Em ambiente de desenvolvimento pode ser necessário remover as pastas ``parts`` e ``webpack/node_modules`` para efetivar a atualização de ambiente.
 
+- Simplifica visão de agenda.
+  [rodfersou]
+
 - Corrige título da agenda diária caso o nome da pessoa no cargo mudar (closes `#142 <https://github.com/plonegovbr/brasil.gov.agenda/issues/142>`_).
   [hvelarde]
 

buildout.cfg

@@ -15,6 +15,7 @@ parts +=
     omelette
     precompile
     pylint
+    rebuild_i18n-sh
     node
     staticresources
 

src/brasil/gov/agenda/browser/agenda.py

@@ -30,6 +30,7 @@ def setup(self):
         self._ts = api.portal.get_tool('translation_service')
         self.agenda = self.context
         self.editable = context_state.is_editable()
+        self.date = datetime.now()
 
     def results(self, b_size=16):
         """Retorna as ultimas agendas diárias"""

src/brasil/gov/agenda/browser/mixin.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from six.moves import range  # noqa: I001
-from datetime import datetime
 from datetime import timedelta
 from plone import api
 from zope.component import getMultiAdapter
@@ -27,33 +26,35 @@ def _translate(self, msgid, locale='plonelocales', mapping=None):
 
     def month(self):
         tool = api.portal.get_tool('translation_service')
-        today = datetime.now()
-        strmonth = self._translate(tool.month_msgid(today.strftime('%m')))
+        strmonth = self._translate(tool.month_msgid(self.date.strftime('%m')))
         return {
             'strmonth': strmonth[:3].upper(),
             'strmonthcomplete': strmonth.upper(),
-            'month': today.month,
-            'year': today.year,
+            'month': self.date.month,
+            'year': self.date.year,
         }
 
     def days(self):
         tool = api.portal.get_tool('translation_service')
-        today = datetime.now()
-        # get a list with 3 days before and 3 days after today
-        days = [(today + timedelta(i)) for i in range(-3, 4)]
+        # get a list with 3 days before and 3 days after current day
+        days = [(self.date + timedelta(i)) for i in range(-3, 4)]
         weekdays = []
         for day in days:
             cssclass = ['day']
-            if day == today:
+            has_appointment = False
+            if day == self.date:
                 cssclass.append('is-selected')
             if self.agenda.get(day.strftime('%Y-%m-%d'), False):
+                has_appointment = True
                 cssclass.append('has-appointment')
-            strweek = self._translate(tool.day_msgid(day.weekday()))
+            # Weekday difference between datetime and DateTime objects
+            strweek = self._translate(tool.day_msgid((day.weekday() + 1) % 7))
             weekdays.append({
                 'day': day.day,
                 'weekday': strweek[:3],
                 'iso': day.isoformat(),
                 'cssclass': ' '.join(cssclass),
+                'hasappointment': has_appointment,
             })
         return weekdays
 

src/brasil/gov/agenda/browser/templates/agenda_macros.pt

@@ -30,10 +30,13 @@
       <tal:event repeat="day view/days">
         <li tal:attributes="data-day day/iso;
                             class day/cssclass;">
-          <div class="daypicker-day"
-               tal:content="day/day" />
-          <div class="daypicker-weekday"
-               tal:content="day/weekday" />
+          <a tal:attributes="href string:${view/agenda/absolute_url}/${day/iso}"
+             tal:omit-tag="not:day/hasappointment">
+            <div class="daypicker-day"
+                 tal:content="day/day" />
+            <div class="daypicker-weekday"
+                 tal:content="day/weekday" />
+          </a>
         </li>
       </tal:event>
     </ul>
@@ -98,7 +101,7 @@
     </li>
     <li class="sem-compromisso item-compromisso"
         tal:condition="view/exibe_sem_compromissos">
-      <span i18n:translate="label_agendadiaria_sem_compromissos">Sem compromissos oficiais.</span>
+      <span i18n:translate="">Atualmente não existem compromissos agendados.</span>
     </li>
   </ul>
 </metal:form>

src/brasil/gov/agenda/browser/templates/agendadiariaview.pt

@@ -13,8 +13,7 @@
     </metal:slot>
     <metal:block fill-slot="content-core">
       <div class="dados-agenda"
-           tal:attributes="data-url view/agenda/absolute_url;
-                           data-editable view/editable">
+           tal:attributes="data-url view/agenda/absolute_url">
         <div class="calendar"></div>
         <span metal:use-macro="context/@@agenda-macros/daypicker" />
         <span metal:use-macro="context/@@agenda-macros/search" />

src/brasil/gov/agenda/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>4102</version>
+  <version>4103</version>
   <dependencies>
     <dependency>profile-collective.cover:default</dependency>
     <dependency>profile-plone.app.dexterity:default</dependency>

src/brasil/gov/agenda/tests/test_setup.py

@@ -40,7 +40,7 @@ def test_installed(self):
 
     def test_version(self):
         self.assertEqual(
-            self.st.getLastVersionForProfile(self.profile), (u'4102',))
+            self.st.getLastVersionForProfile(self.profile), (u'4103',))
 
     def test_css_registered(self):
         cssreg = getattr(self.portal, 'portal_css')

src/brasil/gov/agenda/tests/test_upgrades.py

@@ -129,3 +129,14 @@ def test_uninstall_dependency(self):
         self.assertIsNotNone(step)
 
         self.execute_upgrade_step(step)
+
+
+class to4103TestCase(UpgradeTestCaseBase):
+
+    def setUp(self):
+        UpgradeTestCaseBase.setUp(self, u'4102', u'4103')
+
+    def test_registrations(self):
+        version = self.setup.getLastVersionForProfile(self.profile_id)[0]
+        self.assertGreaterEqual(int(version), int(self.to_version))
+        self.assertEqual(self.total_steps, 2)

src/brasil/gov/agenda/tiles/agenda.pt

@@ -101,7 +101,7 @@
                     </div>
                   </tal:page>
                   <div class="swiper-slide no-events"
-                       i18n:translate="label_agendadiaria_sem_compromissos"
+                       i18n:translate=""
                        tal:condition="not:view/agenda_diaria">
                     Sem compromissos oficiais.
                   </div>

src/brasil/gov/agenda/tiles/agenda.py

@@ -82,6 +82,13 @@ class AgendaTile(PersistentCoverTile, AgendaMixin):
     limit = 1
     page_size = 3  # items by swiper slide
 
+    def __init__(self, context, request):
+        super(AgendaTile, self).__init__(context, request)
+        self.setup()
+
+    def setup(self):
+        self.date = datetime.now()
+
     def populate_with_object(self, obj):
         super(AgendaTile, self).populate_with_object(obj)  # check permissions
 

src/brasil/gov/agenda/upgrades/configure.zcml

@@ -2,4 +2,5 @@
   <include package=".v4100" />
   <include package=".v4101" />
   <include package=".v4102" />
+  <include package=".v4103" />
 </configure>

src/brasil/gov/agenda/upgrades/v4103/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

src/brasil/gov/agenda/upgrades/v4103/configure.zcml

@@ -0,0 +1,23 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:genericsetup="http://namespaces.zope.org/genericsetup">
+
+  <genericsetup:upgradeSteps
+      source="4102"
+      destination="4103"
+      profile="brasil.gov.agenda:default">
+
+    <genericsetup:upgradeStep
+        title="Cook CSS resources"
+        description="There were changes in the CSS files, so we need to cook the resources."
+        handler="..cook_css_resources"
+        />
+    <genericsetup:upgradeStep
+        title="Cook JS resources"
+        description="There were changes in the JS files, so we need to cook the resources."
+        handler="..cook_javascript_resources"
+        />
+
+  </genericsetup:upgradeSteps>
+
+</configure>

webpack/app/js/agenda.js

@@ -7,88 +7,39 @@ let zfill = (number, size=2) => (Array(size).fill('0').join('') + number).slice(
 export default class AgendaView {
   constructor(container) {
     this.container = container;
-    this.datepicker = new DatePicker(container, this.onDateChange.bind(this), true);
+    this.datepicker = new DatePicker(container);
     this.$appointments = this.$('.list-compromissos');
-    this.editable = container.dataset.editable === 'True';
+    this.bindEvents();
   }
   $(selector) {
     return $(selector, this.container.parentElement);
   }
-  extractTime(dateTime) {
-    let [, time] = dateTime.split('T');
-    let [hours, minutes, ] = time.split(':');
-    return `${zfill(hours)}h${zfill(minutes)}`;
-  }
-  onDateChange(agendaDiaria) {
-    let $item, $edit;
-    this.$appointments.html('');
-    this.$('.portalMessage.info').html(agendaDiaria.update);
-    if (agendaDiaria.hasAppointment === false) {
-      this.$appointments.append(`
-        <li class="sem-compromisso item-compromisso">
-          <span>Atualmente não existem compromissos agendados.</span>
-        </li>
-      `);
-      return;
-    }
-    for (let compromisso of agendaDiaria.items) {
-      $item = $(`
-        <li class="item-compromisso-wrapper">
-          <div class="item-compromisso">
-            <div class="compromisso-horarios">
-              <time class="horario compromisso-inicio"
-                    datetime="${compromisso.datetime}">
-                ${compromisso.start}
-              </time>
-            </div>
-            <div class="compromisso-dados">
-              <h4 class="compromisso-titulo">${compromisso.title}</h4>` +
-              (compromisso.location == null? '': `<p class="compromisso-local">${compromisso.location}</p>`) +
-              `<span class="download-compromisso">
-                <a class="add-agenda vcal" href="${compromisso.href}/vcal_view">VCAL</a>
-                <span>Adicionar ao meu calendário</span>
-              </span>
-            </div>
-          </div>
-        </li>
-      `);
-      if (this.editable) {
-        $edit = $(`
-          <ul class="compromisso-acoes">
-            <li class="compromisso-acao">
-              <a class="compromisso editar_compromisso acao" href="${compromisso.href}/edit">Editar</a>
-            </li>
-            <li class="compromisso-acao">
-              <a class="compromisso remover_compromisso acao" href="${compromisso.href}/delete_confirmation">Remover</a>
-            </li>
-          </ul>
-        `);
-        $('.editar_compromisso', $edit).prepOverlay({
-          subtype: 'ajax',
-          filter: common_content_filter,
-          formselector: '#form',
-          cssclass: 'overlay-compromisso',
-          noform: function(el) {return $.plonepopups.noformerrorshow(el, 'redirect');},
-          redirect: location.href,
-          closeselector: '[name="form.buttons.cancel"]',
-          width:'50%'
-        });
-        $('.remover_compromisso', $edit).prepOverlay({
-          subtype: 'ajax',
-          filter: common_content_filter,
-          formselector: '#delete_confirmation',
-          cssclass: 'overlay-compromisso',
-          noform: function(el) {return $.plonepopups.noformerrorshow(el, 'redirect');},
-          redirect: location.href,
-          closeselector: '[name="form.button.Cancel"]',
-          width:'50%'
-        });
-        $('.item-compromisso', $item).append($edit);
-      }
-      if (compromisso.isNow) {
-        $('.compromisso-horarios', $item).append('<div class="now">Agora</div>');
-      }
-      this.$appointments.append($item);
-    }
+  /**
+   * Create overlays
+   * Create overlays when edit and remove appointments
+   **/
+  bindEvents(){
+    // overlay when edit appointment
+    this.$('.editar_compromisso').prepOverlay({
+      subtype: 'ajax',
+      filter: common_content_filter,
+      formselector: '#form',
+      cssclass: 'overlay-compromisso',
+      noform: function(el) {return $.plonepopups.noformerrorshow(el, 'redirect');},
+      redirect: location.href,
+      closeselector: '[name="form.buttons.cancel"]',
+      width:'50%'
+    });
+    // overlay when delete appointment
+    this.$('.remover_compromisso').prepOverlay({
+      subtype: 'ajax',
+      filter: common_content_filter,
+      formselector: '#delete_confirmation',
+      cssclass: 'overlay-compromisso',
+      noform: function(el) {return $.plonepopups.noformerrorshow(el, 'redirect');},
+      redirect: location.href,
+      closeselector: '[name="form.button.Cancel"]',
+      width:'50%'
+    });
   }
 }