diff --git a/_modules/apis_core/utils/DateParser.html b/_modules/apis_core/utils/DateParser.html index e34299db0..0e85f89f5 100644 --- a/_modules/apis_core/utils/DateParser.html +++ b/_modules/apis_core/utils/DateParser.html @@ -359,88 +359,6 @@

Source code for apis_core.utils.DateParser

 
     return date_single, date_ab, date_bis
- - -
-[docs] -def get_date_help_text_from_dates( - single_date, single_start_date, single_end_date, single_date_written -): - """ - function for creating string help text from parsed dates, to provide feedback to the user - about the parsing status of a given date field. - - :param single_date: datetime : - the individual date point - :param single_start_date: datetime : - the start range of a date - :param single_end_date: datetime : - the endrange of a date - :param single_date_written: str : - the textual user entry of a date field (needed to check if empty or not) - :return help_text: str : - The text to be displayed underneath a date field, informing the user about the parsing result - """ - - # check which of the dates could be parsed to construct the relevant feedback text - help_text = "" - if single_date: - # single date could be parsed - help_text = "Date interpreted as " - if single_start_date or single_end_date: - # date has also start or end ranges, then ignore single date - if single_start_date: - # date has start range - help_text += ( - str(single_start_date.year) - + "-" - + str(single_start_date.month) - + "-" - + str(single_start_date.day) - + " until " - ) - else: - # date has no start range, then write "undefined" - help_text += "undefined start until " - if single_end_date: - # date has end range - help_text += ( - str(single_end_date.year) - + "-" - + str(single_end_date.month) - + "-" - + str(single_end_date.day) - ) - else: - # date has no start range, then write "undefined" - help_text += "undefined end" - else: - # date has no start nor end range. Use single date then. - help_text += ( - str(single_date.year) - + "-" - + str(single_date.month) - + "-" - + str(single_date.day) - ) - elif single_date_written is not None: - # date input field is not empty but it could not be parsed either. Show parsing info and help text - help_text = ( - "<b>Date could not be interpreted</b><br>" + get_date_help_text_default() - ) - else: - # date field is completely empty. Show help text only - help_text = get_date_help_text_default() - - return help_text
- - - -
-[docs] -def get_date_help_text_default(): - return "Dates are interpreted by defined rules. If this fails, an iso-date can be explicitly set with '&lt;YYYY-MM-DD&gt;'."
- diff --git a/_modules/apis_core/utils/test_DateParser.html b/_modules/apis_core/utils/test_DateParser.html index 6ee3f643c..e620ff9bc 100644 --- a/_modules/apis_core/utils/test_DateParser.html +++ b/_modules/apis_core/utils/test_DateParser.html @@ -88,7 +88,7 @@

Source code for apis_core.utils.test_DateParser

< from django.test import TestCase -from .DateParser import get_date_help_text_from_dates, parse_date +from .DateParser import parse_date help_text_default = "Dates are interpreted by defined rules. If this fails, an iso-date can be explicitly set with '&lt;YYYY-MM-DD&gt;'." @@ -102,26 +102,23 @@

Source code for apis_core.utils.test_DateParser

< # a dict of dates with the written date as key -# followed by a tuple of (single, start, end, help_text) +# followed by a tuple of (single, start, end) dates = { "vor dem 23.10.1449 <1449-10-23>": ( fi("1449-10-23"), None, None, - "Date interpreted as 1449-10-23", ), "1459-12": ( fi("1459-12-16"), fi("1459-12-01"), fi("1459-12-31"), - "Date interpreted as 1459-12-1 until 1459-12-31", ), - "1460-03-30": (fi("1460-03-30"), None, None, "Date interpreted as 1460-3-30"), + "1460-03-30": (fi("1460-03-30"), None, None), "": ( None, None, None, - "<b>Date could not be interpreted</b><br>" + help_text_default, ), } @@ -132,19 +129,11 @@

Source code for apis_core.utils.test_DateParser

<
[docs] def test_dates(self): - for datestring, (expsingle, expstart, expend, help_text) in dates.items(): + for datestring, (expsingle, expstart, expend) in dates.items(): single, start, end = parse_date(datestring) self.assertEqual(expsingle, single) self.assertEqual(expstart, start) self.assertEqual(expend, end)
- - -
-[docs] - def test_help_text(self): - for datestring, (single, start, end, exp_help_text) in dates.items(): - help_text = get_date_help_text_from_dates(single, start, end, datestring) - self.assertEqual(exp_help_text, help_text)
diff --git a/genindex.html b/genindex.html index b4b26a900..02f7f7690 100644 --- a/genindex.html +++ b/genindex.html @@ -1691,10 +1691,6 @@

G

  • get_data() (apis_core.generic.importers.GenericModelImporter method)
  • get_data_for_m2m_field() (apis_core.history.serializers.ModelChangeSerializer method) -
    • -
  • get_date_help_text_default() (in module apis_core.utils.DateParser) -
    • -
  • get_date_help_text_from_dates() (in module apis_core.utils.DateParser)
  • get_definition_and_attributes_from_uri() (in module apis_core.utils.rdf)
    • @@ -1720,10 +1716,10 @@

    G

  • get_entity_list_filter() (apis_core.apis_entities.models.AbstractEntity class method)
    • - - +
    @@ -2995,10 +2995,10 @@

    apis_core/utils/DateParser.py (no class) - 151 - 59 + 133 + 56 0 - 61% + 58% apis_core/utils/__init__.py @@ -3129,20 +3129,20 @@

    67% - apis_core/utils/test_DateParser.py - DateParserTest - 8 + apis_core/utils/test_DateParser.py + DateParserTest + 5 0 0 - 100% + 100% apis_core/utils/test_DateParser.py (no class) - 10 + 9 0 0 - 100% + 100% apis_core/utils/test_helpers.py @@ -3509,10 +3509,10 @@

    Total   - 4050 - 1981 + 4028 + 1978 0 - 51% + 51% @@ -3524,7 +3524,7 @@

    coverage.py v7.6.8, - created at 2024-12-17 09:35 +0000 + created at 2024-12-17 09:43 +0000