diff --git a/src/app/submission/sections/container/section-container.component.html b/src/app/submission/sections/container/section-container.component.html index e7a9d141c7..95ed9289c9 100644 --- a/src/app/submission/sections/container/section-container.component.html +++ b/src/app/submission/sections/container/section-container.component.html @@ -1,52 +1,49 @@ -
- +
+ - {{ 'submission.sections.'+sectionData.header | translate }} + {{ 'submission.sections.'+sectionData.header | translate + }}
- +
-
+
-
+
\ No newline at end of file diff --git a/src/app/submission/sections/sections.directive.ts b/src/app/submission/sections/sections.directive.ts index 3ffb317b15..d82cff82d6 100644 --- a/src/app/submission/sections/sections.directive.ts +++ b/src/app/submission/sections/sections.directive.ts @@ -94,8 +94,8 @@ export class SectionsDirective implements OnDestroy, OnInit { * @param {SectionsService} sectionService */ constructor(private changeDetectorRef: ChangeDetectorRef, - private submissionService: SubmissionService, - private sectionService: SectionsService) { + private submissionService: SubmissionService, + private sectionService: SectionsService) { } /** @@ -272,6 +272,19 @@ export class SectionsDirective implements OnDestroy, OnInit { } } + + /** + * Check if section is information + * + * @returns {Observable} + * Emits true whenever section is information + */ + public isInfo(): boolean { + return this.sectionService.getIsInformational(this.sectionType); + } + + + /** * Remove error from list * diff --git a/src/app/submission/sections/sections.service.ts b/src/app/submission/sections/sections.service.ts index 64f9e2efcd..56b2356ed7 100644 --- a/src/app/submission/sections/sections.service.ts +++ b/src/app/submission/sections/sections.service.ts @@ -60,11 +60,11 @@ export class SectionsService { * @param {TranslateService} translate */ constructor(private formService: FormService, - private notificationsService: NotificationsService, - private scrollToService: ScrollToService, - private submissionService: SubmissionService, - private store: Store, - private translate: TranslateService) { + private notificationsService: NotificationsService, + private scrollToService: ScrollToService, + private submissionService: SubmissionService, + private store: Store, + private translate: TranslateService) { } /** @@ -197,7 +197,7 @@ export class SectionsService { path: pathCombiner.getPath(error.fieldId.replace(/\_/g, '.')).path, message: error.message } as SubmissionSectionError)) - .filter((sectionError: SubmissionSectionError) => findIndex(state.errorsToShow, {path: sectionError.path}) === -1); + .filter((sectionError: SubmissionSectionError) => findIndex(state.errorsToShow, { path: sectionError.path }) === -1); return [...state.errorsToShow, ...sectionErrors]; }) )) @@ -262,7 +262,7 @@ export class SectionsService { } }), distinctUntilChanged() - ); + ); } /** @@ -371,7 +371,7 @@ export class SectionsService { return this.store.select(submissionObjectFromIdSelector(submissionId)).pipe( filter((submissionState: SubmissionObjectEntry) => isNotUndefined(submissionState)), map((submissionState: SubmissionObjectEntry) => { - return isNotUndefined(submissionState.sections) && isNotUndefined(findKey(submissionState.sections, {sectionType: sectionType})); + return isNotUndefined(submissionState.sections) && isNotUndefined(findKey(submissionState.sections, { sectionType: sectionType })); }), distinctUntilChanged()); } @@ -514,4 +514,16 @@ export class SectionsService { return metadata; } + /** + * Return if the section is an informational type section. + * @param sectionType + */ + public getIsInformational(sectionType: SectionsType): boolean { + if (sectionType === SectionsType.SherpaPolicies) { + return true; + } else { + return false; + } + } + } diff --git a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.html b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.html index 767bab0d98..0b52c8341d 100644 --- a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.html +++ b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.html @@ -1,20 +1,45 @@
- +
+ +
+ {{version.embargo.amount}} + {{version.embargo.units[1]}} + + {{ + 'submission.sections.sherpa.publisher.policy.noembargo' | translate }} + + + + + + {{version.locations[0]}} +{{version.locations.length-1}} + + + {{ + 'submission.sections.sherpa.publisher.policy.nolocation' | translate }} + + +
+
-
-
+
+
-

