diff --git a/app/models/appcatalog.py b/app/models/appcatalog.py index f785ece..2c9ec69 100644 --- a/app/models/appcatalog.py +++ b/app/models/appcatalog.py @@ -41,6 +41,7 @@ class AppCatalog(): known_app.maintained = 'package-not-maintained' not in app.get('antifeatures', []) known_app.state = app["state"] known_app.public_level = app.get("level", None) + known_app.packaging_format = app["manifest"].get("packaging_format", 0) if "github" in known_app.repo: @@ -86,6 +87,7 @@ class App(db.Model): testing_pr = db.Column(db.PickleType, default=None) opened_issues = db.Column(db.Integer, default=-1) opened_prs = db.Column(db.Integer, default=-1) + packaging_format = db.Column(db.Integer, default=-1) long_term_good_quality = db.Column(db.Boolean) long_term_broken = db.Column(db.Boolean) diff --git a/app/templates/appci_branch.html b/app/templates/appci_branch.html index 8774736..9dba3ea 100644 --- a/app/templates/appci_branch.html +++ b/app/templates/appci_branch.html @@ -2,7 +2,8 @@ {% block content %}

{{ branch.display_name }}

-
+
+
@@ -24,7 +25,7 @@ {% for result in app_results %} - + {% if result.app.long_term_good_quality %} @@ -32,6 +33,9 @@ {% if result.app.long_term_broken %} {% endif %} + {% if result.app.packaging_format and result.app.packaging_format >= 2 %} + + {% endif %} {{ result.app.name }} @@ -112,6 +116,23 @@ window.onload = function () { }] }); chart.render(); + var chart2 = new CanvasJS.Chart("packagingSummary", { + animationEnabled: false, + data: [{ + type: "doughnut", + startAngle: -90, + //innerRadius: 60, + indexLabelFontSize: 17, + indexLabel: "{label} - {y}", + toolTipContent: "{label}: {y}", + dataPoints: [ + { y: $(".resultline[data-packaging=2]").length, label: "Packaging v2", color: "#8829df" }, + { y: $(".resultline[data-packaging=1]").length, label: "Packaging v1", color: "#f0f0f0" }, + ] + }] + }); + chart2.render(); + $("input[type='radio']").change(function() { update_filters(); }); update_filters(); }