diff --git a/backend/routers/projects.py b/backend/routers/projects.py index 5349788..29e71cd 100644 --- a/backend/routers/projects.py +++ b/backend/routers/projects.py @@ -2038,6 +2038,7 @@ async def generate_excel_report( import openpyxl from openpyxl.chart import LineChart, Reference from openpyxl.chart.label import DataLabelList + from openpyxl.chart.shapes import GraphicalProperties from openpyxl.styles import Font, Alignment, Border, Side, PatternFill from openpyxl.utils import get_column_letter except ImportError: @@ -2340,6 +2341,10 @@ async def generate_excel_report( chart.series[2].graphicalProperties.line.solidFill = "0070C0" chart.series[2].graphicalProperties.line.width = 19050 + _plot_border = GraphicalProperties() + _plot_border.ln.solidFill = "000000" + _plot_border.ln.w = 12700 + chart.plot_area.spPr = _plot_border ws.add_chart(chart, "H4") # --- Stats table: note at I28-I29, headers at I31, data rows 32-34 --- @@ -2679,6 +2684,7 @@ async def generate_report_from_preview( try: import openpyxl from openpyxl.chart import LineChart, Reference + from openpyxl.chart.shapes import GraphicalProperties from openpyxl.styles import Font, Alignment, Border, Side, PatternFill from openpyxl.utils import get_column_letter except ImportError: @@ -2821,6 +2827,10 @@ async def generate_report_from_preview( chart.series[1].graphicalProperties.line.width = 19050 chart.series[2].graphicalProperties.line.solidFill = "0070C0" chart.series[2].graphicalProperties.line.width = 19050 + _plot_border = GraphicalProperties() + _plot_border.ln.solidFill = "000000" + _plot_border.ln.w = 12700 + chart.plot_area.spPr = _plot_border ws.add_chart(chart, "H4") # --- Stats block starting at I28 --- @@ -2957,6 +2967,7 @@ async def generate_combined_excel_report( try: import openpyxl from openpyxl.chart import LineChart, Reference + from openpyxl.chart.shapes import GraphicalProperties from openpyxl.styles import Font, Alignment, Border, Side, PatternFill from openpyxl.utils import get_column_letter except ImportError: @@ -3163,6 +3174,10 @@ async def generate_combined_excel_report( chart.series[2].graphicalProperties.line.solidFill = "0070C0" chart.series[2].graphicalProperties.line.width = 19050 + _plot_border = GraphicalProperties() + _plot_border.ln.solidFill = "000000" + _plot_border.ln.w = 12700 + chart.plot_area.spPr = _plot_border ws.add_chart(chart, "H4") # Stats table: note at I28-I29, headers at I31, data rows 32-34, border row 35 @@ -3569,6 +3584,7 @@ async def generate_combined_from_preview( try: import openpyxl from openpyxl.chart import LineChart, Reference + from openpyxl.chart.shapes import GraphicalProperties from openpyxl.styles import Font, Alignment, Border, Side, PatternFill from openpyxl.utils import get_column_letter from openpyxl.worksheet.properties import PageSetupProperties @@ -3736,6 +3752,10 @@ async def generate_combined_from_preview( chart.series[2].graphicalProperties.line.solidFill = "0070C0" chart.series[2].graphicalProperties.line.width = 19050 + _plot_border = GraphicalProperties() + _plot_border.ln.solidFill = "000000" + _plot_border.ln.w = 12700 + chart.plot_area.spPr = _plot_border ws.add_chart(chart, "H4") hdr_fill_tbl = PatternFill(start_color="F2F2F2", end_color="F2F2F2", fill_type="solid") diff --git a/templates/combined_report_wizard.html b/templates/combined_report_wizard.html index a6c213f..264f185 100644 --- a/templates/combined_report_wizard.html +++ b/templates/combined_report_wizard.html @@ -75,7 +75,7 @@ -