diff --git a/.gitignore b/.gitignore index 5223a9b..d15d914 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ settings.py env/ db.sqlite3 *.json +admin/ diff --git a/sgawebsite/apps/main/models.py b/sgawebsite/apps/main/models.py index a90f0a6..1f2dbda 100644 --- a/sgawebsite/apps/main/models.py +++ b/sgawebsite/apps/main/models.py @@ -16,14 +16,6 @@ class Member(models.Model): def __str__(self): return self.first_name + ' ' + self.last_name - def username(self): - if self.first_name and self.last_name: - if self.year > 0: - return str(year) + first_name[:1] + last_name[:7] - else: - return first_name[:1] + last_name[:7] - return None - class Resource(models.Model): name = models.CharField(max_length=50) diff --git a/sgawebsite/apps/main/views.py b/sgawebsite/apps/main/views.py index 312cc82..37d2302 100644 --- a/sgawebsite/apps/main/views.py +++ b/sgawebsite/apps/main/views.py @@ -1,10 +1,14 @@ from django.shortcuts import render from django.template.defaulttags import register from .models import Member, Resource +from django.contrib.staticfiles.storage import staticfiles_storage +import os + def index(request): return render(request, 'index.html') + def about(request): categories = list(Member.CATEGORIES) orgs = [c[0] for c in list(Member.CATEGORIES)] @@ -18,12 +22,38 @@ def about(request): context['data'] = data return render(request, 'about.html', context) + @register.filter def get_item(dictionary, key): return dictionary.get(key) + +@register.filter +def username(obj): + if obj.first_name and obj.last_name: + if obj.year > 0: + return str(str(obj.year) + + obj.first_name[:1] + + obj.last_name[:7]).lower() + else: + return str(obj.first_name[:1] + obj.last_name[:7]).lower() + return None + + +@register.filter +def filename(obj): + uname = username(obj) + folder = 'img' + filepath = os.path.join(folder, 'people', uname + '.jpg') + if uname is not None and staticfiles_storage.exists(filepath): + return os.path.join('static', filepath) + else: + return os.path.join('static', folder, 'profile.jpg') + + def resources(request): return render(request, 'resources.html') + def events(request): return render(request, 'events.html') diff --git a/sgawebsite/templates/about.html b/sgawebsite/templates/about.html index ae3d631..589188f 100644 --- a/sgawebsite/templates/about.html +++ b/sgawebsite/templates/about.html @@ -26,13 +26,25 @@ {% for org in categories %}

{{ org.1 }}

-
{% with key=data|get_item:org.0 %} {% for member in key %}
- {% with year=member.year first=member.first_name last=member.last_name %} - {{ first }} {{ last }} {{ year }} - {% endwith %} +
+ +
+
+ {{ member.first_name }} {{ member.last_name }} + {% if member.category != 'sponsors' and member.category != 'senators' %} + {{ member.year }} + {% endif %} +
+ {% if member.category != "officers" %} + {{ member.title }} + {% endif %} + + {% if member.category == "officers" and member.intro != '' %} +

{{ member.intro }}

+ {% endif %}
{% endfor %} {% endwith %} diff --git a/sgawebsite/templates/about.html.bk b/sgawebsite/templates/about.html.bk deleted file mode 100644 index bb371af..0000000 --- a/sgawebsite/templates/about.html.bk +++ /dev/null @@ -1,72 +0,0 @@ - - -{% load static %} - - - {% include 'head.html' %} - About - TJSGA - - - {% include 'header.html' %} -
-
-

Contact Us!

-
- - "The world is moved not only by the mighty shoves of the heroes, but also by the aggregate of the tiny pushes of each honest worker." - Helen Keller - -
-
- Contact us at - sga.tjhsst@gmail.com. We would love to answer questions or hear - about how you think we can improve TJ! -
-
-
- {{ categories }} - -
- {% include 'footer.html' %} - -