diff --git a/projects/admin/src/app/app.module.ts b/projects/admin/src/app/app.module.ts index 159f4f950..437889436 100644 --- a/projects/admin/src/app/app.module.ts +++ b/projects/admin/src/app/app.module.ts @@ -108,6 +108,13 @@ import { } from './record/detail-view/contribution-detail-view/corporate-bodies-detail-view/corporate-bodies-detail-view.component'; import { PersonDetailViewComponent } from './record/detail-view/contribution-detail-view/person-detail-view/person-detail-view.component'; import { DialogImportComponent } from './record/detail-view/document-detail-view/dialog-import/dialog-import.component'; +import { DescriptionZoneComponent } from './record/detail-view/document-detail-view/document-description/description-zone/description-zone.component'; +import { + DocumentDescriptionComponent +} from './record/detail-view/document-detail-view/document-description/document-description.component'; +import { + OtherEditionComponent +} from './record/detail-view/document-detail-view/document-description/other-edition/other-edition.component'; import { DocumentDetailViewComponent } from './record/detail-view/document-detail-view/document-detail-view.component'; import { HoldingDetailComponent } from './record/detail-view/document-detail-view/holding-detail/holding-detail.component'; import { HoldingSharedViewComponent } from './record/detail-view/document-detail-view/holding-shared-view/holding-shared-view.component'; @@ -266,7 +273,10 @@ export function appInitFactory(appInitService: AppInitService) { CirculationLogsComponent, CirculationLogsDialogComponent, CirculationLogComponent, - ItemInCollectionPipe + ItemInCollectionPipe, + DocumentDescriptionComponent, + OtherEditionComponent, + DescriptionZoneComponent ], imports: [ AppRoutingModule, diff --git a/projects/admin/src/app/record/detail-view/document-detail-view/document-description/description-zone/description-zone.component.html b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/description-zone/description-zone.component.html new file mode 100644 index 000000000..5c5c4ed02 --- /dev/null +++ b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/description-zone/description-zone.component.html @@ -0,0 +1,24 @@ + +
+
+ +
+
+ +
+
diff --git a/projects/admin/src/app/record/detail-view/document-detail-view/document-description/description-zone/description-zone.component.spec.ts b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/description-zone/description-zone.component.spec.ts new file mode 100644 index 000000000..65065b1dd --- /dev/null +++ b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/description-zone/description-zone.component.spec.ts @@ -0,0 +1,41 @@ +/* + * RERO ILS UI + * Copyright (C) 2021 RERO + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, version 3 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { DescriptionZoneComponent } from './description-zone.component'; + + +describe('DescriptionZoneComponent', () => { + let component: DescriptionZoneComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ DescriptionZoneComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(DescriptionZoneComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/projects/admin/src/app/record/detail-view/document-detail-view/document-description/description-zone/description-zone.component.ts b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/description-zone/description-zone.component.ts new file mode 100644 index 000000000..47317b667 --- /dev/null +++ b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/description-zone/description-zone.component.ts @@ -0,0 +1,23 @@ +/* + * RERO ILS UI + * Copyright (C) 2021 RERO + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, version 3 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +import { Component } from '@angular/core'; + +@Component({ + selector: 'admin-description-zone', + templateUrl: './description-zone.component.html' +}) +export class DescriptionZoneComponent { } diff --git a/projects/admin/src/app/record/detail-view/document-detail-view/document-description/document-description.component.html b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/document-description.component.html new file mode 100644 index 000000000..d3e006b38 --- /dev/null +++ b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/document-description.component.html @@ -0,0 +1,418 @@ + + +
+ + + +
+ +
+
+ +
+ + +
+ + {{ 'General note' | translate }} + +
    +
  • {{ note }}
    • +
+ + +
+ + +
+ + {{ 'Other responsibilities' | translate }} + +
    +
  • {{ credit }}
    • +
+ + +
+ + +
+ + {{ 'Language' | translate }} + + + {{ lang.value | translateLanguage: currentLanguage }}, + + + +
+ + +
+ + {{ 'Original language' | translate }} + + + {{ lang | translateLanguage: currentLanguage }}, + + + +
+ + +
+ + {{ 'Original title' | translate }} + +
    +
  • {{ title }}
    • +
+ + +
+ + + + + +
+ + {{ 'Contents' | translate }} + +
    +
  • {{ table }}
    • +
+ + +
+ + +
+ + {{ 'Thesis' | translate }} + +
    + + +
  • {{ label.value }}
    • +     +     +
+ + +
+ + +
+ + {{ 'Intended audience' | translate }} + + + {{ audience.value | translate }}, + + + +
+ + +
+ + {{ 'Illustrations' | translate }} + + {{ record.metadata.illustrativeContent.join(', ') }} + + +
+ + +
+ + {{ 'Colors' | translate }} + + + {{ color | translate }}, + + + +
+ + +
+ + {{ 'Scale' | translate }} + +
    +
  • {{ scale.label }}
    • +
+ + +
+ + +
+ + {{ 'Cartographic data' | translate }} + +
    +
  • + {{ cartographic.projection }} + ; + + {{ cartographic.coordinates.label }} + +
    • +
+ + +
+ + +
+ + {{ 'Classification' | translate }} + +
    +
  • + {{ classification.classificationPortion }} + + - {{ classification.subdivision.join(' - ') }} + + ({{ classification.type | translate }}) +
    • +
+ + +
+ + + + +
+ + {{ 'Use and access condition' | translate }} + +
    +
  • {{ usage.label }}
    • +
+ + +
+ + +
+ +
+
+ +
+
+ +
+ + + +
+ + {{ title.key | translate | ucfirst }} + +
    +
  • {{ value }}
    • +
+ + +
+ + + +
+ + {{ 'Statement of responsibility' | translate }} + +
    +
  • {{ responsibility }}
    • +
+ + +
+ + +
+ + {{ 'Series statement' | translate }} + +
    +
  • {{ serie.value }}
    • +
+ + +
+ + +
+ + {{ 'Date of the original' | translate }} + + + {{ provision.original_date }}, + + + +
+ + +
+ + {{ 'Copyright date' | translate }} + + {{ record.metadata.copyrightDate.join(", ") }} + + +
+ + +
+ + {{ 'Numbering' | translate }} + + {{ record.metadata.sequence_numbering }} + + +
+ + +
+ + {{ 'Dimensions' | translate }} + + {{ record.metadata.dimensions.join(", ") }} + + +
+ + +
+ + {{ 'Format' | translate }} + + {{ record.metadata.bookFormat.join(", ") }} + + +
+ + +
+ + {{ 'Production method' | translate }} + + + {{ method | translate }}, + + + +
+ + + +
+ + {{ noteType.key | translate | ucfirst }} + +
    +
  • {{ note }}
    • +
+ + +
+ + + +
+ + {{ 'Supplementary content' | translate }} + +
    +
  • {{ sup }}
    • +
+ + +
+ + +
+ + {{ 'Terms of availability' | translate }} + +
    +
  • {{ term }}
    • +
+ + +
+ + +
+ + {{ 'Identifier' | translate }} + +
    +
  • + + {{ identifier.value }} + + + {{ identifier.value }} + + - {{ identifier.details }} + + {{ identifier.type }} + +
    • +
+ + +
+ + + + +
+ + {{ 'Carrier and content type' | translate }} + + + {{ content.carrierType | translate }} + + ({{ type | translate }}) + , + + + + +
+ + +
+ + {{ 'Mode of issuance' | translate }} + + {{ record.metadata.issuance.main_type | translate }} / {{ record.metadata.issuance.subtype }} + + +
+
diff --git a/projects/admin/src/app/record/detail-view/document-detail-view/document-description/document-description.component.spec.ts b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/document-description.component.spec.ts new file mode 100644 index 000000000..7aa33ac7a --- /dev/null +++ b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/document-description.component.spec.ts @@ -0,0 +1,48 @@ +/* + * RERO ILS UI + * Copyright (C) 2021 RERO + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, version 3 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { TranslateModule } from '@ngx-translate/core'; +import { DocumentDescriptionComponent } from './document-description.component'; + + +describe('DocumentDescriptionComponent', () => { + let component: DocumentDescriptionComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ DocumentDescriptionComponent ], + imports: [ + TranslateModule.forRoot() + ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(DocumentDescriptionComponent); + component = fixture.componentInstance; + component.record = { + metadata: {} + }; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/projects/admin/src/app/record/detail-view/document-detail-view/document-description/document-description.component.ts b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/document-description.component.ts new file mode 100644 index 000000000..687379537 --- /dev/null +++ b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/document-description.component.ts @@ -0,0 +1,170 @@ +/* + * RERO ILS UI + * Copyright (C) 2021 RERO + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, version 3 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +import { Component, Input } from '@angular/core'; +import { TranslateService } from '@ngx-translate/core'; + +@Component({ + selector: 'admin-document-description', + templateUrl: './document-description.component.html' +}) +export class DocumentDescriptionComponent { + + @Input() record: any; + + /** + * Get Current language interface + * @return string - language + */ + get currentLanguage() { + return this.translateService.currentLang; + } + + // ---- FIELDS + + /** Get cartographic attributes */ + get cartographicAttributes(): any[] { + const cartographic = []; + if ('cartographicAttributes' in this.record.metadata) { + this.record.metadata.cartographicAttributes.forEach((attribute: any) => { + if ('projection' in attribute || ('coordinates' in attribute && 'label' in attribute.coordinates)) { + cartographic.push(attribute); + } + }); + } + return cartographic; + } + + /** Get list of document edition statement */ + get editionStatement(): any[] { + const results = []; + if ('seriesStatement' in this.record.metadata) { + this.record.metadata.seriesStatement.forEach((element: any) => { + if ('_text' in element) { + const elementText = element._text; + const keys = Object.keys(elementText); + const indexDefault = keys.indexOf('default'); + if (indexDefault > -1) { + results.push(elementText.default); + keys.splice(indexDefault, 1); + } + + keys.forEach(key => { + results.push(elementText[key]); + }); + } + }); + } + return results; + } + + /** Get list of document identifiers */ + get identifiedBy(): any[] { + const identifiers = []; + if ('identifiedBy' in this.record.metadata) { + this.record.metadata.identifiedBy.forEach((id: any) => { + const details = []; + // Replace bf:Local by source + const idType = (id.type === 'bf:Local') ? id.source : id.type; + // Format qualifier, status and note + if (id.qualifier) { + details.push(id.qualifier); + } + if (id.status) { + details.push(id.status); + } + if (id.note) { + details.push(id.note); + } + identifiers.push({ + type: idType, + value: id.value, + details: details.join(', ') + }); + }); + } + return identifiers; + } + + /** Get notes except general type */ + get notesExceptGeneral(): any { + if ('note' in this.record.metadata) { + return this._sortedNotesByType( + this.record.metadata.note.filter((el: any) => el.noteType !== 'general') + ); + } + return; + } + + /** Get notes general only */ + get notesGeneral(): any { + if ('note' in this.record.metadata) { + return this._sortedNotesByType( + this.record.metadata.note.filter((el: any) => el.noteType === 'general') + ); + } + return; + } + + /** Get provision activity with available original_date field */ + get provisionActivity() { + return ('provisionActivity' in this.record.metadata) + ? this.record.metadata.provisionActivity.filter((provision: any) => 'original_date' in provision) + : []; + } + + /** Get title variants by type */ + get titleVariants(): any { + const variants = {}; + if ('title' in this.record.metadata) { + const titles = this.record.metadata.title.filter((title: any) => title.type !== 'bf:Title'); + titles.forEach((title: any) => { + if (!(title.type in variants)) { + variants[title.type] = []; + } + title.mainTitle.forEach((variant: any) => { + variants[title.type].push(variant.value); + }); + }); + } + return variants; + } + + /** + * Constructor + * @param translateService - TranslateService + */ + constructor(public translateService: TranslateService) {} + + /** + * Sorted notes by type + * @param notes - Array of notes + * @returns sorted by type or null + */ + private _sortedNotesByType(notes: { noteType: string, label: string }[]): any { + if (notes.length === 0) { + return; + } + const sortedByType = {}; + notes.forEach(note => { + if (!(note.noteType in sortedByType)) { + sortedByType[note.noteType] = []; + } + sortedByType[note.noteType].push(note.label); + }); + return sortedByType; + } +} diff --git a/projects/admin/src/app/record/detail-view/document-detail-view/document-description/other-edition/other-edition.component.html b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/other-edition/other-edition.component.html new file mode 100644 index 000000000..a4b02d6ee --- /dev/null +++ b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/other-edition/other-edition.component.html @@ -0,0 +1,47 @@ + +
+ + {{ fieldLabel }} + + + + +
+ +
+ {{ fieldLabel }}: + + {{ edition.label }} + + + {{ document[0]._text }} + + + ; + +
+ diff --git a/projects/admin/src/app/record/detail-view/document-detail-view/document-description/other-edition/other-edition.component.spec.ts b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/other-edition/other-edition.component.spec.ts new file mode 100644 index 000000000..6e3740415 --- /dev/null +++ b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/other-edition/other-edition.component.spec.ts @@ -0,0 +1,41 @@ +/* + * RERO ILS UI + * Copyright (C) 2021 RERO + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, version 3 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { OtherEditionComponent } from './other-edition.component'; + + +describe('OtherEditionComponent', () => { + let component: OtherEditionComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ OtherEditionComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(OtherEditionComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/projects/admin/src/app/record/detail-view/document-detail-view/document-description/other-edition/other-edition.component.ts b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/other-edition/other-edition.component.ts new file mode 100644 index 000000000..7d3a8ab43 --- /dev/null +++ b/projects/admin/src/app/record/detail-view/document-detail-view/document-description/other-edition/other-edition.component.ts @@ -0,0 +1,33 @@ +/* + * RERO ILS UI + * Copyright (C) 2021 RERO + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, version 3 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ +import { Component, Input } from '@angular/core'; + +@Component({ + selector: 'admin-other-edition', + templateUrl: './other-edition.component.html' +}) +export class OtherEditionComponent { + + /** Field in header */ + @Input() header = false; + + /** Field label */ + @Input() fieldLabel: string; + + /** Field data */ + @Input() field: any; +} diff --git a/projects/admin/src/app/record/detail-view/document-detail-view/document-detail-view.component.html b/projects/admin/src/app/record/detail-view/document-detail-view/document-detail-view.component.html index 1aec4e9b0..19ad19408 100644 --- a/projects/admin/src/app/record/detail-view/document-detail-view/document-detail-view.component.html +++ b/projects/admin/src/app/record/detail-view/document-detail-view/document-detail-view.component.html @@ -1,13 +1,16 @@ @@ -28,12 +31,33 @@
-
+
+ +
    +
  • + + {{ genre.term }} + + + +
    • +
