- {% for member in committee_members %}
+ {% for member in committee_members.members %}
@@ -41,7 +41,7 @@
diff --git a/mps_site/views.py b/mps_site/views.py
index 8f5c1a4..7cf3cc3 100644
--- a/mps_site/views.py
+++ b/mps_site/views.py
@@ -11,6 +11,7 @@
from .data.dcufm import *
from .data.dcutv import *
from .data.thecollegeview import *
+from .data.committee import *
def index(request):
video = get_latest_video_id("https://www.youtube.com/feeds/videos.xml?channel_id=UCEnLsvcq1eFkSFFAIqBDgUw")
@@ -36,9 +37,7 @@ def tcv(request):
posts = tcv_posts("https://thecollegeview.ie/wp-json/wp/v2/posts?per_page=10&orderby=date&_fields=id,date,title,content,link,author,featured_media")
news = tcv_posts("https://thecollegeview.ie/wp-json/wp/v2/posts?per_page=3&orderby=date&categories=4&_fields=id,date,title,content,link,author,featured_media")
sport = tcv_posts("https://thecollegeview.ie/wp-json/wp/v2/posts?per_page=3&orderby=date&categories=7&_fields=id,date,title,content,link,author,featured_media")
- editors1 = CommitteeMember.objects.filter(position="Editor in Chief")
- editors2 = CommitteeMember.objects.filter(position="Webmaster")
- editors = editors1 | editors2
+ editors = [member for member in committee_list["members"] if member["position"] == "Editor in-Chief" or member["position"] == "Deputy Editor in-Chief"]
return render(request, 'thecollegeview.html', {'page_name': 'The College View', 'posts': posts, 'news': news, 'sport': sport, 'family_tree' : tcv_family_tree, 'editors': editors})
def committee(request):
@@ -46,7 +45,8 @@ def committee(request):
return render(request, 'committee.html',
{'page_name': 'Committee',
'committee_members': committee_members,
- 'committee_video_id': 'TqaiFaxgg0g'})
+ 'committee_list': committee_list,
+ 'committee_video_id': '1wiscXP9nw0'})
def committee_history(request):
committee_history = CommitteeHistory.objects.all()
@@ -65,15 +65,16 @@ def contact(request):
{'page_name': 'Contact'})
def dcutv(request):
+ tv_managers = [member for member in committee_list["members"] if member["position"] == "TV Manager"]
return render(request, 'dcutv.html',
{'page_name': 'DCUtv',
'tv_thursday' : 'RON9_ByY190',
'latest_video_id' : get_latest_video_id("https://www.youtube.com/feeds/videos.xml?channel_id=UCEnLsvcq1eFkSFFAIqBDgUw"),
'most_recent_videos': get_latest_video_ids("https://www.youtube.com/feeds/videos.xml?channel_id=UCEnLsvcq1eFkSFFAIqBDgUw"),
- 'tv_managers': CommitteeMember.objects.filter(position="TV Manager"),
+ 'tv_managers': tv_managers,
'dcutv_carousel': dcutv_carousel,
'stats_data': dcutv_stats_data,
- 'committee_video_id': 'TqaiFaxgg0g',})
+ 'committee_video_id': '1wiscXP9nw0',})
def gallery(request):
gallery_page_info = GalleryPage.objects.all().first()
@@ -83,7 +84,7 @@ def gallery(request):
def dcufm(request):
previous, current, next_show = get_date_time()
family_tree = DCUfmFamilyTree.objects.all()
- fm_managers = CommitteeMember.objects.filter(position="FM Manager")
+ fm_managers = [member for member in committee_list["members"] if member["position"] == "FM Manager"]
return render(request, 'dcufm.html',
{'page_name': 'DCUfm',
'previous_show': previous,
- 
+
At the heart of Dublin City University, we are DCUfm, the hub of student
{% include 'components/carousel.html' with images=dcufm_carousel %}
-{% include 'components/about_section.html' with title="About DCUfm" names="FM Managers: Caoimhe & Matthew" %}
+{% include 'components/about_section.html' with title="About DCUfm" names="FM Managers: Lauren & Eoin" %}
{% include 'components/managers.html' with title="Meet The FM Managers" subtitle="The team behind everything radio!" managers=fm_managers %}
diff --git a/mps_site/templates/dcutv.html b/mps_site/templates/dcutv.html
index 29ee51b..d92ae69 100644
--- a/mps_site/templates/dcutv.html
+++ b/mps_site/templates/dcutv.html
@@ -22,7 +22,7 @@