From fd000a24231dbe8c9f116ff007a6b09228b23784 Mon Sep 17 00:00:00 2001 From: desafinadude Date: Thu, 5 Dec 2024 18:06:13 +0200 Subject: [PATCH] Added Consitutional Court to Bill Status --- pmg/admin/__init__.py | 1 + pmg/bills.py | 22 ++++++++++++++---- pmg/models/resources.py | 3 +++ pmg/static/resources/css/style.scss | 12 ++++++++++ .../resources/images/bills/bill-concourt.png | Bin 0 -> 10558 bytes 5 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 pmg/static/resources/images/bills/bill-concourt.png diff --git a/pmg/admin/__init__.py b/pmg/admin/__init__.py index a62452783..65843c43b 100644 --- a/pmg/admin/__init__.py +++ b/pmg/admin/__init__.py @@ -1152,6 +1152,7 @@ def __init__(self, *args, **kwargs): ("bill-signed", "Bill signed"), ("bill-enacted", "Bill enacted"), ("bill-act-commenced", "Act commenced"), + ("bill-concourt", "Before Constitutional Court") ] def populate_obj(self, obj, name): diff --git a/pmg/bills.py b/pmg/bills.py index b2d1a4a53..7d9a9de0b 100644 --- a/pmg/bills.py +++ b/pmg/bills.py @@ -15,6 +15,7 @@ "house": "house.png", "president": "signed-by-president.png", "unknown": "bill-introduced.png", + "concourt": "bill-concourt.png", } @@ -25,6 +26,12 @@ def get_location(event): "class": "president", } + if event.get("type") == "bill-concourt": + return { + "name": "Constitutional Court", + "class": "concourt", + } + if event.get("house"): return { "name": event["house"]["name"], @@ -78,10 +85,17 @@ def get_agent(event, bill): } elif event.get("house"): - info = { - "name": event["house"]["name"], - "type": "house", - } + + if event["house"]["short_name"] == "concourt": + info = { + "name": "Constitutional Court", + "type": "concourt", + } + else: + info = { + "name": event["house"]["name"], + "type": "house", + } else: info = {"name": "Unknown", "type": "unknown"} diff --git a/pmg/models/resources.py b/pmg/models/resources.py index bf99cb070..928640a4a 100644 --- a/pmg/models/resources.py +++ b/pmg/models/resources.py @@ -594,6 +594,9 @@ class BillCommenced(Event): class BillUpdate(Event): __mapper_args__ = {"polymorphic_identity": "bill-updated"} +class BillConcourt(Event): + __mapper_args__ = {"polymorphic_identity": "bill-concourt"} + class MembershipType(db.Model): diff --git a/pmg/static/resources/css/style.scss b/pmg/static/resources/css/style.scss index b7c998489..c5bea37ab 100644 --- a/pmg/static/resources/css/style.scss +++ b/pmg/static/resources/css/style.scss @@ -852,6 +852,18 @@ mark { } } + .bill-location.concourt { + border-color: #fcec56; + + .panel-heading { + border-color: #fcec56; + background-color: #fcec56; + } + } + + + + .media-body { li { display: table; diff --git a/pmg/static/resources/images/bills/bill-concourt.png b/pmg/static/resources/images/bills/bill-concourt.png new file mode 100644 index 0000000000000000000000000000000000000000..fc66fa21923947e5c1e5885842d8974c764a359e GIT binary patch literal 10558 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