Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Issue #34: Change brother profile to include leadership positons held #40

Merged
merged 1 commit into from

1 participant

@rogerskw
Owner

within the fraterntiy and jobs

@rogerskw rogerskw merged commit 40662b3 into v1.0.0
@rogerskw rogerskw deleted the iss34 branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 7, 2014
  1. @rogerskw

    Issue #34: Change brother profile to include leadership positons held

    rogerskw authored
    within the fraterntiy and jobs
This page is out of date. Refresh to see the latest.
Showing with 23 additions and 8 deletions.
  1. +7 −6 info/models.py
  2. +16 −2 info/templates/brother_profile.html
View
13 info/models.py
@@ -128,10 +128,11 @@ def __str__(self):
class BrotherEntity():
def __init__(self, brotherObj):
self.brother = brotherObj
- heldPosition = HeldPosition.objects.filter(brother = self.brother)
- heldPositions = []
- self.heldPositions = []
+ heldPositions = HeldPosition.objects.filter(brother = self.brother.id)
+ retrievedJobs = Job.objects.filter(brother = self.brother.id)
+ self.positions = []
for heldPosition in heldPositions:
- self.majors.append(heldPosition.position)
-
-
+ self.positions.append(heldPosition)
+ self.jobs = []
+ for job in retrievedJobs:
+ self.jobs.append(job)
View
18 info/templates/brother_profile.html
@@ -30,8 +30,6 @@ <h1 class="page-header"> {{ be.brother.firstName }} {{ be.brother.lastName }} <s
{% endif %}
| Class of {{ be.brother.graduationYear }}
</h2>
- <h3>Bio</h3>
- <p>{{ be.brother.bio }}</p>
<h3>Major(s)</h3>
<ul>
{% if be.brother.majors %}
@@ -42,6 +40,22 @@ <h1 class="page-header"> {{ be.brother.firstName }} {{ be.brother.lastName }} <s
<li> Undecided Engineering </li>
{% endif %}
</ul>
+ {% if be.positions %}
+ <h3>Leadership Positions in &Theta;&Tau;</h3>
+ <ul>
+ {% for position in be.positions %}
+ <li>{{ position.position.name }} ({{ position.semester }} {{ position.year }}) </li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+ {% if be.jobs %}
+ <h3>Internships, Co-ops, and Full Time Positions</h3>
+ <ul>
+ {% for job in be.jobs %}
+ <li>{{ job.type.name }} - {{ job.title }} at {{ job.company }} ({{ job.year }})</li>
+ {% endfor %}
+ </ul>
+ {% endif %}
<h4><a href="{{ be.brother.resume }}">Resume</a></h4>
</div>
Something went wrong with that request. Please try again.