Commit e99c5b4a authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'ci/fix_basop_report_creation' into 'main' 

[BASOP-CI]fix basop report

See merge request !1605
parents f1580974 dce84c5f

ci/basop-pages/create_report_pages.py

+15 −8
Original line number Diff line number Diff line
@@ -31,20 +31,15 @@ Comparing: 
</ul>



<br>

<b>Table is sorted by Difference in MLD.</b>

<b>Table is sorted by Difference in MLD with ERRORs or missing values ("None", "") being on top additionally.</b>

<br>



<table class="tbase"><thead>

  <tr>

    <th class="tunder" rowspan="2">Testcase</th>

    <th class="tunder" colspan="2">MLD</th>

    <th class="tunder" colspan="2">Max Abs Diff</th>

    {table_header_a}

  </tr>

  <tr>

    <th class="tcenter">{id_previous}</th>

    <th class="tcenter">{id_current}</th>

    <th class="tcenter">{id_previous}</th>

    <th class="tcenter">{id_current}</th>

    {table_header_b}

  </tr></thead>

<tbody>

{table_body}
@@ -55,6 +50,9 @@ TD_TMPL_NORMAL = "<td class='tleft'>{}</td>" 
TD_TMPL_INCREASE = "<td class='tincrease'>{}</td>"

TD_TMPL_REDUCE = "<td class='treduce'>{}</td>"

TR_TMPL = "<tr>{}</tr>"

TH_TMPL_GLOBAL = '<th class="tunder" rowspan="2">{}</th>'

TH_TMPL_DIFFERENTIAL = '<th class="tunder" colspan="2">{}</th>'

TH_TMPL_SECOND_ROW = '<th class="tcenter">{}</th>'



# expected columns. actual columns are filtered from the incoming data later, this

# is mainly for controlling the order in the output table
@@ -76,6 +74,13 @@ def create_subpage( 
        csv_current, csv_previous, id_current, id_previous

    )

    write_out_csv(merged_reports, merged_reports[0].keys(), csv_out)



    table_header_a = "".join([TH_TMPL_GLOBAL.format(c) for c in COLUMNS_GLOBAL] + [TH_TMPL_DIFFERENTIAL.format(c) for c in COLUMNS_DIFFERENTIAL])

    table_header_b = list()

    for c in COLUMNS_DIFFERENTIAL:

        table_header_b.append(TH_TMPL_SECOND_ROW.format(id_previous))

        table_header_b.append(TH_TMPL_SECOND_ROW.format(id_current))

    table_header_b = "".join(table_header_b)

    table_body = "\n".join(

        tr_from_row(row, id_current, id_previous) for row in merged_reports

    )
@@ -84,6 +89,8 @@ def create_subpage( 
        id_previous=id_previous,

        table_body=table_body,

        job_name=job_name,

        table_header_a=table_header_a,

        table_header_b=table_header_b,

    )

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

        f.write(new_subpage)