@@ -47,6 +47,9 @@ class Train:
def timeleft(self):
return self.time - self.distance
+ def display(self):
+ return (self.timeleft() < 30)
+
def stop_short(self):
return re.sub(r'\b(St|Ave)\b','',self.stop).replace('Sunset Tunnel East Portal','Sunset Tunnel')
main.py
@@ -4,33 +4,35 @@
<h1>When should {{who}} leave for work?</h1>
<ul>
{% for train in trains %}
- {% if train.is_past %}
- <li class="gone">
- The {{train.route_short}}
- {% if train.show_destination %}
- to {{train.destination}}
- {% endif %}
+ {% if train.display %}
+ {% if train.is_past %}
+ <li class="gone">
+ The {{train.route_short}}
+ {% if train.show_destination %}
+ to {{train.destination}}
+ {% endif %}
- {% if train.time %}
- leaves in {{train.time}} min{{train.time|pluralize }}
- {% else %}
- is leaving now
- {% endif %}
- from {{train.stop_short}}
- </li>
- {% else %}
- <li {% ifchanged train.is_past %}id="next"{% endifchanged %}>Go
- {% if train.timeleft %}
- in <b>{{train.timeleft}}</b> minute{{train.timeleft|pluralize }}
- {% else %}
- <b>now</b>
- {% endif %}
- to get the <b>{{train.route}}</b><br><small>leaving in {{train.time}} min{{train.time|pluralize }} from {{train.stop}}
- {% if train.show_destination %}
- <br>going to {{train.destination}}
- {% endif %}
- </small>
- </li>
+ {% if train.time %}
+ leaves in {{train.time}} min{{train.time|pluralize }}
+ {% else %}
+ is leaving now
+ {% endif %}
+ from {{train.stop_short}}
+ </li>
+ {% else %}
+ <li {% ifchanged train.is_past %}id="next"{% endifchanged %}>Go
+ {% if train.timeleft %}
+ in <b>{{train.timeleft}}</b> minute{{train.timeleft|pluralize }}
+ {% else %}
+ <b>now</b>
+ {% endif %}
+ to get the <b>{{train.route}}</b><br><small>leaving in {{train.time}} min{{train.time|pluralize }} from {{train.stop}}
+ {% if train.show_destination %}
+ <br>going to {{train.destination}}
+ {% endif %}
+ </small>
+ </li>
+ {% endif %}
{% endif %}
{% endfor %}
</ul>
templates/index.html
e5137a3991c4a17cd8c22285506079d9f32217e2
Paul Hammond
mail@paranoidfish.org
http://github.com/paulhammond/minimuni/commit/37dd9374f5bb4f1202862e7d9d9cb4659168e6fb
37dd9374f5bb4f1202862e7d9d9cb4659168e6fb
2009-11-08T22:25:18-08:00
2009-11-08T22:25:18-08:00
only display trains in the next 30 minutes or so
6fe638ee89aed5934c07aa515d67bce9cb6a62e7
Paul Hammond
mail@paranoidfish.org