Merge branch 'ui-redesign' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot.git into ui-redesign
This commit is contained in:
commit
0bceae3409
|
@ -7,7 +7,7 @@
|
|||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="heading">1.1 {{'DATASET-EDITOR.FIELDS.TITLE' | translate}}*</div>
|
||||
<span class="hint">{{'DATASET-EDITOR.HINT.TITLE' | translate}}</span>
|
||||
<!-- <span class="hint">{{'DATASET-EDITOR.HINT.TITLE' | translate}}</span> -->
|
||||
<a class="dmp-link dmp-tour-{{ formGroup.get('id').value + 1 }}" (click)="restartTour(formGroup.get('id').value + 1)">{{'DATASET-EDITOR.FIELDS.DMP' | translate}}</a>
|
||||
<span class="hint">{{'DATASET-EDITOR.HINT.TITLE-REST' | translate}}</span>
|
||||
<div class="title-form">
|
||||
|
@ -39,7 +39,7 @@
|
|||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="heading">1.3 {{'DATASET-EDITOR.FIELDS.EXTERNAL-LINK' | translate}}</div>
|
||||
<span class="hint">{{'DATASET-EDITOR.HINT.TITLE' | translate}}</span><a class="dmp-link" target="_blank" [routerLink]="['/overview/' + dmpId]">{{'DATASET-EDITOR.FIELDS.DMP' | translate}}</a><span class="hint">{{'DATASET-EDITOR.HINT.TITLE-REST' | translate}}</span>
|
||||
<!-- <span class="hint">{{'DATASET-EDITOR.HINT.TITLE' | translate}}</span><a class="dmp-link" target="_blank" [routerLink]="['/overview/' + dmpId]">{{'DATASET-EDITOR.FIELDS.DMP' | translate}}</a><span class="hint">{{'DATASET-EDITOR.HINT.TITLE-REST' | translate}}</span> -->
|
||||
<div class="uri-form">
|
||||
<mat-form-field>
|
||||
<input matInput placeholder="{{'DATASET-EDITOR.PLACEHOLDER.EXTERNAL-LINK' | translate}}" type="text" name="uri" formControlName="uri">
|
||||
|
|
|
@ -77,7 +77,7 @@
|
|||
</div>
|
||||
<div class="col-auto form">
|
||||
<app-dataset-editor-component [hidden]="this.step !== 0" [formGroup]="formGroup" [dmpId]="formGroup.get('dmp').value.id" [availableProfiles]="formGroup.get('dmp').value.profiles" (formChanged)="formChanged()"></app-dataset-editor-component>
|
||||
<app-dataset-description-form [hidden]="this.step === 0" *ngIf="formGroup && datasetWizardModel && datasetWizardModel.datasetProfileDefinition" [form]="this.formGroup.get('datasetProfileDefinition')" [visibilityRules]="datasetWizardModel.datasetProfileDefinition.rules" [datasetProfileId]="formGroup.get('profile').value" [linkToScroll]="linkToScroll"></app-dataset-description-form>
|
||||
<app-dataset-description [hidden]="this.step === 0" *ngIf="formGroup && datasetWizardModel && datasetWizardModel.datasetProfileDefinition" [form]="this.formGroup.get('datasetProfileDefinition')" [visibilityRules]="datasetWizardModel.datasetProfileDefinition.rules" [datasetProfileId]="formGroup.get('profile').value" [linkToScroll]="linkToScroll"></app-dataset-description>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
@ -237,12 +237,14 @@ 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]);
|
||||
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');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<div class="col-12">
|
||||
<div class="heading">3 {{'DMP-EDITOR.STEPPER.DATASET-INFO' | translate}}*</div>
|
||||
<div class="hint">
|
||||
<div class="pb-1">{{'DMP-EDITOR.MAIN-INFO.HINT' | translate}}</div>
|
||||
<!-- <div class="pb-1">{{'DMP-EDITOR.MAIN-INFO.HINT' | translate}}</div> -->
|
||||
<div><span class="material-icons-outlined align-bottom">info</span> {{'DMP-EDITOR.MAIN-INFO.TYPING' | translate}}</div>
|
||||
</div>
|
||||
<div class="profile-form">
|
||||
|
|
|
@ -78,7 +78,7 @@
|
|||
|
||||
<li *ngIf="!isNewDataset" (click)="changeStep(1)" [ngClass]="{'active': this.step === 1}">{{'DMP-EDITOR.STEPPER.FUNDING-INFO' | translate}} (3)</li>
|
||||
|
||||
<li *ngIf="!isNewDataset" (click)="changeStep(2)" [ngClass]="{'active': this.step === 2}">{{'DMP-EDITOR.STEPPER.LICENSE-INFO' | translate}} (6)</li>
|
||||
<li *ngIf="!isNewDataset" (click)="changeStep(2)" [ngClass]="{'active': this.step === 2}">{{'DMP-EDITOR.STEPPER.LICENSE-INFO' | translate}} (5)</li>
|
||||
|
||||
<li *ngIf="!isNewDataset" (click)="changeStep(3)" [ngClass]="{'active': this.step === 3}">{{'DMP-EDITOR.STEPPER.DATASET-INFO' | translate}}</li>
|
||||
<li *ngIf="isNewDataset" (click)="changeStep(1)" [ngClass]="{'active': this.step === 1}">{{'DMP-EDITOR.STEPPER.DATASET-INFO' | translate}}</li>
|
||||
|
|
|
@ -36,9 +36,9 @@
|
|||
<div *ngIf="isCreateNewFunder" (click)="createFunder()">
|
||||
<span class="insert">{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.EXIST-FUNDER' | translate}}</span>
|
||||
</div>
|
||||
<div *ngIf="!isCreateNewFunder" (click)="createFunder()">
|
||||
<div *ngIf="!isCreateNewFunder">
|
||||
<span [ngClass]="isNewVersion?'disabled-toggle':'not-found'">{{'DMP-EDITOR.FUNDING-INFO.FIND' | translate}}</span>
|
||||
<span [ngClass]="isNewVersion?'disabled-toggle':'insert'">{{'DMP-EDITOR.ACTIONS.INSERT-MANUALLY' | translate}}</span>
|
||||
<span [ngClass]="isNewVersion?'disabled-toggle':'insert'" (click)="createFunder()">{{'DMP-EDITOR.ACTIONS.INSERT-MANUALLY' | translate}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -82,9 +82,9 @@
|
|||
<div *ngIf="isCreateNew" (click)="createGrant()">
|
||||
<span class="insert">{{'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.ACTIONS.EXIST-GRANT' | translate}}</span>
|
||||
</div>
|
||||
<div *ngIf="!isCreateNew" (click)="createGrant()">
|
||||
<div *ngIf="!isCreateNew">
|
||||
<span [ngClass]="isNewVersion || isGrantDisabled()?'disabled-toggle':'not-found'">{{'DMP-EDITOR.FUNDING-INFO.FIND' | translate}}</span>
|
||||
<span [ngClass]="isNewVersion || isGrantDisabled()?'disabled-toggle':'insert'">{{'DMP-EDITOR.ACTIONS.INSERT-MANUALLY' | translate}}</span>
|
||||
<span [ngClass]="isNewVersion || isGrantDisabled()?'disabled-toggle':'insert'" (click)="createGrant()">{{'DMP-EDITOR.ACTIONS.INSERT-MANUALLY' | translate}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -68,7 +68,7 @@
|
|||
}
|
||||
|
||||
.not-found {
|
||||
cursor: pointer;
|
||||
// cursor: pointer;
|
||||
font-size: 1rem;
|
||||
font-weight: 400;
|
||||
padding: 0rem 0.5rem 0rem 0rem;
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="heading">4.1 {{'DMP-EDITOR.FIELDS.LANGUAGE' | translate}}</div>
|
||||
<div class="hint">{{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}</div>
|
||||
<!-- <div class="hint">{{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}</div> -->
|
||||
<div class="title-form">
|
||||
<mat-form-field *ngIf="!isNewDataset">
|
||||
<mat-select [formControl]="formGroup.get('extraProperties').get('language')" placeholder="{{'DMP-EDITOR.FIELDS.LANGUAGE' | translate}}">
|
||||
|
@ -44,7 +44,7 @@
|
|||
<div class="row" *ngIf="!isNewDataset">
|
||||
<div class="col-12">
|
||||
<div class="heading">4.3 {{'DMP-EDITOR.FIELDS.VISIBILITY' | translate}}</div>
|
||||
<div class="hint">{{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}</div>
|
||||
<!-- <div class="hint">{{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}</div> -->
|
||||
<div class="author-form">
|
||||
<mat-form-field>
|
||||
<mat-select [formControl]="formGroup.get('extraProperties').get('visible')" placeholder="{{'DMP-EDITOR.FIELDS.VISIBILITY' | translate}}">
|
||||
|
@ -64,7 +64,7 @@
|
|||
<div class="row" *ngIf="!isNewDataset && formGroup.get('extraProperties').get('visible').value">
|
||||
<div class="col-12">
|
||||
<div class="heading">4.4 {{'DMP-EDITOR.FIELDS.PUBLICATION' | translate}}</div>
|
||||
<div class="hint">{{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}</div>
|
||||
<!-- <div class="hint">{{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}</div> -->
|
||||
<div class="organizations-form">
|
||||
<mat-form-field>
|
||||
<input matInput [matDatepicker]="picker" [formControl]="formGroup.get('extraProperties').get('publicDate')" placeholder="{{'DMP-EDITOR.FIELDS.PUBLICATION' | translate}}">
|
||||
|
@ -81,7 +81,7 @@
|
|||
<div class="row" *ngIf="!isNewDataset">
|
||||
<div class="col-12">
|
||||
<div class="heading">4.5 {{'DMP-EDITOR.FIELDS.CONTACT' | translate}}</div>
|
||||
<div class="hint">{{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}</div>
|
||||
<!-- <div class="hint">{{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}</div> -->
|
||||
<div class="organizations-form">
|
||||
<mat-form-field>
|
||||
<mat-select [formControl]="formGroup.get('extraProperties').get('contact')" placeholder="{{'DMP-EDITOR.FIELDS.CONTACT' | translate}}">
|
||||
|
@ -97,7 +97,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" *ngIf="!isNewDataset">
|
||||
<!-- <div class="row" *ngIf="!isNewDataset">
|
||||
<div class="col-12">
|
||||
<div class="heading">4.6 {{'DMP-EDITOR.FIELDS.COST' | translate}}</div>
|
||||
<div class="hint">{{'DMP-EDITOR.LICENSE-INFO.HINT' | translate}}</div>
|
||||
|
@ -108,6 +108,6 @@
|
|||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="heading">1.1 {{'DMP-EDITOR.FIELDS.NAME' | translate}}*</div>
|
||||
<div class="hint">{{'DMP-EDITOR.MAIN-INFO.HINT' | translate}}</div>
|
||||
<!-- <div class="hint">{{'DMP-EDITOR.MAIN-INFO.HINT' | translate}}</div> -->
|
||||
<div class="title-form">
|
||||
<mat-form-field *ngIf="!isNewDataset">
|
||||
<input matInput placeholder="{{'DMP-EDITOR.FIELDS.NAME' | translate}}" type="text" name="label" formControlName="label" required>
|
||||
|
@ -28,7 +28,7 @@
|
|||
<div class="row" *ngIf="!isNewDataset">
|
||||
<div class="col-12">
|
||||
<div class="heading">1.2 {{'DMP-EDITOR.FIELDS.DESCRIPTION' | translate}}</div>
|
||||
<div class="hint">{{'DMP-EDITOR.MAIN-INFO.HINT' | translate}}</div>
|
||||
<!-- <div class="hint">{{'DMP-EDITOR.MAIN-INFO.HINT' | translate}}</div> -->
|
||||
<div class="description-form">
|
||||
<mat-form-field>
|
||||
<textarea rows="3" matInput class="description-area" placeholder="{{'DMP-EDITOR.PLACEHOLDER.DESCRIPTION' | translate}}" formControlName="description"></textarea>
|
||||
|
@ -41,7 +41,7 @@
|
|||
<div class="col-12">
|
||||
<div class="heading">1.3 {{'DMP-EDITOR.FIELDS.RESEARCHERS' | translate}}</div>
|
||||
<div class="hint">
|
||||
<div class="pb-1">{{'DMP-EDITOR.MAIN-INFO.HINT' | translate}}</div>
|
||||
<!-- <div class="pb-1">{{'DMP-EDITOR.MAIN-INFO.HINT' | translate}}</div> -->
|
||||
<div><span class="material-icons-outlined align-bottom">info</span> {{'DMP-EDITOR.MAIN-INFO.TYPING' | translate}}</div>
|
||||
</div>
|
||||
<div class="author-form">
|
||||
|
@ -52,10 +52,12 @@
|
|||
{{formGroup.get('researchers').getError('backendError').message}}</mat-error>
|
||||
<mat-error *ngIf="formGroup.get('researchers').hasError('required')">
|
||||
{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
||||
<button matSuffix class="input-btn" [disabled]="formGroup.get('researchers').disabled" type="button" (click)="addResearcher($event)">
|
||||
<!-- <button matSuffix class="input-btn" [disabled]="formGroup.get('researchers').disabled" type="button" (click)="addResearcher($event)">
|
||||
<mat-icon class="icon-btn">add_circle</mat-icon>
|
||||
</button>
|
||||
</button> -->
|
||||
</mat-form-field>
|
||||
<span *ngIf="!formGroup.get('researchers').disabled" class="not-found">{{'DMP-EDITOR.FUNDING-INFO.FIND' | translate}}</span>
|
||||
<span *ngIf="!formGroup.get('researchers').disabled" class="insert-manually" (click)="addResearcher($event)">{{'DMP-EDITOR.ACTIONS.INSERT-MANUALLY' | translate}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -74,10 +76,14 @@
|
|||
<mat-error *ngIf="formGroup.get('organisations').hasError('backendError')">
|
||||
{{formGroup.get('organisations').getError('backendError').message}}</mat-error>
|
||||
<mat-error *ngIf="formGroup.get('organisations').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
||||
<button *ngIf="showOrganizationCreator()" matSuffix class="input-btn" [disabled]="canAddOrganizations()" type="button" (click)="addOrganization($event)">
|
||||
<!-- <button *ngIf="showOrganizationCreator()" matSuffix class="input-btn" [disabled]="cantAddOrganizations()" type="button" (click)="addOrganization($event)">
|
||||
<mat-icon class="icon-btn">add_circle</mat-icon>
|
||||
</button>
|
||||
</button> -->
|
||||
</mat-form-field>
|
||||
<div *ngIf="showOrganizationCreator()" class="pb-4">
|
||||
<span *ngIf="!cantAddOrganizations()" class="not-found">{{'DMP-EDITOR.FUNDING-INFO.FIND' | translate}}</span>
|
||||
<span *ngIf="!cantAddOrganizations()" class="insert-manually" (click)="addOrganization($event)">{{'DMP-EDITOR.ACTIONS.INSERT-MANUALLY' | translate}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -97,11 +97,11 @@
|
|||
<span class="material-icons">horizontal_rule</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mt-2">
|
||||
<button mat-raised-button class="add-dataset-btn" *ngIf="isDraftDmp(dmp)" (click)="addNewDataset()">
|
||||
<div class="row mt-2 add-dataset-txt">
|
||||
<a class="add-dataset-btn" *ngIf="isDraftDmp(dmp)" [routerLink]="['/datasets/new/' + dmp.id]" target="_blank">
|
||||
<mat-icon>add</mat-icon>
|
||||
{{'DMP-LISTING.ACTIONS.ADD-DATASET-SHORT' | translate}}
|
||||
</button>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4 col-lg-4 p-0">
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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) {
|
||||
|
@ -663,23 +664,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 {
|
||||
|
|
Loading…
Reference in New Issue