Merge pull request #75 from cisagov/71-conclusionrecommendation-title…

…-stays-on-previous-page Update layout for conclusion section in report_generator.py
cisagov · Dec 12, 2023 · 304dc8a · 304dc8a
2 parents e746094 + 8572383
commit 304dc8a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/src/tpt_reports/_version.py b/src/tpt_reports/_version.py
@@ -1,2 +1,2 @@
 """This file defines the version of this module."""
-__version__ = "1.1.3"
+__version__ = "1.1.4"
diff --git a/src/tpt_reports/report_generator.py b/src/tpt_reports/report_generator.py
@@ -413,23 +413,31 @@ def content_page(canvas, doc):
 
     # Generate a table using a tabframe passed to my format_table function
     Story.append(
-        format_table(
-            pd.DataFrame.from_records(payloads_list),
-            table_header,
-            [3.2 * inch, 0.9 * inch, 1.1 * inch, 1.1 * inch],
-            [body, body, None, None],
+        KeepTogether(
+            [
+                format_table(
+                    pd.DataFrame.from_records(payloads_list),
+                    table_header,
+                    [3.2 * inch, 0.9 * inch, 1.1 * inch, 1.1 * inch],
+                    [body, body, None, None],
+                ),
+                Paragraph("Figure 2: Payload testing results", image_text),
+            ]
         )
     )
-    Story.append(Paragraph("Figure 2: Payload testing results", image_text))
     Story.append(point12_spacer)
-    Story.append(Paragraph("CONCLUSION / RECOMMENDED MITIGATION", h2))
     Story.append(
-        Paragraph(
-            """Regularly analyze border and host-level protections, including
-            spam-filtering capabilities, to ensure their continued effectiveness
-            in blocking the delivery and execution of malware. These tools must
-            be kept up-to-date.""",
-            body,
+        KeepTogether(
+            [
+                Paragraph("CONCLUSION / RECOMMENDED MITIGATION", h2),
+                Paragraph(
+                    """Regularly analyze border and host-level protections, including
+                spam-filtering capabilities, to ensure their continued effectiveness
+                in blocking the delivery and execution of malware. These tools must
+                be kept up-to-date.""",
+                    body,
+                ),
+            ]
         )
     )