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 000000000..fc66fa219 Binary files /dev/null and b/pmg/static/resources/images/bills/bill-concourt.png differ