push

Author: jessgrahamuq

final_fix.py

@@ -0,0 +1,104 @@
+#!/usr/bin/env python3
+"""
+Final fix: Apply the working structure from exemplar.
+1. Only ctx at the start (no canvas)
+2. medianValuesPlugin
+3. DPI fix (which defines canvas)
+4. Chart creation
+5. Event handlers AFTER chart
+"""
+
+from pathlib import Path
+import re
+
+def fix_chart_file(file_path):
+    """Fix a single chart file."""
+
+    with open(file_path, 'r', encoding='utf-8') as f:
+        content = f.read()
+
+    # Step 1: Remove any existing "const canvas = " line that comes before the DPI fix
+    # This is the line that comes right before "const ctx"
+    content = re.sub(
+        r'        const canvas = document\.getElementById\(\'severityChart\'\);\n        const ctx = document\.getElementById\(\'severityChart\'\)\.getContext\(\'2d\'\);',
+        r'        const ctx = document.getElementById(\'severityChart\').getContext(\'2d\');',
+        content
+    )
+
+    # Step 2: Ensure the DPI fix is in the right place and defines canvas
+    # Remove any existing DPI fix
+    content = re.sub(
+        r'\n        //  Fix blurry canvas on high-DPI displays\n        const dpr = window\.devicePixelRatio \|\| 1;\n        const (rect|canvas) = .*?\n        .*?\n        .*?\n        ctx\.scale\(dpr, dpr\);',
+        '',
+        content,
+        flags=re.DOTALL
+    )
+
+    # Add DPI fix right before chart creation
+    dpi_fix = '''
+        // Fix blurry canvas on high-DPI displays
+        const dpr = window.devicePixelRatio || 1;
+        const canvas = document.getElementById('severityChart');
+        const rect = canvas.getBoundingClientRect();
+        canvas.width = rect.width * dpr;
+        canvas.height = rect.height * dpr;
+        ctx.scale(dpr, dpr);
+
+'''
+
+    # Insert before "const chart = new Chart"
+    content = re.sub(
+        r'(        const chart = new Chart\(ctx,)',
+        dpi_fix + r'\1',
+        content
+    )
+
+    # Step 3: Move mouse event handlers after chart creation
+    # First, extract the handlers
+    mouse_handler_pattern = r'(\n        // Add mouse move handler for hover interaction\n        const chartCanvas = document\.getElementById\(\'severityChart\'\);\n        const tooltip = document\.getElementById\(\'expertTooltip\'\);.*?chartCanvas\.addEventListener\(\'mouseleave\'.*?\n        \}\);\n)'
+
+    match = re.search(mouse_handler_pattern, content, re.DOTALL)
+
+    if match:
+        handlers = match.group(1)
+        # Remove from current location
+        content = content.replace(handlers, '')
+
+        # Insert right before "// UI Controls"
+        content = re.sub(
+            r'(\n        // UI Controls)',
+            handlers + r'\1',
+            content
+        )
+
+    # Write back
+    with open(file_path, 'w', encoding='utf-8') as f:
+        f.write(content)
+
+    print(f"Fixed: {file_path.name}")
+
+
+def main():
+    """Process all severity chart files."""
+
+    # Find all BAU and PM severity charts
+    bau_charts = sorted(Path('.').glob('risk*_bau_chart.html'))
+    pm_charts = sorted(Path('.').glob('risk*_pm_chart.html'))
+
+    all_charts = bau_charts + pm_charts
+
+    if not all_charts:
+        print("No severity charts found!")
+        return
+
+    print(f"Found {len(all_charts)} severity charts")
+    print(f"Applying final fix...\n")
+
+    for chart_file in all_charts:
+        fix_chart_file(chart_file)
+
+    print(f"\nCompleted!")
+
+
+if __name__ == '__main__':
+    main()

fix_event_handler_order.py