+
+ + +
+ {{ 'Encoding level' | translate }}: {{ record.metadata.adminMetadata.encodingLevel | translate }}. + + {{ note }}. + +
+ + -

+

-

{{ altgr_title }}

+

{{ altgr_title }}

 - +
  • {{ altgr_title }}

*ngIf="contribution.agent.pid" [innerHTML]="contribution | contributionFormat: true" [routerLink]="['/records', contributionTypeParam(contribution.agent), 'detail', contribution.agent.pid]"> - - {{ last ? '' : '; ' }} + ; - +
  • {{ altgr_title }} - -
    {{ record.metadata.extent }}
    -     +
    + {{ record.metadata.extent }} +
    + + +
    + {{ 'Duration' | translate }}: {{ record.metadata.duration.join(", ") }} +
    - +
      -
    • - {{ edition.value }} -
      • +
    • {{ edition._text[0].value }}
    - +
    + + +
    + {{ 'Frequency' | translate }}: + + {{ freq.label }} ({{ freq.date }}); + +
    - - + + + + + + + + + + + + + + - +
      @@ -111,19 +176,6 @@

      {{ altgr_title }}

    - -
    -
    - - {{ subject.text }} - -
    -
    - @@ -143,6 +195,22 @@

    {{ altgr_title }}

