From 4e727fd3b2cc62d02cabd93b76f176203489f883 Mon Sep 17 00:00:00 2001 From: dweinholz Date: Wed, 18 Sep 2024 12:34:14 +0200 Subject: [PATCH] feat(Doi):added doi modal to modificaiton and termination requests (#6211) * feat(Doi):added doi modal to modificaiton and termination requests * audit fix --------- Co-authored-by: denbicloud <46009071+denbicloud@users.noreply.github.com> --- .../extension-entry.component.html | 49 ++++++++++++++----- .../extension-entry.component.scss | 11 +++++ .../testimonial/extension-entry.component.ts | 18 +++++-- .../projectmanagement/overview.component.html | 10 ++-- .../projectmanagement/overview.component.ts | 16 +++++- .../shared/enums/application-request-type.ts | 5 ++ 6 files changed, 84 insertions(+), 25 deletions(-) create mode 100644 src/app/shared/enums/application-request-type.ts diff --git a/src/app/projectmanagement/modals/testimonial/extension-entry.component.html b/src/app/projectmanagement/modals/testimonial/extension-entry.component.html index 26cb6cb3f9..822b979a97 100644 --- a/src/app/projectmanagement/modals/testimonial/extension-entry.component.html +++ b/src/app/projectmanagement/modals/testimonial/extension-entry.component.html @@ -11,20 +11,43 @@

Experiences and publications

>
-
- We are very pleased that the de.NBI Cloud meets with your expectations and that you would like to extend your - project. As an academic cloud that provides its resources free of charge, we depend on our users. +
+ @if (isModification) { +

+ We are very pleased that the de.NBI Cloud meets with your expectations and that you would like to request + additional resources. +

+ } @else if (isExtension) { +

+ We are very pleased that the de.NBI Cloud meets with your expectations and that you would like to extend your + project. +

+ } @else if (isTermination) { +

+ We hope that your project on the de.NBI Cloud has been successful and that it has helped you achieve your + research goals. +

+ } +

As an academic cloud providing free resources, we rely on our users' support.

- In order to be able to continue to offer these services free of charge in the future, it is essential for us, for - example, to publish publications which resulted from the work in the de.NBI Cloud or are in any way connected to - it. Please enter the DOIs of those publications in the form below. -
- We also want to promote the use of the cloud with positive experiences from users and the community in order to - make this service available to many more researchers. For this reason, we rely on testimonials from our users, - which we can use for this purpose. To submit a testimonial, please use the form below on this project overview - page. You can find an overview of already published testimonials here. -
- We really appreciate your help! + +

To ensure the continued availability of these services, we kindly ask for your help in two ways:

+
    +
  • + Publication acknowledgement: If you've published research resulting from work done in the + de.NBI Cloud or related to it, please enter the DOIs of those publications below. This helps us demonstrate + the impact of our services and secure future funding. +
    +
    • +
  • + User testimonials: We'd love to hear about your positive experiences with the cloud! Your + testimonial will help us promote the service to other researchers and make it more widely available. Please + use the form on this project overview page to share your story. You can find already published testimonials + here. +
    • +
+ +

We really appreciate your help!

diff --git a/src/app/projectmanagement/modals/testimonial/extension-entry.component.scss b/src/app/projectmanagement/modals/testimonial/extension-entry.component.scss index e69de29bb2..c025aa5454 100644 --- a/src/app/projectmanagement/modals/testimonial/extension-entry.component.scss +++ b/src/app/projectmanagement/modals/testimonial/extension-entry.component.scss @@ -0,0 +1,11 @@ +.custom-container { + background-color: #f8f9fa; + color: #6c757d; /* secondary text color */ + padding: 20px; + border: 1px solid #dee2e6; + border-radius: .25rem; + box-shadow: 0 .125rem .25rem rgba(0, 0, 0, 0.075); + } + .custom-container .list-item { + margin-bottom: 1rem; + } \ No newline at end of file diff --git a/src/app/projectmanagement/modals/testimonial/extension-entry.component.ts b/src/app/projectmanagement/modals/testimonial/extension-entry.component.ts index 89adc470cb..6850189cd1 100644 --- a/src/app/projectmanagement/modals/testimonial/extension-entry.component.ts +++ b/src/app/projectmanagement/modals/testimonial/extension-entry.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, OnDestroy } from '@angular/core' +import { Component, EventEmitter, Input, OnDestroy } from '@angular/core' import { BsModalRef } from 'ngx-bootstrap/modal' import { Subscription } from 'rxjs' import { TESTIMONIAL_PAGE_LINK, WIKI_PUBLICATIONS } from '../../../../links/links' @@ -14,6 +14,10 @@ import { GroupService } from '../../../api-connector/group.service' export class ExtensionEntryComponent implements OnDestroy { private subscription: Subscription = new Subscription() public event: EventEmitter = new EventEmitter() + @Input() isTermination: boolean = false + @Input() isModification: boolean = false + @Input() isExtension: boolean = false + TESTIMONIAL_PAGE_LINK = TESTIMONIAL_PAGE_LINK WIKI_PUBLICATIONS: string = WIKI_PUBLICATIONS @@ -27,13 +31,17 @@ export class ExtensionEntryComponent implements OnDestroy { constructor( public bsModalRef: BsModalRef, private groupService: GroupService - ) { - - } + ) {} ngOnDestroy(): void { this.subscription.unsubscribe() - this.event.emit({ reloadDoi: false, showExtension: true }) + if (this.isTermination) { + this.event.emit({ reloadDoi: false, showTermination: true, showModification: false, showExtension: false }) + } else if (this.isModification) { + this.event.emit({ reloadDoi: false, showExtension: false, showModification: true, showTermination: false }) + } else if (this.isExtension) { + this.event.emit({ reloadDoi: false, showExtension: true, showModification: false, showTermination: false }) + } } isNewDoi(): boolean { diff --git a/src/app/projectmanagement/overview.component.html b/src/app/projectmanagement/overview.component.html index 1215fdfc9c..ed1865bd65 100644 --- a/src/app/projectmanagement/overview.component.html +++ b/src/app/projectmanagement/overview.component.html @@ -306,7 +306,7 @@

[ngStyle]="{ 'width.%': calculateProgressBar( project_application?.DaysRunning / project_application?.lifetime_days - ) + ), }" aria-valuemax="100" aria-valuemin="0" @@ -350,7 +350,7 @@

Withdraw extension request