diff --git a/src/app/views/edition-view/edition-outlets/edition-complex/edition-complex.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-complex/edition-complex.component.spec.ts index b35763bb3f..11409fddd9 100644 --- a/src/app/views/edition-view/edition-outlets/edition-complex/edition-complex.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-complex/edition-complex.component.spec.ts @@ -433,7 +433,7 @@ describe('EditionComplexComponent (DONE)', () => { const mnrPlusComplex = new EditionComplex( { title: 'Test M* Complex', - catalogueType: 'MNR_PLUS', + catalogueType: 'MNR_STAR', catalogueNumber: '100', }, { @@ -442,7 +442,7 @@ describe('EditionComplexComponent (DONE)', () => { }, { series: '1', section: '5' } ); - expectedSelectedEditionComplexId = 'mPlus100'; + expectedSelectedEditionComplexId = 'm_star100'; // Spy on the static method and provide a custom implementation spyOn(EditionComplexesService, 'getEditionComplexById').and.callFake((id: string) => { diff --git a/src/app/views/edition-view/edition-route-constants.ts b/src/app/views/edition-view/edition-route-constants.ts index a5f384850c..31fde07afa 100644 --- a/src/app/views/edition-view/edition-route-constants.ts +++ b/src/app/views/edition-view/edition-route-constants.ts @@ -28,8 +28,8 @@ export class EDITION_CATALOGUE_TYPE_CONSTANTS { /** * The route constant for an extended Moldenhauer number (AWG-ID). */ - static readonly MNR_PLUS: EditionRouteConstant = { - route: '/m_plus', + static readonly MNR_STAR: EditionRouteConstant = { + route: '/m_star', short: 'M*', full: 'Moldenhauer-Nr. (AWG-ID)', }; diff --git a/src/app/views/edition-view/services/edition-complexes.service.spec.ts b/src/app/views/edition-view/services/edition-complexes.service.spec.ts index 883d764cf6..a645c11121 100644 --- a/src/app/views/edition-view/services/edition-complexes.service.spec.ts +++ b/src/app/views/edition-view/services/edition-complexes.service.spec.ts @@ -205,7 +205,7 @@ describe('EditionComplexesService (DONE)', () => { const testComplex = new EditionComplex( { title: 'Test M Complex', - catalogueType: 'MNR_PLUS', + catalogueType: 'MNR_STAR', catalogueNumber: '100', }, { @@ -214,7 +214,7 @@ describe('EditionComplexesService (DONE)', () => { }, { series: '1', section: '5' } ); - const testComplexId = 'm_plus100'; + const testComplexId = 'm_star100'; const expectedList = { [testComplexId.toUpperCase()]: testComplex }; EditionComplexesService.setEditionComplexesList(expectedList); diff --git a/src/assets/data/edition/edition-complexes.json b/src/assets/data/edition/edition-complexes.json index 5c23903eff..b64ca877f3 100644 --- a/src/assets/data/edition/edition-complexes.json +++ b/src/assets/data/edition/edition-complexes.json @@ -22,6 +22,28 @@ } } }, + { + "M23": { + "titleStatement": { + "title": "Der Winter ist vergangen, ich seh den Maienschein. Studienkomposition für Klavier", + "catalogueType": "MNR", + "catalogueNumber": "23" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "29. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, { "M29": { "titleStatement": { @@ -88,6 +110,50 @@ } } }, + { + "M32": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR", + "catalogueNumber": "32" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "24. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M33": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR", + "catalogueNumber": "33" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "27. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, { "M34": { "titleStatement": { @@ -198,6 +264,28 @@ } } }, + { + "M39": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR", + "catalogueNumber": "39" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "9. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, { "M40": { "titleStatement": { @@ -264,6 +352,226 @@ } } }, + { + "M44": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR", + "catalogueNumber": "44" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "9. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M45": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR", + "catalogueNumber": "45" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "27. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M46": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR", + "catalogueNumber": "46" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "27. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M75": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR", + "catalogueNumber": "75" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "30. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M76": { + "titleStatement": { + "title": "Studienkomposition für Klavier/Streichquartett", + "catalogueType": "MNR", + "catalogueNumber": "76" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "27. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M112": { + "titleStatement": { + "title": "Satz für Klavier. Studienkomposition für Klavier", + "catalogueType": "MNR", + "catalogueNumber": "112" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "5. Februar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M113": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR", + "catalogueNumber": "113" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "23. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M114": { + "titleStatement": { + "title": "Rondo für Klavier. Studienkomposition für Klavier", + "catalogueType": "MNR", + "catalogueNumber": "114" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "6. Februar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M116": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR", + "catalogueNumber": "116" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "23. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M267": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR", + "catalogueNumber": "267" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "30. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, { "M133": { "titleStatement": { @@ -770,6 +1078,226 @@ } } }, + { + "M_STAR409": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR_STAR", + "catalogueNumber": "409" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "30. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M_STAR410": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR_STAR", + "catalogueNumber": "410" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "30. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M_STAR412": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR_STAR", + "catalogueNumber": "412" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "30. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M_STAR413": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR_STAR", + "catalogueNumber": "413" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "5. Februar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M_STAR414": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR_STAR", + "catalogueNumber": "414" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "30. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M_STAR415": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR_STAR", + "catalogueNumber": "415" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "30. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M_STAR416": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR_STAR", + "catalogueNumber": "416" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "30. Januar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M_STAR465": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR_STAR", + "catalogueNumber": "465" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "6. Februar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M_STAR466": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR_STAR", + "catalogueNumber": "466" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "6. Februar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, + { + "M_STAR467": { + "titleStatement": { + "title": "Studienkomposition für Klavier", + "catalogueType": "MNR_STAR", + "catalogueNumber": "467" + }, + "respStatement": { + "editors": [ + { + "name": "Michael Matter", + "homepage": "https://www.anton-webern.ch/index.php?id=3" + } + ], + "lastModified": "6. Februar 2025" + }, + "pubStatement": { + "series": "2", + "section": "2a" + } + } + }, { "OP3": { "titleStatement": { diff --git a/src/assets/data/edition/edition-outline.json b/src/assets/data/edition/edition-outline.json index e22f36a425..ef22e24a25 100644 --- a/src/assets/data/edition/edition-outline.json +++ b/src/assets/data/edition/edition-outline.json @@ -108,13 +108,37 @@ { "complex": "M36", "disabled": false }, { "complex": "M37", "disabled": false }, { "complex": "M38", "disabled": false }, + { "complex": "M39", "disabled": false }, { "complex": "M40", "disabled": false }, { "complex": "M41", "disabled": false }, - { "complex": "M29", "disabled": false }, { "complex": "M30", "disabled": false }, { "complex": "M31", "disabled": false }, + { "complex": "M29", "disabled": false }, + { "complex": "M45", "disabled": false }, + { "complex": "M46", "disabled": false }, + { "complex": "M32", "disabled": false }, + { "complex": "M33", "disabled": false }, + { "complex": "M_STAR409", "disabled": false }, + { "complex": "M_STAR410", "disabled": false }, + { "complex": "M_STAR412", "disabled": false }, + { "complex": "M_STAR413", "disabled": false }, + { "complex": "M_STAR414", "disabled": false }, + { "complex": "M_STAR415", "disabled": false }, + { "complex": "M_STAR416", "disabled": false }, { "complex": "M22", "disabled": false }, - { "complex": "M43", "disabled": false } + { "complex": "M23", "disabled": false }, + { "complex": "M_STAR465", "disabled": false }, + { "complex": "M_STAR466", "disabled": false }, + { "complex": "M_STAR467", "disabled": false }, + { "complex": "M116", "disabled": false }, + { "complex": "M75", "disabled": false }, + { "complex": "M76", "disabled": false }, + { "complex": "M43", "disabled": false }, + { "complex": "M44", "disabled": false }, + { "complex": "M113", "disabled": false }, + { "complex": "M114", "disabled": false }, + { "complex": "M112", "disabled": false }, + { "complex": "M267", "disabled": false } ] } }