staticdash 2025.23__tar.gz → 2025.25__tar.gz

{staticdash-2025.23 → staticdash-2025.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: staticdash
-Version: 2025.23
+Version: 2025.25
 Summary: A lightweight static HTML dashboard generator with Plotly and pandas support.
 Author-email: Brian Day <brian.day1@gmail.com>
 License: CC0-1.0

{staticdash-2025.23 → staticdash-2025.25}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "staticdash"
-version = "2025.23"
+version = "2025.25"
 description = "A lightweight static HTML dashboard generator with Plotly and pandas support."
 authors = [
     { name = "Brian Day", email = "brian.day1@gmail.com" }

{staticdash-2025.23 → staticdash-2025.25}/staticdash/dashboard.py

@@ -65,19 +65,41 @@ class Page(AbstractPage):
         effective_width = self.page_width or inherited_width
         elements = []
 
-        # Add floating header and footer for marking
+        # # Add floating header and footer for marking
+        # marking = self.marking or "Default Marking"
+        # elements.append(div(
+        #     marking,
+        #     cls="floating-header",
+        #     style="position: fixed; top: 0; left: 50%; transform: translateX(-50%); width: auto; background-color: #f8f9fa; text-align: center; padding: 10px; z-index: 1000; font-weight: normal;"
+        # ))
+        # elements.append(div(
+        #     marking,
+        #     cls="floating-footer",
+        #     style="position: fixed; bottom: 0; left: 50%; transform: translateX(-50%); width: auto; background-color: #f8f9fa; text-align: center; padding: 10px; z-index: 1000; font-weight: normal;"
+        # ))
+
+        # Add floating header and footer with optional distribution
         marking = self.marking or "Default Marking"
+        distribution = getattr(self, "distribution", None)
+
         elements.append(div(
             marking,
             cls="floating-header",
             style="position: fixed; top: 0; left: 50%; transform: translateX(-50%); width: auto; background-color: #f8f9fa; text-align: center; padding: 10px; z-index: 1000; font-weight: normal;"
         ))
+
+        footer_block = []
+        if distribution:
+            footer_block.append(div(distribution, style="margin-bottom: 4px; font-size: 10pt;"))
+        footer_block.append(div(marking))
+
         elements.append(div(
-            marking,
+            *footer_block,
             cls="floating-footer",
             style="position: fixed; bottom: 0; left: 50%; transform: translateX(-50%); width: auto; background-color: #f8f9fa; text-align: center; padding: 10px; z-index: 1000; font-weight: normal;"
         ))
 
+
         for kind, content, el_width in self.elements:
             style = ""
             outer_style = ""
@@ -205,11 +227,12 @@ class MiniPage(AbstractPage):
         return row_div
 
 class Dashboard:
-    def __init__(self, title="Dashboard", page_width=900, marking=None):
+    def __init__(self, title="Dashboard", page_width=900, marking=None, distribution=None):
         self.title = title
         self.pages = []
         self.page_width = page_width
         self.marking = marking  # Dashboard-wide marking
+        self.distribution = distribution  # NEW: Distribution statement
 
     def add_page(self, page):
         self.pages.append(page)
@@ -431,17 +454,60 @@ class Dashboard:
                         self.notify('TOCEntry', (outline_level, text, self.page))
 
 
-
         def add_marking(canvas, doc, marking):
+            from reportlab.pdfbase.pdfmetrics import stringWidth
+
+            distribution = self.distribution
+            canvas.saveState()
+            canvas.setFont("Helvetica", 10)
+            width, height = doc.pagesize
+
+            line_height = 12
+            margin_y = 36
+
+            # Top of page marking
+            if marking:
+                top_width = stringWidth(marking, "Helvetica", 10)
+                x_top = (width - top_width) / 2
+                canvas.drawString(x_top, height - margin_y, marking)
+
+            # Bottom of page — prepare to stack upward
+            y = margin_y
+
+            # First: bottom marking
             if marking:
-                canvas.saveState()
-                canvas.setFont("Helvetica", 10)
-                width, height = doc.pagesize
-                text_width = canvas.stringWidth(marking, "Helvetica", 10)
-                x = (width - text_width) / 2
-                canvas.drawString(x, height - 36, marking)
-                canvas.drawString(x, 36, marking)
-                canvas.restoreState()
+                bot_width = stringWidth(marking, "Helvetica", 10)
+                x_bot = (width - bot_width) / 2
+                canvas.drawString(x_bot, y, marking)
+                y += line_height  # make room above
+
+            # Then: bottom distribution (above marking)
+            if distribution:
+                max_width = width - 144  # ~1" margins
+                words = distribution.split()
+                lines = []
+                current_line = []
+
+                for word in words:
+                    test_line = " ".join(current_line + [word])
+                    if stringWidth(test_line, "Helvetica", 10) <= max_width:
+                        current_line.append(word)
+                    else:
+                        lines.append(" ".join(current_line))
+                        current_line = [word]
+
+                if current_line:
+                    lines.append(" ".join(current_line))
+
+                # Draw top-down (above marking)
+                for line in reversed(lines):
+                    line_width = stringWidth(line, "Helvetica", 10)
+                    x = (width - line_width) / 2
+                    y += line_height
+                    canvas.drawString(x, y, line)
+
+            canvas.restoreState()
+
 
         if include_title_page:
             story.append(Spacer(1, 120))
@@ -467,33 +533,29 @@ class Dashboard:
             story.append(PageBreak())
 
         def render_page(page, level=0, sec_prefix=[]):
-            heading_style = styles['Heading1'] if level == 0 else styles['Heading2']
+            heading_style = styles.get(f'Heading{min(level + 1, 4)}', styles['Heading4'])
 
-            # Only add the page.title as a real heading if it's a top-level page
-            # if level == 0:
-            #     story.append(Paragraph(page.title, heading_style))
-            #     story.append(Spacer(1, 12))
+            # Remember where we started
+            content_start = len(story)
 
-            heading_style = styles['Heading1'] if level == 0 else styles['Heading2']
             story.append(Paragraph(page.title, heading_style))
             story.append(Spacer(1, 12))
 
-
             for kind, content, _ in page.elements:
-                if kind == "text":
-                    story.append(Paragraph(content, normal_style))
-                    story.append(Spacer(1, 8))
-
-                elif kind == "header":
-                    text, lvl = content
-                    safe_lvl = max(1, min(lvl + 1, 4))  # Clamp to Heading1–Heading4
-                    style = styles[f'Heading{safe_lvl}']
-                    story.append(Paragraph(text, style))
-                    story.append(Spacer(1, 8))
-
-                elif kind == "table":
-                    df = content
-                    try:
+                try:
+                    if kind == "text":
+                        story.append(Paragraph(content, normal_style))
+                        story.append(Spacer(1, 8))
+
+                    elif kind == "header":
+                        text, lvl = content
+                        safe_lvl = max(1, min(lvl + 1, 4))
+                        style = styles[f'Heading{safe_lvl}']
+                        story.append(Paragraph(text, style))
+                        story.append(Spacer(1, 8))
+
+                    elif kind == "table":
+                        df = content
                         data = [df.columns.tolist()] + df.values.tolist()
                         t = Table(data, repeatRows=1)
                         t.setStyle(TableStyle([
@@ -515,48 +577,59 @@ class Dashboard:
                         ]))
                         story.append(t)
                         story.append(Spacer(1, 12))
-                    except Exception:
-                        story.append(Paragraph("Table could not be rendered.", normal_style))
 
-                elif kind == "plot":
-                    fig = content
-                    try:
-                        if hasattr(fig, "savefig"):  # Matplotlib
-                            buf = io.BytesIO()
+                    elif kind == "plot":
+                        fig = content
+                        buf = io.BytesIO()
+                        if hasattr(fig, "savefig"):
                             fig.savefig(buf, format="png", bbox_inches="tight", dpi=300)
-                            buf.seek(0)
-                            story.append(Spacer(1, 8))
-                            story.append(Image(buf, width=6*inch, height=4.5*inch))
-                            story.append(Spacer(1, 12))
-                        elif hasattr(fig, "write_image"):  # Plotly
-                            with tempfile.NamedTemporaryFile(suffix=".png", delete=False) as tmpfile:
-                                fig.write_image(tmpfile.name, width=600, height=360, scale=2)
-                                with open(tmpfile.name, "rb") as f:
-                                    story.append(Spacer(1, 8))
-                                    story.append(Image(io.BytesIO(f.read()), width=6*inch, height=3.6*inch))
-                                    story.append(Spacer(1, 12))
-                            os.unlink(tmpfile.name)
-                    except Exception as e:
-                        story.append(Paragraph(f"Plot rendering failed: {e}", normal_style))
+                        else:
+                            fig.write_image(buf, format="png", width=600, height=360, scale=2)
+                        buf.seek(0)
+                        story.append(Image(buf, width=6 * inch, height=4.5 * inch))
+                        story.append(Spacer(1, 12))
+
+                    elif kind == "syntax":
+                        code, language = content
+                        from html import escape
+                        story.append(Paragraph(f"<b>Code ({language}):</b>", normal_style))
+                        story.append(Spacer(1, 4))
+                        code_html = escape(code).replace(" ", "&nbsp;").replace("\n", "<br/>")
+                        story.append(Paragraph(f"<font face='Courier'>{code_html}</font>", styles['CodeBlock']))
+                        story.append(Spacer(1, 12))
+
+                    elif kind == "minipage":
+                        render_page(content, level=level + 1, sec_prefix=sec_prefix)
 
-                elif kind == "syntax":
-                    code, language = content
-                    from html import escape
-                    story.append(Paragraph(f"<b>Code ({language}):</b>", normal_style))
-                    story.append(Spacer(1, 4))
-                    code_html = escape(code).replace(" ", "&nbsp;").replace("\n", "<br/>")
-                    story.append(Paragraph(f"<font face='Courier'>{code_html}</font>", styles['CodeBlock']))
-                    story.append(Spacer(1, 12))
+                except Exception as e:
+                    story.append(Paragraph(f"Error rendering element: {e}", normal_style))
+
+
+            just_broke = False
+
+            for i, child in enumerate(page.children):
+                if i > 0 and not just_broke:
+                    story.append(PageBreak())
 
-                elif kind == "minipage":
-                    render_page(content, level=level + 1, sec_prefix=sec_prefix)
+                before = len(story)
+                render_page(child, level=level + 1, sec_prefix=sec_prefix + [i + 1])
+                after = len(story)
 
-            for child in page.children:
+                # Determine if child added a PageBreak
+                just_broke = isinstance(story[-1], PageBreak) if after > before else False
+
+
+            # Determine if anything meaningful was added
+            def has_meaningful_content(start_idx):
+                for elem in story[start_idx:]:
+                    if isinstance(elem, (Paragraph, Table, Image)):
+                        return True
+                return False
+
+            if not page.children and has_meaningful_content(content_start):
                 story.append(PageBreak())
-                render_page(child, level=level + 1, sec_prefix=sec_prefix + [1])
 
 
-            story.append(PageBreak())
 
         for page in self.pages:
             render_page(page)

{staticdash-2025.23 → staticdash-2025.25}/staticdash.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: staticdash
-Version: 2025.23
+Version: 2025.25
 Summary: A lightweight static HTML dashboard generator with Plotly and pandas support.
 Author-email: Brian Day <brian.day1@gmail.com>
 License: CC0-1.0