Commit 10c395a9 authored by norvell's avatar norvell
Browse files

Fix for empty cells in csv report and optional argument for histogram png

parent 2e98f7fd

ci/basop-pages/create_report_pages.py

+13 −1
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ Comparing: 
    <li><a href="{job_name}--merged_csv--{id_current}.csv">Merged csv data</a></li>

</ul>



<img src={histogram}>



<br>

<b>How is the table sorted?</b>

<ul>
@@ -106,6 +108,7 @@ def create_subpage( 
    id_current: int,

    id_previous: int,

    job_name: str,

    histogram: str,

):

    merged_reports = merge_and_cleanup_mld_reports(

        csv_current, csv_previous, id_current, id_previous
@@ -135,6 +138,7 @@ def create_subpage( 
        job_name=job_name,

        table_header_a=table_header_a,

        table_header_b=table_header_b,

        histogram=histogram

    )

    with open(html_out, "w") as f:

        f.write(new_subpage)
@@ -242,6 +246,7 @@ def merge_and_cleanup_mld_reports( 
            for col_pair in other_col_pairs:

                col_prev = col_pair[0]

                col_curr = col_pair[1]

                if x[col_curr] != '' and x[col_prev] != '':

                    diff_other += abs(float(x[col_curr]) - float(x[col_prev]))



            if diff_other > 0:
@@ -293,8 +298,14 @@ if __name__ == "__main__": 
    parser.add_argument("id_current", type=int)

    parser.add_argument("id_previous", type=int)

    parser.add_argument("job_name")

    parser.add_argument("--histogram", type=str, nargs=1, help="histogram picture", default = None)

    args = parser.parse_args()



    if args.histogram != None:

        histogram = args.histogram[0]

    else:

        histogram = "None"



    create_subpage(

        args.html_out,

        args.csv_out,
@@ -303,4 +314,5 @@ if __name__ == "__main__": 
        args.id_current,

        args.id_previous,

        args.job_name,

        histogram,

    )