Skip to content

Fixes for Brexit #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NickCEBM wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes for Brexit #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c55204
Fixes for Brexit
NickCEBM Jan 11, 2021
4055360
typo fix
NickCEBM Jan 11, 2021
a7a28d8
Adding columns
NickCEBM Jan 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion euctr/crawl/tests/test_scraper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def test_get_trials_from_db(self):
'exempt', 'single_blind', 'rare_disease', 'phase',
'bioequivalence_study', 'health_volunteers', 'trial_status',
'any_terminated', 'all_terminated', 'results_expected',
'all_completed_no_comp_date', 'sponsor_status',
'all_completed_no_comp_date', 'sponsor_status', brexit_excluded,
'name_of_sponsor',
'trial_title',
'trial_url',
Expand Down
19 changes: 15 additions & 4 deletions euctr/euctr/management/commands/opentrials-to-csv.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ SELECT
WHEN end_of_trial_status = 'Completed' THEN 1
ELSE NULL
END) AS completed,
count ( CASE
WHEN end_of_trial_status = 'GB - no longer in EU/EEA' THEN 1
ELSE NULL
END) AS gb_exclude,
count ( CASE
WHEN end_of_trial_status = 'Ongoing'
OR end_of_trial_status = 'Restarted' THEN 1
Expand Down Expand Up @@ -252,13 +256,14 @@ SELECT
END AS health_volunteers,
CASE
WHEN ongoing = Total THEN 0
WHEN completed + terminated = Total THEN 1
WHEN ((completed + terminated)
WHEN completed + terminated + gb_exclude = Total AND gb_exclude != Total THEN 1
WHEN ((completed + terminated + gb_exclude)
> 0
AND (completed + terminated)
AND (completed + terminated + gb_exclude)
< total)
THEN 2
WHEN empty = total THEN 4
WHEN gb_exclude = Total THEN 5
ELSE 3
END AS Trial_status,
CASE
Expand All @@ -270,7 +275,8 @@ SELECT
ELSE 0
END AS all_terminated,
CASE
WHEN completed + terminated = Total
WHEN completed + terminated + gb_exclude = Total
AND gb_exclude != Total
AND comp_date > 0
AND max_end_date < %(due_date_cutoff)s
AND NOT (phase_i_trial = Total AND Includes_PIP = 0)
Expand All @@ -283,6 +289,11 @@ SELECT
THEN 1
ELSE 0
END AS all_completed_no_comp_date,
CASE
WHEN gb_exclude = Total
THEN 1
ELSE 0
END AS brexit_excluded,
Spons3.Sponsor_Status,
Spons3.name_of_sponsor AS name_of_sponsor,
CASE
Expand Down