Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Anthony
memopol
Commits
4ae5ac4c
Commit
4ae5ac4c
authored
Jul 05, 2016
by
Nicolas Joyard
Browse files
Add 'no recommendation' label to dossier detail and #proposals to dossier list
parent
2f172532
Changes
4
Show whitespace changes
Inline
Side-by-side
memopol/views/dossier_list.py
View file @
4ae5ac4c
...
...
@@ -17,6 +17,7 @@ class DossierList(PaginationMixin, generic.ListView):
'proposals'
,
'proposals__recommendation'
).
annotate
(
nb_proposals
=
Count
(
'proposals'
),
nb_recomm
=
Count
(
'proposals__recommendation'
)
).
order_by
(
'-nb_recomm'
,
'-reference'
)
...
...
static/scss/table.scss
View file @
4ae5ac4c
...
...
@@ -18,3 +18,8 @@ table.detail-view {
.grid-list-selector
{
// text-align: right;
}
.no-recommendation
{
font-style
:
italic
;
text-align
:
center
;
}
\ No newline at end of file
templates/representatives_votes/dossier_detail.haml
View file @
4ae5ac4c
...
...
@@ -34,8 +34,15 @@
%small
{{ proposal.reference }}
{{ proposal.kind }}
-
if
proposal
.
recommendation
%td
=
proposal
.
recommendation
.
title
%td
=
proposal
.
recommendation
.
recommendation
|
position_icon
-
else
%td
.no-recommendation
{
colspan
:
2
}=
"No recommendation"
%td
=
proposal
.
status
%td
=
proposal
.
total_for
%td
=
proposal
.
total_against
...
...
templates/representatives_votes/dossier_list.haml
View file @
4ae5ac4c
...
...
@@ -29,6 +29,8 @@
-
trans
"Title"
%th
-
trans
"Recommendations"
%th
-
trans
"Proposals"
%th
-
trans
"Reference"
...
...
@@ -38,6 +40,7 @@
%a
{
'href'
:
"{% url 'dossier-detail' dossier.pk %}"
}
{{ dossier.title }}
%td
=
dossier
.
nb_recomm
%td
=
dossier
.
nb_proposals
%td
=
dossier
.
reference
-
include
"core/blocks/pagination.html"
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment