Skip to content

Commit

Permalink
Corrige mensagem de agenda vazia quando não existem compromissos
Browse files Browse the repository at this point in the history
  • Loading branch information
rodfersou committed Jun 19, 2018
1 parent a845c4e commit 35d99a0
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 13 deletions.
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ Changelog
Esta versão também remove a dependência no collective.portlet.calendar.
Remova manualmente todos os portlets de calendario estendido e desinstale o pacote antes de atualizar.

- Corrige mensagem de agenda vazia quando não existem compromissos.
[rodfersou]

- Corrige a busca de compromissos na agenda.
[hvelarde]

Expand Down
2 changes: 1 addition & 1 deletion src/brasil/gov/agenda/tiles/agenda.pt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="agenda-tile tile-content"
tal:attributes="id string:agenda-$tile_id;
class python: 'agenda-tile tile-content' + (' has-image' if view.has_image else '');
data-url view/agenda_url">
data-url view/agenda_url"
tal:condition="not:is_empty">
<tal:image condition="view/has_image">
<img class="agenda-image"
Expand Down
2 changes: 1 addition & 1 deletion webpack/app/js/agenda.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default class AgendaView {
}
onDateChange(agendaDiaria) {
this.$appointments.html('');
if (agendaDiaria.hasAppointments === false) {
if (agendaDiaria.hasAppointment === false) {
this.$appointments.append(`
<li class="sem-compromisso item-compromisso">
<span>Atualmente não existem compromissos agendados.</span>
Expand Down
22 changes: 11 additions & 11 deletions webpack/app/js/tile.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ export default class AgendaTile {
}
onDateChange(agendaDiaria) {
this.swiper.removeAllSlides();
this._$slide = $('<div class="swiper-slide"></div>');
if (agendaDiaria.hasAppointments === false) {
this._$slide.addClass('no-events');
this._$slide.html('Sem compromissos oficiais.');
this.swiper.appendSlide(this._$slide);
let $slide = $('<div class="swiper-slide"></div>');
if (agendaDiaria.hasAppointment === false) {
$slide.addClass('no-events');
$slide.html('Sem compromissos oficiais.');
this.swiper.appendSlide($slide);
return;
}
for (let compromisso of agendaDiaria.items) {
if (this._$slide.children().length === this.pageSize) {
this.swiper.appendSlide(this._$slide);
this._$slide = $('<div class="swiper-slide"></div>');
if ($slide.children().length === this.pageSize) {
this.swiper.appendSlide($slide);
$slide = $('<div class="swiper-slide"></div>');
}
let $item = $(`
<div class="collection-events-item">
Expand All @@ -51,10 +51,10 @@ export default class AgendaTile {
$('.timestamp-cell', $item).addClass('is-now');
$('.timestamp-cell', $item).append('<div class="now">Agora</div>')
}
this._$slide.append($item);
$slide.append($item);
}
if (this._$slide.children().length > 0) {
this.swiper.appendSlide(this._$slide);
if ($slide.children().length > 0) {
this.swiper.appendSlide($slide);
}
}
initSwiper() {
Expand Down

0 comments on commit 35d99a0

Please sign in to comment.