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

Add permalinks for announcements #1054

Merged
merged 2 commits into from
Aug 11, 2019
Merged

Add permalinks for announcements #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea7c2dd
Add permalinks for announcements
subins2000 Aug 10, 2019
a175be5
Fix pinned items not showing up in filter tags
subins2000 Aug 10, 2019
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
1 change: 1 addition & 0 deletions mainapp/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
path('find_people/', views.find_people, name='find_people'),
path('missing_persons/', views.missing_persons, name='missing_persons'),
path('announcements/', views.announcements, name="Announcements"),
path('announcements/<int:id>', views.announcements_id, name="announcements_id"),
path('announcements/<str:filter_>', views.announcements_filter, name="announcements_filter"),
path('camp_requirements/', views.camp_requirements_list, name='camp_requirements_list'),
path('submission_success/', views.SubmissionSuccess.as_view(), name='submission_success'),
Expand Down
14 changes: 12 additions & 2 deletions mainapp/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,10 +795,20 @@ def announcements(request):
return render(request, 'announcements.html', {'filter': filter, "data" : link_data,
'pinned_data': pinned_data, 'hashtags':hashtags})



def announcements_id(request,id):
link_data = Announcements.objects.filter(id=id).all()

hashtags = get_hashtags(Announcements)
paginator = Paginator(link_data, 10)
page = request.GET.get('page')
link_data = paginator.get_page(page)
return render(request, 'announcements.html', {"data" : link_data, 'hashtags':hashtags, 'id': id})


# Function to filter announcements based on hashtag
def announcements_filter(request,filter_):
link_data = Announcements.objects.filter(is_pinned=False,hashtags__icontains=filter_).order_by('-id').all()
link_data = Announcements.objects.filter(hashtags__icontains=filter_).order_by('-id').all()
# Uncomment next line if you want to show pinned data in filtered view and add pinned data in render JSON
# pinned_data = Announcements.objects.filter(is_pinned=True).order_by('-id').all()[:5]

Expand Down
51 changes: 31 additions & 20 deletions templates/announcements.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@
</nav>

<div class="container text-center">
<h2 class="main-logo">Important Announcements</h2>
{% if id %}
<h2 class="main-logo">Announcement {{ id }}</h2>
{% else %}
<h2 class="main-logo">Important Announcements</h2>
{% endif %}
<div class="announcement-cards">
{% if not id %}
<div class="card">
<span class="card-text">Tags<a href="{% url 'Announcements' %}" class="btn btn-info btn-xs pull-right" role="button">Clear Filters</a></span>

Expand All @@ -26,15 +31,15 @@ <h2 class="main-logo">Important Announcements</h2>
</span>

{% endfor %}

</div>
{% endif %}
{% for req in pinned_data %}
<div class="card priority-very-important">
<span class="card-text">
{{ req.description | safe | urlize | linebreaks }}<br/>
</span>
<span class="card-priority">Very Important</span><br/>
<span class="card-time">{% bootstrap_icon "time" %} {{ req.dateadded }}</span>
<span class="card-time">{% bootstrap_icon "time" %}&nbsp;<a href="{% url 'announcements_id' req.id %}">{{ req.dateadded }}</a></span>
</div>
{% endfor %}

Expand All @@ -44,7 +49,7 @@ <h2 class="main-logo">Important Announcements</h2>

{% for req in data %}
<div class="card priority-{{ req.get_priority_display.lower }}">
<span class="card-title">{% bootstrap_icon "time" %} {{ req.dateadded }}&nbsp;<b title="Priority" class="card-priority">{{ req.get_priority_display.upper }} priority</b></span><br/><br/>
<span class="card-title">{% bootstrap_icon "time" %}&nbsp;<a href="{% url 'announcements_id' req.id %}">{{ req.dateadded }}</a>&nbsp;<b title="Priority" class="card-priority">{{ req.get_priority_display.upper }} priority</b></span><br/><br/>
<span class="card-text">
{{ req.description | safe | urlize }}<br/>
{% if req.image %}
Expand All @@ -56,7 +61,7 @@ <h2 class="main-logo">Important Announcements</h2>
class="btn btn-default card-link">{% bootstrap_icon "download" %} Download</a>
{% endif %}
</span>
<span class="card-time">{% bootstrap_icon "time" %} {{ req.dateadded }}</span>
<span class="card-time">{% bootstrap_icon "time" %}&nbsp;<a href="{% url 'announcements_id' req.id %}">{{ req.dateadded }}</a></span>


{% with req.hashtags|get_list as hashtags_ %}
Expand All @@ -72,21 +77,27 @@ <h2 class="main-logo">Important Announcements</h2>
{% endfor %}
</div>

<div class="pagination">
<span class="step-links">
{% if data.has_previous %}
<a href="?page=1">&laquo; first</a>
<a href="?page={{ data.previous_page_number }}">previous</a>
{% endif %} {% for i in data.paginator.page_range %} {% if data.number == i %}
<a class="active"><span>{{ i }} <span class="sr-only">(current)</span></span></a>
{% else %}
<a href="?page={{ i }}">{{ i }}</a>
{% endif %} {% endfor %} {% if data.has_next %}
<a href="?page={{ data.next_page_number }}">next</a>
<a href="?page={{ data.paginator.num_pages }}">last &raquo;</a>
{% endif %}
</span>
</div>
{% if id %}
<div>
<a href="{% url 'Announcements' %}" class="btn btn-primary">See All Announcements</a>
</div>
{% else %}
<div class="pagination">
<span class="step-links">
{% if data.has_previous %}
<a href="?page=1">&laquo; first</a>
<a href="?page={{ data.previous_page_number }}">previous</a>
{% endif %} {% for i in data.paginator.page_range %} {% if data.number == i %}
<a class="active"><span>{{ i }} <span class="sr-only">(current)</span></span></a>
{% else %}
<a href="?page={{ i }}">{{ i }}</a>
{% endif %} {% endfor %} {% if data.has_next %}
<a href="?page={{ data.next_page_number }}">next</a>
<a href="?page={{ data.paginator.num_pages }}">last &raquo;</a>
{% endif %}
</span>
</div>
{% endif %}
</div>


Expand Down