rushilwiz/website-2018
1
0
Fork 0
mirror of https://github.com/tjsga/website-2018.git synced 2025-04-18 18:20:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

working on making templating work

Browse Source
This commit is contained in:
William Zhang 2018-05-26 13:39:01 -04:00
parent 57a671523b
commit 3713afb653
6 changed files with 76 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sgawebsite/apps/main/admin.py
View File

@ -1,3 +1,14 @@
from django.contrib import admin from django.contrib import admin
# Register your models here. from .models import Member, Resource
'''
class MemberAdmin(admin.ModelAdmin):
list_display = ('name', 'display')
class ResourceAdmin(admin.ModelAdmin):
list_display = ('name', 'display')
'''
admin.site.register(Member)
admin.site.register(Resource)

31
sgawebsite/apps/main/models.py
View File

@ -1,18 +1,37 @@
from django.db import models from django.db import models
# Create your models here. # Create your models here.
class Member(models.Model): class Member(models.Model):
first_name = models.CharField(max_length=50) first_name = models.CharField(max_length=50)
last_name = models.CharField(max_length=50) last_name = models.CharField(max_length=50)
year = models.IntegerField() year = models.IntegerField(blank=True, default=-1)
intro = models.CharField(max_length=140) intro = models.CharField(max_length=140, blank=True, default='')
title = models.CharField(max_length=30) title = models.CharField(max_length=30, blank=True, default='')
CATEGORIES = (('officers', 'Officers'), ('excomm', 'Executive Committee'), ('senators', 'Class Senators'), ('sponsors', 'Sponsors')) CATEGORIES = (('officers', 'Officers'), ('excomm', 'Executive Committee'),
category = models.CharField(max_length=1, choices=CATEGORIES) ('senators', 'Class Senators'), ('sponsors', 'Sponsors'))
category = models.CharField(max_length=10, choices=CATEGORIES)
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): class Resource(models.Model):
name = models.CharField(max_length=50) name = models.CharField(max_length=50)
link = models.URLField() link = models.URLField()
text = models.CharField(max_length=140) text = models.CharField(max_length=140)
CATEGORIES = (('general', 'General Resources'), ('event', 'Event Resources')) CATEGORIES = (('general', 'General Resources'),
('event', 'Event Resources'))
category = models.CharField(max_length=1, choices=CATEGORIES) category = models.CharField(max_length=1, choices=CATEGORIES)
def __str__(self):
return self.name

13
sgawebsite/apps/main/views.py
View File

@ -1,20 +1,27 @@
from django.shortcuts import render from django.shortcuts import render
from django.template.defaulttags import register
from .models import Member, Resource from .models import Member, Resource
def index(request): def index(request):
return render(request, 'index.html') return render(request, 'index.html')
def about(request): def about(request):
categories = Member.CATEGORIES categories = list(Member.CATEGORIES)
context = dict() orgs = [c[0] for c in list(Member.CATEGORIES)]
data = dict() data = dict()
context = dict()
for c in categories: for c in categories:
data[c[0]] = Member.objects.filter(category=c[0]) data[c[0]] = Member.objects.filter(category=c[0])
print(categories)
context['categories'] = categories context['categories'] = categories
context['orgs'] = orgs
context['data'] = data context['data'] = data
print(context)
return render(request, 'about.html', context) return render(request, 'about.html', context)
@register.filter
def get_item(dictionary, key):
return dictionary.get(key)
def resources(request): def resources(request):
return render(request, 'resources.html') return render(request, 'resources.html')

8
sgawebsite/templates/about.html
View File

@ -26,10 +26,16 @@
{% for org in categories %} {% for org in categories %}
<section id="{{ org.0 }}"> <section id="{{ org.0 }}">
<h2>{{ org.1 }}</h2> <h2>{{ org.1 }}</h2>
{% for member in categories.org %} <div class="{{ org.username }}-intro">
{% with key=data|get_item:org.0 %}
{% for member in key %}
<div class="{{ org.0 }}-intro"> <div class="{{ org.0 }}-intro">
{% with year=member.year first=member.first_name last=member.last_name %}
{{ first }} {{ last }} {{ year }}
{% endwith %}
</div> </div>
{% endfor %} {% endfor %}
{% endwith %}
</section> </section>
{% endfor %} {% endfor %}
</div> </div>

20
sgawebsite/templates/events.html Normal file
View File

@ -0,0 +1,20 @@
{% load static %}
<!DOCTYPE html>
<html>
<head>
<link href="{% static 'css/events.css' %}" rel="stylesheet" />
{% include 'head.html' %}
<title>Events - TJSGA</title>
</head>
<body>
{% include 'header.html' %}
<div id="wrapper" class="fluid">
<section id="calendar">
<iframe src="https://calendar.google.com/calendar/b/3/embed?showTitle=0&amp;showPrint=0&amp;height=600&amp;wkst=1&amp;bgcolor=%23ffffff&amp;src=sga.tjhsst%40gmail.com&amp;color=%23711616&amp;ctz=America%2FNew_York" style="border-width:0" width="800" height="600" frameborder="0" scrolling="no"></iframe>
</section>
<section id="events">
</section>
</div>
{% include 'footer.html' %}
</body>
</html>

3
sgawebsite/templates/index.html
View File

@ -43,9 +43,6 @@
</div> </div>
</section> </section>
<hr /> <hr />
<section id="calendar">
<iframe src="https://calendar.google.com/calendar/b/3/embed?showTitle=0&amp;showPrint=0&amp;height=600&amp;wkst=1&amp;bgcolor=%23ffffff&amp;src=sga.tjhsst%40gmail.com&amp;color=%23711616&amp;ctz=America%2FNew_York" style="border-width:0" width="800" height="600" frameborder="0" scrolling="no"></iframe>
</section>
</div> </div>
{% include 'footer.html' %} {% include 'footer.html' %}
</body> </body>