gov-uk-dashboards 15.0.0__tar.gz → 15.0.2__tar.gz

{gov_uk_dashboards-15.0.0/gov_uk_dashboards.egg-info → gov_uk_dashboards-15.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gov_uk_dashboards
-Version: 15.0.0
+Version: 15.0.2
 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-15.0.0 → gov_uk_dashboards-15.0.2}/gov_uk_dashboards/components/plotly/choropleth_map.py

@@ -210,12 +210,31 @@ class ChoroplethMap:
             },
         )
 
+    def _wrap_text(self, text, max_chars_per_line):
+        words = text.split()
+        lines = []
+        current_line = ""
+
+        for word in words:
+            if len(current_line) + len(word) + 1 > max_chars_per_line:
+                lines.append(current_line)
+                current_line = word
+            else:
+                if current_line:
+                    current_line += " "
+                current_line += word
+
+        if current_line:
+            lines.append(current_line)
+
+        return "<br>".join(lines)
+
     def _get_color_bar(self):
         if self.discrete_map:
             return None
 
         return {
-            "title": self.column_to_plot,
+            "title": self._wrap_text(self.legend_title_text, 10),
             "thickness": 20,
             "len": 0.8,
             "x": 0.9,

{gov_uk_dashboards-15.0.0 → gov_uk_dashboards-15.0.2}/gov_uk_dashboards/components/plotly/time_series_chart.py

@@ -193,7 +193,6 @@ class TimeSeriesChart:
         #             hoverinfo="skip",
         #         )
         #     )
-
         if self.verticle_line_x_value_and_name is not None:
 
             fig.add_vline(
@@ -203,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],
@@ -267,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],
@@ -316,6 +314,7 @@ class TimeSeriesChart:
                 ][HOVER_TEXT_HEADERS]
             )
         # pylint: disable=duplicate-code
+
         return (
             f"{trace_name}<br>"
             f"{hover_text_headers[0]}"
@@ -332,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]]
@@ -368,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-15.0.0 → gov_uk_dashboards-15.0.2/gov_uk_dashboards.egg-info}/PKG-INFO

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