From 30f09ae04adb35d1613a5ae7e9866e0b96a59cbe Mon Sep 17 00:00:00 2001
From: Zorex <zorexsalvo@gmail.com>
Date: Fri, 21 Oct 2022 11:53:57 +0800
Subject: [PATCH] Update our_team.html template

---
 landing/templates/landing/our_team.html | 87 ++-----------------------
 organisation/admin.py                   |  8 ++-
 2 files changed, 13 insertions(+), 82 deletions(-)

diff --git a/landing/templates/landing/our_team.html b/landing/templates/landing/our_team.html
index 74f87ed..269a9a7 100644
--- a/landing/templates/landing/our_team.html
+++ b/landing/templates/landing/our_team.html
@@ -217,101 +217,26 @@
             aria-labelledby="volunteers-tab"
           >
             <div class="w-full md:flex justify-center">
+              {% for commitee in commitees %}
               <div class="text-center md:w-1/3">
                 <h3
                   class="text-yellow text-20 font-montserrat mb-9 md:mb-16"
                   data-aos="py-slide"
                   data-aos-delay="600"
                 >
-                  Meetup / Events
+                  {{ commitee.name }}
                 </h3>
                 <ul
                   class="text-18 mb-26 md:mb-60 list-none"
                   data-aos="py-slide"
                   data-aos-delay="700"
                 >
-                <li>Vanessa Bermudez</li>
-                <li>Freilla Mae Espinola</li>
-                <li>Janine Bagares</li>
-                <li>Jay Mendez</li>
-                </ul>
-              </div>
-              <div class="text-center md:w-1/3">
-                <h3
-                  class="text-yellow text-20 font-montserrat mb-9 md:mb-16"
-                  data-aos="py-slide"
-                  data-aos-delay="600"
-                >
-                  Marketing
-                </h3>
-                <ul
-                  class="text-18 mb-26 md:mb-60 list-none"
-                  data-aos="py-slide"
-                  data-aos-delay="700"
-                >
-                <li>Angelica Lapastora</li>
-                <li>Carl John Viñas</li>
-                <li>Aira Joan Alonzo</li>
-                </ul>
-              </div>
-              <div class="text-center md:w-1/3">
-                <h3
-                  class="text-yellow text-20 font-montserrat text-center mb-9 md:mb-16"
-                  data-aos="py-slide"
-                  data-aos-delay="800"
-                >
-                  Public Training
-                </h3>
-                <ul
-                  class="mb-60 list-none text-18"
-                  data-aos="py-slide"
-                  data-aos-delay="900"
-                >
-                  <li>Ryan Ermita</li>
-                  <li>Sony Valdez</li>
-                  <li>Ariel Conde</li>
-                  <li>Jeff Paredes</li>
-                </ul>
-              </div>
-              <div class="text-center md:w-1/3">
-                <h3
-                  class="text-yellow text-20 font-montserrat text-center mb-9 md:mb-16"
-                  data-aos="py-slide"
-                  data-aos-delay="800"
-                >
-                  Engineering
-                </h3>
-                <ul
-                  class="mb-60 list-none text-18"
-                  data-aos="py-slide"
-                  data-aos-delay="900"
-                >
-                  <li>Zorex Salvo</li>
-                  <li>Rommel Philip Afurong</li>
-                  <li>Von Louie Cruto</li>
-                  <li>Dan Belza</li>
-                  <li>Laurence Rebadulla</li>
-                </ul>
-              </div>
-              <div class="text-center md:w-1/3">
-                <h3
-                  class="text-yellow text-20 font-montserrat text-center mb-9 md:mb-16"
-                  data-aos="py-slide"
-                  data-aos-delay="800"
-                >
-                  Content Creation
-                </h3>
-                <ul
-                  class="mb-60 list-none text-18"
-                  data-aos="py-slide"
-                  data-aos-delay="900"
-                >
-                  <li>Albert Yumol</li>
-                  <li>Alysson Alvaran</li>
-                  <li>Jeff Paredes</li>
-                  <li>Von Louie Cruto</li>
+                {% for volunteer in commitee.volunteers.all %}
+                <li>{{ volunteer.display_name }}</li>
+                {% endfor %}
                 </ul>
               </div>
+              {% endfor %}
             </div>
           </div>
         </div>
diff --git a/organisation/admin.py b/organisation/admin.py
index 58ebef3..0d7bb7d 100644
--- a/organisation/admin.py
+++ b/organisation/admin.py
@@ -3,5 +3,11 @@
 from .models import Commitee, Volunteer
 
 
+
+class VolunteerAdmin(admin.ModelAdmin):
+    list_display = ("display_name", "commitee", "first_name", "last_name",)
+    list_filter = ("commitee",)
+
+
 admin.site.register(Commitee)
-admin.site.register(Volunteer)
+admin.site.register(Volunteer, VolunteerAdmin)