gov-uk-dashboards 14.0.0__py3-none-any.whl → 15.0.1__py3-none-any.whl

gov_uk_dashboards/components/plotly/time_series_chart.py

@@ -172,6 +172,7 @@ class TimeSeriesChart:
                     ),
                 )
             )
+        self._format_x_axis(fig)
 
         # if self.average_increment_for_average_trace is not None:
         #     trace_name = LINEAR_TRAJECTORY
@@ -192,7 +193,6 @@ class TimeSeriesChart:
         #             hoverinfo="skip",
         #         )
         #     )
-
         if self.verticle_line_x_value_and_name is not None:
 
             fig.add_vline(
@@ -202,7 +202,7 @@ class TimeSeriesChart:
                 line_color="#b3b3b3",
             )
             fig.add_annotation(
-                x=self.verticle_line_x_value_and_name,
+                x=self.verticle_line_x_value_and_name[0],
                 yref="paper",
                 y=0.9,
                 text=self.verticle_line_x_value_and_name[1],
@@ -246,8 +246,6 @@ class TimeSeriesChart:
             range=range_x,
         )
 
-        return tick_values
-
     def create_time_series_trace(
         self,
         df: pl.DataFrame,
@@ -268,7 +266,6 @@ class TimeSeriesChart:
             hover_label (dict[str,str]): Properties for hoverlabel parameter.
             marker (dict[str,str]): Properties for marker parameter.
         """
-
         return go.Scatter(
             x=df[self.x_axis_column],
             y=df[self.y_axis_column],
@@ -317,6 +314,7 @@ class TimeSeriesChart:
                 ][HOVER_TEXT_HEADERS]
             )
         # pylint: disable=duplicate-code
+
         return (
             f"{trace_name}<br>"
             f"{hover_text_headers[0]}"
@@ -333,7 +331,6 @@ class TimeSeriesChart:
             and trace_name
             in self.hover_data_for_traces_with_different_hover_for_last_point
         ):
-
             customdata = [
                 (
                     [df[col][i] for col in self.hover_data[trace_name][CUSTOM_DATA]]
@@ -369,16 +366,17 @@ class TimeSeriesChart:
                 .dt.year()
                 .alias(YEAR)
             )
-
+            date_list = df_with_year_column[self.x_axis_column].unique().to_list()
+            min_date_string = min(date_list)
+            max_date_string = max(date_list)
+            min_datetime = datetime.strptime(min_date_string, "%Y-%m-%d")
+            max_datetime = datetime.strptime(max_date_string, "%Y-%m-%d")
             year_list = df_with_year_column[YEAR].unique().to_list()
-
-            tick_text = [min(year_list) - 1] + year_list + [max(year_list) + 1]
-
+            tick_text = list(range(min(year_list) - 1, max(year_list) + 2))
             tick_values = [date(year, 1, 1) for year in tick_text]
-
             range_x = [
-                tick_values[0] + relativedelta(months=6),
-                tick_values[-1] + relativedelta(months=6),
+                min_datetime - relativedelta(months=6),
+                max_datetime + relativedelta(months=6),
             ]
 
         elif self.xaxis_tick_text_format == XAxisFormat.MONTH_YEAR.value:

{gov_uk_dashboards-14.0.0.dist-info → gov_uk_dashboards-15.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gov_uk_dashboards
-Version: 14.0.0
+Version: 15.0.1
 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-14.0.0.dist-info → gov_uk_dashboards-15.0.1.dist-info}/RECORD

@@ -78,7 +78,7 @@ gov_uk_dashboards/components/plotly/captioned_figure.py,sha256=T0sbtGTiJ79FXxVdP
 gov_uk_dashboards/components/plotly/choropleth_map.py,sha256=kX44qgxAL9i3w0bT7N2274iBcH5RiyeWF_lVWV1hju0,9292
 gov_uk_dashboards/components/plotly/enums.py,sha256=0QnVyXwnBQRqP3p8YIgPsvGLPu-wClBj9F_722GDfYU,794
 gov_uk_dashboards/components/plotly/stacked_barchart.py,sha256=y2XOf96tMfy5ythPb5RzqW5qGc2sKU3W508UbWO2iC0,12175
-gov_uk_dashboards/components/plotly/time_series_chart.py,sha256=hZ99q1PeyPKKoFvXsUPQfbpjMamKLGy7iJZ2rjJOmDI,17862
+gov_uk_dashboards/components/plotly/time_series_chart.py,sha256=oOxGjCjoKclLc5o9qGc6vMtb1LXWZ2WbdZzQ31NLZ9E,18176
 gov_uk_dashboards/figures/__init__.py,sha256=_snQeNlM81nNKERl4gg9ScH2HYbtwaBjl8yQonccx34,712
 gov_uk_dashboards/figures/chart_data.py,sha256=fEsNkQFzXKIQ0h7aLBWq3J1qAxHbxvJeKU23JrVodVc,757
 gov_uk_dashboards/figures/line_chart.py,sha256=rEB51_z9cPl7BcT94iA6ZsZXzecnVCnGpQWW_9SNGUY,2813
@@ -99,8 +99,8 @@ gov_uk_dashboards/lib/dap/dap_deployment.py,sha256=ZXixeOAtRNjMsPdGKLwwLNamlo0mi
 gov_uk_dashboards/lib/dap/get_dataframe_from_cds.py,sha256=OiusRCgYnkBjK_GZgYLGzNrxOGizYt8CgThiWRCVKK0,3921
 gov_uk_dashboards/lib/datetime_functions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gov_uk_dashboards/lib/datetime_functions/datetime_functions.py,sha256=BQgr8I_vFNYwLi-fE4YC6jZ5PpbPea2rnD_2a_lw0YE,12209
-gov_uk_dashboards-14.0.0.dist-info/licenses/LICENSE,sha256=GDiD7Y2Gx7JucPV1JfVySJeah-qiSyBPdpJ6RHCEHTc,1126
-gov_uk_dashboards-14.0.0.dist-info/METADATA,sha256=qvuAm5o4ZXqvgFBrzuYmtkzWH9AHsG0PZhuT0Demiu0,5917
-gov_uk_dashboards-14.0.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-gov_uk_dashboards-14.0.0.dist-info/top_level.txt,sha256=gPaN1P3-H3Rgi2me6tt-fX_cxo19CZfA4PjlZPjGRpo,18
-gov_uk_dashboards-14.0.0.dist-info/RECORD,,
+gov_uk_dashboards-15.0.1.dist-info/licenses/LICENSE,sha256=GDiD7Y2Gx7JucPV1JfVySJeah-qiSyBPdpJ6RHCEHTc,1126
+gov_uk_dashboards-15.0.1.dist-info/METADATA,sha256=SMJrlFrbMV_PvdI6pxCnzRwNj35EXukgfUj4CEXTAY8,5917
+gov_uk_dashboards-15.0.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+gov_uk_dashboards-15.0.1.dist-info/top_level.txt,sha256=gPaN1P3-H3Rgi2me6tt-fX_cxo19CZfA4PjlZPjGRpo,18
+gov_uk_dashboards-15.0.1.dist-info/RECORD,,