Mercurial > bus-service / file comparison
comparison: service.py
service.py
- changeset 25
- cb423946cf33
- parent 24
- e6bdb9c54096
- child 27
- f89504285945
equal
deleted
inserted
replaced
| 24:e6bdb9c54096 | 25:cb423946cf33 |
|---|---|
| 82 'sign': sign(schedule_entry), | 82 'sign': sign(schedule_entry), |
| 83 'trip': schedule_entry['stop'].trip.name, | 83 'trip': schedule_entry['stop'].trip.name, |
| 84 'night': is_night_time(schedule_entry['time']), | 84 'night': is_night_time(schedule_entry['time']), |
| 85 }) | 85 }) |
| 86 return render_template( | 86 return render_template( |
| 87 'pysäkki.html', | 87 'stop.html', |
| 88 schedule = schedule, | 88 schedule = schedule, |
| 89 name = reference + ' ' + tr(bus_stop.name, 'bus_stops'), | 89 name = reference + ' ' + tr(bus_stop.name, 'bus_stops'), |
| 90 link_to_map = bus_stop.location.link_to_map, | 90 link_to_map = bus_stop.location.link_to_map, |
| 91 region = bus_stop.region, | 91 region = bus_stop.region, |
| 92 location = bus_stop.location, | 92 location = bus_stop.location, |
| 173 used_areas.add(region) | 173 used_areas.add(region) |
| 174 sign = reduce_schedule([k['region'] for k in concise_schedule], whole = True, trip_length = trip.length) | 174 sign = reduce_schedule([k['region'] for k in concise_schedule], whole = True, trip_length = trip.length) |
| 175 sign = [sign[0], sign[-1]] | 175 sign = [sign[0], sign[-1]] |
| 176 for entry in concise_schedule: | 176 for entry in concise_schedule: |
| 177 entry['region'] = tr(entry['region'], 'paikat') | 177 entry['region'] = tr(entry['region'], 'paikat') |
| 178 return render_template('ajovuoro.html', | 178 return render_template('trip.html', |
| 179 schedule = schedule, | 179 schedule = schedule, |
| 180 concise_schedule = concise_schedule, | 180 concise_schedule = concise_schedule, |
| 181 trip_reference = trip_reference, | 181 trip_reference = trip_reference, |
| 182 route = trip.route.reference, | 182 route = trip.route.reference, |
| 183 description = ' - '.join(tr(place, 'paikat') for place in sign), | 183 description = ' - '.join(tr(place, 'paikat') for place in sign), |
