diff --git a/cypress/e2e/codeAttributesMobile.cy.ts b/cypress/e2e/codeAttributesMobile.cy.ts index 56c8974..f08a474 100644 --- a/cypress/e2e/codeAttributesMobile.cy.ts +++ b/cypress/e2e/codeAttributesMobile.cy.ts @@ -41,10 +41,8 @@ describe('Code attributes test suite for desktop version', function () { cy.contains("Abschlag pro Tag").should('be.visible'); cy.contains("0.845").should('be.visible'); cy.contains("Erster Tag mit Zuschlag").should('be.visible'); - cy.contains("29").should('be.visible'); cy.contains("Zuschlag pro Tag").should('be.visible'); - cy.contains("0.289").should('be.visible'); - + cy.visit(baseUrl + '/fr/SwissDRG/V12.0/drgs/B02A?query=A06A'); cy.contains("Durée de séjour moyenne (journées)").should('be.visible'); cy.contains("Premier jour avec réduction").should('be.visible'); diff --git a/cypress/e2e/default.cy.ts b/cypress/e2e/default.cy.ts index 4d27750..2722a0b 100644 --- a/cypress/e2e/default.cy.ts +++ b/cypress/e2e/default.cy.ts @@ -16,14 +16,14 @@ describe('Default test suite, testing general navigation via clicks', function ( cy.contains('CHOP'); cy.contains('C14: Operationen am Bewegungsapparat (76–84)'); cy.contains('Untergeordnete Codes'); - cy.url().should('eq', baseUrl + "/de/CHOP/CHOP_2025/chop_chapters/CHOP_2025"); + cy.url().should('eq', baseUrl + "/de/CHOP/CHOP_2026/chop_chapters/CHOP_2026"); cy.get('#catalog_button').click(); cy.get('#SwissDRG_button').click(); cy.contains('SwissDRG'); cy.contains('MDC 22:'); cy.contains('Verbrennungen'); cy.contains('Untergeordnete Codes'); - cy.url().should('eq', baseUrl + "/de/SwissDRG/V14.0/mdcs/V14.0"); + cy.url().should('eq', baseUrl + "/de/SwissDRG/V15.0/mdcs/V15.0"); cy.get('#catalog_button').click(); cy.get("#TARMED_button").click(); cy.contains('TARMED'); diff --git a/src/App.tsx b/src/App.tsx index b74d8ae..2b69c44 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -75,10 +75,10 @@ class App extends Component{ collapseMenu: window.innerWidth <= 991, hasCollapsedBefore: false, initialVersions: { - 'ICD': [], 'CHOP:': [], 'TARMED': [], 'TARDOC': [], 'SwissDRG': [], 'AmbGroup': [], 'Reha': [], 'Supplements': [] + 'ICD': [], 'CHOP:': [], 'TARMED': [], 'SwissDRG': [], 'Reha': [], 'Supplements': [] }, currentVersions: { - 'ICD': [], 'CHOP:': [], 'TARMED': [], 'TARDOC': [], 'SwissDRG': [], 'AmbGroup': [], 'Reha': [], 'Supplements': [] + 'ICD': [], 'CHOP:': [], 'TARMED': [], 'SwissDRG': [], 'Reha': [], 'Supplements': [] }, isFetching: true, isSearching: false, @@ -248,10 +248,6 @@ class App extends Component{ code = version; resource_type = 'supplements'; break; - case 'AmbGroup': - code = version; - resource_type = 'capitula'; - break; case 'Reha': code = version; resource_type = 'arcgs'; @@ -321,8 +317,6 @@ class App extends Component{ 'CHOP': 'CHOP', 'SwissDRG': 'SwissDRG', 'TARMED': 'TARMED', - 'TARDOC': 'TARDOC', - 'AmbGroup': t("LBL_AMB_GROUP"), 'MIGEL': t("LBL_MIGEL_LABEL"), 'AL': t("LBL_AL"), 'DRUG': t("LBL_DRUG"), @@ -494,8 +488,7 @@ class App extends Component{ changeSelectedVersion={this.changeSelectedVersion} changeSelectedDate={this.changeSelectedDate} labels={this.labelHash()} - buttons={['ICD', 'CHOP', 'SwissDRG', 'Supplements', 'Reha', 'TARMED', 'TARDOC', - 'AmbGroup', 'MIGEL', 'AL', 'DRUG']} + buttons={['ICD', 'CHOP', 'SwissDRG', 'Supplements', 'Reha', 'TARMED', 'MIGEL', 'AL', 'DRUG']} />
{ changeSelectedVersion={this.changeSelectedVersion} changeSelectedDate={this.changeSelectedDate} labels={this.labelHash()} - buttons={['ICD', 'CHOP', 'SwissDRG', 'Supplements', 'Reha', 'TARMED', 'TARDOC', - 'AmbGroup', 'MIGEL', 'AL', 'DRUG']} + buttons={['ICD', 'CHOP', 'SwissDRG', 'Supplements', 'Reha', 'TARMED', 'MIGEL', + 'AL', 'DRUG']} />
diff --git a/src/Components/Bodies/CodeBodyVersionized.tsx b/src/Components/Bodies/CodeBodyVersionized.tsx index f173dcb..2a91570 100644 --- a/src/Components/Bodies/CodeBodyVersionized.tsx +++ b/src/Components/Bodies/CodeBodyVersionized.tsx @@ -139,8 +139,6 @@ class CodeBodyVersionized extends Component { breadcrumbRoot = t('LBL_SUPPLEMENTS') + ' ' + version.substring(1) } else if (catalog == "Reha") { breadcrumbRoot = "ST Reha " + version.substring(5).replace("_", " ") - } else if (catalog == "AmbGroup"){ - breadcrumbRoot = t('LBL_AMB_GROUP') + " " + version.substring(1) } } else { breadcrumbRoot = ''; diff --git a/src/Components/Buttons/ButtonGroup.tsx b/src/Components/Buttons/ButtonGroup.tsx index a15eff9..e43d007 100644 --- a/src/Components/Buttons/ButtonGroup.tsx +++ b/src/Components/Buttons/ButtonGroup.tsx @@ -38,8 +38,6 @@ interface IButtons { currentSwissDRG: string, currentCHOP: string, currentTARMED: string, - currentTARDOC: string, - currentAmbGroup: string, currentReha: string, currentSupplements: string, selectedDate: string, @@ -63,8 +61,6 @@ class ButtonGroup extends Component{ currentSwissDRG: this.props.initialVersions['SwissDRG'].at(-1), currentCHOP: this.props.initialVersions['CHOP'].at(-1), currentTARMED: this.props.initialVersions['TARMED'].at(-1), - currentTARDOC: this.props.initialVersions['TARDOC'].at(-1), - currentAmbGroup: this.props.initialVersions['AmbGroup'].at(-1), currentReha: this.props.initialVersions['Reha'].at(-1), currentSupplements: this.props.initialVersions['Supplements'].at(-1), selectedDate: dateFormat(new Date(), "dd.mm.yyyy"), diff --git a/src/Components/SearchResult/SearchResult.tsx b/src/Components/SearchResult/SearchResult.tsx index 4a3f953..dcecdd3 100644 --- a/src/Components/SearchResult/SearchResult.tsx +++ b/src/Components/SearchResult/SearchResult.tsx @@ -46,8 +46,6 @@ class SearchResult extends Component { pathname = "/" + path[1] + "/" + path[2] + "/" + path[3] + "/drgs/" + this.props.result.code } else if (path[2] === "Reha") { pathname = "/" + path[1] + "/" + path[2] + "/" + path[3] + "/rcgs/" + this.props.result.code - } else if (path[2] === "AmbGroup") { - pathname = "/" + path[1] + "/" + path[2] + "/" + path[3] + "/amb_groups/" + this.props.result.code } else if (path[2] === "Supplements") { pathname = "/" + path[1] + "/" + path[2] + "/" + path[3] + "/supplements/" + this.props.result.code } else { diff --git a/src/Components/Searchbar/Searchbar.tsx b/src/Components/Searchbar/Searchbar.tsx index afa230b..367d113 100644 --- a/src/Components/Searchbar/Searchbar.tsx +++ b/src/Components/Searchbar/Searchbar.tsx @@ -14,11 +14,9 @@ const resourceTypeByBtn = { "ICD": 'icds', "CHOP": 'chops', "TARMED": 'tarmeds', - "TARDOC": 'tardocs', "MIGEL": 'migels', "AL": 'laboratory_analyses', "DRUG": 'drugs', - 'AmbGroup': 'amb_groups', 'Reha': 'rcgs', 'Supplements': 'supplements' } diff --git a/src/Services/catalog-version.service.tsx b/src/Services/catalog-version.service.tsx index ccb16ae..6dd4a0a 100644 --- a/src/Services/catalog-version.service.tsx +++ b/src/Services/catalog-version.service.tsx @@ -6,8 +6,6 @@ export const versionizedCatalogs = [ 'SwissDRG', 'CHOP', 'TARMED', - 'TARDOC', - 'AmbGroup', 'Reha', 'Supplements' ] @@ -16,8 +14,6 @@ export const currentCatalogsByButton = { 'SwissDRG': 'currentSwissDRG', 'CHOP': 'currentCHOP', 'TARMED': 'currentTARMED', - 'TARDOC': 'currentTARDOC', - 'AmbGroup': 'currentAmbGroup', 'Reha': 'currentReha', 'Supplements': 'currentSupplements' } @@ -37,11 +33,8 @@ export function cutCatalogFromVersion(catalog, version) { return version.substring(5).replace("_", " ") case "SwissDRG": case "Supplements": - case "AmbGroup": - return version case "TARMED": - case "TARDOC": - return version.substring(7) + return version default: return } @@ -64,10 +57,6 @@ export function convertCatalogToResourceType(catalog) { return "supplements" case "TARMED": return "tarmeds" - case "TARDOC": - return "tardocs" - case "AmbGroup": - return "amb_groups" case "Reha": return "rcgs" case "Supplements":