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

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

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

@@ -9,6 +9,7 @@ class XAxisFormat(Enum):
 
     YEAR = "year"
     MONTH_YEAR = "month_year"
+    MONTH_YEAR_MONTHLY_DATA = "month_year_monthly_data"
     FINANCIAL_QUARTER = "financial_quarter"
 
 

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

@@ -397,7 +397,6 @@ class TimeSeriesChart:
             tick_text_length = len(tick_text)
             total_tick_points = int((tick_text_length / 5) * 7)
             additional_tick_points = total_tick_points - tick_text_length
-
             last_current_tick_text = datetime.strptime(tick_text[-1], "%b %Y")
 
             for x in range(additional_tick_points):
@@ -417,6 +416,34 @@ class TimeSeriesChart:
                 tick_values[-1] + relativedelta(months=1),
             ]
             tick_text = replace_jun_jul_month_abbreviations(tick_text)
+
+        elif self.xaxis_tick_text_format == XAxisFormat.MONTH_YEAR_MONTHLY_DATA.value:
+            df = self.filtered_df.with_columns(
+                pl.col(self.x_axis_column)
+                .str.strptime(pl.Date, "%Y-%m-%d")
+                .alias(self.x_axis_column)
+            ).sort(self.x_axis_column)
+
+            start_datetime = datetime(2024, 7, 1).date()
+            latest_datetime = df[self.x_axis_column].max()
+            extra_datetime = latest_datetime + relativedelta(months=1)
+
+            tick_text = []
+            current = start_datetime
+            while current <= extra_datetime:
+                tick_text.append(current.strftime("%b %Y"))
+                current += relativedelta(months=1)
+
+            tick_values = [
+                datetime.strptime(month_year, "%b %Y").replace(day=1)
+                for month_year in tick_text
+            ]
+
+            range_x = [
+                tick_values[0],
+                tick_values[-1],
+            ]
+            tick_text = replace_jun_jul_month_abbreviations(tick_text)
         elif self.xaxis_tick_text_format == XAxisFormat.FINANCIAL_QUARTER.value:
             tick_values = [1, 2, 3, 4]
             tick_text = [

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

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