diff --git a/rero_ils/modules/items/api/circulation.py b/rero_ils/modules/items/api/circulation.py index 42cb70c112..2558541bfa 100644 --- a/rero_ils/modules/items/api/circulation.py +++ b/rero_ils/modules/items/api/circulation.py @@ -1251,7 +1251,7 @@ def available(self): """Get availability for item.""" return self.item_has_active_loan_or_request() == 0 - def get_item_end_date(self, format='short'): + def get_item_end_date(self, format='short', time_format='medium'): """Get item due date for a given item.""" loan = get_loan_for_item(item_pid_to_object(self.pid)) if loan: @@ -1259,7 +1259,7 @@ def get_item_end_date(self, format='short'): due_date = format_date_filter( end_date, date_format=format, - time_format=None, + time_format=time_format, locale=current_i18n.locale.language, ) return due_date diff --git a/rero_ils/modules/items/views.py b/rero_ils/modules/items/views.py index 7156ace061..904c94fd00 100644 --- a/rero_ils/modules/items/views.py +++ b/rero_ils/modules/items/views.py @@ -132,7 +132,7 @@ def item_availability_text(item): else: text = '' if item.status == ItemStatus.ON_LOAN: - due_date = item.get_item_end_date(format='short') + due_date = item.get_item_end_date(format='short', time_format=None) text = '{msg} {date}'.format( msg=_('due until'), date=due_date) diff --git a/rero_ils/modules/patrons/templates/rero_ils/_patron_profile_head.html b/rero_ils/modules/patrons/templates/rero_ils/_patron_profile_head.html index d79d518d4d..3669f0336f 100644 --- a/rero_ils/modules/patrons/templates/rero_ils/_patron_profile_head.html +++ b/rero_ils/modules/patrons/templates/rero_ils/_patron_profile_head.html @@ -20,16 +20,7 @@
-
+

{{ record.first_name }} {{ record.last_name }}

- {% if record.birth_date %} -

- {{ _('Date of birth') }}: {{ record.birth_date | format_date( - date_format='medium', - time_format=None, - locale=current_i18n.locale.language - )}} -

- {% endif %}
diff --git a/rero_ils/modules/patrons/templates/rero_ils/_patron_profile_personal.html b/rero_ils/modules/patrons/templates/rero_ils/_patron_profile_personal.html index 5d345642fe..b4268e09d6 100644 --- a/rero_ils/modules/patrons/templates/rero_ils/_patron_profile_personal.html +++ b/rero_ils/modules/patrons/templates/rero_ils/_patron_profile_personal.html @@ -35,7 +35,7 @@

{{ _('Personal details') }}{{_('Email')}}:
{{ record.email }}
{% endif %} -
{{_('Barcode')}}:
+
{{_('Patron number')}}:
{{ record.patron.barcode }}
{{_('Account expiration')}}:
{{ record.patron.expiration_date | format_date( diff --git a/tests/api/test_availability.py b/tests/api/test_availability.py index fb09fb2aed..bebbf33e6f 100644 --- a/tests/api/test_availability.py +++ b/tests/api/test_availability.py @@ -337,7 +337,7 @@ class locale: 'rero_ils.modules.items.api.circulation.current_i18n', current_i18n ): - end_date = item.get_item_end_date() + end_date = item.get_item_end_date(time_format=None) assert item_availability_text(item) == 'due until ' + end_date """