From: rubenwardy Date: Tue, 18 Aug 2020 16:28:42 +0000 (+0100) Subject: Add unfulfilled dependencies todo page X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=f6ff5cba8296385e20701a34a57ff7a9846d3509;p=cheatdb.git Add unfulfilled dependencies todo page --- diff --git a/app/blueprints/todo/__init__.py b/app/blueprints/todo/__init__.py index ba370a6..20520ce 100644 --- a/app/blueprints/todo/__init__.py +++ b/app/blueprints/todo/__init__.py @@ -67,11 +67,17 @@ def view(): total_packages = Package.query.filter_by(approved=True, soft_deleted=False).count() total_to_tag = Package.query.filter_by(approved=True, soft_deleted=False, tags=None).count() + unfulfilled_meta_packages = MetaPackage.query \ + .filter(~ MetaPackage.packages.any(approved=True, soft_deleted=False)) \ + .filter(MetaPackage.dependencies.any(optional=False)) \ + .order_by(db.asc(MetaPackage.name)).count() + return render_template("todo/list.html", title="Reports and Work Queue", packages=packages, releases=releases, screenshots=screenshots, canApproveNew=canApproveNew, canApproveRel=canApproveRel, canApproveScn=canApproveScn, topics_to_add=topics_to_add, total_topics=total_topics, \ - total_packages=total_packages, total_to_tag=total_to_tag) + total_packages=total_packages, total_to_tag=total_to_tag, \ + unfulfilled_meta_packages=unfulfilled_meta_packages) @bp.route("/todo/topics/") @@ -116,3 +122,13 @@ def tags(): tags = Tag.query.order_by(db.asc(Tag.title)).all() return render_template("todo/tags.html", packages=query.all(), tags=tags) + + +@bp.route("/todo/metapackages/") +def metapackages(): + mpackages = MetaPackage.query \ + .filter(~ MetaPackage.packages.any(approved=True, soft_deleted=False)) \ + .filter(MetaPackage.dependencies.any(optional=False)) \ + .order_by(db.asc(MetaPackage.name)).all() + + return render_template("todo/metapackages.html", mpackages=mpackages) diff --git a/app/templates/todo/list.html b/app/templates/todo/list.html index 4d0b75c..24d5289 100644 --- a/app/templates/todo/list.html +++ b/app/templates/todo/list.html @@ -115,6 +115,20 @@ View Tags + {% if unfulfilled_meta_packages %} +

+ + {{ unfulfilled_meta_packages }} Unfulfilled Dependencies +

+ +

+ Meta packages that have hard dependers, but are not fulfilled. +

+ + View + {% endif %} + +

Unadded Topic List

{% if total_topics > 0 %} diff --git a/app/templates/todo/metapackages.html b/app/templates/todo/metapackages.html new file mode 100644 index 0000000..9135fe1 --- /dev/null +++ b/app/templates/todo/metapackages.html @@ -0,0 +1,24 @@ +{% extends "base.html" %} + +{% block title %} +Unfulfilled Meta Packages +{% endblock %} + +{% block content %} +

Unfulfilled Meta Packages

+ +

+ Meta packages that have hard dependers, but are not fulfilled. +

+ +
+ {% for meta in mpackages %} + + {{ meta.name }} + + {% else %} +
  • No meta packages found.
  • + {% endfor %} +
    +{% endblock %}