Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
ab588b2
feat: DOI registration task
JackScanlon Aug 12, 2025
c88012c
fix: disable DOI reg for remote
JackScanlon Aug 12, 2025
ef2702e
feat: redirect to approval list post-publication when interacting wit…
JackScanlon Aug 12, 2025
7fe71ad
feat: redirect DOI resources, identifiers & utilities
JackScanlon Aug 14, 2025
ebca83f
fix: rm env interpolation from remote test
JackScanlon Aug 14, 2025
3aeaa90
feat: disable for DEMO site
JackScanlon Sep 1, 2025
dcea10b
fix: DataSource api consistency
JackScanlon Sep 4, 2025
07cfeb2
feat: DataSources, GA4 & DOI
JackScanlon Oct 7, 2025
73a74c1
fix: rm legacy code
JackScanlon Oct 7, 2025
6d62bda
feat: improve detail & doi presentation
JackScanlon Oct 7, 2025
ae0f16f
fix: doi register toggle
JackScanlon Oct 7, 2025
1a76b5e
feat: enhance nav menu
JackScanlon Oct 8, 2025
f525201
feat: post-impl. GA4 API, pre-impl. User-Generated Content graphs
JackScanlon Oct 15, 2025
ff352be
feat: DOI registration task
JackScanlon Aug 12, 2025
250e12b
feat: redirect DOI resources, identifiers & utilities
JackScanlon Aug 14, 2025
151233b
fix: DataSource api consistency
JackScanlon Sep 4, 2025
922e650
feat: DataSources, GA4 & DOI
JackScanlon Oct 7, 2025
79a231c
feat: post-impl. GA4 API, pre-impl. User-Generated Content graphs
JackScanlon Oct 15, 2025
938129a
Merge branch 'feat/BA' of https://github.com/SwanseaUniversityMedical…
JackScanlon Oct 15, 2025
1945d25
feat: pub status changes
JackScanlon Nov 5, 2025
2f7370c
feat: upd. studio target
JackScanlon Nov 5, 2025
8ab43ee
fix: codelist download
JackScanlon Nov 10, 2025
c51cd76
docs: rm. legacy documentation
JackScanlon Nov 10, 2025
5f4b111
feat: impl. organisation analytics
JackScanlon Nov 10, 2025
05d5ce0
fix: sec. bump
JackScanlon Nov 10, 2025
bdce4c7
fix: allure cov
JackScanlon Nov 10, 2025
0340326
fix: allure cov
JackScanlon Nov 10, 2025
6232ff8
fix: allure cov
JackScanlon Nov 10, 2025
097ec4a
fix: allure cov
JackScanlon Nov 10, 2025
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
11 changes: 11 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
docs
.git
.github
LICENSE
README.md
renovate.json
**/staticroot
**/__pycache__
**/.pytest_cache
**/.gitkeep
**/.gitignore
4 changes: 2 additions & 2 deletions .github/workflows/testing-pipline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- uses: actions/checkout@v3
- run: |
sudo apt-get update
sudo apt-get install -y libgconf-2-4 libatk1.0-0 libatk-bridge2.0-0 libgdk-pixbuf2.0-0 libgtk-3-0 libgbm-dev libnss3-dev libxss-dev libasound2
sudo apt-get install -y libatk1.0-0 libatk-bridge2.0-0 libgdk-pixbuf2.0-0 libgtk-3-0 libgbm-dev libnss3-dev libxss-dev libasound2-dev
- uses: browser-actions/setup-chrome@v1
- uses: actions/cache@v3
with:
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:

- name: Allure report action # Step to generate Allure report
if: (success() || failure()) && github.event_name != 'pull_request'
uses: simple-elf/allure-report-action@v1.7
uses: simple-elf/allure-report-action@v1.13
with:
allure_results: CodeListLibrary_project/clinicalcode/tests/allure-results
allure_report: CodeListLibrary_project/clinicalcode/tests/allure-report
Expand Down
319 changes: 0 additions & 319 deletions CodeListLibrary_project/assets/style.css

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ def general_var(request):
return {
'USER_CREATE_CONTEXT': permission_utils.user_has_create_context(request),
'IS_BRAND_ADMIN': permission_utils.is_requestor_brand_admin(request),
'GA4_STUDIO_LINK': settings.GA4_STUDIO_LINK,
'MEDIA_URL': settings.MEDIA_URL,
'CLL_READ_ONLY': settings.CLL_READ_ONLY,
'SHOWADMIN': settings.SHOWADMIN,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,11 @@ def get_concept_headers(concept_information, default=None):
end as is_published,
concept.phenotype_owner_id,
codingsystem.id as coding_system_id,
codingsystem.name as coding_system_name
codingsystem.name as coding_system_name,
case
when concept.is_deleted is null then false
else concept.is_deleted
end as is_deleted
from concept_information as info,
json_array_elements(info.doc) as obj
join public.clinicalcode_concept as concept
Expand Down Expand Up @@ -909,10 +913,11 @@ def get_clinical_concept_data(concept_id, concept_history_id, include_reviewed_c
if not latest_version:
latest_version = historical_concept

ph_owner_id = concept.phenotype_owner.id if concept.phenotype_owner is not None else None
concept_data['latest_version'] = {
'id': latest_version.id,
'history_id': latest_version.history_id,
'is_out_of_date': historical_concept.history_id < latest_version.history_id,
'is_out_of_date': (requested_entity_id is None or requested_entity_id != ph_owner_id) and historical_concept.history_id < latest_version.history_id,
}

concept_data['is_published'] = is_concept_published(concept_id, concept_history_id)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,15 @@ class ENTITY_STATUS(int, enum.Enum):
FINAL = 2


class DELETION_QUERY(int, enum.Enum):
"""
Used to alter query parameters examining the status of UGC
"""
ANY = 0
ACTIVE = 1
DELETED = 2


class APPROVAL_STATUS(int, enum.Enum):
"""
Approval status of a published entity
Expand Down
Loading
Loading