gov-uk-dashboards 20.0.0__tar.gz → 21.0.0__tar.gz

{gov_uk_dashboards-20.0.0/gov_uk_dashboards.egg-info → gov_uk_dashboards-21.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gov_uk_dashboards
-Version: 20.0.0
+Version: 21.0.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-20.0.0 → gov_uk_dashboards-21.0.0}/gov_uk_dashboards/components/helpers/display_chart_or_table_with_header.py

@@ -7,14 +7,18 @@ from gov_uk_dashboards.components.dash.download_button import (
     create_download_button_with_icon,
 )
 from gov_uk_dashboards.components.dash.heading import HeadingSizes
+from gov_uk_dashboards.components.dash.paragraph import paragraph
 
 
+# pylint: disable=too-many-arguments
+# pylint: disable=too-many-positional-arguments
 def display_chart_or_table_with_header(
     chart_or_table: Component,
     heading: str = None,
     sub_heading: str = None,
     download_button_id: str = None,
     download_data_button_id: str = None,
+    footnote: str = None,
 ) -> html.Div:
     """Generate the wrapping information/header for a chart or table.
 
@@ -25,6 +29,7 @@ def display_chart_or_table_with_header(
         download_button_id (str, optional): id for download button if required. Defaults to None.
                                             if None then the button will not be included.
         download_data_button_id (str, optional): the id to be applied to the download data button.
+        footnote (str, optional): the footnote to be added to charts and downloads.
 
     Returns:
         html.Div: Div containing Header and chart/table.
@@ -50,6 +55,7 @@ def display_chart_or_table_with_header(
                 ]
             ),
             chart_or_table,
+            html.Div([paragraph(footnote)], style={"padding-top": "20px"}),
             html.Div(
                 (
                     [

{gov_uk_dashboards-20.0.0 → gov_uk_dashboards-21.0.0}/gov_uk_dashboards/components/helpers/get_chart_for_download.py

@@ -6,6 +6,7 @@ def get_chart_for_download(self, fig):
     """Returns a fig with title and subtitle for download as png"""
     main_title = self.title_data[MAIN_TITLE]
     subtitle = self.title_data[SUBTITLE]
+    footnote = self.footnote
 
     fig.update_layout(
         title={
@@ -16,6 +17,18 @@ def get_chart_for_download(self, fig):
         title_subtitle={
             "text": f"<b><span style='color: black; margin: 0px 0px 5px'>{subtitle}</span></b>"
         },
-        margin={"t": 100},
+        annotations=[
+            {
+                "text": f"<span style='color: black; font-size: 18px;'>{footnote}</span>",
+                "x": -0.01,
+                "y": -0.4,  # Bottom of the plotting area
+                "xref": "paper",
+                "yref": "paper",
+                "xanchor": "left",
+                "yanchor": "top",
+                "showarrow": False,
+                "align": "left",
+            }
+        ],
     )
     return fig

{gov_uk_dashboards-20.0.0 → gov_uk_dashboards-21.0.0}/gov_uk_dashboards/components/plotly/time_series_chart.py

@@ -82,6 +82,7 @@ class TimeSeriesChart:
         number_of_traces_colour_shift_dict: Optional[dict] = None,
         additional_line: Optional[dict] = None,
         hover_distance: Optional[int] = 1,
+        footnote: Optional[str] = None,
     ):
         self.title_data = title_data
         self.y_axis_column = y_axis_column
@@ -112,6 +113,7 @@ class TimeSeriesChart:
         self.hover_distance = hover_distance
         self.colour_list = self._get_colour_list()
         self.fig = self.create_time_series_chart()
+        self.footnote = footnote
 
     def get_time_series_chart(self) -> html.Div:
         """Creates and returns time series chart for display on application.
@@ -130,6 +132,7 @@ class TimeSeriesChart:
             self.title_data[SUBTITLE],
             self.download_chart_button_id,
             self.download_data_button_id,
+            self.footnote,
         )
 
     def is_json_serializable(self, value):

{gov_uk_dashboards-20.0.0 → gov_uk_dashboards-21.0.0}/gov_uk_dashboards/lib/download_functions/convert_fig_to_image_and_download.py

@@ -9,7 +9,7 @@ def convert_fig_to_image_and_download(fig: go.Figure, name: str):
     """Converts a given Plotly figure to a PNG image and returns a Dash component
     for downloading the image.
     """
-    fig.update_layout(margin={"t": 150, "b": 100, "l": 100, "r": 50})
+    fig.update_layout(margin={"t": 150, "b": 250, "l": 100, "r": 50})
 
     filename = f"{name}-chart.png"
     img_bytes = pio.to_image(fig, format="png", width=1600, height=800)

{gov_uk_dashboards-20.0.0 → gov_uk_dashboards-21.0.0}/gov_uk_dashboards/lib/download_functions/download_csv_with_headers.py

@@ -38,7 +38,7 @@ def download_csv_with_headers(
     }  # range is missing columns in first df compared to max columns across all dfs
 
     subtitle = list_of_df_title_subtitle_dicts[0]["subtitle"]
-
+    footnote = list_of_df_title_subtitle_dicts[0]["footnote"]
     header_data = [
         {column_list[0]: "Date downloaded: " + get_todays_date_for_downloaded_csv()},
         *(
@@ -53,6 +53,7 @@ def download_csv_with_headers(
         ),  # Uses unpacking (*) to add the subtitle row if subtitle is not None. If subtitle is
         # None, it unpacks an empty list, effectively skipping the row.
         {column_list[0]: None},  # Blank row
+        *([{column_list[0]: footnote}] if footnote is not None else []),
         {**column_dict, **blank_dict},
     ]
 
@@ -60,12 +61,11 @@ def download_csv_with_headers(
         header_data = [{column_list[0]: sensitivity_label}] + header_data
 
     pl.DataFrame(header_data).write_csv(csv_buffer, include_header=False)
-
     for i, data in enumerate(list_of_df_title_subtitle_dicts):
         df = data["df"]
         title = data["title"]
         subtitle = data["subtitle"]
-
+        footnote = data.get("footnote")
         if i > 0 and title is not None:
             column_dict = {column_name: column_name for column_name in list(df.columns)}
             header_data = [
@@ -75,6 +75,7 @@ def download_csv_with_headers(
                 ),  # Uses unpacking (*) to add the subtitle row if subtitle is not None. If
                 # subtitle is None, it unpacks an empty list, effectively skipping the row.
                 {column_list[0]: None},  # Blank row
+                *([{column_list[0]: footnote}] if footnote is not None else []),
             ]
             pl.DataFrame(header_data).write_csv(csv_buffer, include_header=False)
         df.write_csv(csv_buffer, include_header=i > 0)

{gov_uk_dashboards-20.0.0 → gov_uk_dashboards-21.0.0/gov_uk_dashboards.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gov_uk_dashboards
-Version: 20.0.0
+Version: 21.0.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-20.0.0 → gov_uk_dashboards-21.0.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="20.0.0",
+    version="21.0.0",
     long_description=long_description,
     long_description_content_type="text/markdown",
     packages=find_packages(),