Skip to content

Commit e84ffad

Browse files
Merge pull request #53 from digital-land/av/config-managaer_fix]
Fix 'nan' in overview status table
2 parents c5f262d + 9bf57b7 commit e84ffad

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

application/data_access/odp_summaries/status.py

-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ def get_odp_status_summary(dataset_types, cohorts):
5252
sql = """
5353
select
5454
rle.organisation,
55-
rle.name,
5655
rle.collection,
5756
rle.pipeline,
5857
rle.endpoint,
@@ -104,7 +103,6 @@ def get_odp_status_summary(dataset_types, cohorts):
104103
datasets,
105104
)
106105
)
107-
108106
# Calculate overview stats
109107
percentages = 0.0
110108
datasets_added = 0

application/data_access/odp_summaries/utils.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,18 @@ def get_provisions(selected_cohorts, all_cohorts):
4848
SELECT
4949
p.cohort,
5050
p.organisation,
51-
c.start_date as cohort_start_date
51+
c.start_date as cohort_start_date,
52+
org.name as name
5253
FROM
5354
provision p
5455
INNER JOIN
5556
cohort c on c.cohort = p.cohort
57+
JOIN organisation org
5658
WHERE
5759
p.provision_reason = "expected"
5860
AND p.project == "open-digital-planning"
5961
{cohort_clause}
62+
AND org.organisation == p.organisation
6063
GROUP BY
6164
p.organisation
6265
ORDER BY

0 commit comments

Comments
 (0)