diff options
Diffstat (limited to 'templatetags/rooms.py')
| -rw-r--r-- | templatetags/rooms.py | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/templatetags/rooms.py b/templatetags/rooms.py index d76f0ee..5108c92 100644 --- a/templatetags/rooms.py +++ b/templatetags/rooms.py @@ -1,18 +1,17 @@ # Copyright (C) 2017 Alban Gruin # -# celcatsanitizer is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# celcatsanitizer is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # celcatsanitizer is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License along -# with celcatsanitizer; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU Affero General Public License +# along with celcatsanitizer. If not, see <http://www.gnu.org/licenses/>. from django import template @@ -20,8 +19,22 @@ register = template.Library() @register.filter def format_rooms(rooms): - joined = ", ".join([str(room) for room in rooms]) - if len(rooms) > 1: - return "Salles {0}".format(joined) + amphi_list = [room.name for room in rooms if room.name.startswith("Amphi")] + room_list = [room.name for room in rooms if not room.name.startswith("Amphi")] + + amphis = ", ".join(amphi_list) + joined = ", ".join(room_list) + + if len(room_list) > 1: + joined = "alles " + joined + elif len(room_list) == 1: + joined = "alle " + joined + + if len(amphi_list) == 0 and len(room_list) == 0: + return "" + elif len(amphi_list) == 0: + return "S" + joined + elif len(room_list) == 0: + return amphis else: - return "Salle {0}".format(joined) + return amphis + ", s" + joined |