gov-uk-dashboards 26.23.0__py3-none-any.whl → 26.24.0__py3-none-any.whl

gov_uk_dashboards/components/dash/context_card.py

@@ -10,7 +10,7 @@ from dash.development.base_component import Component
 from gov_uk_dashboards.components.dash import (
     heading2,
 )
-from gov_uk_dashboards.formatting.number_formatting import add_commas
+from gov_uk_dashboards.formatting.number_formatting import add_commas, format_percentage
 from gov_uk_dashboards.lib.datetime_functions.datetime_functions import (
     convert_date_string_to_text_string,
 )
@@ -67,12 +67,12 @@ def get_rolling_period_context_card(
     context_card_data = {
         VALUE: latest_year_data[VALUE][0],
         DATE_VALID: latest_year_data[DATE_VALID][0],
-        PERCENTAGE_CHANGE_FROM_PREV_YEAR: latest_year_data[
-            PERCENTAGE_CHANGE_FROM_PREV_YEAR
-        ][0],
-        PERCENTAGE_CHANGE_FROM_TWO_PREV_YEAR: latest_year_data[
-            PERCENTAGE_CHANGE_FROM_TWO_PREV_YEAR
-        ][0],
+        PERCENTAGE_CHANGE_FROM_PREV_YEAR: format_percentage(
+            latest_year_data[PERCENTAGE_CHANGE_FROM_PREV_YEAR][0]
+        ),
+        PERCENTAGE_CHANGE_FROM_TWO_PREV_YEAR: format_percentage(
+            latest_year_data[PERCENTAGE_CHANGE_FROM_TWO_PREV_YEAR][0]
+        ),
     }
     return html.Div(
         [
@@ -97,20 +97,6 @@ def _get_rolling_period_data_content_for_x_years(
         data[DATE_VALID], abbreviate_month=False, include_year=True
     )
 
-    current_date = data[DATE_VALID]
-    previous_year_datetime = get_a_previous_date(current_date, "previous", False)
-    two_years_ago_datetime = get_a_previous_date(current_date, "two_previous", False)
-    formatted_year_ago = convert_date_string_to_text_string(
-        previous_year_datetime.strftime("%Y-%m-%d"),
-        abbreviate_month=False,
-        include_year=True,
-    )
-    formatted_two_years_ago = convert_date_string_to_text_string(
-        two_years_ago_datetime.strftime("%Y-%m-%d"),
-        abbreviate_month=False,
-        include_year=True,
-    )
-
     return html.Div(
         [
             html.Div(
@@ -124,21 +110,22 @@ def _get_rolling_period_data_content_for_x_years(
                 className="govuk-body",
             ),
             get_changed_from_content(
-                calculated_percentage_change=data[PERCENTAGE_CHANGE_FROM_PREV_YEAR],
+                calculated_percentage_change=format_percentage(
+                    data[PERCENTAGE_CHANGE_FROM_PREV_YEAR]
+                ),
                 use_calculated_percentage_change=True,
                 increase_is_positive=True,
-                comparison_period_text=f"from same rolling period ending {formatted_year_ago}",
+                comparison_period_text="from same period previous year",
             ),
             html.Div(
                 [
                     get_changed_from_content(
-                        calculated_percentage_change=data[
-                            PERCENTAGE_CHANGE_FROM_TWO_PREV_YEAR
-                        ],
+                        calculated_percentage_change=format_percentage(
+                            data[PERCENTAGE_CHANGE_FROM_TWO_PREV_YEAR]
+                        ),
                         use_calculated_percentage_change=True,
                         increase_is_positive=True,
-                        comparison_period_text="from same rolling period "
-                        f"ending {formatted_two_years_ago}",
+                        comparison_period_text="from same period a year earlier",
                     ),
                 ],
                 style=CHANGED_FROM_GAP_STYLE,

gov_uk_dashboards/formatting/number_formatting.py

@@ -29,3 +29,10 @@ def add_commas(number: int, remove_decimal_places: bool = False) -> str:
     if remove_decimal_places:
         return f"{number:,.0f}"
     return f"{number:,}"
+
+
+def format_percentage(percentage):
+    """Formats percentages to remove decimal place on numbers 10 or more"""
+    if abs(percentage) < 10:
+        return percentage
+    return int(percentage)

{gov_uk_dashboards-26.23.0.dist-info → gov_uk_dashboards-26.24.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gov_uk_dashboards
-Version: 26.23.0
+Version: 26.24.0
 Summary: Provides access to functionality common to creating a data dashboard.
 Author: Department for Levelling Up, Housing and Communities
 Description-Content-Type: text/markdown

{gov_uk_dashboards-26.23.0.dist-info → gov_uk_dashboards-26.24.0.dist-info}/RECORD

@@ -49,7 +49,7 @@ gov_uk_dashboards/components/dash/card_full_width.py,sha256=KnpkB3krgLxp1MoqEZaz
 gov_uk_dashboards/components/dash/collapsible_panel.py,sha256=6A90xiTLU0b5e4jaWcisTbsf_82nRBvGapbyETd5m70,1192
 gov_uk_dashboards/components/dash/comparison_la_filter_button.py,sha256=u53Vmuz4MJ0J8RSVXGEFvDgzXIp_-JpDDE4o9VijoDw,671
 gov_uk_dashboards/components/dash/context_banner.py,sha256=gy0qKhseiM1oUyRS1X8_HrJuah-WaWN6yeZOHoGzAl4,1009
-gov_uk_dashboards/components/dash/context_card.py,sha256=3CzgSEYeyXoKvs5kOBPlp9LDaBq7tgfelKkG-aKzwCE,21987
+gov_uk_dashboards/components/dash/context_card.py,sha256=6bSGmoFsN3dwYvivm439StF0es4uSh7AF4dFHhFGLSI,21475
 gov_uk_dashboards/components/dash/dashboard_container.py,sha256=KC2isR0NShxUYCl_pzDEAS4WK5pFrLMp4m2We3AqiwM,512
 gov_uk_dashboards/components/dash/data_quality_banner.py,sha256=VLuAndN9xVFuMWFLqoPlolAJt08H9_rQa5x7jqde_RQ,2945
 gov_uk_dashboards/components/dash/details.py,sha256=ENkSBKd6XZTq0X7Jn0-zPaO1qR4F7zPNX-RLAXKVvAI,1107
@@ -99,7 +99,7 @@ gov_uk_dashboards/figures/styles/__init__.py,sha256=n4FMyPKfc1I0_SyWo3mklMiW7R38
 gov_uk_dashboards/figures/styles/line_style.py,sha256=L_1b_lDuU2LStewT47Ge5EhOslOPxSoA87p-SrKgJE0,560
 gov_uk_dashboards/formatting/__init__.py,sha256=bQk9_OEubUhuTRQjXUs4ZItgSY7yyDpwQcLauxf11Tk,460
 gov_uk_dashboards/formatting/human_readable.py,sha256=FYGnNHwE7btWpbi3ZNCkswbSCjhwJi6Ym-H4vMHwOlQ,2438
-gov_uk_dashboards/formatting/number_formatting.py,sha256=YrGpnTF1dQcL_U0IxWWpa8yabye-X6Rsy-eiJoyUILM,1121
+gov_uk_dashboards/formatting/number_formatting.py,sha256=CakgGq3oevCNnpqciWYvqFKOFmRdXGUaBnP2oatFjcs,1316
 gov_uk_dashboards/formatting/round_and_add_prefix_and_suffix.py,sha256=nxD7HVMjs0_HJA0d-WqJvKu-IwZZla1khyr0YCYUr40,1457
 gov_uk_dashboards/formatting/rounding.py,sha256=Em1yri_j18IYHbZ64d3bhVKX-XEllRSM9FzAUo1o6fU,968
 gov_uk_dashboards/formatting/text_functions.py,sha256=vHstpUo16LnsSk-rzwFDNP1SIAy2npIo-4ims1xNa64,306
@@ -121,8 +121,8 @@ gov_uk_dashboards/lib/testing_functions/barchart_data_test_assertions.py,sha256=
 gov_uk_dashboards/lib/testing_functions/data_test_assertions.py,sha256=1Icy7NZXw6hI_-7QAUaHqjjPKViY0jcFEASlk6Ul2tg,4162
 gov_uk_dashboards/lib/testing_functions/data_test_helper_functions.py,sha256=JoptoXJORuIdrhweVlp9fhX-ew2GtIkctIotpHWBQDQ,9635
 gov_uk_dashboards/lib/testing_functions/timeseries_data_test_assertions.py,sha256=SJa3WLgFqf7Y1W0sxsOew_-4m3689cjynRjoCyBK5WQ,1240
-gov_uk_dashboards-26.23.0.dist-info/licenses/LICENSE,sha256=GDiD7Y2Gx7JucPV1JfVySJeah-qiSyBPdpJ6RHCEHTc,1126
-gov_uk_dashboards-26.23.0.dist-info/METADATA,sha256=WFFsOytCRQkFGsmcgXBepjbYpuBijAPT4KmpYikqQzc,5903
-gov_uk_dashboards-26.23.0.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-gov_uk_dashboards-26.23.0.dist-info/top_level.txt,sha256=gPaN1P3-H3Rgi2me6tt-fX_cxo19CZfA4PjlZPjGRpo,18
-gov_uk_dashboards-26.23.0.dist-info/RECORD,,
+gov_uk_dashboards-26.24.0.dist-info/licenses/LICENSE,sha256=GDiD7Y2Gx7JucPV1JfVySJeah-qiSyBPdpJ6RHCEHTc,1126
+gov_uk_dashboards-26.24.0.dist-info/METADATA,sha256=mEwosVkphxTbDb1G2pAJhT3y5KgZtta6FkANEbl9OcI,5903
+gov_uk_dashboards-26.24.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+gov_uk_dashboards-26.24.0.dist-info/top_level.txt,sha256=gPaN1P3-H3Rgi2me6tt-fX_cxo19CZfA4PjlZPjGRpo,18
+gov_uk_dashboards-26.24.0.dist-info/RECORD,,

{gov_uk_dashboards-26.23.0.dist-info → gov_uk_dashboards-26.24.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.10.1)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any