diff --git a/CHANGELOG.md b/CHANGELOG.md index 8864329fa6..99e597b04f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,32 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [0.7.1](https://github.com/webern-unibas-ch/awg-app/compare/v0.7.0...v0.7.1) (2020-02-10) + +### Features + +- **core:** add RouterEventsService to store previous route ([23e3656](https://github.com/webern-unibas-ch/awg-app/commit/23e365690b35b6ec9f7169401f1d9fbe35883db9)) +- **core:** add StorageService ([bde1f1e](https://github.com/webern-unibas-ch/awg-app/commit/bde1f1eff3b49341d1ebf621cc5f535b4e9ec1e4)), closes [#5](https://github.com/webern-unibas-ch/awg-app/issues/5) +- **core:** expose GND via postMessage to communicate with inseri ([80648c5](https://github.com/webern-unibas-ch/awg-app/commit/80648c5204a7bc0a46455491bff5de23497978f1)), relates to [nie-ine/inseri#388](https://github.com/nie-ine/inseri/issues/388) +- **edition:** add almost complete TkA for op25 (Sk4 incomplete) ([3dabd8a](https://github.com/webern-unibas-ch/awg-app/commit/3dabd8af6b438088b7a87c65b2134b9e39f58dbe)) +- **edition:** make tka list toggleable per sketch ([01ec0fd](https://github.com/webern-unibas-ch/awg-app/commit/01ec0fd45db4f92e6e01e8364045c6a6df4bacce)) +- **edition:** prepare embedding of op25 sheets ([1f25f63](https://github.com/webern-unibas-ch/awg-app/commit/1f25f63148e61f00461496d25081a448a6310091)) + +### Bug Fixes + +- **app:** move GND exposition to PropsComp and GndService ([e44b332](https://github.com/webern-unibas-ch/awg-app/commit/e44b3324d092d2b799242c9a7b0d0a3cfce371a6), [98bd896](https://github.com/webern-unibas-ch/awg-app/commit/98bd896d6151c09d806fef1c82734e899a55d43d)) +- **core:** add removeItem method to StorageService ([19a6f8d](https://github.com/webern-unibas-ch/awg-app/commit/19a6f8d85548782397e836cd8fd802fb1d840628)) +- **core:** fix check for detecting Storage ([b5c4c08](https://github.com/webern-unibas-ch/awg-app/commit/b5c4c08bf370e9bb6048fa9775ab30ea8690ce45)) +- **core:** use StorageService to expose GND ([e591885](https://github.com/webern-unibas-ch/awg-app/commit/e591885d64977ae9ef87ab6bdc58193f323adefd)) +- **edition:** add missing content description of op. 25 ([29d1c34](https://github.com/webern-unibas-ch/awg-app/commit/29d1c34b7e31b0135982a9061085e75b1d781b90)) +- **edition:** add svg's with path information ([50d23ba](https://github.com/webern-unibas-ch/awg-app/commit/50d23ba0e6413f89f7f759ef8f023ea1296cbc94)) +- **edition:** adjust modal hint for op25 ([d6b4909](https://github.com/webern-unibas-ch/awg-app/commit/d6b4909428450716f320c568763feb7f19cdf4f9)) +- **edition:** get selectability of convolute item from data ([9fcb2dd](https://github.com/webern-unibas-ch/awg-app/commit/9fcb2ddff22f49a019c41c71fcf2d488dcd3fd75)) +- **edition:** handle placeholder for op. 12 Aa:SkI/1 ([ecbb32b](https://github.com/webern-unibas-ch/awg-app/commit/ecbb32b228438a19768ba8b83ef85ad07d7c90d0)) +- **edition:** improve folio handling and rendering ([8c871cc](https://github.com/webern-unibas-ch/awg-app/commit/8c871cc7f435910daea3789a0c2b111982904a29)) +- **edition:** move convolute logic to parent component (edition detail) ([7a9c5ed](https://github.com/webern-unibas-ch/awg-app/commit/7a9c5edaca439fe54a887de7afd75a42496e4dc6), [fb77f72](https://github.com/webern-unibas-ch/awg-app/commit/fb77f72aa9c817c8e0d09e2e9d204dfbf8508683)) +- **home:** adjust title of op. 25 ([9f1c9fc](https://github.com/webern-unibas-ch/awg-app/commit/9f1c9fc07960335d2e4c5c8bec0f7ace44054a9f)) + ## [0.7.0](https://github.com/webern-unibas-ch/awg-app/compare/v0.6.1...v0.7.0) (2020-02-05) ### ⚠ BREAKING CHANGES diff --git a/package.json b/package.json index 321a2a755f..743efe9027 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "awg-app", - "version": "0.7.0", + "version": "0.7.1", "license": "MIT", "author": { "name": "Stefan Münnich", @@ -27,14 +27,16 @@ "start": "ng serve", "e2e": "ng e2e", "test": "ng test", - "test:cov": "ng test awg-app --code-coverage", + "test:cov": "ng test --code-coverage true", + "serve:test:cov": "npx http-server -c-1 -o -p 9875 ./coverage", "test:ci": "yarn test:cov --watch=false --browsers=ChromeHeadlessNoSandbox", "lint": "ng lint awg-app", "tslint-check": "tslint-config-prettier-check ./tslint.json", "format:check": "prettier --check \"src/**/*.ts\"", "format:fix": "pretty-quick --staged", - "serve:doc": "yarn compodoc -p tsconfig.app.json --theme Readthedocs -d dist/compodoc -s -w", - "build:doc": "yarn compodoc -p tsconfig.app.json --theme Readthedocs -d dist/compodoc", + "doc": "yarn compodoc -p tsconfig.app.json --theme Readthedocs -d dist/compodoc", + "serve:doc": "yarn doc -s -w", + "build:doc": "yarn doc", "build": "ng build", "build:prod": "yarn build --prod --aot=false", "postbuild:prod": "run-s gzip:dist build:doc", diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 83969060d6..4bf75ab143 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -5,8 +5,11 @@ import { NavigationEnd, Router } from '@angular/router'; import { of as observableOf } from 'rxjs'; +import Spy = jasmine.Spy; + import { getAndExpectDebugElementByDirective } from '@testing/expect-helper'; +import { RouterEventsService } from '@awg-core/services'; import { AppComponent } from './app.component'; // analytics global @@ -22,7 +25,7 @@ class ViewContainerStubComponent {} @Component({ selector: 'awg-footer', template: '' }) class FooterStubComponent {} -class MockServices { +class MockRouter { // Router events = observableOf(new NavigationEnd(0, 'testUrl', 'testUrl'), [0, 0], 'testString'); } @@ -35,10 +38,20 @@ describe('AppComponent (DONE)', () => { let router: Router; + let getPreviousRouteSpy: Spy; + beforeEach(async(() => { + // create a fake RouterEventsService object with a `getPreviousRoute` spy + const mockRouterEventsService = jasmine.createSpyObj('RouterEventsService', ['getPreviousRoute']); + // make the spies return a synchronous Observable with the test data + getPreviousRouteSpy = mockRouterEventsService.getPreviousRoute.and.returnValue(observableOf('')); + TestBed.configureTestingModule({ declarations: [AppComponent, FooterStubComponent, NavbarStubComponent, ViewContainerStubComponent], - providers: [{ provide: Router, useClass: MockServices }] + providers: [ + { provide: Router, useClass: MockRouter }, + { provide: RouterEventsService, useValue: mockRouterEventsService } + ] }).compileComponents(); })); diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 4ae00b921d..81967fe553 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,6 +1,8 @@ import { Component } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; +import { RouterEventsService } from '@awg-core/services'; + /** * The main component of the AWG App. * @@ -15,14 +17,16 @@ export class AppComponent { /** * Constructor of the AppComponent. * - * It declares a private router instance to catch GoogleAnalytics pageview events, - * see {@link https://codeburst.io/using-google-analytics-with-angular-25c93bffaa18}. + * It declares private instances of the Angular router and the RouterEventsService. * * @param {Router} router Instance of the Angular router. + * @param {RouterEventsService} routerEventsService Instance of the RouterEventsService. */ - constructor(private readonly router: Router) { + constructor(private readonly router: Router, private routerEventsService: RouterEventsService) { this.router.events.subscribe(event => { if (event instanceof NavigationEnd) { + // catch GoogleAnalytics pageview events, + // cf. https://codeburst.io/using-google-analytics-with-angular-25c93bffaa18 (window as any).ga('set', 'page', event.urlAfterRedirects); (window as any).ga('send', 'pageview'); } diff --git a/src/app/app.config.ts b/src/app/app.config.ts index 4fced24519..44c491f4d5 100644 --- a/src/app/app.config.ts +++ b/src/app/app.config.ts @@ -16,6 +16,15 @@ export class AppConfig { return root + api; } + /** + * Getter for the AWG route storage key. + * + * @returns {string} + */ + public static get AWG_APP_ROUTE_STORAGE_KEY(): string { + return 'awg-app-route'; + } + /** * Getter for the url of the AWG edition website (awg-app). * diff --git a/src/app/app.globals.ts b/src/app/app.globals.ts index 2b258c7079..f1290cc460 100644 --- a/src/app/app.globals.ts +++ b/src/app/app.globals.ts @@ -1,15 +1,15 @@ // THIS IS AN AUTO-GENERATED FILE. DO NOT CHANGE IT MANUALLY! -// Generated last time on Wed Feb 5 14:49:11 CET 2020 +// Generated last time on Mon Feb 10 12:21:25 2020 /** * The latest version of the AWG App */ -export const appVersion = '0.7.0'; +export const appVersion = '0.7.1'; /** * The release date of the latest version of the AWG App */ -export const appVersionReleaseDate = '05. Februar 2020'; +export const appVersionReleaseDate = '10. Februar 2020'; /** * The URL of the AWG App diff --git a/src/app/core/services/api-service/api.service.ts b/src/app/core/services/api-service/api.service.ts index f9de2597f7..2ac57d93c6 100644 --- a/src/app/core/services/api-service/api.service.ts +++ b/src/app/core/services/api-service/api.service.ts @@ -37,7 +37,7 @@ export class ApiService { /** * Constructor of the ApiService. * - * It declares a private {@link HttpClient} instance + * It declares a public {@link HttpClient} instance * to handle http requests. * * @param {HttpClient} http Instance of the HttpClient. diff --git a/src/app/core/services/conversion-service/conversion.service.ts b/src/app/core/services/conversion-service/conversion.service.ts index 60e8e68908..4107a7543f 100644 --- a/src/app/core/services/conversion-service/conversion.service.ts +++ b/src/app/core/services/conversion-service/conversion.service.ts @@ -1,10 +1,12 @@ import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; import { NgxGalleryImage } from '@kolkov/ngx-gallery'; import { ApiService } from '@awg-core/services/api-service'; + import { GeoNames } from '@awg-core/core-models'; import { ContextJson, @@ -21,7 +23,6 @@ import { SelectionJson, SubjectItemJson } from '@awg-shared/api-objects'; -import { PropertyJsonValue } from '@awg-shared/api-objects/resource-response-formats/src/property-json'; import { IResourceDataResponse, ResourceDetail, @@ -69,6 +70,19 @@ export class ConversionService extends ApiService { */ filteredOut: number; + /** + * Constructor of the ConversionService. + * + * It declares a public {@link HttpClient} instance + * with a super reference to base class (ApiService) + * and a private {@link StorageService} instance. + * + * @param {HttpClient} http Instance of the HttpClient. + */ + constructor(public http: HttpClient) { + super(http); + } + /** * Public method: convertFullTextSearchResults. * @@ -494,10 +508,6 @@ export class ConversionService extends ApiService { case '14': // RICHTEXT: salsah standoff needs to be converted for (let i = 0; i < prop.values.length; i++) { - // if we have a gnd (prop.pid=856), write it to localstorage - if (prop.pid === '856' && prop.values[i]) { - this.writeGndToLocalStorage(prop.values[i]); - } // convert richtext standoff prop.toHtml[i] = this.convertRichtextValue(prop.values[i].utf8str, prop.values[i].textattr); } @@ -950,32 +960,4 @@ export class ConversionService extends ApiService { links: incomingLinks.filter(incomingLink => incomingLink.restype.label === label) })); } - - /** - * Private method: writeGndToLocalStorage. - * - * It writes the GND number to the localStorage - * for further processing. - * - * @param {} value The given incoming property value. - * - * @returns {void} Writes the GND number to the localStorage. - */ - private writeGndToLocalStorage(value: PropertyJsonValue): void { - const dnbReg = 'http://d-nb.info/gnd/'; - const gndKey = 'gnd'; - let gndItem: string; - - const valueHasGnd = (checkValue: PropertyJsonValue) => { - return !(!checkValue || !checkValue.utf8str || !checkValue.utf8str.includes(dnbReg)); - }; - - if (valueHasGnd(value)) { - // split utf8str with gnd value into array and take last argument (pop) - gndItem = value.utf8str.split(dnbReg).pop(); - localStorage.setItem(gndKey, gndItem); - } else { - localStorage.removeItem(gndKey); - } - } } diff --git a/src/app/core/services/core-service/core.service.spec.ts b/src/app/core/services/core-service/core.service.spec.ts index 7af2e5f7a3..71abf8b5b6 100644 --- a/src/app/core/services/core-service/core.service.spec.ts +++ b/src/app/core/services/core-service/core.service.spec.ts @@ -15,7 +15,7 @@ describe('CoreService (DONE)', () => { TestBed.configureTestingModule({ providers: [CoreService] }); - // inject services and http client handler + // inject service coreService = TestBed.get(CoreService); // test data diff --git a/src/app/core/services/data-streamer/data-streamer.service.spec.ts b/src/app/core/services/data-streamer-service/data-streamer.service.spec.ts similarity index 100% rename from src/app/core/services/data-streamer/data-streamer.service.spec.ts rename to src/app/core/services/data-streamer-service/data-streamer.service.spec.ts diff --git a/src/app/core/services/data-streamer/data-streamer.service.ts b/src/app/core/services/data-streamer-service/data-streamer.service.ts similarity index 100% rename from src/app/core/services/data-streamer/data-streamer.service.ts rename to src/app/core/services/data-streamer-service/data-streamer.service.ts diff --git a/src/app/core/services/data-streamer/index.ts b/src/app/core/services/data-streamer-service/index.ts similarity index 100% rename from src/app/core/services/data-streamer/index.ts rename to src/app/core/services/data-streamer-service/index.ts diff --git a/src/app/core/services/gnd-service/gnd.service.spec.ts b/src/app/core/services/gnd-service/gnd.service.spec.ts new file mode 100644 index 0000000000..176d1cc641 --- /dev/null +++ b/src/app/core/services/gnd-service/gnd.service.spec.ts @@ -0,0 +1,272 @@ +import { TestBed } from '@angular/core/testing'; + +import { expectSpyCall } from '@testing/expect-helper'; + +import { StorageType } from '@awg-core/services/storage-service'; +import { GndService } from './gnd.service'; + +describe('GndService', () => { + let gndService: GndService; + + const sessionType = StorageType.sessionStorage; + const localType = StorageType.localStorage; + + const expectedGndKey = 'gnd'; + const expectedDnbReg = /href="(https?:\/\/d-nb.info\/gnd\/([\w\-]{8,11}))"/i; + + let expectedMockStorage: Storage; + const expectedLocalStorage: Storage = window[localType]; + const expectedSessionStorage: Storage = window[sessionType]; + + const expectedInputValue = 'http://d-nb.info/gnd/12345678-X'; + const expectedItem = '12345678-X'; + const otherInputValue = 'http://d-nb.info/gnd/12345678-X'; + const otherItem = '87654321-A'; + + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [GndService] + }); + // inject service + gndService = TestBed.get(GndService); + + // default to sessionStorage + expectedMockStorage = expectedSessionStorage; + + // mock Storage + let store = {}; + const mockStorage = { + getItem: (key: string): string => { + return key in store ? store[key] : null; + }, + setItem: (key: string, value: string) => { + store[key] = `${value}`; + }, + removeItem: (key: string) => { + delete store[key]; + }, + clear: () => { + store = {}; + } + }; + + // spies replace storage calls with fake mockStorage calls + spyOn(localStorage, 'getItem').and.callFake(mockStorage.getItem); + spyOn(localStorage, 'setItem').and.callFake(mockStorage.setItem); + spyOn(localStorage, 'removeItem').and.callFake(mockStorage.removeItem); + spyOn(localStorage, 'clear').and.callFake(mockStorage.clear); + }); + + afterEach(() => { + // clear storages after each test + expectedSessionStorage.clear(); + expectedLocalStorage.clear(); + }); + + it('should be created', () => { + expect(gndService).toBeTruthy(); + }); + + it('should have gndKey', () => { + expect(gndService.gndKey).toBeTruthy(); + expect(gndService.gndKey).toEqual(expectedGndKey); + }); + + it('should have dnbReg', () => { + expect(gndService.dnbReg).toBeTruthy(); + expect(gndService.dnbReg).toEqual(expectedDnbReg); + }); + + it('should not have linkRegArr before setGndToSessionStorage call', () => { + expect(gndService.linkRegArr).toBeUndefined(); + + gndService.setGndToSessionStorage(expectedInputValue); + + expect(gndService.linkRegArr).toBeDefined(); + }); + + describe('#setGndToSessionStorage', () => { + it('... should set key/value pair to storage if value has gnd link', () => { + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + + gndService.setGndToSessionStorage(expectedInputValue); + + expect(expectedMockStorage.getItem(expectedGndKey)).toEqual(expectedItem, `should be ${expectedItem}`); + }); + + it(`... should set an item to the correct storage if value has gnd link`, () => { + const otherStorage = expectedLocalStorage; + + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + expect(otherStorage.getItem(expectedGndKey)).toBeNull(); + + gndService.setGndToSessionStorage(expectedInputValue); + + expect(expectedMockStorage.getItem(expectedGndKey)).toEqual(expectedItem, `should be ${expectedItem}`); + expect(otherStorage.getItem(expectedGndKey)).not.toEqual(expectedItem, `should not be ${otherItem}`); + expect(otherStorage.getItem(expectedGndKey)).toBeNull(); + }); + + it('... should overwrite an existing gnd key if value has gnd link', () => { + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + + gndService.setGndToSessionStorage(expectedInputValue); + expect(expectedMockStorage.getItem(expectedGndKey)).toEqual(expectedItem, `should be ${expectedItem}`); + + gndService.setGndToSessionStorage(otherInputValue); + expect(expectedMockStorage.getItem(expectedGndKey)).not.toEqual( + expectedItem, + `should not be ${expectedItem}` + ); + expect(expectedMockStorage.getItem(expectedGndKey)).toEqual(otherItem, `should be ${otherItem}`); + }); + + it('... should return null if value has no gnd link', () => { + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + + gndService.setGndToSessionStorage(expectedItem); + + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + }); + + it('... should call helper function with input value to check if value has gnd link', () => { + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + + const valueHasGndSpy = spyOn(gndService, 'valueHasGnd').and.callThrough(); + gndService.setGndToSessionStorage(expectedInputValue); + + expectSpyCall(valueHasGndSpy, 1, expectedInputValue); + }); + + describe('#valueHasGnd', () => { + it('... should execute regex check and populate linkRegArr if value has gnd link', () => { + expect(gndService.linkRegArr).toBeUndefined(); + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + + const valueHasGndSpy = spyOn(gndService, 'valueHasGnd').and.callFake(checkValue => { + gndService.linkRegArr = gndService.dnbReg.exec(checkValue); + }); + gndService.setGndToSessionStorage(expectedInputValue); + + expectSpyCall(valueHasGndSpy, 1, expectedInputValue); + + expect(expectedInputValue).toMatch(expectedDnbReg); + expect(gndService.linkRegArr).toBeDefined(); + expect(gndService.linkRegArr).toEqual(expectedDnbReg.exec(expectedInputValue)); + }); + + it('... should execute regex check and set linkRegArr = null if value has no gnd link', () => { + expect(gndService.linkRegArr).toBeUndefined(); + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + + const valueHasGndSpy = spyOn(gndService, 'valueHasGnd').and.callThrough(); + gndService.setGndToSessionStorage(otherItem); + + expectSpyCall(valueHasGndSpy, 1, otherItem); + + expect(otherItem).not.toMatch(expectedDnbReg); + expect(gndService.linkRegArr).toBeNull(); + }); + + it('... should return true if value has gnd link', () => { + expect(gndService.linkRegArr).toBeUndefined(); + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + + const valueHasGndSpy = spyOn(gndService, 'valueHasGnd').and.callThrough(); + gndService.setGndToSessionStorage(expectedInputValue); + + expectSpyCall(valueHasGndSpy, 1, expectedInputValue); + expect(expectedMockStorage.getItem(expectedGndKey)).toEqual(expectedItem, `should be ${expectedItem}`); + }); + + it('... should return false if value has no gnd link', () => { + expect(gndService.linkRegArr).toBeUndefined(); + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + + const valueHasGndSpy = spyOn(gndService, 'valueHasGnd').and.callThrough(); + gndService.setGndToSessionStorage(otherItem); + + expectSpyCall(valueHasGndSpy, 1, otherItem); + + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + }); + }); + }); + + describe('removeGndFromSessionStorage', () => { + it(`... should remove an item by key from the storage`, () => { + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + expectedMockStorage.setItem(expectedGndKey, expectedItem); + + expect(expectedMockStorage.getItem(expectedGndKey)).toEqual(expectedItem, `should be ${expectedItem}`); + + gndService.removeGndFromSessionStorage(); + + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + }); + + it(`... should remove an item from the correct storage`, () => { + const otherStorage = expectedLocalStorage; + + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + expect(otherStorage.getItem(expectedGndKey)).toBeNull(); + + expectedMockStorage.setItem(expectedGndKey, expectedItem); + otherStorage.setItem(expectedGndKey, otherItem); + + expect(expectedMockStorage.getItem(expectedGndKey)).toEqual(expectedItem, `should be ${expectedItem}`); + expect(otherStorage.getItem(expectedGndKey)).toEqual(otherItem, `should be ${otherItem}`); + + gndService.removeGndFromSessionStorage(); + + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + expect(otherStorage.getItem(expectedGndKey)).toEqual(otherItem, `should be ${otherItem}`); + }); + + it(`... should remove the correct item from the storage`, () => { + const otherKey = 'otherKey'; + + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + expect(expectedMockStorage.getItem(otherKey)).toBeNull(); + + expectedMockStorage.setItem(expectedGndKey, expectedItem); + expectedMockStorage.setItem(otherKey, expectedItem); + + expect(expectedMockStorage.getItem(expectedGndKey)).toEqual(expectedItem, `should be ${expectedItem}`); + expect(expectedMockStorage.getItem(otherKey)).toEqual(expectedItem, `should be ${expectedItem}`); + + gndService.removeGndFromSessionStorage(); + + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + expect(expectedMockStorage.getItem(otherKey)).toEqual(expectedItem, `should be ${expectedItem}`); + }); + + describe(`... should do nothing if:`, () => { + it('- storage has not the gnd key', () => { + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + + gndService.removeGndFromSessionStorage(); + + expect(gndService.removeGndFromSessionStorage()).toBeUndefined(); + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + }); + + it(`- storage has other key but not the gnd key`, () => { + const otherKey = 'otherKey'; + + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + expect(expectedMockStorage.getItem(otherKey)).toBeNull(); + + expectedMockStorage.setItem(otherKey, expectedItem); + + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + expect(expectedMockStorage.getItem(otherKey)).toEqual(expectedItem, `should be ${expectedItem}`); + + gndService.removeGndFromSessionStorage(); + + expect(expectedMockStorage.getItem(expectedGndKey)).toBeNull(); + expect(expectedMockStorage.getItem(otherKey)).toEqual(expectedItem, `should be ${expectedItem}`); + }); + }); + }); +}); diff --git a/src/app/core/services/gnd-service/gnd.service.ts b/src/app/core/services/gnd-service/gnd.service.ts new file mode 100644 index 0000000000..cff874330d --- /dev/null +++ b/src/app/core/services/gnd-service/gnd.service.ts @@ -0,0 +1,135 @@ +import { Injectable } from '@angular/core'; + +import { StorageType, StorageService } from '@awg-core/services/storage-service'; + +/** + * The GndEventType enumeration. + * + * It stores the possible GND event types. + */ +export enum GndEventType { + set = 'set', + get = 'get', + remove = 'remove' +} + +/** + * The GndEvent class. + * + * It stores a GND event. + */ +export class GndEvent { + /** + * The type of the GND event. + */ + type: GndEventType; + + /** + * The value of the GND event (GND number). + */ + value: string; + + /** + * Constructor of the GndEvent class. + * + * It initializes the class with a given type and value. + * + * @param {GndEventType} type The given GND event type. + * @param {string} value The given GND value. + */ + constructor(type: GndEventType, value: string) { + this.type = type; + this.value = value; + } +} + +/** + * The GND service. + * + * It handles the exposure of GND values + * to the session storage via the StorageService + * + * Provided in: `root`. + */ +@Injectable({ + providedIn: 'root' +}) +export class GndService extends StorageService { + /** + * Readonly variable: gndKey. + * + * It holds the public key that is set to the storage. + */ + readonly gndKey = 'gnd'; + + /** + * Readonly variable: dnbReg. + * + * It holds the regular expression for a d-nb link in a href. + */ + readonly dnbReg = /href="(https?:\/\/d-nb.info\/gnd\/([\w\-]{8,11}))"/i; // regexp for d-nb links + + /** + * Public variable: linkRegArr. + * + * It holds the result array of a regex check execution . + */ + linkRegArr: RegExpExecArray; + + /** + * Public method: setGndToSessionStorage. + * + * It sets a given value to the key defined in 'gndKey' + * in the sessionStorage. + * + * @param {string} value The given input value. + * + * @returns {void} It sets the key/value pair to the storage. + */ + setGndToSessionStorage(value: string): void { + if (this.valueHasGnd(value)) { + let gndItem: string; + // take last argument (pop) of linkRegArray + gndItem = this.linkRegArr.pop().toString(); + + // set to storage + this.setStorageKey(StorageType.sessionStorage, this.gndKey, gndItem); + + // postMessage to communicate with Inseri + window.parent.window.postMessage({ for: 'user', key: gndItem }, 'http://localhost:4200'); + } else { + this.removeGndFromSessionStorage(); + } + } + + /** + * Public method: removeGndFromSessionStorage. + * + * It removes the key defined in 'gndKey' + * from the sessionStorage. + * + * @returns {void} It removes the key/value pair from the storage. + */ + removeGndFromSessionStorage(): void { + this.removeStorageKey(StorageType.sessionStorage, this.gndKey); + } + + /** + * Private method: valueHasGnd. + * + * It checks if a given value contains a GND link + * (checked via the dnbReg regex). + * + * @param {string} checkValue The given value to check. + * + * @return {boolean} The boolean result of the check. + */ + private valueHasGnd(checkValue: string): boolean { + if (this.dnbReg.test(checkValue)) { + this.linkRegArr = this.dnbReg.exec(checkValue); + } else { + this.linkRegArr = null; + } + return !!this.linkRegArr; + } +} diff --git a/src/app/core/services/gnd-service/index.ts b/src/app/core/services/gnd-service/index.ts new file mode 100644 index 0000000000..3f6c606015 --- /dev/null +++ b/src/app/core/services/gnd-service/index.ts @@ -0,0 +1 @@ +export * from './gnd.service'; diff --git a/src/app/core/services/index.ts b/src/app/core/services/index.ts index c9b751bdc6..50067ab69f 100644 --- a/src/app/core/services/index.ts +++ b/src/app/core/services/index.ts @@ -10,8 +10,21 @@ import { ApiService } from './api-service'; import { ConversionService } from './conversion-service'; import { CoreService } from './core-service'; -import { DataStreamerService } from './data-streamer'; +import { DataStreamerService } from './data-streamer-service'; +import { GndService } from './gnd-service'; import { LoadingService } from './loading-service'; +import { RouterEventsService } from './router-events-service'; import { SideInfoService } from './side-info-service'; +import { StorageService } from './storage-service'; -export { ApiService, ConversionService, CoreService, DataStreamerService, LoadingService, SideInfoService }; +export { + ApiService, + ConversionService, + CoreService, + DataStreamerService, + GndService, + LoadingService, + RouterEventsService, + SideInfoService, + StorageService +}; diff --git a/src/app/core/services/router-events-service/index.ts b/src/app/core/services/router-events-service/index.ts new file mode 100644 index 0000000000..61bc4d5af8 --- /dev/null +++ b/src/app/core/services/router-events-service/index.ts @@ -0,0 +1 @@ +export * from './router-events.service'; diff --git a/src/app/core/services/router-events-service/router-events.service.spec.ts b/src/app/core/services/router-events-service/router-events.service.spec.ts new file mode 100644 index 0000000000..9b240e21da --- /dev/null +++ b/src/app/core/services/router-events-service/router-events.service.spec.ts @@ -0,0 +1,22 @@ +import { TestBed } from '@angular/core/testing'; +import { RouterTestingModule } from '@angular/router/testing'; + +import { RouterEventsService } from './router-events.service'; + +describe('RouterEventsService', () => { + let routerEventsService: RouterEventsService; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule], + providers: [RouterEventsService] + }); + + // inject service + routerEventsService = TestBed.get(RouterEventsService); + }); + + it('should be created', () => { + expect(routerEventsService).toBeTruthy(); + }); +}); diff --git a/src/app/core/services/router-events-service/router-events.service.ts b/src/app/core/services/router-events-service/router-events.service.ts new file mode 100644 index 0000000000..575270dda9 --- /dev/null +++ b/src/app/core/services/router-events-service/router-events.service.ts @@ -0,0 +1,68 @@ +import { Injectable } from '@angular/core'; +import { Location } from '@angular/common'; +import { Router, RoutesRecognized } from '@angular/router'; + +import { BehaviorSubject, Observable } from 'rxjs'; +import { tap, filter, pairwise } from 'rxjs/operators'; + +/** + * The RouterEvents service. + * + * It saves the previous route of a navigation event. + * cf. https://stackoverflow.com/a/59046339 + * + * Provided in: `root`. + */ +@Injectable({ + providedIn: 'root' +}) +export class RouterEventsService { + /** + * Private behavior subject to handle previous route path. + */ + private previousRoutePathSubject = new BehaviorSubject(''); + + /** + * Private readonly previousRoutePath stream as observable (`BehaviorSubject`). + */ + private readonly previousRoutePath$ = this.previousRoutePathSubject.asObservable(); + + /** + * Constructor of the RouterEventsService. + * + * It declares private instances of the Angular router and the Location. + * It filters the router events fo recognized routes + * to get the previous path from routing and stores it in the previousRoutePath. + * + * @param {Router} router Instance of the Angular router. + * @param {Location} locatoin Instance of the Location. + */ + constructor(private router: Router, private locatoin: Location) { + // ..initial previous route will be the current path for now + this.previousRoutePathSubject.next(this.locatoin.path()); + + // On every route change take the two events of two routes changed (using pairwise operator) + // and save the old one in a behaviour subject to access it in another component. + // Can be used if another component needs the previous route + // because it needs to redirect the user to where he did came from. + this.router.events + .pipe( + filter(e => e instanceof RoutesRecognized), + pairwise() + ) + .subscribe((event: any[]) => { + this.previousRoutePathSubject.next(event[0].urlAfterRedirects); + }); + } + + /** + * Public method: getPreviousRoute. + * + * It provides the previous route path from the previousRoutePath stream. + * + * @returns {Observable} The previousRoutePath stream as observable. + */ + getPreviousRoute(): Observable { + return this.previousRoutePath$; + } +} diff --git a/src/app/core/services/storage-service/index.ts b/src/app/core/services/storage-service/index.ts new file mode 100644 index 0000000000..4047195dc5 --- /dev/null +++ b/src/app/core/services/storage-service/index.ts @@ -0,0 +1 @@ +export * from './storage.service'; diff --git a/src/app/core/services/storage-service/storage.service.spec.ts b/src/app/core/services/storage-service/storage.service.spec.ts new file mode 100644 index 0000000000..ea75a130e1 --- /dev/null +++ b/src/app/core/services/storage-service/storage.service.spec.ts @@ -0,0 +1,366 @@ +import { TestBed } from '@angular/core/testing'; + +import { StorageService, StorageType } from './storage.service'; + +describe('StorageService', () => { + let storageService: StorageService; + + const sessionType = StorageType.sessionStorage; + const localType = StorageType.localStorage; + + let expectedMockStorage: Storage; + const expectedLocalStorage: Storage = window[localType]; + const expectedSessionStorage: Storage = window[sessionType]; + + const expectedKey = 'key'; + const expectedItem = 'expectedItem'; + const otherItem = 'otherItem'; + + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [StorageService] + }); + // inject service + storageService = TestBed.get(StorageService); + + // default to sessionStorage + expectedMockStorage = expectedSessionStorage; + + // mock Storage + let store = {}; + const mockStorage = { + getItem: (key: string): string => { + return key in store ? store[key] : null; + }, + setItem: (key: string, value: string) => { + store[key] = `${value}`; + }, + removeItem: (key: string) => { + delete store[key]; + }, + clear: () => { + store = {}; + } + }; + + // spies replace storage calls with fake mockStorage calls + spyOn(localStorage, 'getItem').and.callFake(mockStorage.getItem); + spyOn(localStorage, 'setItem').and.callFake(mockStorage.setItem); + spyOn(localStorage, 'removeItem').and.callFake(mockStorage.removeItem); + spyOn(localStorage, 'clear').and.callFake(mockStorage.clear); + }); + + afterEach(() => { + // clear storages after each test + expectedSessionStorage.clear(); + expectedLocalStorage.clear(); + }); + + it('should be created', () => { + expect(storageService).toBeTruthy(); + }); + + describe('mockStorage', () => { + it('... should set, get and remove items from mockSessionStorage', () => { + expectedMockStorage = expectedSessionStorage; + + expect(expectedMockStorage.setItem('foo', 'bar')); + expect(expectedMockStorage.getItem('foo')).toBe('bar'); // bar + expect(expectedMockStorage.removeItem('foo')).toBeUndefined(); // undefined + expect(expectedMockStorage.getItem('foo')).toBeNull(); // null + }); + + it('... should set, get and remove items from mockLocalStorage', () => { + expectedMockStorage = expectedLocalStorage; + + expect(expectedMockStorage.setItem('foo', 'bar')); + expect(expectedMockStorage.getItem('foo')).toBe('bar'); // bar + expect(expectedMockStorage.removeItem('foo')).toBeUndefined(); // undefined + expect(expectedMockStorage.getItem('foo')).toBeNull(); // null + }); + + it('... should set, get items and clear mockSessionStorage', () => { + expectedMockStorage = expectedSessionStorage; + + expect(expectedMockStorage.setItem('foo', 'bar')); + expect(expectedMockStorage.setItem('bar', 'foo')); + expect(expectedMockStorage.getItem('foo')).toBe('bar'); // bar + expect(expectedMockStorage.getItem('bar')).toBe('foo'); // foo + expect(expectedMockStorage.clear()).toBeUndefined(); // undefined + expect(expectedMockStorage.getItem('foo')).toBeNull(); // null + expect(expectedMockStorage.getItem('bar')).toBeNull(); // null + }); + + it('... should set, get items and clear mockLocalStorage', () => { + expectedMockStorage = expectedLocalStorage; + + expect(expectedMockStorage.setItem('foo', 'bar')); + expect(expectedMockStorage.setItem('bar', 'foo')); + expect(expectedMockStorage.getItem('foo')).toBe('bar'); // bar + expect(expectedMockStorage.getItem('bar')).toBe('foo'); // foo + expect(expectedMockStorage.clear()).toBeUndefined(); // undefined + expect(expectedMockStorage.getItem('foo')).toBeNull(); // null + expect(expectedMockStorage.getItem('bar')).toBeNull(); // null + }); + }); + + describe('#setStorageKey', () => { + it(`... should set a given key/item string pair to a given storage type`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + storageService.setStorageKey(sessionType, expectedKey, expectedItem); + expect(expectedMockStorage.getItem(expectedKey)).toBe(expectedItem, `should be ${expectedItem}`); + }); + + it(`... should set item to the correct storage type`, () => { + const otherStorage = expectedLocalStorage; + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + expect(otherStorage.getItem(expectedKey)).toBeNull(); + + storageService.setStorageKey(sessionType, expectedKey, expectedItem); + storageService.setStorageKey(localType, expectedKey, otherItem); + + expect(expectedMockStorage.getItem(expectedKey)).toEqual(expectedItem, `should be ${expectedItem}`); + expect(otherStorage.getItem(expectedKey)).toEqual(otherItem, `should be ${otherItem}`); + }); + + it(`... should set a new key/item when a key does not exist`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + storageService.setStorageKey(sessionType, expectedKey, expectedItem); + + expect(expectedMockStorage.getItem(expectedKey)).toEqual(expectedItem, `should be ${expectedItem}`); + }); + + it(`... should overwrite an existing item with the correct item when a key exists`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + storageService.setStorageKey(sessionType, expectedKey, expectedItem); + expect(expectedMockStorage.getItem(expectedKey)).toEqual(expectedItem, `should be ${expectedItem}`); + + storageService.setStorageKey(sessionType, expectedKey, otherItem); + expect(expectedMockStorage.getItem(expectedKey)).toEqual(otherItem, `should be ${otherItem}`); + }); + + describe(`... should do nothing if:`, () => { + it(`- storage type is undefined `, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + storageService.setStorageKey(undefined, expectedKey, expectedItem); + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + }); + + it(`- storage type is null`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + storageService.setStorageKey(null, expectedKey, expectedItem); + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + }); + + it(`- storage is not available`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + spyOn(storageService, 'storageIsAvailable').and.returnValue(false); + storageService.setStorageKey(sessionType, expectedKey, expectedItem); + + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + }); + + it(`- storage is not supported`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + spyOn(storageService, 'storageIsSupported').and.returnValue(false); + storageService.setStorageKey(sessionType, expectedKey, expectedItem); + + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + }); + + it(`- key is undefined `, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + storageService.setStorageKey(sessionType, undefined, expectedItem); + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + }); + + it(`- key is null`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + storageService.setStorageKey(sessionType, null, expectedItem); + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + }); + + it(`- value is undefined `, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + storageService.setStorageKey(sessionType, expectedKey, undefined); + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + }); + + it(`- value is null`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + storageService.setStorageKey(sessionType, expectedKey, null); + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + }); + }); + }); + + describe('#getStorageKey', () => { + it(`... should get an item by key from a given storage type`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + expectedMockStorage.setItem(expectedKey, expectedItem); + + expect(storageService.getStorageKey(sessionType, expectedKey)).toEqual( + expectedItem, + `should be ${expectedItem}` + ); + }); + + it(`... should get item from the correct storage type`, () => { + const otherStorage = expectedLocalStorage; + + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + expect(otherStorage.getItem(expectedKey)).toBeNull(); + + expectedMockStorage.setItem(expectedKey, expectedItem); + otherStorage.setItem(expectedKey, otherItem); + + expect(storageService.getStorageKey(sessionType, expectedKey)).toEqual( + expectedItem, + `should be ${expectedItem}` + ); + expect(storageService.getStorageKey(localType, expectedKey)).toEqual(otherItem, `should be ${otherItem}`); + }); + + it('... should return null for non existing keys', () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + expect(storageService.getStorageKey(sessionType, expectedKey)).toBeNull(); + }); + + describe(`... should do nothing if:`, () => { + it(`- storage type is undefined `, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + expectedMockStorage.setItem(expectedKey, expectedItem); + + expect(storageService.getStorageKey(undefined, expectedKey)).toBeNull(); + }); + + it(`- storage type is null`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + expectedMockStorage.setItem(expectedKey, expectedItem); + + expect(storageService.getStorageKey(null, expectedKey)).toBeNull(); + }); + + it(`- storage has not the given key`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + expectedMockStorage.setItem(expectedKey, expectedItem); + + spyOn(storageService, 'storageHasKey').and.returnValue(false); + + expect(storageService.getStorageKey(sessionType, expectedKey)).toBeNull(); + }); + + it(`- storage is not supported`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + expectedMockStorage.setItem(expectedKey, expectedItem); + + spyOn(storageService, 'storageIsSupported').and.returnValue(undefined); + + expect(storageService.getStorageKey(sessionType, expectedKey)).toBeNull(); + }); + + it(`- storage is not available`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + expectedMockStorage.setItem(expectedKey, expectedItem); + + spyOn(storageService, 'storageIsAvailable').and.returnValue(undefined); + + expect(storageService.getStorageKey(sessionType, expectedKey)).toBeNull(); + }); + }); + }); + + describe('#removeStorageKey', () => { + it(`... should remove an item by key from a given storage type`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + storageService.setStorageKey(sessionType, expectedKey, expectedItem); + expect(expectedMockStorage.getItem(expectedKey)).toBe(expectedItem, `should be ${expectedItem}`); + + storageService.removeStorageKey(sessionType, expectedKey); + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + }); + + it(`... should remove item from the correct storage type`, () => { + const otherStorage = expectedLocalStorage; + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + expect(otherStorage.getItem(expectedKey)).toBeNull(); + + expectedMockStorage.setItem(expectedKey, expectedItem); + otherStorage.setItem(expectedKey, otherItem); + + storageService.removeStorageKey(sessionType, expectedKey); + + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + expect(otherStorage.getItem(expectedKey)).toEqual(otherItem, `should be ${otherItem}`); + + storageService.removeStorageKey(localType, expectedKey); + + expect(otherStorage.getItem(expectedKey)).toBeNull(); + }); + + it('... should return for non existing items', () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + expect(storageService.removeStorageKey(sessionType, expectedKey)).toBeUndefined(); + }); + + describe(`... should do nothing if:`, () => { + it(`- storage type is undefined `, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + expectedMockStorage.setItem(expectedKey, expectedItem); + + expect(expectedMockStorage.getItem(expectedKey)).toEqual(expectedItem, `should be ${expectedItem}`); + + storageService.removeStorageKey(undefined, expectedKey); + + expect(expectedMockStorage.getItem(expectedKey)).toEqual(expectedItem, `should be ${expectedItem}`); + }); + + it(`- storage type is null`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + expectedMockStorage.setItem(expectedKey, expectedItem); + + expect(expectedMockStorage.getItem(expectedKey)).toEqual(expectedItem, `should be ${expectedItem}`); + + storageService.removeStorageKey(null, expectedKey); + + expect(expectedMockStorage.getItem(expectedKey)).toEqual(expectedItem, `should be ${expectedItem}`); + }); + + it(`- storage has not the given key`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + expectedMockStorage.setItem(expectedKey, expectedItem); + + expect(expectedMockStorage.getItem(expectedKey)).toEqual(expectedItem, `should be ${expectedItem}`); + + spyOn(storageService, 'storageHasKey').and.returnValue(false); + storageService.removeStorageKey(sessionType, expectedKey); + + expect(expectedMockStorage.getItem(expectedKey)).toEqual(expectedItem, `should be ${expectedItem}`); + }); + + it(`- storage is not supported`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + expectedMockStorage.setItem(expectedKey, expectedItem); + + expect(expectedMockStorage.getItem(expectedKey)).toEqual(expectedItem, `should be ${expectedItem}`); + + spyOn(storageService, 'storageIsSupported').and.returnValue(undefined); + storageService.removeStorageKey(sessionType, expectedKey); + + expect(expectedMockStorage.getItem(expectedKey)).toEqual(expectedItem, `should be ${expectedItem}`); + }); + + it(`- storage is not available`, () => { + expect(expectedMockStorage.getItem(expectedKey)).toBeNull(); + expectedMockStorage.setItem(expectedKey, expectedItem); + + expect(expectedMockStorage.getItem(expectedKey)).toEqual(expectedItem, `should be ${expectedItem}`); + + spyOn(storageService, 'storageIsAvailable').and.returnValue(undefined); + storageService.removeStorageKey(sessionType, expectedKey); + + expect(expectedMockStorage.getItem(expectedKey)).toEqual(expectedItem, `should be ${expectedItem}`); + }); + }); + }); +}); diff --git a/src/app/core/services/storage-service/storage.service.ts b/src/app/core/services/storage-service/storage.service.ts new file mode 100644 index 0000000000..50c27e9636 --- /dev/null +++ b/src/app/core/services/storage-service/storage.service.ts @@ -0,0 +1,152 @@ +import { Injectable } from '@angular/core'; + +/** + * The StorageType enumeration. + * + * It stores the possible storage types. + */ +export enum StorageType { + localStorage = 'localStorage', + sessionStorage = 'sessionStorage' +} + +/** + * The Storage service. + * + * It handles the storage of data + * in the session- or localstorage. + * + * Provided in: `root`. + */ +@Injectable({ + providedIn: 'root' +}) +export class StorageService { + /** + * Constructor of the StorageService. + */ + constructor() {} + + /** + * Public method: setStorageKey. + * + * It sets a given key/item string pair to a given storage type. + * + * @param {string} type The given storage type. + * @param {string} key The given key. + * @param {string} item The given item. + * + * @returns {void} It sets the storage key. + */ + setStorageKey(type: StorageType, key: string, item: string): void { + if (!type || !key || !item) { + return; + } + const storage = window[type]; + if (this.storageIsSupported(storage)) { + storage.setItem(key, item); + } else { + return; + } + } + + /** + * Public method: getStorageKey. + * + * It gets one item by key from a given storage type. + * + * @param {string} type The given storage type. + * @param {string} key The given key. + * + * @returns {string} The item from the storage. + */ + getStorageKey(type: StorageType, key: string): string { + if (!type || !key) { + return null; + } + const storage = window[type]; + if (this.storageHasKey(storage, key)) { + return storage.getItem(key); + } else { + return null; + } + } + + /** + * Public method: removeStorageKey. + * + * It removes a key from a given storage type. + * + * @param {string} type The given storage type. + * @param {string} key The given key. + * + * @returns {void} Removes a key pair from the storage. + */ + removeStorageKey(type: StorageType, key: string): void { + if (!type || !key) { + return; + } + const storage = window[type]; + if (this.storageHasKey(storage, key)) { + storage.removeItem(key); + } else { + return; + } + } + + /** + * Private method: storageHasKey. + * + * It checks if a given storage type has a given key. + * + * @param {any} storage The given storage type. + * @param {string} key The given key. + * + * @returns {boolean} The boolean value for the given key in the given storage type. + */ + private storageHasKey(storage: Storage, key: string): boolean { + if (this.storageIsSupported(storage)) { + return !!storage.getItem(key); + } + return false; + } + + /** + * Private method: storageIsSupported. + * + * It checks if a given storage type is supported. + * + * @param {Storage} storage The given storage type. + * + * @returns {Storage} The local reference to Storage for the given storage type. + */ + private storageIsSupported(storage: Storage): Storage { + return typeof storage !== 'undefined' && storage !== null && this.storageIsAvailable(storage); + } + + /** + * Private method: storageIsAvailable. + * + * It checks if a given storage type is available. + * cf. https://mathiasbynens.be/notes/localstorage-pattern + * + * @param {Storage} storage The given storage type. + * + * @returns {Storage} The local reference to Storage for the given storage type. + */ + private storageIsAvailable(storage: Storage): Storage { + try { + // make uid from Date + const uid = new Date().toDateString(); + + // set, get and remove item + storage.setItem(uid, uid); + const result = storage.getItem(uid) === uid; + + storage.removeItem(uid); + + // return local reference to Storage or undefined + return result && storage; + } catch (e) {} + } +} diff --git a/src/app/shared/modal/modal.component.ts b/src/app/shared/modal/modal.component.ts index b78d1d2737..3c9cbc79ec 100644 --- a/src/app/shared/modal/modal.component.ts +++ b/src/app/shared/modal/modal.component.ts @@ -15,6 +15,8 @@ const MODALCONTENTSNIPPETS = { 'Die edierten Notentexte von Aa:SkI/1, Ab:SkII/1, Ac:SkIII/1 und Ac:SkIII/7 sowie Ae:SkIV/1 erscheinen im Zusammenhang der vollständigen Edition der Vier Lieder op. 12 in AWG I/5.', op12_editionComingSoon: '

Die Einleitungen, edierten Notentexte und Kritischen Berichte zu

  • Werkedition der Druckfassung der Vier Lieder op. 12
    Textedition von Nr. I „Der Tag ist vergangen“ (Fassung 1)
    Textedition von Nr. I „Der Tag ist vergangen“ (Fassung 2)
    Textedition von Nr. IV Gleich und Gleich (Fassung 1)

erscheinen im Zusammenhang der vollständigen Edition der Vier Lieder op. 12 in AWG I/5.

', + op25_sheetComingSoon: + 'Die edierten Notentexte weiterer Skizzen der Drei Lieder nach Gedichten von Hildegard Jone op. 25 erscheinen in Kürze (02/2020).', op25_sourceNotA: '

Die Beschreibung der Quellen B sowie D–E einschließlich der darin gegebenenfalls enthaltenen Korrekturen erfolgt im Zusammenhang der vollständigen Edition der Drei Lieder nach Gedichten von Hildegard Jone op. 25 in AWG I/5.

', M198: diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.html b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.html index 2e7d081ced..67e78a17bb 100644 --- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.html +++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.html @@ -8,7 +8,7 @@

Objektdaten

  • - {{ prop?.label }} + {{ setLabel(prop) }}
      diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.spec.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.spec.ts index fa7dd70023..280ce463fb 100644 --- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.spec.ts +++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.spec.ts @@ -14,7 +14,7 @@ import { ResourceDetailProperty } from '@awg-views/data-view/models'; import { ResourceDetailHtmlContentPropsComponent } from './props.component'; -describe('ResourceDetailHtmlContentPropsComponent (DONE)', () => { +describe('ResourceDetailHtmlContentPropsComponent', () => { let component: ResourceDetailHtmlContentPropsComponent; let fixture: ComponentFixture; let compDe: DebugElement; diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.ts index 2f1441e016..e7bfda9e62 100644 --- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.ts +++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.ts @@ -1,6 +1,8 @@ -import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { GndEvent, GndEventType } from '@awg-core/services/gnd-service'; import { ResourceDetailProperty } from '@awg-views/data-view/models'; +import { PropertyJson } from '@awg-shared/api-objects'; /** * The ResourceDetailHtmlContentProps component. @@ -14,7 +16,7 @@ import { ResourceDetailProperty } from '@awg-views/data-view/models'; styleUrls: ['./props.component.css'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class ResourceDetailHtmlContentPropsComponent implements OnInit { +export class ResourceDetailHtmlContentPropsComponent implements OnInit, OnDestroy { /** * Input variable: props. * @@ -23,6 +25,14 @@ export class ResourceDetailHtmlContentPropsComponent implements OnInit { @Input() props: ResourceDetailProperty[]; + /** + * Output variable: gndRequest. + * + * It keeps an event emitter for the exposition of a GND value. + */ + @Output() + gndRequest: EventEmitter = new EventEmitter(); + /** * Output variable: resourceRequest. * @@ -64,4 +74,57 @@ export class ResourceDetailHtmlContentPropsComponent implements OnInit { id = id.toString(); this.resourceRequest.emit(id); } + + /** + * Public method: exposeGnd. + * + * It emits a given gnd event (type, value) + * to the {@link gndRequest}. + * + * @param {GndEvent} gndEvent The given GND event. + * + * @returns {void} Emits the GND event. + */ + exposeGnd(gndEvent: GndEvent): void { + if (!gndEvent) { + return; + } + this.gndRequest.emit(gndEvent); + } + + /** + * Public method: setLabel. + * + * It sets the label of a given property object + * while checking for a gnd value to expose. + * + * @param {PropertyJson} prop The given property object. + * + * @returns {string} The property label. + */ + setLabel(prop: PropertyJson): string { + if (!prop) { + return null; + } + // if we have a gnd (prop.pid=856), write it to sessionStorage + if (prop.pid === '856' && prop.values && prop.values.length > 0) { + prop.values.map((value: string) => { + const gndEvent = new GndEvent(GndEventType.set, value); + this.exposeGnd(gndEvent); + }); + } + return prop.label; + } + + /** + * Angular life cycle hook: ngOnDestroy. + * + * It calls the containing methods + * when destroying the component. + */ + ngOnDestroy() { + // if we leave the component, remove gnd from storage + const gndEvent = new GndEvent(GndEventType.remove, null); + this.exposeGnd(gndEvent); + } } diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.html b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.html index d3fd0a9222..88353f4981 100644 --- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.html +++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.html @@ -19,6 +19,7 @@
      diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.spec.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.spec.ts index 4b9583c253..cc9cba6d8b 100644 --- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.spec.ts +++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.spec.ts @@ -12,6 +12,7 @@ import { } from '@testing/expect-helper'; import { mockContextJson } from '@testing/mock-data'; +import { GndEvent } from '@awg-core/services/gnd-service'; import { ContextJson } from '@awg-shared/api-objects'; import { ResourceDetailContent, @@ -28,6 +29,8 @@ class ResourceDetailHtmlContentPropsStubComponent { @Input() props: ResourceDetailProperty[]; @Output() + gndRequest: EventEmitter = new EventEmitter(); + @Output() resourceRequest: EventEmitter = new EventEmitter(); } diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.ts index aef9274aa7..e4b5dc272e 100644 --- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.ts +++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.ts @@ -1,6 +1,7 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { ResourceDetailContent } from '@awg-views/data-view/models'; +import { GndEvent } from '@awg-core/services/gnd-service'; /** * The ResourceDetailHtmlContent component. @@ -26,6 +27,14 @@ export class ResourceDetailHtmlContentComponent implements OnInit { @Input() content: ResourceDetailContent; + /** + * Output variable: gndRequest. + * + * It keeps an event emitter for the exposition of a GND value. + */ + @Output() + gndRequest: EventEmitter = new EventEmitter(); + /** * Output variable: resourceRequest. * @@ -42,6 +51,23 @@ export class ResourceDetailHtmlContentComponent implements OnInit { */ ngOnInit() {} + /** + * Public method: exposeGnd. + * + * It emits a given gnd event (type, value) + * to the {@link gndRequest}. + * + * @param {{type: string, value: string}} gndEvent The given event. + * + * @returns {void} Emits the event. + */ + exposeGnd(gndEvent: GndEvent): void { + if (!gndEvent) { + return; + } + this.gndRequest.emit(gndEvent); + } + /** * Public method: navigateToResource. * diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.html b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.html index e5956ea95f..2e2215dd4f 100644 --- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.html +++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.html @@ -2,6 +2,7 @@ diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.spec.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.spec.ts index eba549fd2c..a2a022d207 100644 --- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.spec.ts +++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.spec.ts @@ -13,6 +13,7 @@ import { ResourceDetailImage, ResourceDetailProperty } from '@awg-views/data-view/models'; +import { GndEvent } from '@awg-core/services/gnd-service'; import { ResourceDetailHtmlComponent } from './resource-detail-html.component'; @@ -22,6 +23,8 @@ class ResourceDetailHtmlContentStubComponent { @Input() content: ResourceDetailContent; @Output() + gndRequest: EventEmitter = new EventEmitter(); + @Output() resourceRequest: EventEmitter = new EventEmitter(); } diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.ts index fc9ea6dbaf..0b4aff42e0 100644 --- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.ts +++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.ts @@ -1,6 +1,7 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { ResourceDetail } from '@awg-views/data-view/models'; +import { GndEvent } from '@awg-core/services/gnd-service'; /** * The ResourceDetailHtml component. @@ -24,6 +25,14 @@ export class ResourceDetailHtmlComponent implements OnInit { @Input() resourceDetailData: ResourceDetail; + /** + * Output variable: gndRequest. + * + * It keeps an event emitter for the exposition of a GND value. + */ + @Output() + gndRequest: EventEmitter = new EventEmitter(); + /** * Output variable: resourceRequest. * @@ -40,6 +49,23 @@ export class ResourceDetailHtmlComponent implements OnInit { */ ngOnInit() {} + /** + * Public method: exposeGnd. + * + * It emits a given gnd event (type, value) + * to the {@link gndRequest}. + * + * @param {{type: string, value: string}} gndEvent The given event. + * + * @returns {void} Emits the event. + */ + exposeGnd(gndEvent: GndEvent): void { + if (!gndEvent) { + return; + } + this.gndRequest.emit(gndEvent); + } + /** * Public method: navigateToResource. * diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.html b/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.html index 2af6044f38..6795a59c6c 100644 --- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.html +++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.html @@ -33,6 +33,7 @@ diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.spec.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.spec.ts index 081ec14865..34734a6ad2 100644 --- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.spec.ts +++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.spec.ts @@ -11,6 +11,7 @@ import { NgbTabsetModule } from '@ng-bootstrap/ng-bootstrap'; import Spy = jasmine.Spy; import { DataStreamerService, LoadingService } from '@awg-core/services'; +import { GndEvent } from '@awg-core/services/gnd-service'; import { DataApiService } from '@awg-views/data-view/services'; import { ResourceFullResponseJson } from '@awg-shared/api-objects'; @@ -34,6 +35,8 @@ class ResourceDetailHtmlStubComponent { @Input() resourceDetailData: ResourceDetail; @Output() + gndRequest: EventEmitter = new EventEmitter(); + @Output() resourceRequest: EventEmitter = new EventEmitter(); } diff --git a/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.ts b/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.ts index 97af269869..1161799bed 100644 --- a/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.ts +++ b/src/app/views/data-view/data-outlets/resource-detail/resource-detail.component.ts @@ -6,7 +6,8 @@ import { switchMap, takeUntil } from 'rxjs/operators'; import { NgbTabsetConfig } from '@ng-bootstrap/ng-bootstrap'; -import { DataStreamerService, LoadingService } from '@awg-core/services'; +import { DataStreamerService, GndService, LoadingService } from '@awg-core/services'; +import { GndEvent, GndEventType } from '@awg-core/services/gnd-service'; import { DataApiService } from '@awg-views/data-view/services'; import { ResourceData } from '@awg-views/data-view/models'; @@ -96,13 +97,14 @@ export class ResourceDetailComponent implements OnInit, OnDestroy { * * It declares private instances of the Angular ActivatedRoute, * the Angular Router, the DataApiService, the DataStreamerService, - * the LoadingService, and a configuration object for the + * the GndService, the LoadingService, and a configuration object for the * ng-bootstrap tabset. * * @param {ActivatedRoute} route Instance of the Angular ActivatedRoute. * @param {Router} router Instance of the Angular Router. * @param {DataApiService} dataApiService Instance of the DataApiService. * @param {DataStreamerService} dataStreamerService Instance of the DataStreamerService. + * @param {GndService} gndService Instance of the GndService. * @param {LoadingService} loadingService Instance of the LoadingService. * @param {NgbTabsetConfig} config Instance of the NgbTabsetConfig. */ @@ -111,6 +113,7 @@ export class ResourceDetailComponent implements OnInit, OnDestroy { private router: Router, private dataApiService: DataApiService, private dataStreamerService: DataStreamerService, + private gndService: GndService, private loadingService: LoadingService, config: NgbTabsetConfig ) { @@ -203,6 +206,38 @@ export class ResourceDetailComponent implements OnInit, OnDestroy { this.router.navigate(['/data/resource', +nextId]); } + /** + * Public method: exposeGnd. + * + * It delegates a given gnd event type ('set', 'get', 'remove') + * with a given value to the {@link GndService}. + * The gnd event is emitted from the {@link ResourceDetailHtmlContentPropsComponent}. + * + * @param {{type: string, value: string}} gndEvent The given event. + * + * @returns {void} Delegates the event to the GndService. + */ + exposeGnd(gndEvent: GndEvent): void { + if (!gndEvent) { + return; + } + switch (gndEvent.type) { + case GndEventType.set: { + // statements + this.gndService.setGndToSessionStorage(gndEvent.value); + break; + } + case GndEventType.remove: { + // statements + this.gndService.removeGndFromSessionStorage(); + break; + } + default: { + console.log('got an uncatched GND event', gndEvent); + } + } + } + /** * Public method: routeToSidenav. * diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-accolade/edition-accolade.component.html b/src/app/views/edition-view/edition-outlets/edition-detail/edition-accolade/edition-accolade.component.html index 9cd3807368..a2e3f4b6ec 100644 --- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-accolade/edition-accolade.component.html +++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-accolade/edition-accolade.component.html @@ -15,7 +15,8 @@
      -

      +

      Textkritischer Kommentar ({{ selectedOverlay.typeLabel }} {{ selectedOverlay.id }}): -
      + = new EventEmitter(); + /** + * Output variable: selectConvoluteRequest. + * + * It keeps an event emitter for the selected convolute. + */ + @Output() + selectConvoluteRequest: EventEmitter = new EventEmitter(); + /** * Output variable: selectSvgSheetRequest. * @@ -75,13 +91,6 @@ export class EditionConvoluteComponent implements OnInit { */ faSquare = faSquare; - /** - * Public variable: selectedConvolute. - * - * It keeps the selected convolute. - */ - selectedConvolute: FolioConvolute; - /** * Public variable: folioLegends. * @@ -108,15 +117,7 @@ export class EditionConvoluteComponent implements OnInit { * It calls the containing methods * when initializing the component. */ - ngOnInit() { - if ( - this.folioConvoluteData.convolutes && - this.folioConvoluteData.convolutes.constructor === Array && - this.folioConvoluteData.convolutes.length > 0 - ) { - this.selectedConvolute = this.folioConvoluteData.convolutes[0]; - } - } + ngOnInit() {} /** * Public method: openModal. @@ -128,6 +129,9 @@ export class EditionConvoluteComponent implements OnInit { * @returns {void} Emits the id. */ openModal(id: string): void { + if (!id) { + return; + } this.openModalRequest.emit(id); } @@ -144,16 +148,7 @@ export class EditionConvoluteComponent implements OnInit { if (!id) { return; } - const convoluteIndex = this.folioConvoluteData.convolutes.findIndex(c => c.convoluteId === id); - const convolute: FolioConvolute = this.folioConvoluteData.convolutes[convoluteIndex]; - if (convolute.folios && convolute.folios.constructor === Array && convolute.folios.length === 0) { - // if no folio data provided, open modal - if (convolute.linkTo) { - this.openModal(convolute.linkTo); - } - return; - } - this.selectedConvolute = convolute; + this.selectConvoluteRequest.emit(id); } /** @@ -166,6 +161,9 @@ export class EditionConvoluteComponent implements OnInit { * @returns {void} Emits the id. */ selectSvgSheet(id: string): void { + if (!id) { + return; + } this.selectSvgSheetRequest.emit(id); } } diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.html b/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.html index c7b6d2f051..4e87c6a482 100644 --- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.html +++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.html @@ -9,8 +9,10 @@ diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.spec.ts index 087fed8afa..c2734e95f8 100644 --- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.spec.ts @@ -16,7 +16,8 @@ import { EditionSvgSheetList, FolioConvoluteList, EditionWork, - EditionWorks + EditionWorks, + FolioConvolute } from '@awg-views/edition-view/models'; import { EditionDataService, EditionService } from '@awg-views/edition-view/services'; import { CompileHtmlComponent } from '@awg-shared/compile-html'; @@ -32,6 +33,8 @@ class EditionConvoluteStubComponent { @Input() folioConvoluteData: FolioConvoluteList; @Input() + selectedConvolute: FolioConvolute; + @Input() selectedSvgSheet: EditionSvgSheet; // TODO: add outputs diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.ts index 45d1109fd3..e9f3b12047 100644 --- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-detail.component.ts @@ -1,14 +1,15 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, NavigationExtras, ParamMap, Router } from '@angular/router'; import { switchMap } from 'rxjs/operators'; +import { ModalComponent } from '@awg-shared/modal/modal.component'; import { EditionSvgOverlay, EditionSvgSheet, EditionSvgSheetList, EditionWork, - EditionWorks, + FolioConvolute, FolioConvoluteList, TextcriticalComment, TextcriticsList @@ -30,6 +31,13 @@ import { EditionDataService, EditionService } from '@awg-views/edition-view/serv styleUrls: ['./edition-detail.component.css'] }) export class EditionDetailComponent implements OnInit { + /** + * ViewChild variable: modal. + * + * It keeps the reference to the awg-modal. + */ + @ViewChild('modal', { static: true }) modal: ModalComponent; + /** * Public variable: editionWork. * @@ -58,6 +66,20 @@ export class EditionDetailComponent implements OnInit { */ textcriticsData: TextcriticsList; + /** + * Public variable: selectedConvolute. + * + * It keeps the selected convolute. + */ + selectedConvolute: FolioConvolute; + + /** + * Public variable: selectedOverlay. + * + * It keeps the selected svg overlay. + */ + selectedOverlay: EditionSvgOverlay; + /** * Public variable: selectedSvgSheet. * @@ -72,13 +94,6 @@ export class EditionDetailComponent implements OnInit { */ selectedTextcriticalComments: TextcriticalComment[]; - /** - * Public variable: selectedOverlay. - * - * It keeps the selected svg overlay. - */ - selectedOverlay: EditionSvgOverlay; - /** * Public variable: errorMessage. * @@ -136,7 +151,7 @@ export class EditionDetailComponent implements OnInit { // get current editionWork from editionService .getEditionWork() .pipe( - switchMap(work => { + switchMap((work: EditionWork) => { // set current editionWork this.editionWork = work; // return EditionDetailData from editionDataService @@ -157,7 +172,15 @@ export class EditionDetailComponent implements OnInit { .subscribe( (queryParams: ParamMap) => { const sheetId: string = this.getSketchParams(queryParams); - this.selectedSvgSheet = this.setSelectedSvgSheet(sheetId); + this.selectedSvgSheet = this.findSvgSheet(sheetId); + if ( + !this.selectedConvolute && + this.folioConvoluteData.convolutes && + this.folioConvoluteData.convolutes.constructor === Array && + this.folioConvoluteData.convolutes.length > 0 + ) { + this.selectedConvolute = this.folioConvoluteData.convolutes[0]; + } }, error => { this.errorMessage = error as any; @@ -166,42 +189,27 @@ export class EditionDetailComponent implements OnInit { } /** - * Private method: getSketchParams. - * - * It checks the route params for a sketch query - * and returns the id of the selected sheet. + * Public method: onConvoluteSelect. * - * @default first entry of this.svgSheetsData + * It selects a convolute by its id. * - * @param {ParamMap} queryParams The query paramMap of the activated route. - * @returns {string} The id of the selected sheet. + * @param {string} id The given id. + * @returns {void} Sets the selectedConvolute variable. */ - private getSketchParams(queryParams?: ParamMap): string { - // if there is no id in query params - // take first entry of svg sheets data as default - if (!queryParams.get('sketch')) { - this.onSvgSheetSelect(this.svgSheetsData.sheets[0].id); + onConvoluteSelect(id: string): void { + if (!id) { return; } - return queryParams.get('sketch') ? queryParams.get('sketch') : this.svgSheetsData.sheets[0].id; - } + const convolute: FolioConvolute = this.findConvolute(id); - /** - * Private method: setSelectedSvgSheet. - * - * It sets the selectedSvg from a given id. - * - * @param {string} id The given id input. - * @returns {EditionSvgSheet} The selected sheet. - */ - private setSelectedSvgSheet(id: string): EditionSvgSheet { - if (!id) { + if (convolute.folios && convolute.folios.constructor === Array && convolute.folios.length === 0) { + // if no folio data provided, open modal + if (convolute.linkTo) { + this.modal.open(convolute.linkTo); + } return; } - // find index of given id in svgSheetsData.sheets array - const sheetIndex = this.svgSheetsData.sheets.findIndex(sheets => sheets.id === id); - // return the sheet with the given id - return this.svgSheetsData.sheets[sheetIndex]; + this.selectedConvolute = convolute; } /** @@ -217,12 +225,7 @@ export class EditionDetailComponent implements OnInit { if (!this.textcriticsData && !this.selectedSvgSheet) { return; } - - // shortcut - const textcriticsIndex = this.textcriticsData.textcritics.findIndex(textcritic => { - return textcritic.id === this.selectedSvgSheet.id; - }); - const textcriticalComments = this.textcriticsData.textcritics[textcriticsIndex].comments; + const textcriticalComments: TextcriticalComment[] = this.findTextCriticalComments(); this.selectedOverlay = overlay; this.selectedTextcriticalComments = this.editionService.getTextcriticalComments( @@ -246,7 +249,7 @@ export class EditionDetailComponent implements OnInit { if (!id) { id = ''; } - this.selectedSvgSheet = this.setSelectedSvgSheet(id); + this.selectedSvgSheet = this.findSvgSheet(id); this.showTkA = false; const navigationExtras: NavigationExtras = { @@ -256,4 +259,80 @@ export class EditionDetailComponent implements OnInit { this.router.navigate([this.editionWork.baseRoute, this.editionWork.detailRoute], navigationExtras); } + + /** + * Private method: getSketchParams. + * + * It checks the route params for a sketch query + * and returns the id of the selected sheet. + * + * @default first entry of this.svgSheetsData + * + * @param {ParamMap} queryParams The query paramMap of the activated route. + * @returns {string} The id of the selected sheet. + */ + private getSketchParams(queryParams?: ParamMap): string { + // if there is no id in query params + // take first entry of svg sheets data as default + if (!queryParams.get('sketch')) { + this.onSvgSheetSelect(this.svgSheetsData.sheets[0].id); + return; + } + return queryParams.get('sketch') ? queryParams.get('sketch') : this.svgSheetsData.sheets[0].id; + } + + /** + * Private method: findConvolute. + * + * It finds a convolute with a given id. + * + * @param {string} id The given id input. + * @returns {FolioConvolute} The convolute that was found. + */ + private findConvolute(id: string): FolioConvolute { + if (!id) { + return; + } + // find index of given id in folioConvoluteData.convolutes array + const convoluteIndex = this.folioConvoluteData.convolutes.findIndex(convolute => convolute.convoluteId === id); + // return the convolute with the given id + return this.folioConvoluteData.convolutes[convoluteIndex]; + } + + /** + * Private method: findSvgSheet. + * + * It finds a svg sheet with a given id. + * + * @param {string} id The given id input. + * @returns {EditionSvgSheet} The sheet that was found. + */ + private findSvgSheet(id: string): EditionSvgSheet { + if (!id) { + return; + } + // find index of given id in svgSheetsData.sheets array + const sheetIndex = this.svgSheetsData.sheets.findIndex(sheets => sheets.id === id); + // return the sheet with the given id + return this.svgSheetsData.sheets[sheetIndex]; + } + + /** + * Private method: findTextCriticalComments. + * + * It finds the textcritical comments for an svg overlay. + * + * @returns {TextcriticalComment[]} The textcritical comments that were found. + */ + private findTextCriticalComments(): TextcriticalComment[] { + if (!this.textcriticsData && !this.selectedSvgSheet) { + return; + } + // find index of teh selected svg sheet id in textcriticsData.textcritics array + const textcriticsIndex = this.textcriticsData.textcritics.findIndex( + textcritic => textcritic.id === this.selectedSvgSheet.id + ); + // return the comments with the given id + return this.textcriticsData.textcritics[textcriticsIndex].comments; + } } diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.html b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.html index 9fe95576ed..7ae0beabd9 100644 --- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.html +++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.html @@ -1,6 +1,19 @@
      - -
      + + + + + +
      +

      + [Der edierte Notentext von Aa:SKI/1 erscheint im Zusammenhang der vollständigen Edition der + Vier Lieder op. 12 in AWG I/5.] +

      +
      + + + +
      - +
      - + - -
      + +
      - + - +
      - + - -
      + +
      - +
      - + - -
      + +
      - + - +
      - - - + + + + + + + +
      + + + +
      + + + +
      + + + +
      + + + +
      + + + +
      + + + +
      + + + +
      + + + +
      + + + +
      + + + +
      + + + +
      + + + +
      + + + +
      + + + +
      + + + +
      + + + +
      + + + +
      + + + +
      + + + + +
      +
      - diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.spec.ts index c28f799893..1dda5a0594 100644 --- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.spec.ts @@ -56,6 +56,7 @@ describe('EditionSvgSheetComponent', () => { expectedOverlay = new EditionSvgOverlay(type, id); // simulate the parent setting the input properties + component.svgSheetsData = { sheets: [expectedSvgSheet] }; component.selectedSvgSheet = expectedSvgSheet; component.selectedOverlay = expectedOverlay; diff --git a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.ts b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.ts index e0cd7e0d8d..9bd69a3087 100644 --- a/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-detail/edition-svg-sheet/edition-svg-sheet.component.ts @@ -1,20 +1,51 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; // import { NgxGalleryImage, NgxGalleryOptions } from '@kolkov/ngx-gallery'; -import { EditionSvgSheet, EditionSvgOverlay } from '@awg-views/edition-view/models'; +import { EditionSvgSheet, EditionSvgOverlay, EditionSvgSheetList } from '@awg-views/edition-view/models'; /** - * The SvgSheetLabels enumeration. + * The SvgSheetLabelsOp12 enumeration. * - * It stores the possible sheet labels. + * It stores the possible sheet labels for op12. + * TODO: Refactor temporary solution. Will be removed and created dynamically from data. */ -export enum SvgSheetLabels { +export enum SvgSheetLabelsOp12 { + sheet1 = 'Aa:SkI/1', sheet2 = 'Aa:SkI/2', sheet3 = 'Aa:SkI/3', sheet4 = 'Aa:SkI/4', sheet5 = 'Aa:SkI/5' } +/** + * The SvgSheetLabelsOp25 enumeration. + * + * It stores the possible sheet labels for op25. + * TODO: Refactor temporary solution. Will be removed and created dynamically from data. + */ +export enum SvgSheetLabelsOp25 { + sheet1 = 'A:SkI/1', + sheet2 = 'A:SkI/2', + sheet2_1 = 'A:SkI/2.1', + sheet2_1_1 = 'A:SkI/2.1.1', + sheet2_1_2 = 'A:SkI/2.1.2', + sheet2_1_2_1 = 'A:SkI/2.1.2.1', + sheet2_1_3 = 'A:SkI/2.1.3', + sheet3 = 'A:SkI/3', + sheet3_1 = 'A:SkI/3.1', + sheet3_1_1 = 'A:SkI/3.1.1', + sheet3_1_2 = 'A:SkI/3.1.2', + sheet3_1_3 = 'A:SkI/3.1.3', + sheet3_1_3_1 = 'A:SkI/3.1.3.1', + sheet4a = 'A:SkI/4a', + sheet4b = 'A:SkI/4b', + sheet4c = 'A:SkI/4c', + sheet4d = 'A:SkI/4d', + sheet4_1 = 'A:SkI/4.1', + sheet4_2 = 'A:SkI/4.2', + sheet4_3 = 'A:SkI/4.3' +} + /** * The EditionSvgSheet component. * @@ -29,6 +60,14 @@ export enum SvgSheetLabels { changeDetection: ChangeDetectionStrategy.OnPush }) export class EditionSvgSheetComponent implements OnInit { + /** + * Input variable: svgSheetsData. + * + * It keeps the svg sheets data. + */ + @Input() + svgSheetsData: EditionSvgSheetList; + /** * Input variable: selectedSvgSheet. * @@ -65,15 +104,49 @@ export class EditionSvgSheetComponent implements OnInit { * Public variable: svgSheetLabels. * * It keeps the labels of the svg sheets. + * TODO: Refactor temporary solution. Will be removed and created dynamically from data. */ svgSheetLabels = { - sheet2: SvgSheetLabels.sheet2, - sheet3: SvgSheetLabels.sheet3, - sheet4: SvgSheetLabels.sheet4, - sheet5: SvgSheetLabels.sheet5 + op12: { + sheet1: SvgSheetLabelsOp12.sheet1, + sheet2: SvgSheetLabelsOp12.sheet2, + sheet3: SvgSheetLabelsOp12.sheet3, + sheet4: SvgSheetLabelsOp12.sheet4, + sheet5: SvgSheetLabelsOp12.sheet5 + }, + op25: { + sheet1: SvgSheetLabelsOp25.sheet1, + sheet2: SvgSheetLabelsOp25.sheet2, + sheet2_1: SvgSheetLabelsOp25.sheet2_1, + sheet2_1_1: SvgSheetLabelsOp25.sheet2_1_1, + sheet2_1_2: SvgSheetLabelsOp25.sheet2_1_2, + sheet2_1_2_1: SvgSheetLabelsOp25.sheet2_1_2_1, + sheet2_1_3: SvgSheetLabelsOp25.sheet2_1_3, + sheet3: SvgSheetLabelsOp25.sheet3, + sheet3_1: SvgSheetLabelsOp25.sheet3_1, + sheet3_1_1: SvgSheetLabelsOp25.sheet3_1_1, + sheet3_1_2: SvgSheetLabelsOp25.sheet3_1_2, + sheet3_1_3: SvgSheetLabelsOp25.sheet3_1_3, + sheet3_1_3_1: SvgSheetLabelsOp25.sheet3_1_3_1, + sheet4a: SvgSheetLabelsOp25.sheet4a, + sheet4b: SvgSheetLabelsOp25.sheet4b, + sheet4c: SvgSheetLabelsOp25.sheet4c, + sheet4d: SvgSheetLabelsOp25.sheet4d, + sheet4_1: SvgSheetLabelsOp25.sheet4_1, + sheet4_2: SvgSheetLabelsOp25.sheet4_2, + sheet4_3: SvgSheetLabelsOp25.sheet4_3 + } }; - /* TODO: mute for now sind not working yet + /** + * Public variable: sheetsArray. + * + * It keeps the array of of the svg sheets' labels. + * TODO: Refactor temporary solution. Will be removed and created dynamically from data. + */ + sheetsArray: string[]; + + /* TODO: mute for now since not working yet galleryOptions: NgxGalleryOptions[]; galleryImages: NgxGalleryImage[]; */ @@ -85,6 +158,8 @@ export class EditionSvgSheetComponent implements OnInit { * when initializing the component. */ ngOnInit() { + this.sheetsArray = this.svgSheetsData.sheets.map(sheet => sheet.id); + /* TODO: mute for now since not working yet this.galleryOptions = [ diff --git a/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.css b/src/app/views/edition-view/edition-outlets/edition-folio/folio-overview.component.css similarity index 100% rename from src/app/views/edition-view/edition-outlets/edition-folio/folio.component.css rename to src/app/views/edition-view/edition-outlets/edition-folio/folio-overview.component.css diff --git a/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.html b/src/app/views/edition-view/edition-outlets/edition-folio/folio-overview.component.html similarity index 100% rename from src/app/views/edition-view/edition-outlets/edition-folio/folio.component.html rename to src/app/views/edition-view/edition-outlets/edition-folio/folio-overview.component.html diff --git a/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.spec.ts b/src/app/views/edition-view/edition-outlets/edition-folio/folio-overview.component.spec.ts similarity index 91% rename from src/app/views/edition-view/edition-outlets/edition-folio/folio.component.spec.ts rename to src/app/views/edition-view/edition-outlets/edition-folio/folio-overview.component.spec.ts index 9c4f28b584..ec10b46cd1 100644 --- a/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/edition-folio/folio-overview.component.spec.ts @@ -1,24 +1,24 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { FolioComponent } from './folio.component'; +import { FolioOverviewComponent } from './folio-overview.component'; import { FolioService } from './folio.service'; import { Folio, FolioSvgData, EditionSvgSheet, FolioCalculation, FolioSettings } from '@awg-views/edition-view/models'; describe('FolioComponent', () => { - let component: FolioComponent; - let fixture: ComponentFixture; + let component: FolioOverviewComponent; + let fixture: ComponentFixture; let expectedFolios: Folio[]; let expectedSvgSheet: EditionSvgSheet; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [FolioComponent], + declarations: [FolioOverviewComponent], providers: [FolioService] }).compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(FolioComponent); + fixture = TestBed.createComponent(FolioOverviewComponent); component = fixture.componentInstance; }); diff --git a/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.ts b/src/app/views/edition-view/edition-outlets/edition-folio/folio-overview.component.ts similarity index 92% rename from src/app/views/edition-view/edition-outlets/edition-folio/folio.component.ts rename to src/app/views/edition-view/edition-outlets/edition-folio/folio-overview.component.ts index 6dc0b3c37a..86f29d1c4c 100644 --- a/src/app/views/edition-view/edition-outlets/edition-folio/folio.component.ts +++ b/src/app/views/edition-view/edition-outlets/edition-folio/folio-overview.component.ts @@ -1,12 +1,12 @@ import { AfterViewChecked, - AfterViewInit, ChangeDetectionStrategy, Component, EventEmitter, Input, - OnInit, - Output + OnChanges, + Output, + SimpleChanges } from '@angular/core'; import { Folio, FolioSettings, FolioSvgData, EditionSvgSheet, ViewBox } from '@awg-views/edition-view/models'; @@ -28,11 +28,11 @@ declare var Snap: any; */ @Component({ selector: 'awg-edition-folio', - templateUrl: './folio.component.html', - styleUrls: ['./folio.component.css'], + templateUrl: './folio-overview.component.html', + styleUrls: ['./folio-overview.component.css'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class FolioComponent implements OnInit, AfterViewInit, AfterViewChecked { +export class FolioOverviewComponent implements OnChanges, AfterViewChecked { /** * Input variable: folios. * @@ -134,7 +134,7 @@ export class FolioComponent implements OnInit, AfterViewInit, AfterViewChecked { /** * Self-referring variable needed for CompileHtml library. */ - ref: FolioComponent; + ref: FolioOverviewComponent; /** * Constructor of the FolioComponent. @@ -150,24 +150,14 @@ export class FolioComponent implements OnInit, AfterViewInit, AfterViewChecked { } /** - * Angular life cycle hook: ngOnInit. + * Angular life cycle hook: ngOnChanges. * - * It calls the containing methods - * when initializing the component. - */ - ngOnInit() { - this.prepareFolioSvgOutput(); - } - - /** - * Angular life cycle hook: ngAfterViewInit. + * It checks for changes of the given input. * - * It calls the containing methods - * after the view was initialized. + * @param {SimpleChanges} changes The changes of the input. */ - ngAfterViewInit() { - // start to render svg only after view, inputs and calculation are available - this.renderSnapSvg(); + ngOnChanges(changes: SimpleChanges) { + this.prepareFolioSvgOutput(); } /** @@ -177,6 +167,8 @@ export class FolioComponent implements OnInit, AfterViewInit, AfterViewChecked { * after the view was built and checked. */ ngAfterViewChecked() { + // start to render svg only after view, inputs and calculation are available + this.renderSnapSvg(); // toggle active classes after view was checked this.toggleActiveClass(); } @@ -248,7 +240,7 @@ export class FolioComponent implements OnInit, AfterViewInit, AfterViewChecked { this.canvasArray = []; /* apply data from folioSvgDataArray to render the svg image with snapsvg */ - this.folioSvgDataArray.forEach((folioSvg: FolioSvgData, folioIndex: number) => { + this.folioSvgDataArray.map((folioSvg: FolioSvgData, folioIndex: number) => { // init canvas const snapId: string = '#folio-' + folioSvg.sheet.folioId; const snapCanvas: any = Snap(snapId); diff --git a/src/app/views/edition-view/edition-outlets/edition-folio/folio.module.ts b/src/app/views/edition-view/edition-outlets/edition-folio/folio.module.ts index dbb9f255c0..9c07bf4953 100644 --- a/src/app/views/edition-view/edition-outlets/edition-folio/folio.module.ts +++ b/src/app/views/edition-view/edition-outlets/edition-folio/folio.module.ts @@ -1,17 +1,17 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '@awg-shared/shared.module'; -import { FolioComponent } from './folio.component'; +import { FolioOverviewComponent } from './folio-overview.component'; /** * The edition folio module. * - * It embeds the {@link FolioComponent} + * It embeds the {@link FolioOverviewComponent} * as well as the {@link SharedModule}. */ @NgModule({ imports: [SharedModule], - declarations: [FolioComponent], - exports: [FolioComponent] + declarations: [FolioOverviewComponent], + exports: [FolioOverviewComponent] }) export class FolioModule {} diff --git a/src/app/views/edition-view/edition-outlets/edition-folio/folio.service.ts b/src/app/views/edition-view/edition-outlets/edition-folio/folio.service.ts index 346ae06169..a876e3cf65 100644 --- a/src/app/views/edition-view/edition-outlets/edition-folio/folio.service.ts +++ b/src/app/views/edition-view/edition-outlets/edition-folio/folio.service.ts @@ -267,27 +267,31 @@ export class FolioService { // init const centeredXPosition = contentItem.upperLeftCorner.x + contentItem.width / 2; const centeredYPosition = contentItem.upperLeftCorner.y + contentItem.height / 2; - const itemLabelArray: string[] = [contentItem.sigle, ' T. ' + contentItem.measure]; + const itemLabelArray: string[] = contentItem.measure + ? [contentItem.sigle, ' T. ' + contentItem.measure] + : [contentItem.sigle]; const snapItemLabel: any = snapCanvas.text(0, 0, itemLabelArray); snapItemLabel.attr({ class: 'item-label', - fontSize: '18px' + style: 'font: 12px Source Sans Pro, source-sans-pro, sans-serif', + dominantBaseline: 'middle' }); // attributes for tspan elements of itemLabel array + const textAnchor = 'middle'; snapItemLabel.select('tspan:first-of-type').attr({ x: centeredXPosition, y: centeredYPosition, - alignmentBaseline: 'middle', - textAnchor: 'middle' - }); - snapItemLabel.select('tspan:last-of-type').attr({ - x: centeredXPosition, - y: centeredYPosition, - alignmentBaseline: 'middle', - textAnchor: 'middle', - dy: '1.2em' + textAnchor }); + if (itemLabelArray.length > 1) { + snapItemLabel.select('tspan:last-of-type').attr({ + x: centeredXPosition, + y: centeredYPosition, + textAnchor, + dy: '1.2em' + }); + } // item shape const snapItemShape = snapCanvas.group(); @@ -331,8 +335,8 @@ export class FolioService { // add click event handler // exclude and mute sketch Aa:SkI for now - if (contentItem.sigle === 'Aa:SkI/1a' || contentItem.sigle === 'Aa:SkI/1b') { - snapItemGroup.click(() => this.ref.openModal('op12_sourceNotA')); + if (contentItem.selectable === false) { + snapItemGroup.click(() => this.ref.openModal(contentItem.linkTo)); snapItemGroup.attr({ stroke: 'grey', fill: 'grey' diff --git a/src/app/views/edition-view/edition-outlets/edition-tka-table/edition-tka-table.component.html b/src/app/views/edition-view/edition-outlets/edition-tka-table/edition-tka-table.component.html index d08d76327c..6ae99abb84 100644 --- a/src/app/views/edition-view/edition-outlets/edition-tka-table/edition-tka-table.component.html +++ b/src/app/views/edition-view/edition-outlets/edition-tka-table/edition-tka-table.component.html @@ -2,16 +2,16 @@ - - + + - - + + diff --git a/src/app/views/edition-view/edition-outlets/report/report.module.ts b/src/app/views/edition-view/edition-outlets/report/report.module.ts index 836709dc43..ebdf83eadc 100644 --- a/src/app/views/edition-view/edition-outlets/report/report.module.ts +++ b/src/app/views/edition-view/edition-outlets/report/report.module.ts @@ -9,7 +9,7 @@ import { SourceEvaluationComponent, SourceListComponent } from './sources'; -import { TextcriticsComponent } from './textcritics'; +import { CriticsListComponent, TextcriticsComponent } from './textcritics'; /** * The report module. @@ -24,6 +24,7 @@ import { TextcriticsComponent } from './textcritics'; SourceDescriptionComponent, SourceEvaluationComponent, SourceListComponent, + CriticsListComponent, TextcriticsComponent ], exports: [ @@ -31,6 +32,7 @@ import { TextcriticsComponent } from './textcritics'; SourceDescriptionComponent, SourceEvaluationComponent, SourceListComponent, + CriticsListComponent, TextcriticsComponent ] }) diff --git a/src/app/views/edition-view/edition-outlets/report/textcritics/critics-list/critics-list.component.css b/src/app/views/edition-view/edition-outlets/report/textcritics/critics-list/critics-list.component.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/views/edition-view/edition-outlets/report/textcritics/critics-list/critics-list.component.html b/src/app/views/edition-view/edition-outlets/report/textcritics/critics-list/critics-list.component.html new file mode 100644 index 0000000000..3d6d19dd1f --- /dev/null +++ b/src/app/views/edition-view/edition-outlets/report/textcritics/critics-list/critics-list.component.html @@ -0,0 +1,31 @@ + + + +
      + + +
      +       + +
      +

      Skizzenkommentar:

      +

      +
      +
      +

      Textkritischer Kommentar:

      + + +
      +       +       +       diff --git a/src/app/views/edition-view/edition-outlets/report/textcritics/critics-list/critics-list.component.spec.ts b/src/app/views/edition-view/edition-outlets/report/textcritics/critics-list/critics-list.component.spec.ts new file mode 100644 index 0000000000..53eec61c97 --- /dev/null +++ b/src/app/views/edition-view/edition-outlets/report/textcritics/critics-list/critics-list.component.spec.ts @@ -0,0 +1,42 @@ +import { Component, Input } from '@angular/core'; + +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap'; + +import { CompileHtmlComponent } from '@awg-shared/compile-html'; +import { EditionTkaTableComponent } from '@awg-views/edition-view/edition-outlets/edition-tka-table/edition-tka-table.component'; +import { TextcriticalComment } from '@awg-views/edition-view/models'; + +import { CriticsListComponent } from './critics-list.component'; + +// mock tka table component +@Component({ selector: 'awg-edition-tka-table', template: '' }) +class EditionTkaTableStubComponent { + @Input() + textcriticalComments: TextcriticalComment[]; + + // TODO: handle outputs +} + +describe('CriticsListComponent', () => { + let component: CriticsListComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [NgbAccordionModule], + declarations: [CriticsListComponent, CompileHtmlComponent, EditionTkaTableStubComponent] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CriticsListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/views/edition-view/edition-outlets/report/textcritics/critics-list/critics-list.component.ts b/src/app/views/edition-view/edition-outlets/report/textcritics/critics-list/critics-list.component.ts new file mode 100644 index 0000000000..a16e14aff0 --- /dev/null +++ b/src/app/views/edition-view/edition-outlets/report/textcritics/critics-list/critics-list.component.ts @@ -0,0 +1,103 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; + +import { TextcriticalComment, TextcriticsList } from '@awg-views/edition-view/models'; + +/** + * The CriticsList component. + * + * It contains the list of textcritical comments + * of the critical report of the edition view of the app + * with an {@link EditionTkaTableComponent}. + */ +@Component({ + selector: 'awg-critics-list', + templateUrl: './critics-list.component.html', + styleUrls: ['./critics-list.component.css'] +}) +export class CriticsListComponent implements OnInit { + /** + * Input variable: textcriticsData. + * + * It keeps the textcritics data. + */ + @Input() + textcriticsData: TextcriticsList; + + /** + * Output variable: openModalRequest. + * + * It keeps an event emitter to open the modal + * with the selected modal text snippet. + */ + @Output() + openModalRequest: EventEmitter = new EventEmitter(); + + /** + * Output variable: selectSvgSheetRequest. + * + * It keeps an event emitter for the selected id of an svg sheet. + */ + @Output() + selectSvgSheetRequest: EventEmitter = new EventEmitter(); + + /** + * Self-referring variable needed for CompileHtml library. + */ + ref: CriticsListComponent; + + /** + * Constructor of the TextcriticsComponent. + * + * It initializes the self-referring ref variable needed for CompileHtml library. + */ + constructor() { + this.ref = this; + } + + /** + * Angular life cycle hook: ngOnInit. + * + * It calls the containing methods + * when initializing the component. + */ + ngOnInit() {} + + /** + * Public method: openModal. + * + * It emits a given id of a modal snippet text + * to the {@link openModalRequest}. + * + * @param {string} id The given modal snippet id. + * @returns {void} Emits the id. + */ + openModal(id: string): void { + this.openModalRequest.emit(id); + } + + /** + * Public method: selectSvgSheet. + * + * It emits a given id of a selected svg sheet + * to the {@link selectSvgSheetRequest}. + * + * @param {string} id The given sheet id. + * @returns {void} Emits the id. + */ + selectSvgSheet(id: string): void { + this.selectSvgSheetRequest.emit(id); + } + + /** + * Public method: isNotEmptyArray. + * + * It checks if a given array of the textcritical comment input + * is not empty. + * + * @param {TextcriticalComment[] | string[]} part The given array input. + * @returns {boolean} The boolean result of the check. + */ + isNotEmptyArray(checkArray: TextcriticalComment[] | string[]): boolean { + return checkArray && checkArray.constructor === Array && checkArray.length > 0; + } +} diff --git a/src/app/views/edition-view/edition-outlets/report/textcritics/critics-list/index.ts b/src/app/views/edition-view/edition-outlets/report/textcritics/critics-list/index.ts new file mode 100644 index 0000000000..d4dc12e55c --- /dev/null +++ b/src/app/views/edition-view/edition-outlets/report/textcritics/critics-list/index.ts @@ -0,0 +1 @@ +export * from './critics-list.component'; diff --git a/src/app/views/edition-view/edition-outlets/report/textcritics/index.ts b/src/app/views/edition-view/edition-outlets/report/textcritics/index.ts index 5f0dc9a95d..489e249049 100644 --- a/src/app/views/edition-view/edition-outlets/report/textcritics/index.ts +++ b/src/app/views/edition-view/edition-outlets/report/textcritics/index.ts @@ -7,6 +7,7 @@ * */ +import { CriticsListComponent } from './critics-list'; import { TextcriticsComponent } from './textcritics.component'; -export { TextcriticsComponent }; +export { CriticsListComponent, TextcriticsComponent }; diff --git a/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.html b/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.html index 44348f1185..3ae9bb6b37 100644 --- a/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.html +++ b/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.html @@ -1,28 +1,12 @@ -
      -
      -
      - {{ textcritic.id }} -
      -
      -

      -
      - - - -
      -
      +       diff --git a/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.spec.ts b/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.spec.ts index 3e1e26e648..8e0f170126 100644 --- a/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.spec.ts +++ b/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.spec.ts @@ -2,20 +2,17 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { Component, Input } from '@angular/core'; -import { RouterLinkStubDirective } from '@testing/router-stubs'; - import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap'; -import { CompileHtmlComponent } from '@awg-shared/compile-html'; -import { TextcriticalComment } from '@awg-views/edition-view/models'; - +import { TextcriticsList } from '@awg-views/edition-view/models'; +import { CriticsListComponent } from './critics-list/critics-list.component'; import { TextcriticsComponent } from './textcritics.component'; -// mock heading component -@Component({ selector: 'awg-edition-tka-table', template: '' }) -class EditionTkaTableStubComponent { +// mock critics list component +@Component({ selector: 'awg-critics-list', template: '' }) +class CriticsListStubComponent { @Input() - textcriticalComments: TextcriticalComment[]; + textcriticsData: TextcriticsList; // TODO: handle outputs } @@ -27,12 +24,7 @@ describe('TextcriticsComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [NgbAccordionModule], - declarations: [ - TextcriticsComponent, - EditionTkaTableStubComponent, - CompileHtmlComponent, - RouterLinkStubDirective - ] + declarations: [TextcriticsComponent, CriticsListStubComponent] }).compileComponents(); })); diff --git a/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.ts b/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.ts index b1ea27f768..f96e6ed4b3 100644 --- a/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.ts +++ b/src/app/views/edition-view/edition-outlets/report/textcritics/textcritics.component.ts @@ -1,13 +1,13 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { TextcriticalComment, TextcriticsList } from '@awg-views/edition-view/models'; +import { TextcriticsList } from '@awg-views/edition-view/models'; /** * The TextcriticalComment component. * - * It contains the textcritical comments section + * It contains the panel for the textcritical comments section * of the critical report of the edition view of the app - * with an {@link EditionTkaTableComponent}. + * with a {@link TextcriticsList}. */ @Component({ selector: 'awg-textcritics', @@ -41,20 +41,6 @@ export class TextcriticsComponent implements OnInit { @Output() selectSvgSheetRequest: EventEmitter = new EventEmitter(); - /** - * Self-referring variable needed for CompileHtml library. - */ - ref: TextcriticsComponent; - - /** - * Constructor of the TextcriticsComponent. - * - * It initializes the self-referring ref variable needed for CompileHtml library. - */ - constructor() { - this.ref = this; - } - /** * Angular life cycle hook: ngOnInit. * @@ -88,17 +74,4 @@ export class TextcriticsComponent implements OnInit { selectSvgSheet(id: string): void { this.selectSvgSheetRequest.emit(id); } - - /** - * Public method: hasComments. - * - * It checks if a given textcritical comment array - * is not empty. - * - * @param {string} comments The given TextCriticalComment array. - * @returns {boolean} The boolean result of the check. - */ - hasComments(comments: TextcriticalComment[]): boolean { - return comments && comments.constructor === Array && comments.length > 0; - } } diff --git a/src/app/views/edition-view/models/folio-calculation.model.ts b/src/app/views/edition-view/models/folio-calculation.model.ts index e3db3b0d0a..a6df6e9364 100644 --- a/src/app/views/edition-view/models/folio-calculation.model.ts +++ b/src/app/views/edition-view/models/folio-calculation.model.ts @@ -227,14 +227,24 @@ export class FolioCalculationContentItem { previous: FolioCalculationContentItemCache; /** - * The optional label for the sigle of the content item (string). + * The label for the sigle of the content item (string). */ - sigle?: string; + sigle: string; /** - * The optional label for the measure of the content item (string). + * The label for the measure of the content item (string). */ - measure?: string; + measure: string; + + /** + * The boolean flag if the content item can be selected.. + */ + selectable: boolean; + + /** + * The link to a convolute description in the critical report. + */ + linkTo: string; } /** @@ -582,6 +592,12 @@ export class FolioCalculation { calculatedContentItem.sigle = content.sigle; calculatedContentItem.measure = content.measure; + calculatedContentItem.selectable = true; + calculatedContentItem.linkTo = ''; + if (content['selectable'] === false && content['linkTo']) { + calculatedContentItem.selectable = content.selectable; + calculatedContentItem.linkTo = content.linkTo; + } calculatedContentItems.push(calculatedContentItem); }); diff --git a/src/app/views/edition-view/models/folio-svg-data.model.ts b/src/app/views/edition-view/models/folio-svg-data.model.ts index bf0d9008b3..60e6b93334 100644 --- a/src/app/views/edition-view/models/folio-svg-data.model.ts +++ b/src/app/views/edition-view/models/folio-svg-data.model.ts @@ -108,6 +108,16 @@ class FolioSvgContentItem { */ measure: string; + /** + * The optional boolean flag if the content item can be selected.. + */ + selectable: boolean; + + /** + * The optional link to a convolute description in the critical report. + */ + linkTo: string; + /** * The upper left corner of a content item (FolioCalculationPoint). * @@ -144,6 +154,9 @@ class FolioSvgContentItem { constructor(calculatedContentItem: FolioCalculationContentItem) { this.sigle = calculatedContentItem.sigle; this.measure = calculatedContentItem.measure; + this.selectable = calculatedContentItem.selectable; + this.linkTo = calculatedContentItem.linkTo; + this.upperLeftCorner = calculatedContentItem.current.cornerPoints.upperLeftCorner; this.width = calculatedContentItem.width; this.height = calculatedContentItem.height; diff --git a/src/app/views/edition-view/models/folio.model.ts b/src/app/views/edition-view/models/folio.model.ts index d55b754714..4ecacedd65 100644 --- a/src/app/views/edition-view/models/folio.model.ts +++ b/src/app/views/edition-view/models/folio.model.ts @@ -102,6 +102,16 @@ export class FolioContent { */ measure: string; + /** + * Boolean flag if the content item can be selected.. + */ + selectable?: boolean; + + /** + * The link to a convolute description in the critical report. + */ + linkTo?: string; + /** * The folio content's optional sectionPartition (number). */ diff --git a/src/app/views/edition-view/models/textcritics.model.ts b/src/app/views/edition-view/models/textcritics.model.ts index 202b1c4129..538a6373af 100644 --- a/src/app/views/edition-view/models/textcritics.model.ts +++ b/src/app/views/edition-view/models/textcritics.model.ts @@ -43,7 +43,7 @@ export class Textcritics { /** * The description of the textcritics. */ - description: string; + description: string[]; /** * The array of textcritical comments from a textcritics list. diff --git a/src/app/views/home-view/home-view.component.html b/src/app/views/home-view/home-view.component.html index 1c531520ef..978b6ab6a4 100644 --- a/src/app/views/home-view/home-view.component.html +++ b/src/app/views/home-view/home-view.component.html @@ -8,7 +8,7 @@
      AWG / Serie I (Werke mit Opuszahlen) / Abteilung 5 (Klavierlieder)

      Vier Lieder op. 12 (Skizzen)

      -

      Drei Lieder op. 25 (Graph)

      +

      Drei Lieder nach Gedichten von Hildegard Jone op. 25 (Graph)

      diff --git a/src/assets/data/edition/series1/section5/op12/folio-convolute.json b/src/assets/data/edition/series1/section5/op12/folio-convolute.json index f71baf2fbe..ce37cb9214 100644 --- a/src/assets/data/edition/series1/section5/op12/folio-convolute.json +++ b/src/assets/data/edition/series1/section5/op12/folio-convolute.json @@ -14,6 +14,8 @@ { "sigle": "Aa:SkI/1a", "measure": "1–2, [3–6]", + "selectable": false, + "linkTo": "op12_sourceNotA", "sectionPartition": 1, "sections": [ { @@ -24,6 +26,8 @@ }, { "sigle": "Aa:SkI/1a", + "selectable": false, + "linkTo": "op12_sourceNotA", "measure": "[7–12]", "sectionPartition": 1, "sections": [ @@ -36,6 +40,8 @@ }, { "sigle": "Aa:SkI/1a", + "selectable": false, + "linkTo": "op12_sourceNotA", "measure": "[13–17]", "sectionPartition": 1, "sections": [ @@ -116,6 +122,8 @@ "content": [ { "sigle": "Aa:SkI/1b", + "selectable": false, + "linkTo": "op12_sourceNotA", "measure": "[18–22]", "sections": [ { @@ -126,6 +134,8 @@ }, { "sigle": "Aa:SkI/1b", + "selectable": false, + "linkTo": "op12_sourceNotA", "measure": "[23–24]", "sectionPartition": 1, "sections": [ diff --git a/src/assets/data/edition/series1/section5/op12/svg-sheets.json b/src/assets/data/edition/series1/section5/op12/svg-sheets.json index 7c023c1164..a8c4da1203 100644 --- a/src/assets/data/edition/series1/section5/op12/svg-sheets.json +++ b/src/assets/data/edition/series1/section5/op12/svg-sheets.json @@ -1,5 +1,11 @@ { "sheets": [ + { + "id": "Aa:SkI/1", + "svg": "", + "image": "", + "alt": "Aa:SkI/1" + }, { "id": "Aa:SkI/2", "svg": "assets/img/edition/series1/section5/op12/SkI_2n_small_cut_opt.svg", diff --git a/src/assets/data/edition/series1/section5/op12/textcritics.json b/src/assets/data/edition/series1/section5/op12/textcritics.json index 0a2d4acc7f..494f8ae989 100644 --- a/src/assets/data/edition/series1/section5/op12/textcritics.json +++ b/src/assets/data/edition/series1/section5/op12/textcritics.json @@ -3,7 +3,7 @@ { "id": "Aa:SkI/1", "description": [ - "[Der Textkritische Kommentar zu Aa:Sk1/1 erscheint im Zusammenhang der vollständigen Edition der Vier Lieder op. 12 in AWG I/5.]" + "[Der Skizzenkommentar und die textkritischen Kommentare zu Aa:Sk1/1 erscheinen im Zusammenhang der vollständigen Edition der Vier Lieder op. 12 in AWG I/5.]" ], "comments": [] }, diff --git a/src/assets/data/edition/series1/section5/op25/folio-convolute.json b/src/assets/data/edition/series1/section5/op25/folio-convolute.json index b8955f705a..7a36968393 100644 --- a/src/assets/data/edition/series1/section5/op25/folio-convolute.json +++ b/src/assets/data/edition/series1/section5/op25/folio-convolute.json @@ -10,7 +10,126 @@ "height": 270, "width": 335 }, - "content": [] + "content": [ + { + "sigle": "A:SkI/2", + "measure": "", + "sectionPartition": 5, + "sections": [ + { + "position": 1, + "startSystem": 1, + "endSystem": 1 + } + ] + }, + { + "sigle": "A:SkI/1", + "measure": "", + "sectionPartition": 5, + "sections": [ + { + "position": 2, + "startSystem": 1, + "endSystem": 1 + } + ] + }, + { + "sigle": "A:SkI/2.1", + "measure": "", + "selectable": false, + "linkTo": "op25_sheetComingSoon", + "sectionPartition": 5, + "sections": [ + { + "position": 4, + "startSystem": 1, + "endSystem": 3 + } + ] + }, + { + "sigle": "A:SkI/2.1.1", + "measure": "", + "selectable": false, + "linkTo": "op25_sheetComingSoon", + "sectionPartition": 5, + "sections": [ + { + "position": 5, + "startSystem": 1, + "endSystem": 1 + } + ] + }, + { + "sigle": "A:SkI/2.1.2", + "measure": "", + "selectable": false, + "linkTo": "op25_sheetComingSoon", + "sectionPartition": 5, + "sections": [ + { + "position": 3, + "startSystem": 2, + "endSystem": 2 + } + ] + }, + { + "sigle": "A:SkI/2.1.2.1", + "measure": "", + "selectable": false, + "linkTo": "op25_sheetComingSoon", + "sectionPartition": 8, + "sections": [ + { + "position": 5, + "startSystem": 4, + "endSystem": 4 + } + ] + }, + { + "sigle": "A:SkI/3", + "measure": "", + "sectionPartition": 2, + "sections": [ + { + "position": 1, + "startSystem": 3, + "endSystem": 3 + } + ] + }, + { + "sigle": "A:SkI/4a", + "measure": "{1A}–3A", + "sectionPartition": 1, + "sections": [ + { + "position": 1, + "startSystem": 9, + "endSystem": 12 + } + ] + }, + { + "sigle": "A:SkI/4.1", + "measure": "", + "selectable": false, + "linkTo": "op25_sheetComingSoon", + "sectionPartition": 3, + "sections": [ + { + "position": 3, + "startSystem": 13, + "endSystem": 15 + } + ] + } + ] }, { "folioId": "39r", @@ -19,7 +138,72 @@ "height": 270, "width": 335 }, - "content": [] + "content": [ + { + "sigle": "A:SkI/4b", + "measure": "3B–6", + "sectionPartition": 1, + "sections": [ + { + "position": 1, + "startSystem": 1, + "endSystem": 6 + } + ] + }, + { + "sigle": "A:SkI/4c", + "measure": "7–12", + "sectionPartition": 1, + "sections": [ + { + "position": 1, + "startSystem": 8, + "endSystem": 12 + } + ] + }, + { + "sigle": "A:SkI/4d", + "measure": "7–12", + "sectionPartition": 4, + "sections": [ + { + "position": 1, + "startSystem": 13, + "endSystem": 16 + } + ] + }, + { + "sigle": "A:SkI/4.2", + "measure": "", + "selectable": false, + "linkTo": "op25_sheetComingSoon", + "sectionPartition": 4, + "sections": [ + { + "position": 2, + "startSystem": 13, + "endSystem": 13 + } + ] + }, + { + "sigle": "A:SkI/4.3", + "measure": "", + "selectable": false, + "linkTo": "op25_sheetComingSoon", + "sectionPartition": 7, + "sections": [ + { + "position": 5, + "startSystem": 15, + "endSystem": 16 + } + ] + } + ] } ] }, @@ -28,7 +212,7 @@ "folios": [ { "folioId": "38v", - "systems": "16", + "systems": "18", "format": { "height": 270, "width": 335 @@ -37,7 +221,7 @@ }, { "folioId": "39r", - "systems": "16", + "systems": "18", "format": { "height": 270, "width": 335 diff --git a/src/assets/data/edition/series1/section5/op25/source-description.json b/src/assets/data/edition/series1/section5/op25/source-description.json index 889393445b..57ac5a8e81 100644 --- a/src/assets/data/edition/series1/section5/op25/source-description.json +++ b/src/assets/data/edition/series1/section5/op25/source-description.json @@ -14,8 +14,7 @@ "Taktzahlen: Taktzahlen 1–2, 3–6 und 9–15 in M 317 Sk4 sowie 2–3 in M 317 Sk4.1 mit schwarzem Buntstift; Taktzahlen 7–8 in M 317 Sk4 mit Bleistift und nachgezogen mit schwarzem Buntstift.
      Taktzahl 52 (zu op. 24/1) auf Bl. 39r oben links mit schwarzem Buntstift.", "Instrumentenvorsatz: Akkoladenstrich und teilweise Schlüsselvorsatz auf Bl. 38v System 1–4 (zu op. 24/1).
      Akkoladenstrich und Schlüsselvorsatz auf Bl. 39r System 1–4 (zu op. 24/1), eingekreist und gestrichen mit rotem Buntstift.", "Eintragungen: Reihe auf Bl. 38v System 5 links (zu M 317 Sk3.1.3) mit schwarzem Buntstift.", - "Inhalt:
      Bl. 38v System 1b: T. 1–2: Skizze zu Nr. I T. 1–2 (M317 SkI/1).
      Bl. 38v System 1a: Reihenfragment (Teil A); Zwölftonreihe Gcis (Teil B) (SkI/2).
      ...", - "[Weitere Inhaltsangaben folgen in Kürze (02/2020).]" + "Inhalt:
      Bl. 38v System 1b: T. 1–2: Skizze zu Nr. I T. 1–2 (M 317 SkI/1).
      Bl. 38v System 1a: Reihenfragment (Teil A); Zwölftonreihe Gcis (Teil B) (M 317 SkI/2).
      Bl. 38v System 1c–3c: T. 1–4 (M 317 SkI/2.1).
      Bl. 38v System 1d: T. 1–2 (M 317 SkI/2.1.1).
      Bl. 38v System 2a: T. 3 (M 317 SkI/2.1.2).
      Bl. 38v System 4c: T. 3 (M 317 SkI/2.1.2.1).
      Bl. 38v System 3d–4d: Tonbuchstaben (M 317 SkI/2.1.3).
      Bl. 38v System 3a: T. 1–5 (M 317 SkI/3).
      Bl. 38v System 3b–5b: T. 2–4, {{ '{' }}5–6{{ '}' }} (M 317 SkI/3.1).
      Bl. 38v System 5c–6b: T. 4–5 (M 317 SkI/3.1.1).
      Bl. 38v System 4a: T. 3–5 (M 317 SkI/3.1.2).
      Bl. 38v System 4a: T. 3–5 (M 317 SkI/3.1.2).
      M 317 SkI/3.1.3 (Reihentabelle):
      Bl. 38v System 6a: Gg (1); Bl. 38v System 6b: Kgis (2)
      Bl. 38v System 7a: Ug (3); Bl. 38v System 7b: KUfis (4)
      Bl. 38v System 6c: Zwölftonreihe Gg (M 317 SkI/3.1.3.1).
      Bl. 38v System 10–12 T. {{ '{' }}1A{{ '}' }}, {{ '{' }}1B{{ '}' }},
      T. 1–2, 3A, (M 317 SkI/4a),
      Bl. 39r System 1–8b: T. 3B, 4–6 (M 317 SkI/4b),
      Bl. 39r System 9–12, 13c, 14b: T. 7–12 (M 317 SkI/4c),
      Bl. 39r System 13a–16a: T. 13–15 (M 317 SkI/4d).
      Bl. 38v System 13–15: T. 2,{{ '{' }}3{{ '}' }} (M 317 SkI/4.1).
      Bl. 39r System 13b: T. 13 (M 317 SkI/4.2).
      Bl. 39r System 15c–16c: T. 13 (M 317 SkI/4.3)." ] }, { diff --git a/src/assets/data/edition/series1/section5/op25/source-list.json b/src/assets/data/edition/series1/section5/op25/source-list.json index 5bbadd5374..47dcbe167c 100644 --- a/src/assets/data/edition/series1/section5/op25/source-list.json +++ b/src/assets/data/edition/series1/section5/op25/source-list.json @@ -26,7 +26,7 @@ }, { "siglum": "E", - "type": "Autograph von Drei Lieder nach Gedichten von Hildegard Jone op. 25:\n I (\"Wie bin ich froh!\" M 317: Textfassung [1-->] 2)\n II (\"Des Herzens Purpurvogel\" M 322: einzige Textfassung)\n III (\"Sterne, Ihr silbernen Bienen\" M 321: einzige Textfassung).", + "type": "Autograph von Drei Lieder nach Gedichten von Hildegard Jone op. 25:
      I (\"Wie bin ich froh!\" M 317: Textfassung [1-->] 2)
      II (\"Des Herzens Purpurvogel\" M 322: einzige Textfassung)
      III (\"Sterne, Ihr silbernen Bienen\" M 321: einzige Textfassung).", "location": "Wien, Universal Edition, UEQ 493.", "linkTo": "op25_sourceNotA" } diff --git a/src/assets/data/edition/series1/section5/op25/textcritics.json b/src/assets/data/edition/series1/section5/op25/textcritics.json index 9e1017f598..bea2a16b9b 100644 --- a/src/assets/data/edition/series1/section5/op25/textcritics.json +++ b/src/assets/data/edition/series1/section5/op25/textcritics.json @@ -1,32 +1,457 @@ { "textcritics": [ { - "id": "A:Sk1", + "id": "A:SkI/1", "description": [ - "[Der Textkritische Kommentar zu A:Sk1 erscheint im Zusammenhang der vollständigen Edition der Drei Lieder nach Gedichten von Hildegard Jone op. 25 in AWG I/5.]" + "Sk1 entwirft eine viertönige Figur, die in ihrem Tonvorrat und ihrer rhythmischen Kontur dem Anfang der Singstimme von „Wie bin ich froh!“ M 317 entspricht. Dass es sich um die erste Skizzeneinheit zu dem Lied handelt, erschließt sich aus dem skripturalen Zusammenhang mit der links danebenstehenden Einheit Sk2: Diese weist an ihrem rechten Ende ein deutlich zusammengedrängtes Schriftbild auf, was sich durch den bereits von Sk1 beanspruchten Raum auf der Seite erklärt.
      Noch vor der Niederschrift von Sk1 war die Seite am linken Rand vermutlich mit dem Akkoladenstrich von System 1–4 sowie der Schlüsselung in System 2–3 versehen: Diese präparieren die Seite für die Fortsetzung der (bereits im Sommer 1931 begonnenen) Verlaufskizze zu op. 24/I auf Bl. 22v–26r, 31v–33r, und 36v–38r im Skizzenbuch. (Siehe auch Akkoladenstrich, Schlüsselung und Taktziffer am linken Rand von Bl. 39r System 1–4, die ebenfalls als Präparierung der Verlaufskizze zu op. 24/1 fungieren [Sk4 T. 3B–6].)
      Die Datierung 4. VII. 34 oberhalb vom linken Rand von System 1 ist möglicherweise bereits im Zusammenhang mit Sk1, vielleicht aber auch erst mit Sk2 notiert worden.
      Der über System 1 stehende Titel „Wie bin ich froh!“ ist allerdings sehr wahrscheinlich erst nach Abschluss der Verlaufskizze Sk4, möglicherweise erst bei einer späteren Redaktion des gesamten Skizzenbuches eingetragen worden, worauf der auch für andere entsprechende Titel im Skizzenbuch verwendete Schreibstoff und Schreibduktus hinweist." + ], + "comments": [ + { + "measure": "1–2", + "system": "1", + "position": "", + "comment": "Durch Einklammerung rechts getilgt." + } + ] + }, + { + "id": "A:SkI/2", + "description": [ + "Sk2 entwirft eine Zwölftonreihe in zwei Anläufen. Reihe A umfasst lediglich fünf Töne, Reihe B ergänzt nach einer Permutation des 3.–4. Reihentons die Reihe zur vollständigen Zwölftönigkeit. Die ersten fünf Töne beider Reihen ergänzen den ungeordneten Tonvorrat von Sk1 um den Anfangston cis. Die Niederschrift von Reihe B erfolgt dann im dynamischen Abgleich mit Sk2.1, Sk2.1.1, Sk2.1.2, Sk2.1.2.1 und Sk2.1.3." + ], + "comments": [ + { + "measure": "A", + "system": "1", + "position": "1.–5. Reihenton", + "comment": "Durch Einklammerung rechts getilgt." + }, + { + "measure": "A", + "system": "1", + "position": "2. Reihenton", + "comment": "♮ nachgezogen (überschreibt ♭?)." + }, + { + "measure": "B", + "system": "1", + "position": "4. Reihenton", + "comment": "♯fis2 überschreibt ♮g2." + } + ] + }, + { + "id": "A:SkI/2.1", + "description": [ + "Sk2.1 entwirft auf der Grundlage der rhythmischen Kontur von Sk1 eine Melodielinie mit Text, die in ihrer ausführlichsten und vermutlich letzten Schicht (T. 1 bis T. 2 1. TH: System 1; T. 2 2. TH bis T. 4: System 2) Reihe B aus Sk2 artikuliert. Die Niederschrift erfolgt im dynamischen Abgleich mit Sk2.1.1, Sk2.1.2, Sk2.1.2.1 und Sk2.1.3." + ], + "comments": [ + { + "measure": "1–3", + "system": "1", + "position": "", + "comment": "Text in Kurrentschrift." + }, + { + "measure": "1", + "system": "1", + "position": "6/8", + "comment": "♭ nachgezogen (überschreibt Ansatz von ♯ zu dis2?)." + }, + { + "measure": "2", + "system": "1", + "position": "1. Note", + "comment": "Durch Einkreisung getilgt." + }, + { + "measure": "2", + "system": "1", + "position": "3/8", + "comment": "♯ nachgezogen (überschreibt ♮?)." + }, + { + "measure": "2", + "system": "3", + "position": "letzte Note", + "comment": "Punkt unter der Note: Fleck oder Ansatz zu Notenkopf f?" + }, + { + "measure": "2
      bis 3", + "system": "3", + "position": "letzte Note
      3 . Note", + "comment": "Durch Einklammerung getilgt." + }, + { + "measure": "3", + "system": "1", + "position": "3 . Note", + "comment": "Klammerung rechts zeigt Tilgung an. Es ist nicht eindeutig, ob die so angezeigte Tilgung ab T. 2 4/8 beginnt (mit den Varianten in System 2–3) oder ob sie sich auch auf T. 1 ff. bezieht (mit den Varianten in Sk2.1.1 und Sk2.1.2." + }, + { + "measure": "3", + "system": "2", + "position": "4/8", + "comment": "Punktierte Achtelnote c1 überschreibt radierte Achtelpause." + } + ] + }, + { + "id": "A:SkI/2.1.1", + "description": [ + "Sk2.1.1 formuliert eine Variante des Anfangs von Sk2.1 auf der Grundlage des 1.–5. Reihentons von Reihe B in Sk2.", + "[Zu dieser Skizze gibt es keine textkritischen Kommentare.]" ], "comments": [] }, { - "id": "A:Sk2", + "id": "A:SkI/2.1.2", + "description": [ + "Sk2.1.2 ist vermutlich eine inhaltliche Fortsetzung von Sk2.1.1 (als T. 3): Hierfür spricht der Anfangston b1 an entsprechender Stelle von Varianten in Sk2.1 (System 1 und 2) sowie die dort ebenfalls anzutreffende Ligatur über den Taktstrich (System 1 und 3). Allerdings artikuliert Sk2.1.2 einen anderen Reihenverlauf als Reihe B in Sk2." + ], + "comments": [ + { + "measure": "3", + "system": "2", + "position": "", + "comment": "Durch Einklammerung getilgt." + } + ] + }, + { + "id": "A:SkI/2.1.2.1", "description": [ - "[Der Textkritische Kommentar zu A:Sk2 erscheint im Zusammenhang der vollständigen Edition der Drei Lieder nach Gedichten von Hildegard Jone op. 25 in AWG I/5.]" + "Sk2.1.2.1 formuliert eine rhythmisch-metrische Variante des Anfangs von Sk2.1.2.", + "[Zu dieser Skizze gibt es keine textkritischen Kommentare.]" ], "comments": [] }, { - "id": "A:Sk3", + "id": "A:SkI/2.1.3", "description": [ - "[Der Textkritische Kommentar zu A:Sk3 erscheint im Zusammenhang der vollständigen Edition der Drei Lieder nach Gedichten von Hildegard Jone op. 25 in AWG I/5.]" + "Die in Sk2.1.3 notierten Tonbuchstaben c, f, gis und a beziehen sich vermutlich auf noch fehlende Reihentöne bei der Niederschrift von Sk2 (Reihe B), Sk2.1 und Sk2.1.2.", + "[Zu dieser Skizze gibt es keine textkritischen Kommentare.]" + ], + "comments": [] + }, + { + "id": "A:SkI/3", + "description": [ + "Sk3 stellt gegenüber Sk2 und deren begleitenden Skizzeneinheiten einen inhaltlichen Neuansatz dar, insofern die in Sk2 notierte vollständige Zwölftonreihe (Reihe B) nicht mehr verwendet wird. Stattdessen formuliert Sk3 auf der Grundlage des permutierten Tonvorrats von Sk1 einen neuen zwölftönigen Verlauf. Im dynamischen Abgleich mit Sk3.1, Sk3.1.1, Sk3.1.2 wird dieser Verlauf weiter verändert und als rhythmisch abstrahierte Zwölftonreihe in Sk3.1.3 und Sk3.1.3.1 notiert." + ], + "comments": [ + { + "measure": "1
      bis 2", + "system": "3", + "position": "1. Note
      1. Note", + "comment": "Text in Kurrentschrift." + }, + { + "measure": "2", + "system": "3", + "position": "1. Note", + "comment": "Punktierung durch Einkreisung getilgt?" + }, + { + "measure": "2", + "system": "3", + "position": "1. Note", + "comment": "Pfeil zur Variante der Fortsetzung in Sk3.1." + } + ] + }, + { + "id": "A:SkI/3.1", + "description": [ + "Sk3.1 führt den Anfang von Sk3 ab dem Auftakt zu T. 3 in Varianten weiter bis T. {{ '{' }}6{{ '}' }}." + ], + "comments": [ + { + "measure": "vor 3
      bis 3", + "system": "4", + "position": "1. Note
      1. Note", + "comment": "Text in Kurrentschrift." + }, + { + "measure": "3", + "system": "4", + "position": "Taktanfang", + "comment": "Asterisk verweist auf Variante der Fortsetzung in Sk3.1.2." + }, + { + "measure": "{{ '{' }}5–6{{ '}' }}", + "system": "4", + "position": "", + "comment": "Durch Einklammerung getilgt. (Die Variante in System 3 wird allerdings nicht von der Einklammerung eingeschlossen.)" + }, + { + "measure": "{{ '{' }}5{{ '}' }}", + "system": "4", + "position": "1. Note", + "comment": "Pfeil unten rechts von Variante T. 4 in Sk3.1.1.
      Ligaturbogen gestrichen." + }, + { + "measure": "{{ '{' }}5{{ '}' }}", + "system": "4", + "position": "6/8", + "comment": "I markiert hier als Reihenziffer vermutlich den wiederholten Beginn der in Sk3 T. 1–2 1. Note und in Sk3.1 fortgeführten Zwölftonreihe. Diese Reihe ist nicht identisch mit Gg in den Reihentabellen Sk3.1.3 und M 317 Sk5 / M 321 Sk1 / M 322 Sk1 in C (dort jeweils mit arabischer Ziffer 1 bezeichnet)." + }, + { + "measure": "{{ '{' }}5{{ '}' }}
      bis {{ '{' }}6{{ '}' }}", + "system": "4", + "position": "6/8
      3. Note", + "comment": "Text in Kurrentschrift." + }, + { + "measure": "{{ '{' }}6{{ '}' }}", + "system": "4", + "position": "1–2/8", + "comment": "Text: leuch[-]tet zusammengeschrieben." + } + ] + }, + { + "id": "A:SkI/3.1.1", + "description": ["Sk3.1.1 formuliert Varianten von T. 4–5 in Sk3.1."], + "comments": [ + { + "measure": "5", + "system": "6", + "position": "", + "comment": "Halbe Note überschreibt Viertelnote." + } + ] + }, + { + "id": "A:SkI/3.1.2", + "description": [ + "Sk3.1.2 formuliert eine Variante von Sk3.1 ab T. 3. Zusammen mit Sk3 T. 1–2 1. Note und Sk3.1 Auftakt zu T. 3 ergibt sich eine Tonfolge, die der Reihenform Gg (1) der Zwölftonreihe in Sk3.1.3 und Sk3.1.3.1 entspricht." + ], + "comments": [ + { + "measure": "3
      bis 5", + "system": "4", + "position": "1. Note
      1. Note", + "comment": "Text in Kurrentschrift." + }, + { + "measure": "3", + "system": "4", + "position": "Taktanfang", + "comment": "Asterisk verweist auf Anschluss von Sk3.1." + }, + { + "measure": "3", + "system": "4", + "position": "1. Note", + "comment": "Punktierung durch Einkreisung getilgt." + }, + { + "measure": "5", + "system": "4", + "position": "1. Note", + "comment": "Punktierte Viertelnote überschreibt Halbe Note." + }, + { + "measure": "5", + "system": "4", + "position": "nach 1. Note", + "comment": "Durch Einklammerung abgegrenzt von Sk3.1." + } + ] + }, + { + "id": "A:SkI/3.1.3", + "description": [ + "Sk3.1.3 notiert die vier in op. 25/I verwendeten Reihenformen in einer tabellarischen Anordnung und versieht sie mit den ebenfalls in Sk4 und Sk4.1 verwendeten Reihenziffern 1 bis 4. Die Permutation des 10.–11. Reihentons von Gg und Ug bzw. des 2.–3. Reihentons von Kgis und KUfis ist bereits in Sk3.1.2 vollzogen. " + ], + "comments": [ + { + "measure": "", + "system": "5", + "position": "", + "comment": "Strich mit unklarer Bedeutung." + }, + { + "measure": "Gg (1)", + "system": "6", + "position": "vor 1. Reihenton", + "comment": "1 mit rotem Buntstift." + }, + { + "measure": "Gg (1)", + "system": "6", + "position": "7. Reihenton", + "comment": "sic: kein ♮." + }, + { + "measure": "Gg (1)", + "system": "6", + "position": "10.–11. Reihenton", + "comment": "♮a, ♮c1 durch Einkreisung getilgt und ersetzt durch c2 (sic: kein ♮), ♮a1." + }, + { + "measure": "Kgis (2)", + "system": "6", + "position": "vor 1. Reihenton", + "comment": "2 mit grünem Buntstift." + }, + { + "measure": "Kgis (2)", + "system": "6", + "position": "2.–3. Reihenton", + "comment": "♮c1, ♮a durch Einkreisung getilgt und ersetzt durch a1, c2 (sic: keine ♮)." + }, + { + "measure": "Ug (3)", + "system": "7", + "position": "vor 1. Reihenton", + "comment": "3 mit schwarzem Buntstift." + }, + { + "measure": "Ug (3)", + "system": "7", + "position": "10.–11. Reihenton", + "comment": "♮f2, ♮d2 durch Einkreisung getilgt und ersetzt durch ♮d1, ♮f1." + }, + { + "measure": "KUfis (4)", + "system": "7", + "position": "vor 1. Reihenton", + "comment": "4 mit rotem Buntstift." + }, + { + "measure": "KUfis (4)", + "system": "7", + "position": "2.–3. Note", + "comment": "♮d2, ♮f2 durch Einkreisung getilgt und ersetzt durch ♮f1, d1 (sic: kein ♮)." + }, + { + "measure": "", + "system": "6–7", + "position": "nach letzter Note", + "comment": "Klammer rechts mit rotem Buntstift." + } + ] + }, + { + "id": "A:SkI/3.1.3.1", + "description": [ + "Sk3.1.3.1 notiert das Ergebnis der in Sk3.1.3 erkennbaren Änderung des 10.–11. Reihentons von Gg und Ug bzw. des 2.–3. Reihentons von Kgis und KUfis am Beispiel von Gg noch einmal in einem einheitlichen Oktavregister.", + "[Zu dieser Skizze gibt es keine textkritischen Kommentare.]" ], "comments": [] }, { "id": "A:Sk4", "description": [ - "[Der Textkritische Kommentar zu A:Sk4 erscheint im Zusammenhang der vollständigen Edition der Drei Lieder nach Gedichten von Hildegard Jone op. 25 in AWG I/5.]" + "Sk4 ist eine vollständige Verlaufskizze des Liedes „Wie bin ich froh!“. Die Verlaufskizze erstreckt sich über vier Akkoladen (T. {{ '{' }}1A{{ '}' }}–3A, T. 3B–6, T. 7–12 und T. 13–15) und umfasst im Unterschied zu den Reinschriften von Textfassung 1 und Textfassung 2 in B und E nicht zwölf, sondern 15 gültige Takte.
      Bereits vor der Niederschrift von Sk4 war Bl. 39r mit Akkoladenstrich, Schlüsselung und Taktziffer am linken Rand von System 1–4 versehen (Sk4 T. 3B–6): Diese präparieren die Seite für die Fortsetzung der (bereits im Sommer 1931 begonnenen) Verlaufskizze zu op. 24/I auf Bl. 22v–26r, 31v–33r, und 36v–38r im Skizzenbuch.
      (Siehe auch Akkoladenstrich von System 1–4 sowie die Schlüsselung in System 2–3 am linken Rand von Bl. 38v, die ebenfalls als Präparierung der Verlaufskizze zu op. 24/I fungieren [Sk1 bis Sk3.1.2].)
      Sk 4 ist laut der nach T. 15 folgenden Datierung am 16. Juli 1934 beendet worden.", + "Die Ziffern 1 (Gg), 2 (Kgis), 3 (Ug) und 4 (KUfis) bezeichnen in der Regel den Anfang von Reihenformen gemäß den Reihentabellen Sk3.1.3 und M 317 Sk5 / M 321 Sk1 / M 322 Sk1 in C. Winkel markieren in der Regel deren Ende (┐, ┘) oder Anfang (┌, └)." + ], + "comments": [ + { + "measure": "1A", + "system": "10–12", + "position": "", + "comment": "Durch Einklammerung rechts getilgt." + }, + { + "measure": "1B", + "system": "10–12", + "position": "", + "comment": "Durch Einklammerung rechts getilgt." + }, + { + "measure": "vor 1C", + "system": "11", + "position": "1. Note", + "comment": "4 mit rotem Buntstift." + }, + { + "measure": "1C", + "system": "11", + "position": "6/8", + "comment": "sic: Winkel markiert hier nicht das Ende, sondern den 11. Reihenton von KUfis (4). 12. Reihenton von KUfis (g) ist zugleich 1. Reihenton von Gg (1): siehe T. 2 System 10–11 jeweils 1. Note." + }, + { + "measure": "nach 1C", + "system": "11–12", + "position": "", + "comment": "Taktstrich nachgezogen mit rotem Buntstift." + }, + { + "measure": "2", + "system": "10", + "position": "1. Note", + "comment": "1 mit rotem Buntstift." + }, + { + "measure": "…", + "system": "…", + "position": "…", + "comment": "[Die vollständige Liste der textkritischen Kommentare zu Sk4 erscheint in Kürze (02/2020).]" + } + ] + }, + { + "id": "A:SkI/4.1", + "description": [ + "Sk4.1 formuliert eine rhythmisch-metrische Variante von Sk4 T. 2–3A. Der dort im Klavier offen gelassene Takt 3A wird in Sk4.1 ansatzweise gefüllt, aber dann insgesamt gestrichen (T. {{ '{' }}3{{ '}' }}): möglicherweise auch auf Grund des in skripturaler Hinsicht engen Raumes. Der Takt wird in Sk4 T. 3B weiter ausgearbeitet.
      Vor der Niederschrift von Sk4.1 war die Seite am linken Rand von System 14–16 mit einer Akkoladenklammer beschriftet, die offensichtlich einer Präparierung der Fortsetzung von Sk4 nach T. {{ '{' }}1A{{ '}' }}–3A dient. Nach der Niederschrift von Sk4.1 erfolgt die Fortsetzung von Sk4 jedoch auf Bl. 39r (Sk4 T. 3B–6)." + ], + "comments": [ + { + "measure": "2", + "system": "14", + "position": "1. Note", + "comment": "Beide Winkel und 1 (Gg) mit rotem Buntstift. " + }, + { + "measure": "2", + "system": "13", + "position": "6/8–4/4", + "comment": "Decrescendogabel zu 4/4 überschrieben zu Decrescendogabel von 6/8–4/4." + }, + { + "measure": "{{ '{' }}3{{ '}' }}", + "system": "", + "position": "", + "comment": "Durch Einklammerung links und Streichung getilgt. Streichung mit rotem Buntstift." + }, + { + "measure": "{{ '{' }}3{{ '}' }}", + "system": "14", + "position": "letzte Note", + "comment": "Winkel mit rotem Buntstift." + } + ] + }, + { + "id": "A:SkI/4.2", + "description": [ + "Sk4.2 formuliert vermutlich den Ansatz zu einer Variante der Singstimme in Sk4 T. 13.", + "[Zu dieser Skizze gibt es keine textkritischen Kommentare.]" ], "comments": [] + }, + { + "id": "A:SkI/4.3", + "description": [ + "Sk4.3 formuliert eine fragmentarische Variante von Sk4 T. 13." + ], + "comments": [ + { + "measure": "13", + "system": "16", + "position": "1. Note", + "comment": "sic: Verweisstrich führt zu Sk4 T. 14. Inhaltlich bezieht sich Sk4.3 jedoch auf Sk4 T. 13. " + }, + { + "measure": "13", + "system": "16", + "position": "letzte Note", + "comment": "Entzifferung von ♯ais unsicher: möglicherweise auch ♭b." + } + ] } ] } diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk1_200123_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk1_200123_1von1.svg index 3984dfdf20..3570d182bd 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk1_200123_1von1.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk1_200123_1von1.svg @@ -1 +1,578 @@ -Zeichenfläche 1&&?4. VII. 34Bl. 38v1234„Wie bin ich froh!‟M 317 Sk134Sk2Sk2.1Sk2.1.1Sk2.1.3Sk2.1.2Sk2.1.2.1Sk3Sk3.1.2Sk3.1&‰œnœnJœbœ#12 \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk1_200123_1von1_a.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk1_200123_1von1_a.svg deleted file mode 100644 index a5066b25a4..0000000000 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk1_200123_1von1_a.svg +++ /dev/null @@ -1 +0,0 @@ -Zeichenfläche 1&&?4. VII. 34Bl. 38v1234„Wie bin ich froh!‟M 317 Sk134Sk2Sk2.1Sk2.1.1Sk2.1.3Sk2.1.2Sk2.1.2.1Sk3Sk3.1.2Sk3.1&‰œnœnJœbœ#12 \ No newline at end of file diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_1_200123_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_1_200123_1von1.svg index 5a37d32ced..aa758eb3a8 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_1_200123_1von1.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_1_200123_1von1.svg @@ -1 +1,592 @@ -Zeichenfläche 1&&?4. VII. 34Bl. 38v1234„Wie bin ich froh!‟M 317 Sk2.1.134Sk1Sk2.1Sk2.1.2Sk2.1.2.1Sk3Sk3.1.2Sk3.1Sk2Sk2.1.3&.œ#‰œn1œbJœ#œn2 \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_200123_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_200123_1von1.svg index 501118ea34..1947c4a335 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_200123_1von1.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_200123_1von1.svg @@ -1 +1,1151 @@ -Zeichenfläche 1&&?4. VII. 34Bl. 38v1234„Wie bin ich froh!‟M 317 Sk2.134Sk2Sk2.1.1Sk2.1.3Sk2.1.2Sk2.1.2.1Sk3Sk3.1.2Sk3.1Sk1&‰œ#-œn-Jœb.Wiebinich68œnJœ#œn‰‰œbœœbfrohfroh!Nochœneinmal-‰œbœb&œn‰.jœn.jœn.œnœjœnœbœ&Jœnœn1234‰ \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_2_1_200123_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_2_1_200123_1von1.svg index 9a451909fb..3bf5563da8 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_2_1_200123_1von1.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_2_1_200123_1von1.svg @@ -1 +1,584 @@ -Zeichenfläche 1&&&?4. VII. 34Bl. 38v1234„Wie bin ich froh!‟M 317: Sk2.1.2.134Sk1Sk2.1Sk2.1.1Sk2.1.3Sk2.1.2Sk3Sk3.1.2Sk3.1Sk2œbœn&œn3 \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_2_200123_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_2_200123_1von1.svg index 1cb9ad6d37..d837562f6e 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_2_200123_1von1.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_2_200123_1von1.svg @@ -1 +1,626 @@ -Zeichenfläche 1&&&?4. VII. 34Bl. 38v1234„Wie bin ich froh!‟M 317 Sk2.1.234Sk1Sk2.1Sk2.1.1Sk2.1.3Sk2.1.2.1Sk3Sk3.1.2Sk3.1Sk2œbœ&œnœn‰œ#œn3 \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_3_200123_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_3_200123_1von1.svg index 083b3dc958..1efd2e1cb7 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_3_200123_1von1.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_1_3_200123_1von1.svg @@ -1 +1,512 @@ -Zeichenfläche 1&&?4. VII. 34Bl. 38v1234„Wie bin ich froh!‟M 317 Sk2.1.334Sk1Sk2.1Sk2.1.1Sk2.1.2Sk2.1.2.1Sk3Sk3.1.2Sk3.1Sk2c f gis a \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_200123_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_200123_1von1.svg index ef653bc92f..405a65e9f9 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_200123_1von1.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk2_200123_1von1.svg @@ -1 +1,699 @@ -Zeichenfläche 1&&&?4. VII. 34œ#œnœ#œ#œBl. 38v1A234„Wie bin ich froh!‟œ#œnœ#œ#œnœbœbœnœnœnœnœnBM 317 Sk234Sk1Sk2.1Sk2.1.1Sk2.1.3Sk2.1.2Sk2.1.2.1Sk3Sk3.1.2Sk3.1nœn \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_1_200123_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_1_200123_1von1.svg index e10eb70f96..b11def272a 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_1_200123_1von1.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_1_200123_1von1.svg @@ -1 +1,369 @@ -Zeichenfläche 1Bl. 38v56&&œnœbœnœnœb.œnJœn4oder˙#5M 317 Sk3.1.1Sk3.1Sk3.1.3Sk3.1.3.1œ \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_200123_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_200123_1von1.svg index cca552beb8..4d63a373fb 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_200123_1von1.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_200123_1von1.svg @@ -1 +1,1085 @@ -Zeichenfläche 1&&?4. VII. 34Bl. 38v1234„Wie bin ich froh!‟M 317 Sk3.134Sk1Sk2.1Sk2.1.1Sk2.1.2Sk2.1.2.1Sk3Sk3.1.2Sk2Sk2.1.3‰œ#œn3&œn‰œbœn.œnœn˙#‰jœnu.Iœnœbœb3œnœbœbleuchtetso5jœb&œœnœSk3.1.1Sk3.1.334{5}{6}jnochein - mal \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_2_200123_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_2_200123_1von1.svg index 3b86d466e4..1334fd9688 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_2_200123_1von1.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_2_200123_1von1.svg @@ -1 +1,809 @@ -Zeichenfläche 1&&?4. VII. 34Bl. 38v1234„Wie bin ich froh!‟M 317 Sk3.1.234Sk1Sk2.1Sk2.1.1Sk2.1.2Sk2.1.2.1Sk3Sk3.1Sk2Sk2.1.3.œn‰œnJœbmalwirdmir&43gilt.œnJœnalles.œ#Grün!-345˙ \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_3_1_2001023_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_3_1_2001023_1von1.svg deleted file mode 100644 index f441ce6705..0000000000 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_3_1_2001023_1von1.svg +++ /dev/null @@ -1 +0,0 @@ -Zeichenfläche 1Bl. 38v6œnœnœbœ#œ#œnœnœnœbœnœnœ#M 317 Sk3.1.3.1Sk3.1.3Sk3.1.1& \ No newline at end of file diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_3_1_200123_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_3_1_200123_1von1.svg new file mode 100644 index 0000000000..e36dffd731 --- /dev/null +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_3_1_200123_1von1.svg @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_3_200210_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_3_200210_1von1.svg new file mode 100644 index 0000000000..71285e35c8 --- /dev/null +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_3_200210_1von1.svg @@ -0,0 +1,853 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_3__2001023_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_3__2001023_1von1.svg deleted file mode 100644 index 1f19437609..0000000000 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_1_3__2001023_1von1.svg +++ /dev/null @@ -1 +0,0 @@ -Zeichenfläche 1&&œnœnœbœ#œ#œnœœnœbœœnœœnnœ#œnœbœnœ#œ#œnœnœbœnœœnnœœnnœ#Bl. 38v56173ReiheAœ#œœnœœnœbœnœnœnœ#œ#œbœnœnœ#œœnnœœnœnœbœnœnœ#œ#œnœbœn42BM 317 Sk3.1.3Sk3.1Sk3.1.1Sk3.1.3.1 \ No newline at end of file diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_200123_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_200123_1von1.svg index a649df3472..72464ed8e1 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_200123_1von1.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk3_200123_1von1.svg @@ -1 +1,820 @@ -Zeichenfläche 1&&?4. VII. 34Bl. 38v1234„Wie bin ich froh!‟M 317 Sk334Sk1Sk2.1Sk2.1.1Sk2.1.2Sk2.1.2.1Sk3.1.2Sk3.1Sk2Sk2.1.334‰œnœnJœbWiebinich.œ#‰œœ#3frohœn‰.jœn.jœ.œ#jœœnœb12345n \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_1_200123_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_1_200123_1von1.svg index a29f6394de..b7f79288d4 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_1_200123_1von1.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_1_200123_1von1.svg @@ -1 +1,856 @@ -Zeichenfläche 1Bl. 38v13141516&&44&gilt‰œn-œnJœ#œ#-Wiebinichfroh!Œœnœnœœ#.œ#.œœnb‰3Œœœnn‰?21f2‰œ#œnœn‰‰œnœb33œnœnœ#3{3}p3M 317 Sk4.1Sk4 T. {1A}–3Af# \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_200123_1von4.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_200123_1von4.svg index fd1d165c56..d87a4ac99a 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_200123_1von4.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_200123_1von4.svg @@ -1 +1,1586 @@ -Zeichenfläche 1&&?œnœœnbBl. 38v9101112œ#œœn#{1A}œ#œnœn3Œ&œn-œb-œœ#n?&œœn#‰œn?&{1B}Œ&œ#œnœnœn.œb3343434SLebhaft q = f4∑œœ#n‰œn-œb-?&œœn#‰?8p1Crit1‰œnœnJœbWiebinichŒœnœnœbœ#.œ#.œœnb3Œ‰œœnn&?22tempo4 u. 1.œ#‰‰œ#œn3froh3A3M 317 Sk4 T. {1A}–3AfSk4.1.‰1 \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_200123_2von4.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_200123_2von4.svg index b5133c6092..dc9c47214c 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_200123_2von4.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_200123_2von4.svg @@ -1 +1,3418 @@ -Zeichenfläche 1&&&?434343424242434343444444&&&Bl. 39r12345678352œn‰œ#œnjœn‰œn-œb-3nocheinmalwirdmirœnœnœ#œnœbœœnn‰3œœn#‰?‰œœnn&Jœ#.‰œœbn&?3Bffzartpp4gilt.œnjœnalles‰œnœnœ#.‰œ#-33&&&&44pgilt.œ‰‰jœn-grünund˙#‰œn-Œœœnb-‰œœnb-‰œnœb‰œœœ#nn3?œnœbœn‰œœœn#b33?Œ‰œnœnœbŒ3œnœbœn‰ŒŒ3353334444viel langsamerrit53fffpfpzart1œnœ#œ#ŒÓ3leuchtetso!‰œœœbnŒœnœœ#‰3‰œœœn#n‰œnœnœb‰œ 3?Œ‰œœ#n‰œnœnœ#œnœb33&Œ‰œœn#3?&364444tempo6ffS3--M 317 Sk4 T. 3B–6&3884441u. 111&3Sk4 T. 7–12n \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_200123_3von4.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_200123_3von4.svg index 0f1700b484..e18dba9842 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_200123_3von4.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_200123_3von4.svg @@ -1 +1,3156 @@ -Zeichenfläche 1&&&?Œ‰œn-œnœbœnœ#Œ‰œn-œnjœbnochüber œbœœ#n‰œœnnœnœ#?&?œœn#‰œœn#44434Bl. 39r8910111277rit1314f‰œ#œ#œndieBlumenœnœ#‰œ#œnœnblühnŒœ#œnœnœbœn‰3&Œ‰‰&?34?88tempoSf‰œnœbœnjœn‰œnœ#333mirdieWelt!nocheinœœ#n‰œbœœn‰œ#œn3œœn#&?Jœ#‰&99giltŒfSœ#œn‰œn-œ#-3malbinich‰œœnnœœnn‰‰œœnbœœbn‰&241010f.œ#Jœ#ganzins‰œnœnœ#‰œ#-33&&1111rit34fœnœnœnœbœn3wWerdenhingestelltŒ‰œbœnœnŒ3‰œ#œnœnœbœnœn‰441212molto4œnœb----M 317 Sk4 T. 7–12fSk4.2Sk4 T. 13–15pp3222Sk4 T. 3B–61-ffp8bmolto [xx] \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_200123_4von4.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_200123_4von4.svg index 0554864596..bd36305a7e 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_200123_4von4.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_200123_4von4.svg @@ -1 +1,1519 @@ -Zeichenfläche 1&&&434343‰œœ#jœ‰œnœ#Jœnundbinaufœœ#n‰‰œœn#œnœb‰33Œ‰œœ#‰‰œœ#nŒ&?&1313viel langsamerBl. 39r13141516π.œbœn‰œn.œbjœnErden.‰Jœœn‰œbœnœœ‰Jœœ#n‰œ#œnœœœ1414f‰œnœnœ#jœn‰1515Œ‰pMaria Enzersdorf16. VII. 34-M 317 Sk4 T. 13–15bu. 43giltu 4u 43bu. 3Sk4.2Sk4 T. 7–12Sk4.3 \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_2_200123_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_2_200123_1von1.svg index 02fadd2094..3d64fe8998 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_2_200123_1von1.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_2_200123_1von1.svg @@ -1 +1,208 @@ -Zeichenfläche 143Bl. 39r13&‰œM 317 Sk4.2Sk4 T. 13–15Sk4 T. 7–1213 \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_3_200123_1von1.svg b/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_3_200123_1von1.svg index 36ee2d2d56..cfc5840682 100644 --- a/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_3_200123_1von1.svg +++ b/src/assets/img/edition/series1/section5/op25/op25_1_Sk4_3_200123_1von1.svg @@ -1 +1,405 @@ -Zeichenfläche 1Bl. 39r141516??œœ#nœœn#‰œnœ#œœM 317 Sk4.3Sk4 T. 13–15Maria Enzersdorf16. VII. 34Sk4 T. 7–12#13 \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/yarn.lock b/yarn.lock index 70ad680dde..a2c21dbef9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3600,7 +3600,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -commander@^2.11.0, commander@^2.12.1, commander@^2.18.0, commander@^2.20.0, commander@~2.20.0: +commander@^2.11.0, commander@^2.12.1, commander@^2.18.0, commander@^2.20.0: version "2.20.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== @@ -3610,6 +3610,11 @@ commander@^3.0.0-0, commander@^3.0.2: resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e" integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow== +commander@~2.20.3: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -5983,21 +5988,10 @@ handle-thing@^2.0.0: resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754" integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ== -handlebars@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67" - integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw== - dependencies: - neo-async "^2.6.0" - optimist "^0.6.1" - source-map "^0.6.1" - optionalDependencies: - uglify-js "^3.1.4" - -handlebars@^4.3.3, handlebars@^4.4.0: - version "4.5.3" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482" - integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA== +handlebars@^4.1.2, handlebars@^4.3.3, handlebars@^4.4.0: + version "4.7.3" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.3.tgz#8ece2797826886cf8082d1726ff21d2a022550ee" + integrity sha512-SRGwSYuNfx8DwHD/6InAPzD6RgeruWLT+B8e8a7gGs8FWgHzlExpTFMEq2IA6QpAfOClpKHy6+8IqTjeBCu6Kg== dependencies: neo-async "^2.6.0" optimist "^0.6.1" @@ -11307,11 +11301,11 @@ typescript@^2.4.2: integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w== uglify-js@^3.1.4: - version "3.6.0" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5" - integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg== + version "3.7.7" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.7.tgz#21e52c7dccda80a53bf7cde69628a7e511aec9c9" + integrity sha512-FeSU+hi7ULYy6mn8PKio/tXsdSXN35lm4KgV2asx00kzrLU9Pi3oAslcJT70Jdj7PHX29gGUPOT6+lXGBbemhA== dependencies: - commander "~2.20.0" + commander "~2.20.3" source-map "~0.6.1" ultron@~1.1.0:
      TaktSystemTaktSystem Ort im Takt Kommentar
      {{ textcriticalComment.measure }}{{ textcriticalComment.system }}