diff --git a/memopol/views.py b/memopol/views.py index ff734b4fd4990406df2ee91db309d1c75a379c56..a3f1e8da23544e01d6197cf2c6e041d2232ab944 100644 --- a/memopol/views.py +++ b/memopol/views.py @@ -88,4 +88,4 @@ class DossierList(PaginationMixin, representatives_votes_views.DossierList): 'proposals__recommendation' ).annotate( nb_recomm=Count('proposals__recommendation') - ).order_by('-reference') + ).order_by('-nb_recomm', '-reference') diff --git a/templates/representatives_votes/dossier_detail.haml b/templates/representatives_votes/dossier_detail.haml index 2237b973bd3bd0fd7d9cf25059e472cee5d32f6b..6723a1647366a32440a4bd9509e930283d2efd85 100644 --- a/templates/representatives_votes/dossier_detail.haml +++ b/templates/representatives_votes/dossier_detail.haml @@ -1,32 +1,43 @@ - extends "base.html" +- load i18n +- load representatives_votes_tags + - block content - %h2= dossier.name - %h3= dossier.title + %h1 {{ dossier.name }} {{ dossier.title }} %p <strong>{{ dossier.reference }}</strong> - %h3 Votes ({{dossier.proposals.count}}) - - for proposal in dossier.proposals.all - %h4 - {{ forloop.counter }}. - {{ proposal.recommendation.title }} - - {{ proposal.datetime }} - - {{ proposal.status }} - %p - {{ proposal.title }} - %small - {{ proposal.reference }} - {{ proposal.kind }} - {{ proposal.recommendation.description }} - %p - %h5 - For : {{ proposal.total_for }} - %h5 - Against : {{ proposal.total_against }} - %h5 - Abstain : {{ proposal.total_abstain }} - %p - Participants : {{ proposal.representatives.count }} - + %h2 + - trans "Recommendations" + + %table.table + %tr + %th + - trans "Proposal" + %th + - trans "Title" + %th + - trans "Recommendation" + %th + - trans "Status" + %th= "for" | position_icon + %th= "against" | position_icon + %th= "abstain" | position_icon + + - for proposal in dossier.proposals.all + %tr + %td + = proposal.title + %br + %small + {{ proposal.reference }} + {{ proposal.kind }} + %td= proposal.recommendation.title + %td= proposal.recommendation.position | position_icon + %td= proposal.status + %td= proposal.total_for + %td= proposal.total_against + %td= proposal.total_abstain +