Projet

Général

Profil

0006-pricing-split-agenda-pricing-list-67675.patch

Lauréline Guérin, 29 juillet 2022 21:57

Télécharger (2,7 ko)

Voir les différences: 

Subject: [PATCH 06/14] pricing: split agenda pricing list (#67675)


 .../pricing/manager_agenda_pricing_list.html  | 19 +++++++++++++++++--
 lingo/pricing/views.py                        |  6 +++++-
 2 files changed, 22 insertions(+), 3 deletions(-)
lingo/pricing/templates/lingo/pricing/manager_agenda_pricing_list.html
19 19 
</div>
20 20 
{% if object_list %}
21 21 
<div>
22 
  <h3>{% trans "Pricings" context 'agenda pricing' %}</h3>
22 23 
  <ul class="objects-list single-links">
23 
    {% for object in object_list %}
24 
    {% for object in object_list %}{% if not object.flat_fee_schedule %}
24 25 
    <li>
25 26 
      <a href="{% url 'lingo-manager-agenda-pricing-detail' pk=object.pk %}">
26 27 
        {{ object }}
......
30 31 
      </a>
31 32 
      <a href="{% url 'lingo-manager-pricing-detail' object.pricing.pk %}" class="link-action-icon link">{% trans "see" %}</a>
32 33 
    </li>
33 
    {% endfor %}
34 
    {% endif %}{% endfor %}
35 
  </ul>
36 
  <h3>{% trans "Flat fee schedule pricings" %}</h3>
37 
  <ul class="objects-list single-links">
38 
    {% for object in object_list %}{% if object.flat_fee_schedule %}
39 
    <li>
40 
      <a href="{% url 'lingo-manager-agenda-pricing-detail' pk=object.pk %}">
41 
        {{ object }}
42 
        ({{ object.pricing }}
43 
        - {% blocktrans with start=object.date_start|date:'d/m/Y' end=object.date_end|date:'d/m/Y' %}From {{ start }} to {{ end }}{% endblocktrans %})
44 
        <span class="extra-info"> [{% trans "identifier:" %} {{ object.slug }}]</span>
45 
      </a>
46 
      <a href="{% url 'lingo-manager-pricing-detail' object.pricing.pk %}" class="link-action-icon link">{% trans "see" %}</a>
47 
    </li>
48 
    {% endif %}{% endfor %}
34 49 
  </ul>
35 50 
</div>
36 51 
{% else %}
lingo/pricing/views.py
744 744 
    model = AgendaPricing
745 745 

  		




  746
  746
  
    
    def get_queryset(self):

  		




  747
  
  
    
        return AgendaPricing.objects.all().select_related('pricing').order_by('date_start', 'date_end')

  		




  
  747
  
    
        return (

  		




  
  748
  
    
            AgendaPricing.objects.all()

  		




  
  749
  
    
            .select_related('pricing')

  		




  
  750
  
    
            .order_by('flat_fee_schedule', 'date_start', 'date_end')

  		




  
  751
  
    
        )

  		




  748
  752
  
    

  		




  749
  753
  
    

  		




  750
  754
  
    
agenda_pricing_list = AgendaPricingListView.as_view()

  		




  751
  
  
    
-