+ + +
+
+ + {{ subject.text }} + +
+
+ + +
@@ -168,245 +236,7 @@

{{ altgr_title }}

{{ 'Description' | translate }}
-
- - - -
- Statement of responsibility -
-
{{ responsibility }}
- - - - - - -
- Variant title -
-
{{ variant_title }}
- - - - - -
Language
-
- - {{ lang.value | translateLanguage: currentLanguage }}, - -
- - - - - -
- Series statement -
-
{{ serie.value }}
- - - - - -
Mode of issuance
-
- {{ record.metadata.issuance.main_type | translate}} / {{ record.metadata.issuance.subtype }} -
- - - - - - - - - - - -
Note
-
-
    -
  • - {{ note }} -
    • -
-
- - -
Physical details
-
-
    -
  • - {{ note }} -
    • -
-
- - -
Accompanying material
-
-
    -
  • - {{ note }} -
    • -
-
- - - - - -
- {{ provision.key | translate }} -
-
-
    -
  • - {{ value }} -
    • -
-
- - - - -
Physical description
-
- - {{ record.metadata.otherMaterialCharacteristics }} - , - - - {{ record.metadata.formats.join(", ") }} - -
- - - - -
Duration
-
- {{ record.metadata.duration.join(", ") }} -
- - - - -
Illustrations
-
- {{ record.metadata.illustrativeContent.join(", ") }} -
- - - - -
Colors
-
- - {{ color | translate }}, - -
- - - - -
Production method
-
- {{ record.metadata.productionMethod.join(", ") }} -
- - - - -
Format
-
- {{ record.metadata.bookFormat.join(", ") }} -
- - - - -
Dimensions
-
- {{ record.metadata.dimensions.join(", ") }} -
- - - - -
Additional materials
-
- {{ record.metadata.additionalMaterials }} -
- - - - -
Uniform title
-
- {{ record.metadata.titlesProper.join("; ") }} -
- - - - - -
Identifier
-
-
    -
  • - - {{ identifier.value }} - - - {{ identifier.value }} - - - {{ identifier.details }} - - {{ identifier.type }} - -
    • -
