0003-wcs-add-pagination-for-list-of-cards-68037.patch

Lauréline Guérin, 09 août 2022 15:33

Voir les différences: en ligne côte à côte

Subject: [PATCH 3/5] wcs: add pagination for list of cards (#68037)

 combo/apps/wcs/forms.py                       |  1 +
 combo/apps/wcs/models.py                      |  2 +-
 combo/public/static/js/combo.public.js        | 68 ++++++++++++-------
 combo/public/templates/combo/pagination.html  |  3 +-
 combo/public/templates/combo/placeholder.html |  3 +
 combo/public/templatetags/combo.py            |  1 +
 tests/test_wcs.py                             |  9 +++
 7 files changed, 60 insertions(+), 27 deletions(-)

combo/apps/wcs/forms.py
86	86	'carddef_reference',
87	87	'related_card_path',
88	88	'card_ids',
	89	'limit',
89	90	'only_for_user',
90	91	'custom_schema',
91	92	)

         @property
         def css_class_names(self):
             return '%s card' % super().css_class_names
             return '%s card %s' % (super().css_class_names, self.get_reference())
         def get_cell_extra_context(self, context):
             extra_context = super().get_cell_extra_context(context)

         return false;
       });
       // pagination in cells with list of items
       $(document).on('combo:cell-loaded', function(ev, cell) {
         var $pagination = $(cell).find('.cell-items-pagination');
         if ($pagination.length == 0) return;
         var page_index = 0;
       function pagination_update_page(items, max_page_index, step, paginate_by, $pagination) {
         var page_index = $pagination.data('page_index') + step;
         if (page_index == 0) {
           $pagination.find('.cell-items-pagination-prev').prop('disabled', true);
         } else {
           $pagination.find('.cell-items-pagination-prev').prop('disabled', null);
+        }
         if (page_index == max_page_index - 1) {
           $pagination.find('.cell-items-pagination-next').prop('disabled', true);
         } else {
           $pagination.find('.cell-items-pagination-next').prop('disabled', null);
+        }
         start_item = paginate_by * page_index;
         items.hide();
         items.slice(start_item, start_item + paginate_by).show();
         $pagination.data('page_index', page_index);
       };
       function paginate($pagination, items) {
         $pagination.data('page_index', 0);
         var paginate_by = parseInt($pagination.data('paginate-by'));
         // Get all <li> inside the same div as us, ignoring whether they are part of
         // different <ul>
         var items = $pagination.parent().find('li');
         var max_page_index = Math.ceil(items.length / paginate_by);
         if (items.length <= paginate_by) {
           return;
+        }
         function update_page(step) {
           page_index = page_index + step;
           if (page_index == 0) {
             $pagination.find('.cell-items-pagination-prev').prop('disabled', true);
           } else {
             $pagination.find('.cell-items-pagination-prev').prop('disabled', null);
+          }
           if (page_index == max_page_index - 1) {
             $pagination.find('.cell-items-pagination-next').prop('disabled', true);
           } else {
             $pagination.find('.cell-items-pagination-next').prop('disabled', null);
+          }
           start_item = paginate_by * page_index;
           items.hide();
           items.slice(start_item, start_item + paginate_by).show();
         };
           pagination_update_page(items, max_page_index, step, paginate_by, $pagination);
+        }
         $pagination.find('.cell-items-pagination-prev').click(function() { update_page(-1); });
         $pagination.find('.cell-items-pagination-next').click(function() { update_page(1); });
         update_page(0);
         $pagination.prop('hidden', null);
       };
       function paginate_cards($pagination) {
         var items = $pagination.parent().find('.card.' + $pagination.data('cell-reference'));
         paginate($pagination, items);
       };
       // pagination for cells with list of items or for card cells
       $(document).on('combo:cell-loaded', function(ev, cell) {
         var $pagination = $(cell).find('.cell-items-pagination');
         if ($pagination.length == 0) return;
         // Get all <li> inside the same div as us, ignoring whether they are part of
         // different <ul>
         var items = $pagination.parent().find('li');
         paginate($pagination, items);
       });
       $('.cell-items-pagination').each(function(idx, elem) {
         $(document).trigger('combo:cell-loaded', $(elem).parents('.cell').first());
         var $cells = $(elem).parents('.cell');
         if ($cells.length) {
           $(document).trigger('combo:cell-loaded', $cells.first());
         } else if ($(elem).data('cell-reference')) {
           paginate_cards($(elem));
+        }
       });
     });

combo/public/templates/combo/pagination.html
1		{% load static %}
2		<div class="cell-items-pagination" data-paginate-by="{{ paginate_by\|default:10 }}" hidden>
	1	<div class="cell-items-pagination"{% if data_cell_reference %} data-cell-reference="{{ data_cell_reference }}"{% endif %} data-paginate-by="{{ paginate_by\|default:10 }}" hidden>
3	2	<button class="cell-items-pagination-prev" disabled>←</a>
4	3	<button class="cell-items-pagination-next" disabled>→</a>
5	4	</div>

          {% if extra_context %}data-extra-context="{{ extra_context|signed|urlencode }}"{% endif %}
          {% endwith %}
          ><div>{% render_cell cell %}</div></div>
     {% if cell.include_pagination %}
     {% include "combo/pagination.html" with paginate_by=cell.limit data_cell_reference=cell.get_reference %}
     {% endif %}
     {% endfor %}
     {% if placeholder_options.fx_grid_layout %}</div>{% endif %}
     {% if outer_tag %}</{{outer_tag|default:"div"}}>{% endif %}

combo/public/templatetags/combo.py
127	127	for i in range(repeat):
128	128	new_cell = copy.copy(cell)
129	129	new_cell.repeat_index = i
	130	new_cell.include_pagination = bool(i + 1 == repeat)
130	131	repeated_cells.append(new_cell)
131	132	context['cells'][cell_idx:cell_idx] = repeated_cells
132	133

         assert len(resp.context['cells']) == 3
         for i in range(0, 3):
             assert '<h2>Foo bar X%sY</h2>' % i in resp
         assert 'data-paginate-by="10"' in resp
         cell.limit = 42
         cell.save()
         resp = app.get(page.get_online_url())
         assert len(resp.context['cells']) == 3
         for i in range(0, 3):
             assert '<h2>Foo bar X%sY</h2>' % i in resp
         assert 'data-paginate-by="42"' in resp
         # using custom view
         cell.carddef_reference = 'default:card_model_1:foo'
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0003-wcs-add-pagination-for-list-of-cards-68037.patch