{{ 'submission.sections.sherpa.publisher.policy.embargo' | translate }}

+

{{ + 'submission.sections.sherpa.publisher.policy.embargo' | translate }}

{{version.embargo.amount}} @@ -22,36 +47,39 @@

{{ 'submission.sections.sherpa.publisher.policy.noembargo' | translate }}

-
-
+
-

{{ 'submission.sections.sherpa.publisher.policy.license' | translate }}

+

{{ + 'submission.sections.sherpa.publisher.policy.license' | translate }}

{{license}}

-
+
-

{{ 'submission.sections.sherpa.publisher.policy.prerequisites' | translate }}

+

{{ + 'submission.sections.sherpa.publisher.policy.prerequisites' | translate }}

{{prerequisite}}

-
+
-

{{ 'submission.sections.sherpa.publisher.policy.location' | translate }}

+

{{ + 'submission.sections.sherpa.publisher.policy.location' | translate }}

{{location}}

-
+
-

{{ 'submission.sections.sherpa.publisher.policy.conditions' | translate }}

+

{{ + 'submission.sections.sherpa.publisher.policy.conditions' | translate }}

{{condition}}

diff --git a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.scss b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.scss index b18e7d3781..e69de29bb2 100644 --- a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.scss +++ b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.scss @@ -1,33 +0,0 @@ -:host ::ng-deep { - .card { - border: none; - margin-bottom: 20px; - border-bottom: 1px solid rgba(0, 0, 0, 0.125); - - .card-header { - border: none; - background-color: transparent; - border-top: 1px solid rgba(0, 0, 0, 0.125); - - button { - text-align: left; - padding: 0px; - width: 100%; - color: #000; - font-weight: 600; - - .fas { - background: #fff; - color: #000; - margin-right: 10px; - height: 1.25em; - display: flex; - align-items: center; - justify-content: center; - font-size: 12px; - } - } - } - } - -} \ No newline at end of file diff --git a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts index 94d085db39..0e7bc863ad 100644 --- a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts +++ b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts @@ -2,6 +2,9 @@ import { Component, Input } from '@angular/core'; import { PermittedVersions } from '../../../../core/submission/models/sherpa-policies-details.model'; +/** + * This component represents a section that contains the inner accordions for the publisher policy versions. + */ @Component({ selector: 'ds-content-accordion', templateUrl: './content-accordion.component.html', @@ -16,5 +19,5 @@ export class ContentAccordionComponent { /** * A boolean representing if div should start collapsed */ - public isCollapsed = false; + public isCollapsed = true; } diff --git a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.html b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.html index 683821d62c..15dd4d7286 100644 --- a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.html +++ b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.html @@ -1,5 +1,5 @@
-
+

{{ 'submission.sections.sherpa.record.information.id' | translate }}

@@ -8,7 +8,7 @@

-
+

{{ 'submission.sections.sherpa.record.information.date.created' | translate }}

@@ -17,7 +17,7 @@

-
+

{{ 'submission.sections.sherpa.record.information.date.modified' | translate }}

@@ -26,7 +26,7 @@

-
+

{{ 'submission.sections.sherpa.record.information.uri' | translate }}

@@ -36,4 +36,4 @@

-
+
\ No newline at end of file diff --git a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts index cced669024..307c18d8cc 100644 --- a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts +++ b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts @@ -2,6 +2,9 @@ import { Component, Input } from '@angular/core'; import { Metadata } from '../../../../core/submission/models/sherpa-policies-details.model'; +/** + * This component represents a section that contains the matadata informations. + */ @Component({ selector: 'ds-metadata-information', templateUrl: './metadata-information.component.html', diff --git a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html index 079535b2fb..3c35da8f08 100644 --- a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html +++ b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html @@ -1,5 +1,5 @@
-
+

{{'submission.sections.sherpa.publication.information.title' | translate}}

@@ -8,7 +8,7 @@

-
+

{{'submission.sections.sherpa.publication.information.issns' | translate}}

@@ -17,7 +17,7 @@

-
+

{{'submission.sections.sherpa.publication.information.url' | translate}}

@@ -29,7 +29,7 @@

-
+

{{'submission.sections.sherpa.publication.information.publishers' | translate}}

@@ -41,7 +41,7 @@

-
+

{{'submission.sections.sherpa.publication.information.romeoPub' | translate}}

@@ -51,9 +51,9 @@

-
+
-

{{'submission.sections.sherpa.publication.information.zetoPub' | translate}}

+

{{'submission.sections.sherpa.publication.information.zetoPub' | translate}}

@@ -61,4 +61,4 @@

-
+
\ No newline at end of file diff --git a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts index 54973eba02..cfe42adf7b 100644 --- a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts +++ b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts @@ -2,6 +2,9 @@ import { Component, Input } from '@angular/core'; import { Journal } from '../../../../core/submission/models/sherpa-policies-details.model'; +/** + * This component represents a section that contains the journal publication information. + */ @Component({ selector: 'ds-publication-information', templateUrl: './publication-information.component.html', diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html index ada6613aa2..24e3b09762 100644 --- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html +++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html @@ -8,7 +8,7 @@
-
+

{{'submission.sections.sherpa.publisher.policy.more.information' | translate}} @@ -20,4 +20,4 @@

-
+
\ No newline at end of file diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts index 639361beb0..42d755d5b1 100644 --- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts +++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts @@ -2,6 +2,9 @@ import { Component, Input } from '@angular/core'; import { Policy } from '../../../../core/submission/models/sherpa-policies-details.model'; +/** + * This component represents a section that contains the publisher policy informations. + */ @Component({ selector: 'ds-publisher-policy', templateUrl: './publisher-policy.component.html', diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.scss b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.scss index adaa627d56..c68df78fca 100644 --- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.scss +++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.scss @@ -1,35 +1,3 @@ -:host ::ng-deep { - .card { - border: none; - margin-bottom: 20px; - border-bottom: 1px solid rgba(0, 0, 0, 0.125); - - .card-header { - border: none; - background-color: transparent; - border-top: 1px solid rgba(0, 0, 0, 0.125); - - button { - text-align: left; - padding: 0px; - // width: auto; - font-weight: bold; - - .fas { - background: #207698; - color: #fff; - margin-right: 10px; - height: 1.25em; - display: flex; - align-items: center; - justify-content: center; - } - } - } - } - -} - .refresh-container { display: flex; justify-content: right; diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts index 8e133224e9..3861bd1217 100644 --- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts +++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts @@ -14,10 +14,9 @@ import { SectionsService } from '../sections.service'; import { SectionModelComponent } from '../models/section.model'; import { SubmissionService } from '../../submission.service'; import { hasValue, isEmpty } from '../../../shared/empty.util'; -import { debounce, debounceTime, timeInterval } from 'rxjs/operators'; /** - * This component represents a section for managing item's access conditions. + * This component represents a section for the sherpa policy informations structure. */ @Component({ selector: 'ds-section-sherpa-policies', diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index d9f6523ed4..9f5ba5c8b1 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -3894,6 +3894,10 @@ "submission.sections.status.warnings.aria": "has warnings", + "submission.sections.status.info.title": "Additional Information", + + "submission.sections.status.info.aria": "Additional Information", + "submission.sections.toggle.open": "Open section", "submission.sections.toggle.close": "Close section", @@ -4020,6 +4024,8 @@ "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo", + "submission.sections.sherpa.publisher.policy.nolocation": "None", + "submission.sections.sherpa.publisher.policy.license": "License", "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites", @@ -4042,11 +4048,6 @@ - - - - - "submission.submit.breadcrumbs": "New submission", "submission.submit.title": "New submission",