-
- - - - - -
Online access
-
- -
- - - - -
Source
-
- {{ record.metadata.source }} -
- -
+
diff --git a/projects/admin/src/app/record/detail-view/document-detail-view/document-detail-view.component.ts b/projects/admin/src/app/record/detail-view/document-detail-view/document-detail-view.component.ts index 9d9f40c55..4ade75cde 100644 --- a/projects/admin/src/app/record/detail-view/document-detail-view/document-detail-view.component.ts +++ b/projects/admin/src/app/record/detail-view/document-detail-view/document-detail-view.component.ts @@ -176,69 +176,6 @@ export class DocumentDetailViewComponent implements DetailRecord, OnInit, OnDest return this._translateService.currentLang; } - /** - * Get list of document identifiers - * @return array - identifiers - */ - get identifiedBy() { - const identified = this.record.metadata.identifiedBy; - if (undefined === identified) { - return []; - } - const identifiers = []; - identified.forEach((id: any) => { - const details = []; - // Replace bf:Local by source - let idType = id.type; - if (id.type === 'bf:Local') { - idType = id.source; - } - // Format qualifier, status and note - if (id.qualifier) { - details.push(id.qualifier); - } - if (id.status) { - details.push(id.status); - } - if (id.note) { - details.push(id.note); - } - identifiers.push({ - type: idType, - value: id.value, - details: details.join(', ') - }); - }); - return identifiers; - } - - /** - * Get list of document edition statement - * @return array - edition statement - */ - getStatement(statements: any) { - if (null === statements) { - return []; - } - const results = []; - statements.forEach((element: any) => { - if ('_text' in element) { - const elementText = element._text; - const keys = Object.keys(elementText); - const indexDefault = keys.indexOf('default'); - if (indexDefault > -1) { - results.push(elementText.default); - keys.splice(indexDefault, 1); - } - - keys.forEach(key => { - results.push(elementText[key]); - }); - } - }); - return results; - } - /** * Get list of document provisions activity * @return array - provisions activity diff --git a/projects/admin/src/app/scss/styles.scss b/projects/admin/src/app/scss/styles.scss index 427334e1b..2e524238c 100644 --- a/projects/admin/src/app/scss/styles.scss +++ b/projects/admin/src/app/scss/styles.scss @@ -275,3 +275,19 @@ json-schema-form { background-color: #f8f9fa; border-radius: 5px; } + +.striped { + padding-top: 2px; +} + +.div-striped .striped:nth-of-type(odd) { + background: #F8F8F8; +} + +.div-striped .striped:nth-of-type(even) { + background: #FFFFFF; +} + +.div-striped .striped .row div:first-of-type { + padding-left: map-get($spacers, 4); +} diff --git a/projects/shared/src/lib/view/brief/part-of/part-of.component.html b/projects/shared/src/lib/view/brief/part-of/part-of.component.html index 198a38823..63ef70a60 100644 --- a/projects/shared/src/lib/view/brief/part-of/part-of.component.html +++ b/projects/shared/src/lib/view/brief/part-of/part-of.component.html @@ -16,7 +16,7 @@ --> - + @@ -44,16 +44,6 @@ - - - - {{ 'Series statement' | translate }}: - - {{ serie.value }} - ; - - - diff --git a/projects/shared/src/lib/view/thumbnail/thumbnail.component.html b/projects/shared/src/lib/view/thumbnail/thumbnail.component.html index 1517edbf1..1f52866bd 100644 --- a/projects/shared/src/lib/view/thumbnail/thumbnail.component.html +++ b/projects/shared/src/lib/view/thumbnail/thumbnail.component.html @@ -26,10 +26,10 @@ -
{{ type.subtype }}
+
{{ type.subtype }}
 -
{{ type.main_type }}
+
{{ type.main_type }}