From edf68379241e2ff669da286979a1b267610951b2 Mon Sep 17 00:00:00 2001
From: Valentin Deniaud <vdeniaud@entrouvert.com>
Date: Wed, 12 Aug 2020 17:33:30 +0200
Subject: [PATCH] templates: shorten displayed event info in settings (#45573)

---
 .../chrono/manager_agenda_event_fragment.html       |  2 ++
 tests/test_manager.py                               | 13 ++++---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/chrono/manager/templates/chrono/manager_agenda_event_fragment.html b/chrono/manager/templates/chrono/manager_agenda_event_fragment.html
index 00e0e93..a361877 100644
--- a/chrono/manager/templates/chrono/manager_agenda_event_fragment.html
+++ b/chrono/manager/templates/chrono/manager_agenda_event_fragment.html
@@ -15,6 +15,7 @@
       {% if event.label %}{{ event.label }} / {% endif %}
     {% endif %}
     {{ event.start_datetime }}
+    {% if not settings_view %}
     {% if event.places or event.waiting_list_places %}-{% endif %}
     {% if event.places %}
       {% blocktrans count remaining_places=event.remaining_places %}{{ remaining_places }} remaining place{% plural %}{{ remaining_places }} remaining places{% endblocktrans %}
@@ -26,6 +27,7 @@
       -
       {% blocktrans with places=event.waiting_list_places count booked_places=event.waiting_list %}{{ booked_places }}/{{ places }} booking{% plural %}{{ booked_places }}/{{ places }} bookings{% endblocktrans %})
     {% endif %}
+    {% endif %}
     {% if settings_view and event.publication_date %}
     ({% trans "publication date:" %} {{ event.publication_date }})
     {% endif %}
diff --git a/tests/test_manager.py b/tests/test_manager.py
index d75cac0..5313c7b 100644
--- a/tests/test_manager.py
+++ b/tests/test_manager.py
@@ -1120,8 +1120,6 @@ def test_add_event(app, admin_user):
     assert "This agenda doesn't have any event yet." not in resp.text
     assert '/manage/agendas/%s/events/%s/' % (agenda.id, event.id) in resp.text
     assert ('Feb. 15, %s, 5 p.m.' % year) in resp.text
-    assert '10 remaining places' in resp.text
-    assert '(0/10 bookings)' in resp.text
 
     resp_datetimes = app.get('/api/agenda/%s/datetimes/' % agenda.id)
     assert resp_datetimes.json['data'][0]['text'] == 'Feb. 15, %s, 5 p.m.' % year
@@ -1186,8 +1184,6 @@ def test_add_event_as_manager(app, manager_user):
     assert "This agenda doesn't have any event yet." not in resp.text
     assert '/manage/agendas/%s/events/%s/edit' % (agenda.id, event.id) in resp.text
     assert 'Feb. 15, 2016, 5 p.m.' in resp.text
-    assert '10 remaining places' in resp.text
-    assert '(0/10 bookings)' in resp.text
     assert event.duration is None
     assert event.end_datetime is None
 
@@ -1226,9 +1222,8 @@ def test_edit_event(app, admin_user):
     resp = resp.follow()
     assert '/manage/agendas/%s/events/%s/edit' % (agenda.id, event.id) in resp.text
     assert 'Feb. 16, 2016, 5 p.m.' in resp.text
-    assert '20 remaining places' in resp.text
-    assert '(0/20 bookings)' in resp.text
     event.refresh_from_db()
+    assert event.places == 20
     assert event.publication_date == datetime.date(2020, 5, 11)
     assert event.duration == 45
     assert event.end_datetime == event.start_datetime + datetime.timedelta(minutes=45)
@@ -1267,8 +1262,6 @@ def test_edit_event_as_manager(app, manager_user):
     resp = resp.follow()
     assert '/manage/agendas/%s/events/%s/edit' % (agenda.id, event.id) in resp.text
     assert 'Feb. 16, 2016, 5 p.m.' in resp.text
-    assert '20 remaining places' in resp.text
-    assert '(0/20 bookings)' in resp.text
     event.refresh_from_db()
     assert event.publication_date is None
 
@@ -1281,7 +1274,9 @@ def test_booked_places(app, admin_user):
     Booking(event=event).save()
     Booking(event=event).save()
     app = login(app)
-    resp = app.get('/manage/agendas/%s/settings' % agenda.id, status=200)
+
+    day = event.start_datetime
+    resp = app.get('/manage/agendas/%s/%d/%d/' % (agenda.id, day.year, day.month), status=200)
     assert '8 remaining places' in resp.text
     assert '(2/10 bookings)' in resp.text
 
-- 
2.20.1