← Back to branch summary

~fginther/helipad/fix_1210205

« back to all changes in this revision

Viewing changes to templates/ci/project_list.html

  • Committer: Tarmac
  • Author(s): chris.gagnon
  • Date: 2013-07-23 19:40:32 UTC
  • mfrom: (15.2.1 ci)
  • Revision ID: tarmac-20130723194032-6pquleeniqw90mr5
fixes nan bug in line and branch coverage gauges https://bugs.launchpad.net/helipad/+bug/1203939. Fixes: https://bugs.launchpad.net/bugs/1203939.

Approved by Chris Johnston, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/ci/project_list.html
44
44
  <div id='avg_chart_text' class='avg_chart_box'>
45
45
        <div class='chart_title'>Code Coverage</div>
46
46
        <div class='avg_chart_box'>
 
47
            <div id='reportingGaugeContainer'></div>
 
48
        </div>
 
49
        <div class='avg_chart_box'>
47
50
            <div id='lineGaugeContainer'></div>
48
51
        </div>
49
52
        <div class='avg_chart_box'>
50
53
             <div id='branchGaugeContainer'></div>
51
54
        </div>
52
 
        <div class='avg_chart_box'>
53
 
            <div id='reportingGaugeContainer'></div>
54
 
        </div>
55
 
  </div>
 
55
 </div>
56
56
  {% endif %}
57
57
</div>
58
58
<div class='grid_13'>
117
117
 
118
118
            if ( line_count > 0) {
119
119
                reporting_project = reporting_project + 1;
120
 
          }
 
120
            }
121
121
 
122
122
            line_sum = line_sum + line_count;
123
123
            hit_sum = hit_sum + {{ project.ci_project.hit_count|default_if_none:"0" }} + 0;
135
135
 
136
136
    var coverage_data = avgLines()
137
137
 
 
138
    var display_line_coverage = (isNaN(coverage_data[0])) ? false : true
 
139
    var display_branch_coverage = (isNaN(coverage_data[1])) ? false : true
 
140
 
 
141
 
138
142
    function init_charts() {
139
 
        create_coverage_gauge("line", "Line", coverage_data[0])
140
 
        create_coverage_gauge("branch", "Branch", coverage_data[1])
 
143
        if (display_line_coverage){
 
144
            create_coverage_gauge("line", "Line", coverage_data[0])};
 
145
        if (display_branch_coverage){
 
146
            create_coverage_gauge("branch", "Branch", coverage_data[1])};
141
147
        create_proj_report_gauge("reporting", "Reporting", coverage_data[2])
142
148
    }
143
149