Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swaps 7th parliament with 6th and fixes a alignment issue on mesages … #237

Merged
merged 2 commits into from
Nov 6, 2024
Merged

Swaps 7th parliament with 6th and fixes a alignment issue on mesages … #237

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6289a60
Swaps 7th parliament with 6th and fixes a alignment issue on mesages …
desafinadude Nov 5, 2024
5e28483
typo fix
desafinadude Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pombola/south_africa/templates/core/person_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ <h3 class="mp-block__title">Former positions:</h3>
</div>
<div class="webf-container" style="padding-top: 3em;">
<h2 class="mp-subheading">Public messages sent to this politician</h2>
<div id="messages">
<div id="messages" class="w-100">
<p>Fetching the latest messages to {{ object.name }} …</p>
</div>
</div>
Expand Down
4 changes: 4 additions & 0 deletions pombola/south_africa/views/person.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,10 @@ def get_attendance_stats(self, attendance_by_year):
}
)

# 2024 is split for 6th and 7th parliament. This puth 7th parliament before 6th in the list.
desafinadude marked this conversation as resolved.
Show resolved Hide resolved
if return_data[0]['year'] == '2024 (6th Parliament)':
return_data.insert(1, return_data.pop(0))

return return_data

def get_attendance_data_for_display(self):
Expand Down
2 changes: 2 additions & 0 deletions pombola/writeinpublic/templates/writeinpublic/messages.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@ <h3>
</div>
</div>
{% empty %}
<div class="col-12">
<div class="mp-item">
<p class="item-text">No messages!</p>
</div>
</div>
{% endfor %}
</div>
<div class="mp-col is--footer">
Expand Down
Loading