Skip to content

Commit

Permalink
Merge pull request #106 from kippnorcal/staging
Browse files Browse the repository at this point in the history
HH Metric Pause
  • Loading branch information
iMark3000 authored Aug 3, 2024
2 parents 4f40ff9 + 8553965 commit 9f26a45
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 9 deletions.
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3'
services:
db:
restart: always
image: postgres:11
image: postgres:15
volumes:
- postgres_data:/var/lib/postgresql/data/
env_file:
Expand Down
18 changes: 10 additions & 8 deletions high_health/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,16 @@ def metrics(school_level):
)
data = []
for metric in metrics:
measures = metric.measure_set.filter(school__school_level=school_level, is_current=True).order_by(order_by)
if measures:
metric_data = {
"metric": metric,
"last_updated": last_updated(metric.id),
"measures": measures,
}
data.append(metric_data)
# Note: Summer 2024 - filtering out all HH reports except ADA, CA, and Suspensions
if metric.id in (2, 3, 5):
measures = metric.measure_set.filter(school__school_level=school_level, is_current=True).order_by(order_by)
if measures:
metric_data = {
"metric": metric,
"last_updated": last_updated(metric.id),
"measures": measures,
}
data.append(metric_data)
return sorted(data, key=lambda d: d["last_updated"], reverse=True)


Expand Down
37 changes: 37 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
-i https://pypi.org/simple
asgiref==3.2.7
attrs==19.3.0
certifi==2020.4.5.1
chardet==3.0.4
coverage==5.1
defusedxml==0.6.0
django-filter==2.2.0
django==3.0.6
djangorestframework==3.11.0
gunicorn==20.0.4
idna==2.9
importlib-metadata==1.6.0 ; python_version < '3.8'
isodate==0.6.0
lxml==4.5.0
more-itertools==8.2.0
packaging==20.3
pkgconfig==1.5.1
pluggy==0.13.1
psycopg2-binary==2.8.5
py==1.8.1
pyparsing==2.4.7
pytest-cov==2.8.1
pytest-django==3.9.0
pytest==5.4.1
python-dateutil==2.8.1
python3-saml==1.9.0
pytz==2020.1
requests==2.23.0
rollbar==0.15.0
six==1.14.0
sqlparse==0.3.1
urllib3==1.25.9
wcwidth==0.1.9
whitenoise==5.0.1
xmlsec==1.3.13
zipp==3.1.0

0 comments on commit 9f26a45

Please sign in to comment.