From 11bf30263127f4251047e9800f79929bdc8d8f3e Mon Sep 17 00:00:00 2001 From: apapachristou Date: Wed, 23 Sep 2020 18:03:07 +0300 Subject: [PATCH 1/7] Fixes bug on dataset overview click of edit --- .../app/ui/dataset/overview/dataset-overview.component.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts index afb0f5033..736d84e48 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts @@ -240,9 +240,10 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { let url = this.router.createUrlTree(['/datasets/publicEdit/', dataset.id]); window.open(url.toString(), '_blank'); } else { + this.router.navigate(['/datasets/edit/', dataset.id]); // let url = this.router.createUrlTree(['/datasets/edit/', dataset.id]); - let url = this.router.createUrlTree(['/plans/edit/', dataset.dmp.id], { queryParams: { dataset: dataset.id } }); - window.open(url.toString(), '_blank'); + // let url = this.router.createUrlTree(['/plans/edit/', dataset.dmp.id], { queryParams: { dataset: dataset.id } }); + // window.open(url.toString(), '_blank'); } } From 226420a999f34e32b5629bc77b9831b570f14b56 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Wed, 23 Sep 2020 18:30:00 +0300 Subject: [PATCH 2/7] Makes edit button of overview pages open in the same tab window --- .../app/ui/dataset/overview/dataset-overview.component.ts | 5 +++-- .../src/app/ui/dmp/overview/dmp-overview.component.ts | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts index 736d84e48..a1cfa2d47 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts @@ -237,8 +237,9 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { editClicked(dataset: DatasetOverviewModel) { if (dataset.public) { - let url = this.router.createUrlTree(['/datasets/publicEdit/', dataset.id]); - window.open(url.toString(), '_blank'); + this.router.navigate(['/datasets/publicEdit/', dataset.id]); + // let url = this.router.createUrlTree(['/datasets/publicEdit/', dataset.id]); + // window.open(url.toString(), '_blank'); } else { this.router.navigate(['/datasets/edit/', dataset.id]); // let url = this.router.createUrlTree(['/datasets/edit/', dataset.id]); diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts index d480a4e44..d0997cb6a 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts @@ -173,8 +173,9 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { } editClicked(dmp: DmpOverviewModel) { - let url = this.router.createUrlTree(['/plans/edit/', dmp.id]); - window.open(url.toString(), '_blank'); + this.router.navigate(['/plans/edit/', dmp.id]); + // let url = this.router.createUrlTree(['/plans/edit/', dmp.id]); + // window.open(url.toString(), '_blank'); } cloneOrNewVersionClicked(dmp: DmpOverviewModel, isNewVersion: boolean) { From f38e858f72aef114fdace26309c31fdb8b03c4e5 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Wed, 23 Sep 2020 18:31:42 +0300 Subject: [PATCH 3/7] Hides cost field on dmp editor at license tab --- .../ui/dmp/editor/license-info/license-info.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.html index c7c672404..87f44ea6d 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.html @@ -97,7 +97,7 @@ -
+
From 3c1455ecb9487a7150f36d841d06ceeab73a16fa Mon Sep 17 00:00:00 2001 From: apapachristou Date: Wed, 23 Sep 2020 19:01:12 +0300 Subject: [PATCH 4/7] Changes component with stepper with a non stepper component --- .../app/ui/dataset/dataset-wizard/dataset-wizard.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html index f8e97ed04..79df062ed 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.html @@ -77,7 +77,7 @@
- +
From 26fa759d810830f8832bdd6e9e940280d98b35ac Mon Sep 17 00:00:00 2001 From: apapachristou Date: Wed, 23 Sep 2020 19:02:59 +0300 Subject: [PATCH 5/7] Removes default hint subtitles on fields of editors --- .../dataset-editor/dataset-editor.component.html | 4 ++-- .../dmp/editor/dataset-info/dataset-info.component.html | 2 +- .../src/app/ui/dmp/editor/dmp-editor.component.html | 2 +- .../dmp/editor/license-info/license-info.component.html | 8 ++++---- .../app/ui/dmp/editor/main-info/main-info.component.html | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html index 643805a0d..7d3524744 100644 --- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html +++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-editor/dataset-editor.component.html @@ -7,7 +7,7 @@
1.1 {{'DATASET-EDITOR.FIELDS.TITLE' | translate}}*
- {{'DATASET-EDITOR.HINT.TITLE' | translate}} + {{'DATASET-EDITOR.FIELDS.DMP' | translate}} {{'DATASET-EDITOR.HINT.TITLE-REST' | translate}}
@@ -39,7 +39,7 @@
1.3 {{'DATASET-EDITOR.FIELDS.EXTERNAL-LINK' | translate}}
- {{'DATASET-EDITOR.HINT.TITLE' | translate}}{{'DATASET-EDITOR.FIELDS.DMP' | translate}}{{'DATASET-EDITOR.HINT.TITLE-REST' | translate}} +
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html index 8920ad1cb..4fd69a994 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html @@ -8,7 +8,7 @@
3 {{'DMP-EDITOR.STEPPER.DATASET-INFO' | translate}}*
-
{{'DMP-EDITOR.MAIN-INFO.HINT' | translate}}
+
info {{'DMP-EDITOR.MAIN-INFO.TYPING' | translate}}
diff --git a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html index 37c50992d..b1e6b11ce 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/dmp-editor.component.html @@ -78,7 +78,7 @@
  • {{'DMP-EDITOR.STEPPER.FUNDING-INFO' | translate}} (3)
    • -
  • {{'DMP-EDITOR.STEPPER.LICENSE-INFO' | translate}} (6)
    • +
  • {{'DMP-EDITOR.STEPPER.LICENSE-INFO' | translate}} (5)
  • {{'DMP-EDITOR.STEPPER.DATASET-INFO' | translate}}
  • {{'DMP-EDITOR.STEPPER.DATASET-INFO' | translate}}
    • diff --git a/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.html index 87f44ea6d..4c3527542 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/license-info/license-info.component.html @@ -7,7 +7,7 @@
    4.1 {{'DMP-EDITOR.FIELDS.LANGUAGE' | translate}}
    -
    {{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}
    +
    @@ -44,7 +44,7 @@
    4.3 {{'DMP-EDITOR.FIELDS.VISIBILITY' | translate}}
    -
    {{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}
    +
    @@ -64,7 +64,7 @@
    4.4 {{'DMP-EDITOR.FIELDS.PUBLICATION' | translate}}
    -
    {{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}
    +
    @@ -81,7 +81,7 @@
    4.5 {{'DMP-EDITOR.FIELDS.CONTACT' | translate}}
    -
    {{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}
    +
    diff --git a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html index f2cf3b18d..35a56a0ff 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html @@ -7,7 +7,7 @@
    1.1 {{'DMP-EDITOR.FIELDS.NAME' | translate}}*
    -
    {{'DMP-EDITOR.MAIN-INFO.HINT' | translate}}
    +
    @@ -28,7 +28,7 @@
    1.2 {{'DMP-EDITOR.FIELDS.DESCRIPTION' | translate}}
    -
    {{'DMP-EDITOR.MAIN-INFO.HINT' | translate}}
    +
    @@ -41,7 +41,7 @@
    1.3 {{'DMP-EDITOR.FIELDS.RESEARCHERS' | translate}}
    -
    {{'DMP-EDITOR.MAIN-INFO.HINT' | translate}}
    +
    info {{'DMP-EDITOR.MAIN-INFO.TYPING' | translate}}
    From eb0bf2f003dec6dadc2c2f240afb8aa26fb97a67 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Wed, 23 Sep 2020 19:41:12 +0300 Subject: [PATCH 6/7] Adds "Insert manually" link instead of add ( + ) button --- .../funding-info/funding-info.component.html | 8 +- .../funding-info/funding-info.component.scss | 2 +- .../editor/main-info/main-info.component.html | 14 +- .../editor/main-info/main-info.component.scss | 143 ++++++++++-------- .../editor/main-info/main-info.component.ts | 10 +- 5 files changed, 99 insertions(+), 78 deletions(-) diff --git a/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.html index 38195029e..3bbb51292 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.html @@ -36,9 +36,9 @@
    {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.EXIST-FUNDER' | translate}}
    -
    +
    {{'DMP-EDITOR.FUNDING-INFO.FIND' | translate}} - {{'DMP-EDITOR.ACTIONS.INSERT-MANUALLY' | translate}} + {{'DMP-EDITOR.ACTIONS.INSERT-MANUALLY' | translate}}
    @@ -82,9 +82,9 @@
    {{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.EXIST-GRANT' | translate}}
    -
    +
    {{'DMP-EDITOR.FUNDING-INFO.FIND' | translate}} - {{'DMP-EDITOR.ACTIONS.INSERT-MANUALLY' | translate}} + {{'DMP-EDITOR.ACTIONS.INSERT-MANUALLY' | translate}}
    diff --git a/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.scss b/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.scss index 94cef8134..c1716ad85 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/funding-info/funding-info.component.scss @@ -68,7 +68,7 @@ } .not-found { - cursor: pointer; + // cursor: pointer; font-size: 1rem; font-weight: 400; padding: 0rem 0.5rem 0rem 0rem; diff --git a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html index 35a56a0ff..30e337af0 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.html @@ -52,10 +52,12 @@ {{formGroup.get('researchers').getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}} -
    @@ -74,10 +76,14 @@ {{formGroup.get('organisations').getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}} -
    diff --git a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.scss b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.scss index dcacc6578..d125f68cf 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.scss +++ b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.scss @@ -1,97 +1,112 @@ .main-info { - // position: relative; - // left: 362px; - // width: calc(100% - 366px); + // position: relative; + // left: 362px; + // width: calc(100% - 366px); - .intro { - text-align: left; - font-weight: 400; - letter-spacing: 0px; - color: #212121; - opacity: 1; - margin: 3rem 0rem 3rem 0rem; - } + .intro { + text-align: left; + font-weight: 400; + letter-spacing: 0px; + color: #212121; + opacity: 1; + margin: 3rem 0rem 3rem 0rem; + } - .heading { - text-align: left; - font-weight: 700; - font-size: 18px; - letter-spacing: 0px; - color: #212121; - opacity: 0.81; - margin-top: 1.625rem; - margin-bottom: 0.625rem; - } + .heading { + text-align: left; + font-weight: 700; + font-size: 18px; + letter-spacing: 0px; + color: #212121; + opacity: 0.81; + margin-top: 1.625rem; + margin-bottom: 0.625rem; + } - .hint { - text-align: left; - font-weight: 400; - font-size: 16px; - letter-spacing: 0px; - color: #212121; - opacity: 0.81; - margin-bottom: 2.125rem; - } + .hint { + text-align: left; + font-weight: 400; + font-size: 16px; + letter-spacing: 0px; + color: #212121; + opacity: 0.81; + margin-bottom: 2.125rem; + } - .title-form, - .description-form { - text-align: left; - font-weight: 400; - font-size: 16px; - letter-spacing: 0.15px; - color: #7d7d7d; - opacity: 1; - margin-bottom: 1rem; - } + .title-form, + .description-form { + text-align: left; + font-weight: 400; + font-size: 16px; + letter-spacing: 0.15px; + color: #7d7d7d; + opacity: 1; + margin-bottom: 1rem; + } - // textarea::placeholder { - // font-style: oblique; - // } + // textarea::placeholder { + // font-style: oblique; + // } - .input-btn { - border: none; - color: #aaaaaa; - background-color: #ffffff00; - cursor: pointer; - } + .input-btn { + border: none; + color: #aaaaaa; + background-color: #ffffff00; + cursor: pointer; + } - .input-btn :hover { - color: #00b29f !important; - } + .input-btn :hover { + color: #00b29f !important; + } + + .insert-manually { + text-decoration: underline; + color: #00b29f; + cursor: pointer; + font-size: 1rem; + font-weight: 400; + } + + .not-found { + // cursor: pointer; + font-size: 1rem; + font-weight: 400; + padding: 0rem 0.5rem 0rem 0rem; + } } ::ng-deep .title-form .mat-form-field-appearance-outline .mat-form-field-outline { - background: #fafafa !important; + background: #fafafa !important; } ::ng-deep .description-form .mat-form-field-appearance-outline .mat-form-field-outline { - background: #fafafa !important; + background: #fafafa !important; } ::ng-deep .organizations-form .mat-form-field-appearance-outline .mat-form-field-outline { - background: #fafafa !important; + background: #fafafa !important; } ::ng-deep .author-form .mat-form-field-appearance-outline .mat-form-field-outline { - background: #fafafa !important; + background: #fafafa !important; } ::ng-deep .title-form .mat-form-field-appearance-outline .mat-form-field-infix { - font-size: 1rem; - padding: 0.6em 0 1em 0 !important; + font-size: 1rem; + padding: 0.6em 0 1em 0 !important; } ::ng-deep .description-form .mat-form-field-appearance-outline .mat-form-field-infix { - font-size: 1rem; - padding: 0.6em 0 1em 0 !important; + font-size: 1rem; + padding: 0.6em 0 1em 0 !important; } ::ng-deep .organizations-form .mat-form-field-appearance-outline .mat-form-field-infix { - font-size: 1rem; - padding: 0.6em 0 1em 0 !important; + font-size: 1rem; + padding: 0.6em 0 1em 0 !important; } ::ng-deep .author-form .mat-form-field-appearance-outline .mat-form-field-infix { - font-size: 1rem; - padding: 0.6em 0 1em 0 !important; + font-size: 1rem; + padding: 0.6em 0 1em 0 !important; } diff --git a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.ts b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.ts index 5f07ecec7..0a72a9fdc 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.ts +++ b/dmp-frontend/src/app/ui/dmp/editor/main-info/main-info.component.ts @@ -84,10 +84,10 @@ export class MainInfoComponent extends BaseComponent implements OnInit { this.formGroup.get('extraProperties').get('publicDate').patchValue(new Date()); } - this.formGroup.valueChanges.pipe(takeUntil(this._destroyed)) - .subscribe(x => { - this.onFormChanged.emit(); - }); + // this.formGroup.valueChanges.pipe(takeUntil(this._destroyed)) + // .subscribe(x => { + // this.onFormChanged.emit(); + // }); } // Researchers @@ -126,7 +126,7 @@ export class MainInfoComponent extends BaseComponent implements OnInit { return this.externalSourcesService.searchDMPOrganizations(value); } - canAddOrganizations(): boolean { + cantAddOrganizations(): boolean { if (!isNullOrUndefined(this.formGroup.get('organizations'))) { return this.formGroup.get('organiztions').disabled; } else { From 4c825d80b4fbf9e72fc7abe65b5ad15af208e79e Mon Sep 17 00:00:00 2001 From: apapachristou Date: Thu, 24 Sep 2020 12:02:51 +0300 Subject: [PATCH 7/7] Retyles button add dataset on overview and removes pop up on click --- .../dmp/overview/dmp-overview.component.html | 6 +- .../dmp/overview/dmp-overview.component.scss | 308 +++++++++--------- .../ui/dmp/overview/dmp-overview.component.ts | 18 +- 3 files changed, 160 insertions(+), 172 deletions(-) diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html index 9758c6331..289a23a20 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html @@ -97,11 +97,11 @@ horizontal_rule
    -
    - +
    diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss index c08278435..ab8af8a19 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss @@ -1,267 +1,267 @@ .container-fluid { - margin: 2em 4em; - padding: 2em; + margin: 2em 4em; + padding: 2em; } // ********ICONS******** .back-icon { - opacity: 0.4; + opacity: 0.4; } .mat-mini-fab { - width: 2.5em; - height: 2.5em; - background-color: #129d99; - color: white; + width: 2.5em; + height: 2.5em; + background-color: #129d99; + color: white; } .mat-mini-fab-icon, .status-icon { - font-size: 1.2em; + font-size: 1.2em; } .status-icon { - color: #a7a7a7; + color: #a7a7a7; } .account-icon { - font-size: 2.5em; + font-size: 2.5em; } // ********BUTTONS******** .id-btn { - background: url("../../../../assets/images/NoPath.png") no-repeat center; - width: 1em; - margin-right: 0.3em; - align-self: center; + background: url("../../../../assets/images/NoPath.png") no-repeat center; + width: 1em; + margin-right: 0.3em; + align-self: center; } .dataset-btn { - width: 36.1em; - padding: 0 1.1em; - background-color: #f7dd72; - border-radius: 4px; - justify-content: space-between; - color: #212121; - // opacity: 0.8; + width: 36.1em; + padding: 0 1.1em; + background-color: #f7dd72; + border-radius: 4px; + justify-content: space-between; + color: #212121; + // opacity: 0.8; } .show-more-btn { - width: 31.6em; - padding: 0 1em; - background-color: #ffffff00; - color: #129d99; - font-weight: 700; + width: 31.6em; + padding: 0 1em; + background-color: #ffffff00; + color: #129d99; + font-weight: 700; } .frame-btn { - border: 1px solid #212121; - color: black; + border: 1px solid #212121; + color: black; } .finalize-btn { - border: 1px solid #129d99; - color: #129d99; + border: 1px solid #129d99; + color: #129d99; } .grant-title { - width: 130px; - color: #089dbb; - background-color: white; - padding: 0px 10px; - margin-top: -16px; - cursor: default; - text-transform: uppercase; + width: 130px; + color: #089dbb; + background-color: white; + padding: 0px 10px; + margin-top: -16px; + cursor: default; + text-transform: uppercase; } .frame-btn, .finalize-btn { - background: #ffffff; - box-shadow: 0px 2px 6px #00000029; + background: #ffffff; + box-shadow: 0px 2px 6px #00000029; } .remove-btn { - border: none; - background-color: transparent; - font-size: 0.875em; - font-weight: bold; - margin-left: auto; + border: none; + background-color: transparent; + font-size: 0.875em; + font-weight: bold; + margin-left: auto; } .invite-btn { - width: 9.4em; - height: 2.9em; - background: #ffffff; - box-shadow: 0px 3px 6px #1e202029; - border: 2px solid #212121; - border-radius: 30px; + width: 9.4em; + height: 2.9em; + background: #ffffff; + box-shadow: 0px 3px 6px #1e202029; + border: 2px solid #212121; + border-radius: 30px; } .account_btn { - background: white; - color: #d5d5d5; - border: none; - height: 2.9em; + background: white; + color: #d5d5d5; + border: none; + height: 2.9em; } // ********TEXT******** .dmp-logo { - width: 4.8em; - height: 2.6em; - background: #129d99; - border-radius: 4px; - font-size: 0.875em; - color: #ffffff; + width: 4.8em; + height: 2.6em; + background: #129d99; + border-radius: 4px; + font-size: 0.875em; + color: #ffffff; } .label-txt { - font-size: 0.875em; + font-size: 0.875em; } .label2-txt { - font-size: 1em; + font-size: 1em; } .label-txt, .label2-txt { - color: #848484; - font-weight: 400; + color: #848484; + font-weight: 400; } .dmp-label { - font-weight: bold; + font-weight: bold; } .uppercase { - text-transform: uppercase; + text-transform: uppercase; } .researcher { - font-size: 0.875em; - color: #008887; - padding-right: 0.5em; - align-self: center; + font-size: 0.875em; + color: #008887; + padding-right: 0.5em; + align-self: center; } .header { - opacity: 0.6; - margin-top: 1em; - margin-bottom: 0.5em; + opacity: 0.6; + margin-top: 1em; + margin-bottom: 0.5em; } .dmp-label, .header { - font-size: 1.25em; - color: #212121; + font-size: 1.25em; + color: #212121; } .desc-txt { - width: 48.25em; - font-size: 1em; - color: #212121; - margin-bottom: 1.875em; + width: 48.25em; + font-size: 1em; + color: #212121; + margin-bottom: 1.875em; } .dataset { - width: fit-content; + width: fit-content; } .dataset-btn-label { - margin-right: 1em; - overflow: hidden; - text-overflow: ellipsis; - letter-spacing: 0px; - color: #212121; - opacity: 0.8; - font-style: normal; + margin-right: 1em; + overflow: hidden; + text-overflow: ellipsis; + letter-spacing: 0px; + color: #212121; + opacity: 0.8; + font-style: normal; } .doi-label { - font-size: 1em; - color: #212121; - opacity: 0.6; - margin-bottom: 0.3em; + font-size: 1em; + color: #212121; + opacity: 0.6; + margin-bottom: 0.3em; } .doi-txt { - font-size: 1em; - letter-spacing: 0.009em; - color: #7d7d7d; - width: 12em; - height: 1.2em; - overflow: hidden; - border: none; - padding: 0px; - background-color: transparent; + font-size: 1em; + letter-spacing: 0.009em; + color: #7d7d7d; + width: 12em; + height: 1.2em; + overflow: hidden; + border: none; + padding: 0px; + background-color: transparent; } .doi-panel { - height: 3.5em; - background: #fafafa; - border: 1px solid #d1d1d1; - border-radius: 4px; - flex-direction: row; - justify-content: space-between; + height: 3.5em; + background: #fafafa; + border: 1px solid #d1d1d1; + border-radius: 4px; + flex-direction: row; + justify-content: space-between; } .doi-link { - color: white; + color: white; } .frame { - background: #ffffff; - box-shadow: 0px 1px 5px #00000026; - border-radius: 4px; - overflow: hidden; - min-width: 18.5em; + background: #ffffff; + box-shadow: 0px 1px 5px #00000026; + border-radius: 4px; + overflow: hidden; + min-width: 18.5em; } .frame-txt { - color: #000000; + color: #000000; } .finalize-txt { - color: #129d99; + color: #129d99; } .frame-txt, .finalize-txt { - font-size: 0.75em; - font-weight: bold; - letter-spacing: 0px; - text-transform: uppercase; - cursor: pointer; + font-size: 0.75em; + font-weight: bold; + letter-spacing: 0px; + text-transform: uppercase; + cursor: pointer; } .hr-line { - border: 1px solid #dbdbdb; - // width: 274px; - // width: 17em; - width: 100%; + border: 1px solid #dbdbdb; + // width: 274px; + // width: 17em; + width: 100%; } .authors { - display: flex; - flex-direction: row; - justify-content: space-between; - width: 100%; + display: flex; + flex-direction: row; + justify-content: space-between; + width: 100%; } .authors-label { - font-size: 0.875em; - color: #212121; - height: 1.4em; - margin-bottom: 0px; + font-size: 0.875em; + color: #212121; + height: 1.4em; + margin-bottom: 0px; } .authors-role { - font-size: 0.875em; - color: #a8a8a8; - height: 1.4em; - margin-bottom: 0px; + font-size: 0.875em; + color: #a8a8a8; + height: 1.4em; + margin-bottom: 0px; } // ********CENTER ELEMENTS******** @@ -272,50 +272,54 @@ .dmp-logo, .frame-btn, .finalize-btn { - display: flex; - justify-content: center; - align-items: center; + display: flex; + justify-content: center; + align-items: center; } .dmp-label, .dataset-btn, +.add-dataset-btn, .doi-panel, .researcher { - display: flex; - align-items: center; + display: flex; + align-items: center; } .add-dataset-btn { - border: 2px solid #212121; - border-radius: 30px; + color: #212121 !important; +} + +.add-dataset-btn:hover { + color: #129d99 !important; } .show-more-btn { - display: flex; - justify-content: center; + display: flex; + justify-content: center; } ::ng-deep .mat-select-value { - color: #848484 !important; + color: #848484 !important; } ::ng-deep .versions-select .mat-form-field-wrapper { - background-color: transparent !important; - padding-bottom: 0 !important; - width: 6.5rem; + background-color: transparent !important; + padding-bottom: 0 !important; + width: 6.5rem; } ::ng-deep .versions-select .mat-form-field-wrapper .mat-form-field-flex { - padding: 0 0.5rem 0 0.625rem; - margin-bottom: 0.2rem; + padding: 0 0.5rem 0 0.625rem; + margin-bottom: 0.2rem; } ::ng-deep mat-select .mat-select-arrow-wrapper { - vertical-align: bottom; + vertical-align: bottom; } ::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix { - padding: 0rem 0rem 0.4rem 0rem !important; + padding: 0rem 0rem 0.4rem 0rem !important; } // .card-content { diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts index d0997cb6a..dab199830 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts @@ -656,23 +656,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { // } addNewDataset() { - const dialogRef = this.dialog.open(StartNewDatasetDialogComponent, { - disableClose: false, - restoreFocus: false, - data: { - startNewDmp: false, - formGroup: new DatasetWizardEditorModel().buildForm() - } - }); - dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => { - if (result) { - if (result.startNewDmp) { - this.openNewDmpDialog(); - } else { - this.router.navigate(['/datasets', 'new', result.formGroup.get('dmp').value.id]); - } - } - }); + this.router.navigate(['/datasets', 'new', this.dmp.id]); } createDoiLink(doi: string): string {