diff --git a/colleges/models.py b/colleges/models.py index 8f42ba603a88cd49aabe6eef763974b56267350f..d3fb1b21f881b7305e1151b99599ac5414fd3686 100644 --- a/colleges/models.py +++ b/colleges/models.py @@ -91,6 +91,12 @@ class PotentialFellowship(models.Model): def __str__(self): return '%s, %s' % (self.profile.__str__(), self.get_status_display()) + def latest_event_details(self): + event = self.potentialfellowshipevent_set.order_by('-noted_on').first() + if not event: + return 'No event recorded' + return '%s [%s]' % (event.get_event_display(), event.noted_on.strftime('%Y-%m-%d')) + class PotentialFellowshipEvent(models.Model): """Any event directly related to a PotentialFellowship instance registered as plain text.""" @@ -105,5 +111,7 @@ class PotentialFellowshipEvent(models.Model): blank=True, null=True) def __str__(self): - return '%s, %s %s: %s' % (self.potfel.last_name, self.potfel.get_title_display(), - self.potfel.first_name, self.get_event_display()) + return '%s, %s %s: %s' % (self.potfel.profile.last_name, + self.potfel.profile.get_title_display(), + self.potfel.profile.first_name, + self.get_event_display()) diff --git a/colleges/templates/colleges/potentialfellowship_list.html b/colleges/templates/colleges/potentialfellowship_list.html index 0fa8ce291258052c86a14a6dc9d20599693b536f..e85fc5a8bea364484aa4e8cdcda44aeaf4fddac2 100644 --- a/colleges/templates/colleges/potentialfellowship_list.html +++ b/colleges/templates/colleges/potentialfellowship_list.html @@ -58,6 +58,7 @@ $(document).ready(function($) { <th>Discipline</th> <th>Expertises</th> <th>Status</th> + <th>Latest event</th> </tr> </thead> <tbody> @@ -71,10 +72,11 @@ $(document).ready(function($) { {% endfor %} </td> <td style="color: #ffffff; background-color:{{ potfel.status|potfelstatuscolor }};">{{ potfel.get_status_display }}</td> + <td>{{ potfel.latest_event_details }}</td> </tr> {% empty %} <tr> - <td colspan="4">No Potential Fellowships found</td> + <td colspan="5">No Potential Fellowships found</td> </tr> {% endfor %} </tbody>