entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 11 Releases Wiki Activity

family: use with_status param in chrono url (#63325)
gitea-wip/combo/pipeline/head There was a failure building this commit Details
gitea/combo/pipeline/head Something is wrong with the build of this commit Details

This commit is contained in:
Lauréline Guérin 2022-03-29 17:51:50 +02:00
parent 11db1b1735
commit d24640eb7b
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
4 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
combo/apps/family/models.py
View File

@ -84,7 +84,7 @@ class WeeklyAgendaCell(JsonCellBase):
else:
agenda_params = 'subscribed=%s' % (self.agenda_categories or 'all')
return (
'%sapi/agendas/datetimes/?%s&date_start=%s&date_end=%s&user_external_id=%s&show_past_events=true'
'%sapi/agendas/datetimes/?%s&date_start=%s&date_end=%s&user_external_id=%s&show_past_events=true&with_status=true'
% (
chrono_url,
agenda_params,

8
combo/apps/family/static/css/combo.weekly_agenda.scss
View File

@ -76,9 +76,15 @@
left: 1px;
}
}
& [data-status=green] span > span::after {
& [data-status=booked] span > span::after {
background: #3c3;
}
& [data-status=cancelled] span > span::after {
background: yellow;
}
& [data-status=absence] span > span::after {
background: red;
}
}
br.weekbreak {

5
combo/apps/family/templates/combo/family/weekly_agenda.html
View File

@ -27,9 +27,8 @@
{% for item in json.data %}
{% if item.date == day_str %}
<li class="activity {% if item.disabled %}disabled{% endif %}"
{% if item.booked_for_external_user %}data-status="green"{% endif %}
><span><span>{{ item.label }}</span></span>
<li class="activity {% if item.disabled %}disabled{% endif %}" data-status="{{ item.status }}">
<span><span>{{ item.label }}</span></span>
</li>
{% endif %}

29
tests/test_family.py
View File

@ -97,7 +97,7 @@ def test_weeklyagenda_cell_user_external_id(context):
cell.render(context)
assert requests_get.call_args_list[0][0][0] == (
'http://chrono.example.org/api/agendas/datetimes/'
'?agendas=&date_start=&date_end=&user_external_id=&show_past_events=true'
'?agendas=&date_start=&date_end=&user_external_id=&show_past_events=true&with_status=true'
)
context['request'].user = MockUserWithNameId()
@ -106,7 +106,7 @@ def test_weeklyagenda_cell_user_external_id(context):
cell.render(context)
assert requests_get.call_args_list[0][0][0] == (
'http://chrono.example.org/api/agendas/datetimes/'
'?agendas=&date_start=&date_end=&user_external_id=&show_past_events=true'
'?agendas=&date_start=&date_end=&user_external_id=&show_past_events=true&with_status=true'
)
cell.user_external_template = 'some-key:{{ user_nameid }}' # check that templating is ok
@ -116,7 +116,7 @@ def test_weeklyagenda_cell_user_external_id(context):
cell.render(context)
assert requests_get.call_args_list[0][0][0] == (
'http://chrono.example.org/api/agendas/datetimes/'
'?agendas=&date_start=&date_end=&user_external_id=some-key:xyz&show_past_events=true'
'?agendas=&date_start=&date_end=&user_external_id=some-key:xyz&show_past_events=true&with_status=true'
)
@ -133,7 +133,7 @@ def test_weeklyagenda_cell_agenda_references_template(context):
cell.render(context)
assert requests_get.call_args_list[0][0][0] == (
'http://chrono.example.org/api/agendas/datetimes/'
'?agendas=&date_start=&date_end=&user_external_id=&show_past_events=true'
'?agendas=&date_start=&date_end=&user_external_id=&show_past_events=true&with_status=true'
)
cell.agenda_references_template = 'some-agenda,other-agenda'
@ -143,7 +143,7 @@ def test_weeklyagenda_cell_agenda_references_template(context):
cell.render(context)
assert requests_get.call_args_list[0][0][0] == (
'http://chrono.example.org/api/agendas/datetimes/'
'?agendas=some-agenda,other-agenda&date_start=&date_end=&user_external_id=&show_past_events=true'
'?agendas=some-agenda,other-agenda&date_start=&date_end=&user_external_id=&show_past_events=true&with_status=true'
)
context['request'].user = MockUserWithNameId()
@ -157,7 +157,7 @@ def test_weeklyagenda_cell_agenda_references_template(context):
cell.render(context)
assert requests_get.call_args_list[1][0][0] == (
'http://chrono.example.org/api/agendas/datetimes/'
'?agendas=,some-agenda,other-agenda,xyz&date_start=&date_end=&user_external_id=&show_past_events=true'
'?agendas=,some-agenda,other-agenda,xyz&date_start=&date_end=&user_external_id=&show_past_events=true&with_status=true'
)
@ -176,7 +176,7 @@ def test_weeklyagenda_cell_agenda_subscribed(context):
cell.render(context)
assert requests_get.call_args_list[0][0][0] == (
'http://chrono.example.org/api/agendas/datetimes/'
'?subscribed=all&date_start=&date_end=&user_external_id=&show_past_events=true'
'?subscribed=all&date_start=&date_end=&user_external_id=&show_past_events=true&with_status=true'
)
@ -199,7 +199,7 @@ def test_weeklyagenda_cell_agenda_agenda_categories(context):
cell.render(context)
assert requests_get.call_args_list[0][0][0] == (
'http://chrono.example.org/api/agendas/datetimes/'
'?subscribed=foo,bar,foobar&date_start=&date_end=&user_external_id=&show_past_events=true'
'?subscribed=foo,bar,foobar&date_start=&date_end=&user_external_id=&show_past_events=true&with_status=true'
)
context['request'].user = MockUserWithNameId()
@ -210,7 +210,7 @@ def test_weeklyagenda_cell_agenda_agenda_categories(context):
cell.render(context)
assert requests_get.call_args_list[0][0][0] == (
'http://chrono.example.org/api/agendas/datetimes/'
'?subscribed=foo,bar,foobar,xyz&date_start=&date_end=&user_external_id=&show_past_events=true'
'?subscribed=foo,bar,foobar,xyz&date_start=&date_end=&user_external_id=&show_past_events=true&with_status=true'
)
@ -230,7 +230,8 @@ def test_weeklyagenda_cell_filter_dates(context, agenda_type, agenda_param):
cell.render(context)
assert requests_get.call_args_list[0][0][0] == (
'http://chrono.example.org/api/agendas/datetimes/'
'?%s&date_start=&date_end=&user_external_id=&show_past_events=true' % agenda_param
'?%s&date_start=&date_end=&user_external_id=&show_past_events=true&with_status=true'
% agenda_param
)
cell.start_date_filter = '2021-09-01'
@ -240,7 +241,8 @@ def test_weeklyagenda_cell_filter_dates(context, agenda_type, agenda_param):
cell.render(context)
assert requests_get.call_args_list[0][0][0] == (
'http://chrono.example.org/api/agendas/datetimes/'
'?%s&date_start=2021-09-01&date_end=&user_external_id=&show_past_events=true' % agenda_param
'?%s&date_start=2021-09-01&date_end=&user_external_id=&show_past_events=true&with_status=true'
% agenda_param
)
cell.end_date_filter = '2022-08-31'
@ -250,7 +252,7 @@ def test_weeklyagenda_cell_filter_dates(context, agenda_type, agenda_param):
cell.render(context)
assert requests_get.call_args_list[0][0][0] == (
'http://chrono.example.org/api/agendas/datetimes/'
'?%s&date_start=2021-09-01&date_end=2022-08-31&user_external_id=&show_past_events=true'
'?%s&date_start=2021-09-01&date_end=2022-08-31&user_external_id=&show_past_events=true&with_status=true'
% agenda_param
)
@ -263,7 +265,8 @@ def test_weeklyagenda_cell_filter_dates(context, agenda_type, agenda_param):
cell.render(context)
assert requests_get.call_args_list[0][0][0] == (
'http://chrono.example.org/api/agendas/datetimes/'
'?%s&date_start=&date_end=xyz&user_external_id=&show_past_events=true' % agenda_param
'?%s&date_start=&date_end=xyz&user_external_id=&show_past_events=true&with_status=true'
% agenda_param
)