gov-uk-dashboards 26.23.0__tar.gz → 26.24.0__tar.gz

{gov_uk_dashboards-26.23.0/gov_uk_dashboards.egg-info → gov_uk_dashboards-26.24.0}/PKG-INFO

@@ -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 → gov_uk_dashboards-26.24.0}/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-26.23.0 → gov_uk_dashboards-26.24.0}/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 → gov_uk_dashboards-26.24.0/gov_uk_dashboards.egg-info}/PKG-INFO

@@ -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 → gov_uk_dashboards-26.24.0}/setup.py

@@ -10,7 +10,7 @@ setup(
     author="Department for Levelling Up, Housing and Communities",
     description="Provides access to functionality common to creating a data dashboard.",
     name="gov_uk_dashboards",
-    version="26.23.0",
+    version="26.24.0",
     long_description=long_description,
     long_description_content_type="text/markdown",
     packages=find_packages(),