@@ -0,0 +1,74 @@
+#!/usr/bin/env python3
+"""
+Move mouse event handlers to AFTER chart creation.
+The handlers reference 'chart' so they must come after it's created.
+"""
+
+from pathlib import Path
+import re
+
+def fix_event_handler_order(file_path):
+    """Move event handlers after chart creation."""
+
+    with open(file_path, 'r', encoding='utf-8') as f:
+        content = f.read()
+
+    # Pattern to match the mouse event handlers section
+    # From "// Add mouse move handler" to the closing of the mouseleave handler
+    event_handlers_pattern = r'(        // Add mouse move handler for hover interaction\n        const chartCanvas = document\.getElementById\(\'severityChart\'\);\n        const tooltip = document\.getElementById\(\'expertTooltip\'\);\n\n        chartCanvas\.addEventListener\(\'mousemove\',.*?chartCanvas\.addEventListener\(\'mouseleave\',.*?\n        \}\);\n\n)'
+
+    match = re.search(event_handlers_pattern, content, re.DOTALL)
+
+    if not match:
+        print(f"ERROR: Could not find event handlers in {file_path.name}")
+        return
+
+    event_handlers = match.group(1)
+
+    # Remove the event handlers from their current location
+    content = content.replace(event_handlers, '')
+
+    # Find the end of chart creation (closing of Chart constructor)
+    # Look for the pattern where Chart(...) ends with }); followed by update button handlers
+    # We want to insert BEFORE the button handlers
+
+    # Find "// Update mode buttons" or first button event listener
+    insert_pattern = r'(        // Update mode buttons|        document\.getElementById\(\'exactBtn\'\)\.addEventListener)'
+
+    match = re.search(insert_pattern, content)
+    if match:
+        insert_pos = match.start()
+        content = content[:insert_pos] + event_handlers + content[insert_pos:]
+
+        with open(file_path, 'w', encoding='utf-8') as f:
+            f.write(content)
+
+        print(f"Fixed: {file_path.name}")
+    else:
+        print(f"ERROR: Could not find insertion point in {file_path.name}")
+
+
+def main():
+    """Process all severity chart files."""
+
+    # Find all BAU and PM severity charts
+    bau_charts = sorted(Path('.').glob('risk*_bau_chart.html'))
+    pm_charts = sorted(Path('.').glob('risk*_pm_chart.html'))
+
+    all_charts = bau_charts + pm_charts
+
+    if not all_charts:
+        print("No severity charts found!")
+        return
+
+    print(f"Found {len(all_charts)} severity charts")
+    print(f"Moving event handlers after chart creation...\n")
+
+    for chart_file in all_charts:
+        fix_event_handler_order(chart_file)
+
+    print(f"\nCompleted!")
+
+
+if __name__ == '__main__':
+    main()

move_handlers_simple.py

@@ -0,0 +1,84 @@
+#!/usr/bin/env python3
+"""
+Move event handlers to after chart creation.
+"""
+
+from pathlib import Path
+
+def move_handlers(file_path):
+    """Move event handlers after chart creation."""
+
+    with open(file_path, 'r', encoding='utf-8') as f:
+        lines = f.readlines()
+
+    # Find the event handler section
+    handler_start = None
+    handler_end = None
+
+    for i, line in enumerate(lines):
+        if '// Add mouse move handler for hover interaction' in line:
+            handler_start = i
+        if handler_start is not None and 'chartCanvas.addEventListener(\'mouseleave\'' in line:
+            # Find the closing }); of this addEventListener
+            for j in range(i, min(i + 10, len(lines))):
+                if '});' in lines[j]:
+                    handler_end = j + 1  # Include the line after });
+                    break
+            break
+
+    if handler_start is None or handler_end is None:
+        print(f"ERROR: Could not find event handlers in {file_path.name}")
+        return
+
+    # Extract the event handler section (including blank line after)
+    handler_lines = lines[handler_start:handler_end]
+
+    # Remove from current location
+    del lines[handler_start:handler_end]
+
+    # Find where to insert: after the chart closing "        });" and before "        // UI Controls"
+    insert_pos = None
+    for i, line in enumerate(lines):
+        if '// UI Controls' in line:
+            insert_pos = i
+            break
+
+    if insert_pos is None:
+        print(f"ERROR: Could not find insertion point in {file_path.name}")
+        return
+
+    # Insert the handlers before "// UI Controls"
+    for j, handler_line in enumerate(handler_lines):
+        lines.insert(insert_pos + j, handler_line)
+
+    # Write back
+    with open(file_path, 'w', encoding='utf-8') as f:
+        f.writelines(lines)
+
+    print(f"Fixed: {file_path.name}")
+
+
+def main():
+    """Process all severity chart files."""
+
+    # Find all BAU and PM severity charts
+    bau_charts = sorted(Path('.').glob('risk*_bau_chart.html'))
+    pm_charts = sorted(Path('.').glob('risk*_pm_chart.html'))
+
+    all_charts = bau_charts + pm_charts
+
+    if not all_charts:
+        print("No severity charts found!")
+        return
+
+    print(f"Found {len(all_charts)} severity charts")
+    print(f"Moving event handlers...\n")
+
+    for chart_file in all_charts:
+        move_handlers(chart_file)
+
+    print(f"\nCompleted!")
+
+
+if __name__ == '__main__':
+    main()