Report: Edit Report history

[csit.git] / resources / tools / presentation / generator_files.py

diff --git a/resources/tools/presentation/generator_files.py b/resources/tools/presentation/generator_files.py
index d6c7546..ec142ed 100644 (file)
--- a/resources/tools/presentation/generator_files.py
+++ b/resources/tools/presentation/generator_files.py
@@ -88,7 +88,12 @@ def file_test_results(file_spec, input_data, frmt=u"rst"):
     """
 
     base_file_name = f"{file_spec[u'output-file']}"
-    rst_header = file_spec.get(u"file-header", u"")
+    rst_header = (
+        u"\n"
+        u".. |br| raw:: html\n\n    <br />\n\n\n"
+        u".. |prein| raw:: html\n\n    <pre>\n\n\n"
+        u".. |preout| raw:: html\n\n    </pre>\n\n"
+    )
     start_lvl = file_spec.get(u"data-start-level", 4)
 
     logging.info(f"  Generating the file {base_file_name} ...")
@@ -118,7 +123,6 @@ def file_test_results(file_spec, input_data, frmt=u"rst"):
     if tests.empty:
         return
     tests = input_data.merge_data(tests)
-    tests.sort_index(inplace=True)
 
     suites = input_data.filter_data(
         file_spec,
@@ -128,6 +132,7 @@ def file_test_results(file_spec, input_data, frmt=u"rst"):
     if suites.empty:
         return
     suites = input_data.merge_data(suites)
+    suites.sort_index(inplace=True)
 
     file_name = u""
     for suite_longname, suite in suites.items():
@@ -156,12 +161,14 @@ def file_test_results(file_spec, input_data, frmt=u"rst"):
                 file_handler.write(f"\n{suite[u'name']}\n{title_line}\n")
 
             if _tests_in_suite(suite[u"name"], tests):
-                file_handler.write(f"\n{suite[u'name']}\n{title_line}\n")
-                file_handler.write(
-                    f"\n{suite[u'doc']}\n".replace(u'|br|', u'\n\n -')
-                )
                 for tbl_file in table_lst:
                     if suite[u"name"] in tbl_file:
+                        file_handler.write(
+                            f"\n{suite[u'name']}\n{title_line}\n"
+                        )
+                        file_handler.write(
+                            f"\n{suite[u'doc']}\n".replace(u'|br|', u'\n\n -')
+                        )
                         if frmt == u"html":
                             file_handler.write(
                                 f"\n.. include:: {tbl_file.split(u'/')[-1]}\n"
@@ -172,6 +179,7 @@ def file_test_results(file_spec, input_data, frmt=u"rst"):
                                     file_latex=tbl_file,
                                     file_html=tbl_file.split(u"/")[-1])
                             )
+                        break
 
     logging.info(u"  Done.")