diff --git a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts index 8eb8359164..86325102c7 100644 --- a/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts +++ b/src/app/core/suggestion-notifications/qa/events/quality-assurance-event-data.service.ts @@ -27,6 +27,9 @@ import { hasValue } from '../../../../shared/empty.util'; import { DeleteByIDRequest, PostRequest } from '../../../data/request.models'; import { HttpHeaders, HttpParams } from '@angular/common/http'; import { HttpOptions } from '../../../dspace-rest/dspace-rest.service'; +import { + QualityAssuranceEventData +} from '../../../../suggestion-notifications/qa/project-entry-import-modal/project-entry-import-modal.component'; /** * The service handling all Quality Assurance topic REST requests. @@ -241,4 +244,9 @@ export class QualityAssuranceEventDataService extends IdentifiableDataService> { + return this.deleteData.delete(qaEvent.id); + } + } diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html index 1024700149..16f1955dc3 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html @@ -2,10 +2,11 @@
-
{{'item.qa-event-notification.check.notification-withdrawn' | translate : {num: source.totalEvents } }}
+
{{ this.item.isArchived ? ('qa-event-notification.check.notification-withdrawn' | translate) + : ('qa-event-notification.check.notification-reinstate' | translate) }}
+ class="btn btn-primary align-self-center">{{ this.item.isArchived ? ('qa-event-notification-undo-withdrawn.check.button' | translate) + : ('qa-event-notification-undo-reinstate.check.button' | translate) }}
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts index fb6bad1b46..0acc78f677 100644 --- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts +++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts @@ -35,7 +35,6 @@ export class QaEventNotificationComponent { * Note: sourceId is composed as: id: "sourceName:" */ getQualityAssuranceSources$(): Observable { - console.log('ciao'); const findListTopicOptions: FindListOptions = { searchParams: [new RequestParam('target', this.item.uuid)] }; diff --git a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html index f0e248c647..1463235bee 100644 --- a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html +++ b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html @@ -1,16 +1,22 @@
@@ -39,7 +46,7 @@ -