MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'Development' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development

This commit is contained in:
gkolokythas 2019-11-06 16:37:40 +02:00
parent e6003292c4 a95c1ecc94
commit bb76a0527e
35 changed files with 185 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dmp-frontend/src/app/library/confirmation-dialog/confirmation-dialog.component.html
View File

@ -9,13 +9,13 @@
</div> </div>
</div> </div>
<div class="row d-flex flex-row"> <div class="row d-flex flex-row">
<div class="col message">{{ data.message }}</div> <div class="col message pb-4 pl-3">{{ data.message }}</div>
<div *ngIf="!data.icon" class="col-auto close-btn justify-content-end" (click)="close()"> <div *ngIf="!data.icon" class="col-auto close-btn justify-content-end" (click)="close()">
<mat-icon>close</mat-icon> <mat-icon>close</mat-icon>
</div> </div>
</div> </div>
<div *ngIf="data.privacyPolicyNames" class="row d-flex flex-col"> <div *ngIf="data.privacyPolicyNames" class="row d-flex flex-col">
<div class="col privacy-policy-names">{{ data.privacyPolicyNames }}</div> <div class="col-12 privacy-policy-names">{{ data.privacyPolicyNames }}</div>
<mat-checkbox [(ngModel)]="agreePrivacyPolicyNames" required class="checkbox-privacy"> <mat-checkbox [(ngModel)]="agreePrivacyPolicyNames" required class="checkbox-privacy">
{{'GENERAL.CONFIRMATION-DIALOG.ACTIONS.POLICY-AGREE' | translate}} {{'GENERAL.CONFIRMATION-DIALOG.ACTIONS.POLICY-AGREE' | translate}}
</mat-checkbox> </mat-checkbox>
@ -25,7 +25,7 @@
<div class="col"></div> <div class="col"></div>
<div class="col-auto"><button mat-raised-button type="button" (click)="cancel()">{{ data.cancelButton }}</button></div> <div class="col-auto"><button mat-raised-button type="button" (click)="cancel()">{{ data.cancelButton }}</button></div>
<div *ngIf="data.isDeleteConfirmation" class="col-auto"><button mat-raised-button type="button" (click)="confirm()" class="delete">{{ data.confirmButton }}</button></div> <div *ngIf="data.isDeleteConfirmation" class="col-auto"><button mat-raised-button type="button" (click)="confirm()" class="delete">{{ data.confirmButton }}</button></div>
<div *ngIf="!data.isDeleteConfirmation && !data.privacyPolicyNames" class="col-auto"><button mat-raised-button type="button" (click)="confirm()" color="accent">{{ data.confirmButton }}</button></div> <div *ngIf="!data.isDeleteConfirmation && !data.privacyPolicyNames" class="col-auto"><button mat-raised-button type="button" (click)="confirm()" color="primary">{{ data.confirmButton }}</button></div>
<div *ngIf="!data.isDeleteConfirmation && data.privacyPolicyNames" class="col-auto"><button mat-raised-button type="button" [disabled]="!agreePrivacyPolicyNames" (click)="confirm()" color="accent">{{ data.confirmButton }}</button></div> <div *ngIf="!data.isDeleteConfirmation && data.privacyPolicyNames" class="col-auto"><button mat-raised-button type="button" [disabled]="!agreePrivacyPolicyNames" (click)="confirm()" color="primary">{{ data.confirmButton }}</button></div>
</div> </div>
</div> </div>

29
dmp-frontend/src/app/library/contact-dialog/contact-dialog.component.html
View File

@ -1,14 +1,13 @@
<div class="row d-flex flex-row"> <form class="form" [formGroup]="data">
<div mat-dialog-title class="col-auto"> <div class="row d-flex flex-row">
<div mat-dialog-title class="col-auto">
{{'CONTACT.SUPPORT.SUBTITLE' | translate}} {{'CONTACT.SUPPORT.SUBTITLE' | translate}}
</div>
<div class="col-auto ml-auto close-btn" (click)="close()">
<mat-icon>close</mat-icon>
</div>
</div> </div>
<div class="col-auto ml-auto close-btn" (click)="close()"> <div mat-dialog-content class="row">
<mat-icon>close</mat-icon>
</div>
</div>
<div mat-dialog-content class="row">
<form class="form" [formGroup]="data">
<mat-form-field class="full-width"> <mat-form-field class="full-width">
<!-- <input matInput placeholder="{{'CONTACT.SUPPORT.SUBJECT' | translate}}" [(ngModel)]="data.subject" name="contactSupportSubject" required> --> <!-- <input matInput placeholder="{{'CONTACT.SUPPORT.SUBJECT' | translate}}" [(ngModel)]="data.subject" name="contactSupportSubject" required> -->
<input matInput placeholder="{{'CONTACT.SUPPORT.SUBJECT' | translate}}" type="text" name="subject" formControlName="subject" required> <input matInput placeholder="{{'CONTACT.SUPPORT.SUBJECT' | translate}}" type="text" name="subject" formControlName="subject" required>
@ -25,9 +24,9 @@
<mat-error *ngIf="data.get('description').hasError('required')"> <mat-error *ngIf="data.get('description').hasError('required')">
{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error> {{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
</mat-form-field> </mat-form-field>
</form> </div>
</div> <div mat-dialog-actions class="row">
<div mat-dialog-actions class="row"> <div class="ml-auto col-auto"><button mat-raised-button type="button" mat-dialog-close (click)="cancel()">{{'CONTACT.SUPPORT.CANCEL' | translate}}</button></div>
<div class="ml-auto col-auto"><button mat-button mat-dialog-close mat-raised-button color="primary" (click)="cancel()">{{'CONTACT.SUPPORT.CANCEL' | translate}}</button></div> <div class="col-auto"><button mat-raised-button color="primary" type="button" [disabled]="!data.valid" (click)="send()"><i class="fa fa-paper-plane pr-2"></i>{{'CONTACT.SUPPORT.SEND' | translate}}</button></div>
<div class="col-auto"><button mat-raised-button color="primary" type="button" [disabled]="!data.valid" (click)="send()"><i class="fa fa-paper-plane pr-2"></i>{{'CONTACT.SUPPORT.SEND' | translate}}</button></div> </div>
</div> </form>

1
dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dataset-profile.component.ts
View File

@ -49,6 +49,7 @@ export class DatasetProfileCriteriaComponent extends BaseCriteriaComponent imple
openDialog(): void { openDialog(): void {
const dialogRef = this.dialog.open(DialodConfirmationUploadDatasetProfiles, { const dialogRef = this.dialog.open(DialodConfirmationUploadDatasetProfiles, {
width: '500px',
restoreFocus: false, restoreFocus: false,
data: { data: {
message: this.language.instant('DATASET-WIZARD.UPLOAD.UPLOAD-XML-FILE-TITLE'), message: this.language.instant('DATASET-WIZARD.UPLOAD.UPLOAD-XML-FILE-TITLE'),

2
dmp-frontend/src/app/ui/admin/dataset-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html
View File

@ -15,7 +15,7 @@
<input matInput placeholder="{{'DATASET-WIZARD.UPLOAD.UPLOAD-XML-NAME'| translate}}" name="datasetProfileName" [(ngModel)]="data.name"> <input matInput placeholder="{{'DATASET-WIZARD.UPLOAD.UPLOAD-XML-NAME'| translate}}" name="datasetProfileName" [(ngModel)]="data.name">
</mat-form-field> </mat-form-field>
<div class="col-auto"> <div class="col-auto">
<button mat-raised-button color="primary" type="button" (click)="cancel()">{{ data.cancelButton }}</button> <button mat-raised-button type="button" (click)="cancel()">{{ data.cancelButton }}</button>
</div> </div>
<div class="col"></div> <div class="col"></div>
<div class="col-auto"> <div class="col-auto">

2
dmp-frontend/src/app/ui/admin/dmp-profile/listing/criteria/dialog-confirmation-upload-profile/dialog-confirmation-upload-profiles.component.html
View File

@ -15,7 +15,7 @@
<input matInput placeholder="{{'DMP-PROFILE-LISTING.UPLOAD.UPLOAD-XML-NAME'| translate}}" name="datasetProfileName" [(ngModel)]="data.name"> <input matInput placeholder="{{'DMP-PROFILE-LISTING.UPLOAD.UPLOAD-XML-NAME'| translate}}" name="datasetProfileName" [(ngModel)]="data.name">
</mat-form-field> </mat-form-field>
<div class="col-auto"> <div class="col-auto">
<button mat-raised-button color="primary" type="button" (click)="cancel()">{{ data.cancelButton }}</button> <button mat-raised-button type="button" (click)="cancel()">{{ data.cancelButton }}</button>
</div> </div>
<div class="col"></div> <div class="col"></div>
<div class="col-auto"> <div class="col-auto">

2
dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component.html
View File

@ -12,7 +12,7 @@
<div class="row"> <div class="row">
<div class="col"></div> <div class="col"></div>
<div class="col-auto"> <div class="col-auto">
<button mat-raised-button color="primary" type="button" (click)="cancel()">{{ data.cancelButton }}</button> <button mat-raised-button type="button" (click)="cancel()">{{ data.cancelButton }}</button>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<button mat-raised-button color="primary" type="button" (click)="confirm()">{{ data.confirmButton }}</button> <button mat-raised-button color="primary" type="button" (click)="confirm()">{{ data.confirmButton }}</button>

4
dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts
View File

@ -142,6 +142,7 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl
addDataRepository() { addDataRepository() {
const dialogRef = this.dialog.open(DatasetExternalDataRepositoryDialogEditorComponent, { const dialogRef = this.dialog.open(DatasetExternalDataRepositoryDialogEditorComponent, {
width: '500px',
restoreFocus: false, restoreFocus: false,
data: {} data: {}
}); });
@ -156,6 +157,7 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl
addRegistry() { addRegistry() {
const dialogRef = this.dialog.open(DatasetExternalRegistryDialogEditorComponent, { const dialogRef = this.dialog.open(DatasetExternalRegistryDialogEditorComponent, {
width: '500px',
restoreFocus: false, restoreFocus: false,
data: {} data: {}
}); });
@ -170,6 +172,7 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl
addExternalDataset() { addExternalDataset() {
const dialogRef = this.dialog.open(DatasetExternalDatasetDialogEditorComponent, { const dialogRef = this.dialog.open(DatasetExternalDatasetDialogEditorComponent, {
width: '500px',
restoreFocus: false, restoreFocus: false,
data: {} data: {}
}); });
@ -184,6 +187,7 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl
addService() { addService() {
const dialogRef = this.dialog.open(DatasetExternalServiceDialogEditorComponent, { const dialogRef = this.dialog.open(DatasetExternalServiceDialogEditorComponent, {
width: '500px',
restoreFocus: false, restoreFocus: false,
data: {} data: {}
}); });

12
dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.html
View File

@ -1,5 +1,12 @@
<form *ngIf="formGroup" [formGroup]="formGroup"> <form *ngIf="formGroup" [formGroup]="formGroup">
<h1 mat-dialog-title>{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.TITLE' | translate}}</h1> <div class="row d-flex flex-row">
<div mat-dialog-title class="col-auto">
{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.TITLE' | translate}}
</div>
<div class="col-auto ml-auto close-btn" (click)="close()">
<mat-icon>close</mat-icon>
</div>
</div>
<div mat-dialog-content class="row"> <div mat-dialog-content class="row">
<mat-form-field class="col-auto"> <mat-form-field class="col-auto">
<input matInput formControlName="label" placeholder="{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.LABEL' | translate}}" required> <input matInput formControlName="label" placeholder="{{'DATASET-REFERENCED-MODELS.DATA-REPOSITORY.LABEL' | translate}}" required>
@ -15,8 +22,7 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div mat-dialog-actions class="row"> <div mat-dialog-actions class="row">
<div class="col-auto"><button mat-button mat-dialog-close mat-raised-button color="primary">Cancel</button></div> <div class="ml-auto col-auto"><button mat-raised-button type="button" mat-dialog-close>Cancel</button></div>
<div class="col"></div>
<div class="col-auto"><button mat-raised-button color="primary" (click)="send()" type="button">Save</button></div> <div class="col-auto"><button mat-raised-button color="primary" (click)="send()" type="button">Save</button></div>
</div> </div>
</form> </form>

3
dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.scss
View File

@ -0,0 +1,3 @@
.close-btn {
cursor: pointer;
}

5
dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/data-repository/dataset-external-data-repository-dialog-editor.component.ts
View File

@ -24,7 +24,6 @@ export class DatasetExternalDataRepositoryDialogEditorComponent extends BaseComp
this.formGroup = datarepo.buildForm(); this.formGroup = datarepo.buildForm();
} }
send(value: any) { send(value: any) {
this.externalDataRepositoryService.create(this.formGroup.value) this.externalDataRepositoryService.create(this.formGroup.value)
.pipe(takeUntil(this._destroyed)) .pipe(takeUntil(this._destroyed))
@ -32,4 +31,8 @@ export class DatasetExternalDataRepositoryDialogEditorComponent extends BaseComp
(item) => this.dialogRef.close(item) (item) => this.dialogRef.close(item)
); );
} }
close() {
this.dialogRef.close(false);
}
} }

12
dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.html
View File

@ -1,5 +1,12 @@
<form *ngIf="formGroup" [formGroup]="formGroup"> <form *ngIf="formGroup" [formGroup]="formGroup">
<h1 mat-dialog-title>{{'DATASET-REFERENCED-MODELS.EXTERNAL-DATASET.TITLE' | translate}}</h1> <div class="row d-flex flex-row">
<div mat-dialog-title class="col-auto">
{{'DATASET-REFERENCED-MODELS.EXTERNAL-DATASET.TITLE' | translate}}
</div>
<div class="col-auto ml-auto close-btn" (click)="close()">
<mat-icon>close</mat-icon>
</div>
</div>
<div mat-dialog-content class="row"> <div mat-dialog-content class="row">
<mat-form-field class="col-auto"> <mat-form-field class="col-auto">
<input matInput formControlName="label" placeholder="{{'DATASET-REFERENCED-MODELS.EXTERNAL-DATASET.LABEL' | translate}}" required> <input matInput formControlName="label" placeholder="{{'DATASET-REFERENCED-MODELS.EXTERNAL-DATASET.LABEL' | translate}}" required>
@ -11,8 +18,7 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div mat-dialog-actions class="row"> <div mat-dialog-actions class="row">
<div class="col-auto"><button mat-button mat-dialog-close mat-raised-button color="primary">Cancel</button></div> <div class="ml-auto col-auto"><button mat-raised-button mat-dialog-close type="button">Cancel</button></div>
<div class="col"></div>
<div class="col-auto"><button mat-raised-button color="primary" (click)="send()" type="button">Save</button></div> <div class="col-auto"><button mat-raised-button color="primary" (click)="send()" type="button">Save</button></div>
</div> </div>
</form> </form>

3
dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.scss
View File

@ -0,0 +1,3 @@
.close-btn {
cursor: pointer;
}

5
dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/external-dataset/dataset-external-dataset-dialog-editor.component.ts
View File

@ -24,7 +24,6 @@ export class DatasetExternalDatasetDialogEditorComponent extends BaseComponent i
this.formGroup = externalDatasetModel.buildForm(); this.formGroup = externalDatasetModel.buildForm();
} }
send(value: any) { send(value: any) {
this.externalDatasetService.create(this.formGroup.value) this.externalDatasetService.create(this.formGroup.value)
.pipe(takeUntil(this._destroyed)) .pipe(takeUntil(this._destroyed))
@ -32,4 +31,8 @@ export class DatasetExternalDatasetDialogEditorComponent extends BaseComponent i
(item) => this.dialogRef.close(item) (item) => this.dialogRef.close(item)
); );
} }
close() {
this.dialogRef.close(false);
}
} }

12
dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.html
View File

@ -1,5 +1,12 @@
<form *ngIf="formGroup" [formGroup]="formGroup"> <form *ngIf="formGroup" [formGroup]="formGroup">
<h1 mat-dialog-title>{{'DATASET-REFERENCED-MODELS.REGISTRY.TITLE' | translate}}</h1> <div class="row d-flex flex-row">
<div mat-dialog-title class="col-auto">
{{'DATASET-REFERENCED-MODELS.REGISTRY.TITLE' | translate}}
</div>
<div class="col-auto ml-auto close-btn" (click)="close()">
<mat-icon>close</mat-icon>
</div>
</div>
<div mat-dialog-content class="row"> <div mat-dialog-content class="row">
<mat-form-field class="col-auto"> <mat-form-field class="col-auto">
<input matInput formControlName="label" placeholder="{{'DATASET-REFERENCED-MODELS.REGISTRY.LABEL' | translate}}" required> <input matInput formControlName="label" placeholder="{{'DATASET-REFERENCED-MODELS.REGISTRY.LABEL' | translate}}" required>
@ -15,8 +22,7 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div mat-dialog-actions class="row"> <div mat-dialog-actions class="row">
<div class="col-auto"><button mat-button mat-dialog-close mat-raised-button color="primary">Cancel</button></div> <div class="ml-auto col-auto"><button mat-raised-button mat-dialog-close type="button">Cancel</button></div>
<div class="col"></div>
<div class="col-auto"><button mat-raised-button color="primary" (click)="send()" type="button">Save</button></div> <div class="col-auto"><button mat-raised-button color="primary" (click)="send()" type="button">Save</button></div>
</div> </div>
</form> </form>

3
dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.scss
View File

@ -0,0 +1,3 @@
.close-btn {
cursor: pointer;
}

5
dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/registry/dataset-external-registry-dialog-editor.component.ts
View File

@ -24,7 +24,6 @@ export class DatasetExternalRegistryDialogEditorComponent extends BaseComponent
this.formGroup = registryModel.buildForm(); this.formGroup = registryModel.buildForm();
} }
send(value: any) { send(value: any) {
this.externalRegistryService.create(this.formGroup.value) this.externalRegistryService.create(this.formGroup.value)
.pipe(takeUntil(this._destroyed)) .pipe(takeUntil(this._destroyed))
@ -32,4 +31,8 @@ export class DatasetExternalRegistryDialogEditorComponent extends BaseComponent
(item) => this.dialogRef.close(item) (item) => this.dialogRef.close(item)
); );
} }
close() {
this.dialogRef.close(false);
}
} }

12
dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.html
View File

@ -1,5 +1,12 @@
<form *ngIf="formGroup" [formGroup]="formGroup"> <form *ngIf="formGroup" [formGroup]="formGroup">
<h1 mat-dialog-title>{{'DATASET-REFERENCED-MODELS.SERVICES.TITLE' | translate}}</h1> <div class="row d-flex flex-row">
<div mat-dialog-title class="col-auto">
{{'DATASET-REFERENCED-MODELS.SERVICES.TITLE' | translate}}
</div>
<div class="col-auto ml-auto close-btn" (click)="close()">
<mat-icon>close</mat-icon>
</div>
</div>
<div mat-dialog-content class="row"> <div mat-dialog-content class="row">
<mat-form-field class="col-auto"> <mat-form-field class="col-auto">
<input matInput formControlName="label" placeholder="{{'DATASET-REFERENCED-MODELS.SERVICES.LABEL' | translate}}" required> <input matInput formControlName="label" placeholder="{{'DATASET-REFERENCED-MODELS.SERVICES.LABEL' | translate}}" required>
@ -15,8 +22,7 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div mat-dialog-actions class="row"> <div mat-dialog-actions class="row">
<div class="col-auto"><button mat-button mat-dialog-close mat-raised-button color="primary">Cancel</button></div> <div class="ml-auto col-auto"><button mat-raised-button mat-dialog-close type="button">Cancel</button></div>
<div class="col"></div>
<div class="col-auto"><button mat-raised-button color="primary" (click)="send()" type="button">Save</button></div> <div class="col-auto"><button mat-raised-button color="primary" (click)="send()" type="button">Save</button></div>
</div> </div>
</form> </form>

3
dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.scss
View File

@ -0,0 +1,3 @@
.close-btn {
cursor: pointer;
}

4
dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/editors/service/dataset-external-service-dialog-editor.component.ts
View File

@ -31,4 +31,8 @@ export class DatasetExternalServiceDialogEditorComponent extends BaseComponent i
(item) => this.dialogRef.close(item) (item) => this.dialogRef.close(item)
); );
} }
close() {
this.dialogRef.close(false);
}
} }

2
dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-upload-dialogue/dataset-upload-dialogue.component.html
View File

@ -32,7 +32,7 @@
</mat-form-field> </mat-form-field>
<div class="col-auto"> <div class="col-auto">
<button mat-raised-button color="primary" type="button" (click)="cancel()">{{'DATASET-UPLOAD.ACTIONS.CANCEL' | translate}}</button> <button mat-raised-button type="button" (click)="cancel()">{{'DATASET-UPLOAD.ACTIONS.CANCEL' | translate}}</button>
</div> </div>
<div class="col"></div> <div class="col"></div>
<div class="col-auto"> <div class="col-auto">

49
dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss
View File

@ -62,53 +62,12 @@
} }
::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle {
color: #00b29f; // color: #00b29f;
background-color: #00b29f; // background-color: #00b29f;
// color: #777777; color: #777777;
// background-color: #777777; background-color: #777777;
} }
.mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element {
background-color: #2e74b649; background-color: #2e74b649;
} }
// .mat-table {
// margin: 24px;
// }
// .mat-fab-bottom-right {
// float: right;
// z-index: 5;
// }
// .full-width {
// width: 100%;
// }
// .mat-card {
// margin: 16px 0;
// }
// .mat-row {
// cursor: pointer;
// }
// mat-row:hover {
// background-color: lightgray;
// }
// mat-row:nth-child(even){
// background-color:red;
// }
// mat-row:nth-child(odd) {
// background-color: #eef0fb;
// }
// h3 {
// margin-top: 0px;
// }
// ::ng-deep .mat-paginator {
// margin-top: auto;
// }

3
dmp-frontend/src/app/ui/dmp/editor/add-researcher/add-researcher.component.html
View File

@ -11,8 +11,7 @@
</mat-form-field> </mat-form-field>
<div class="col-12"> <div class="col-12">
<div class="row"> <div class="row">
<div class="col-auto"><button mat-button mat-dialog-close mat-raised-button color="primary">Cancel</button></div> <div class="ml-auto col-auto"><button mat-raised-button mat-dialog-close type="button">Cancel</button></div>
<div class="col"></div>
<div class="col-auto"><button mat-raised-button color="primary" (click)="addResearcher()" type="button">Save</button></div> <div class="col-auto"><button mat-raised-button color="primary" (click)="addResearcher()" type="button">Save</button></div>
</div> </div>
</div> </div>

2
dmp-frontend/src/app/ui/dmp/editor/available-profiles/available-profiles.component.html
View File

@ -8,5 +8,5 @@
<p> <p>
{{ 'DMP-EDITOR.DATASET-TEMPLATE-LIST.TEXT' | translate }} {{datasetsprofiles.selectedOptions.selected.length}} {{ 'DMP-EDITOR.DATASET-TEMPLATE-LIST.TEXT' | translate }} {{datasetsprofiles.selectedOptions.selected.length}}
</p> </p>
<button mat-raised-button color="primary" (click)="addProfiles(datasetsprofiles)">OK</button> <button mat-raised-button color="primary" (click)="addProfiles(datasetsprofiles)">{{ 'DMP-EDITOR.DATASET-TEMPLATE-LIST.OK' | translate }}</button>
</div> </div>

6
dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.html
View File

@ -32,10 +32,8 @@
</mat-error> </mat-error>
</mat-form-field> --> </mat-form-field> -->
<div class="col-12 d-flex">
<div class="col-12"> <button mat-raised-button color="primary" (click)="send()" type="button" class="ml-auto">{{'INVITATION-EDITOR.ACTIONS.SEND-INVITATION' | translate}}</button>
<button mat-raised-button color="primary" (click)="send()"
type="button">{{'INVITATION-EDITOR.ACTIONS.SEND-INVITATION' | translate}}</button>
</div> </div>
</div> </div>
</form> </form>

2
dmp-frontend/src/app/ui/dmp/listing/criteria/upload-dialogue/dmp-upload-dialogue.component.html
View File

@ -15,7 +15,7 @@
<input class="uploadInput" [(ngModel)]="dmpTitle" matInput placeholder="{{'DMP-UPLOAD.PLACEHOLDER' | translate}}" name="uploadFileInput"> <input class="uploadInput" [(ngModel)]="dmpTitle" matInput placeholder="{{'DMP-UPLOAD.PLACEHOLDER' | translate}}" name="uploadFileInput">
</mat-form-field> </mat-form-field>
<div class="col-auto"> <div class="col-auto">
<button mat-raised-button color="primary" type="button" (click)="cancel()">{{'DMP-UPLOAD.ACTIONS.CANCEL' | translate}}</button> <button mat-raised-button type="button" (click)="cancel()">{{'DMP-UPLOAD.ACTIONS.CANCEL' | translate}}</button>
</div> </div>
<div class="col"></div> <div class="col"></div>
<div class="col-auto"> <div class="col-auto">

2
dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
View File

@ -289,7 +289,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
publish(dmpId: String) { publish(dmpId: String) {
const dialogRef = this.dialog.open(ConfirmationDialogComponent, { const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
maxWidth: '300px', maxWidth: '500px',
restoreFocus: false, restoreFocus: false,
data: { data: {
message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.PUBLISH-ITEM'), message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.PUBLISH-ITEM'),

1
dmp-frontend/src/app/ui/grant/editor/grant-editor.component.ts
View File

@ -16,7 +16,6 @@ import { GrantListingModel } from '../../../core/model/grant/grant-listing';
import { GrantFileUploadService } from '../../../core/services/grant/grant-file-upload.service'; import { GrantFileUploadService } from '../../../core/services/grant/grant-file-upload.service';
import { GrantService } from '../../../core/services/grant/grant.service'; import { GrantService } from '../../../core/services/grant/grant.service';
import { ConfirmationDialogComponent } from '../../../library/confirmation-dialog/confirmation-dialog.component'; import { ConfirmationDialogComponent } from '../../../library/confirmation-dialog/confirmation-dialog.component';
import { SnackBarNotificationComponent } from '../../../library/notification/snack-bar/snack-bar-notification.component';
import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item'; import { BreadcrumbItem } from '../../misc/breadcrumb/definition/breadcrumb-item';
import { IBreadCrumbComponent } from '../../misc/breadcrumb/definition/IBreadCrumbComponent'; import { IBreadCrumbComponent } from '../../misc/breadcrumb/definition/IBreadCrumbComponent';
import { GrantEditorModel } from './grant-editor.model'; import { GrantEditorModel } from './grant-editor.model';

12
dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html
View File

@ -11,12 +11,12 @@
<div mat-dialog-content class="row"> <div mat-dialog-content class="row">
<mat-divider class="col-12"></mat-divider> <mat-divider class="col-12"></mat-divider>
<a mat-button (click)="navigateToProfile()" class="col-12"> <div class="col-12">
{{'USER-DIALOG.USER-PROFILE' | translate}} <mat-icon>person</mat-icon> <a mat-button class="profile" (click)="navigateToProfile()"><mat-icon class="mr-1">person</mat-icon>{{'USER-DIALOG.USER-PROFILE' | translate}}</a>
</a> </div>
<mat-divider class="col-12"></mat-divider> <mat-divider class="col-12"></mat-divider>
<a mat-button (click)="logout()" class="col-12"> <div class="col-12">
{{ 'USER-DIALOG.LOG-OUT' | translate }} <mat-icon>exit_to_app</mat-icon> <a mat-button class="logout" (click)="logout()"><mat-icon class="mr-1">exit_to_app</mat-icon>{{ 'USER-DIALOG.LOG-OUT' | translate }}</a>
</a> </div>
</div> </div>
</form> </form>

4
dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss
View File

@ -5,3 +5,7 @@ $mat-card-header-size: 40px !default;
border-radius: 50%; border-radius: 50%;
flex-shrink: 0; flex-shrink: 0;
} }
.profile, .logout {
margin-left: 3em;
}

2
dmp-frontend/src/app/ui/quick-wizard/quick-wizard-editor/quick-wizard-editor.component.ts
View File

@ -9,7 +9,6 @@ import { ActivatedRoute, Router } from '@angular/router';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model'; import { ValidationErrorModel } from '../../../common/forms/validation/error-model/validation-error-model';
import { BaseComponent } from "../../../core/common/base/base.component";
import { DatasetStatus } from '../../../core/common/enum/dataset-status'; import { DatasetStatus } from '../../../core/common/enum/dataset-status';
import { DmpStatus } from '../../../core/common/enum/dmp-status'; import { DmpStatus } from '../../../core/common/enum/dmp-status';
import { DatasetService } from '../../../core/services/dataset/dataset.service'; import { DatasetService } from '../../../core/services/dataset/dataset.service';
@ -25,7 +24,6 @@ import { QuickWizardEditorWizardModel } from './quick-wizard-editor.model';
import { FunderFormModel } from '../../dmp/editor/grant-tab/funder-form-model'; import { FunderFormModel } from '../../dmp/editor/grant-tab/funder-form-model';
import { ProjectFormModel } from '../../dmp/editor/grant-tab/project-form-model'; import { ProjectFormModel } from '../../dmp/editor/grant-tab/project-form-model';
import { CheckDeactivateBaseComponent } from '../../../library/deactivate/deactivate.component'; import { CheckDeactivateBaseComponent } from '../../../library/deactivate/deactivate.component';
import { PopupNotificationDialogComponent } from '../../../library/notification/popup/popup-notification.component';
@Component({ @Component({
selector: 'app-quick-wizard-editor-component', selector: 'app-quick-wizard-editor-component',

74
dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.html
View File

@ -1,39 +1,41 @@
<div class="row d-flex flex-row"> <div class="faq">
<div mat-dialog-title class="col-auto"> <div class="row d-flex flex-row">
{{'FAQ.TITLE' | translate}} <div mat-dialog-title class="col-auto">
{{'FAQ.TITLE' | translate}}
</div>
<div class="col-auto ml-auto close-btn" (click)="close()">
<mat-icon>close</mat-icon>
</div>
</div> </div>
<div class="col-auto ml-auto close-btn" (click)="close()"> <div mat-dialog-content class="row">
<mat-icon>close</mat-icon> <h4>What is ARGOS?</h4>
<p>ARGOS is an open and collaborative platform for creating Data Management Plans according to funders or institutions’ open science policy requirements. ARGOS technology provides solutions and workflows that connect the DMP to the actual data where they are stored and link to other useful information such as publications and funding information, thus enabling the association between research outputs and processes and leading to the creation of coherent/ complete research entities. ARGOS is comprised of two major features: the ARGOS template and the Dataset Description.</p>
<br />
<h4>Who is it for?</h4>
<p>ARGOS is inclusive to all researchers and research coordinators who may use the tool to create machine actionable DMPs. Funding and Research Performing Organizations as well as research communities may use the tool and create Dataset Description templates according to their preferences or requirements. ARGOS may be used for purposes other than research projects, such as on the occasion of trainings that familiarise scientists with the data management planning process.</p>
<br />
<h4>How can I use it?</h4>
<p>ARGOS is comprised of two main functionalities: DMP templates and Dataset Descriptions. Additional entities are Projects that link to funders and grants information.<br />ARGOS can be used for:
<br /><br /><u style="padding:20px;"> A. viewing/ consulting publicly released DMPs and Dataset Descriptions or Projects corresponding to DMPs</u><br /><br />
The tool offers options for publishing DMPs in two modes, private or public. To view public DMPs and Dataset Descriptions, there is no need for login to the platform.
<br /><br /><u style="padding:20px;"> B. writing and publishing a DMP</u><br /><br />
The tool helps researchers comply with mandates that may be attached to their grant proposal/ project funding. They can therefore choose from the most suitable to their needs template from the Dataset Descriptions collection and proceed with answering the corresponding questions. Once finalized, researchers can assign a DOI to their DMP, publish and eventually cite it.
<br /><br /><u style="padding:20px;"> C. practicing in writing DMPs and Dataset Descriptions</u><br /><br />
Given that Data Management Planning reflects the data management lifecycle and in accordance/ response to the increasing demand of the global scientific/ research community for training in Research Data Management (RDM), ARGOS may be used for educational purposes. Examples may refer to embedding DMP and DMP tools in specific curricula or even utilization of the tool for researchers and students familiarization with the concept and process, as part of library instructions’ sessions.
</p>
<br />
<h4>What is the difference between the “Wizard” and the “Expert” modes/ features?</h4>
<p>There are two ways of creating a DMP: the “Wizard” and the “Expert”. The DMP Wizard combines the most necessary fields of the DMP template and the Data Description template. It is an easy way of starting a DMP and completing a Dataset Description. The downside when using the Wizard is that it only supports one Dataset Description. To add more datasets documentation, someone must open the DMP from DMP Expert.
<br />DMP expert contains extra fields for describing the project, grant, funding, contributors and associations between DMP authors, etc. DMP Expert is advised for use when further modification and personalization is to take place.
</p>
</div>
<div mat-dialog-actions class="row">
<div class="ml-auto col-auto"><button mat-button mat-dialog-close mat-raised-button color="primary" (click)="cancel()">{{'FAQ.CLOSE' | translate}}</button></div>
</div> </div>
</div> </div>
<div mat-dialog-content class="row">
<h4>What is ARGOS?</h4>
<p>ARGOS is an open and collaborative platform for creating Data Management Plans according to funders or institutions’ open science policy requirements. ARGOS technology provides solutions and workflows that connect the DMP to the actual data where they are stored and link to other useful information such as publications and funding information, thus enabling the association between research outputs and processes and leading to the creation of coherent/ complete research entities. ARGOS is comprised of two major features: the ARGOS template and the Dataset Description.</p>
<br />
<h4>Who is it for?</h4>
<p>ARGOS is inclusive to all researchers and research coordinators who may use the tool to create machine actionable DMPs. Funding and Research Performing Organizations as well as research communities may use the tool and create Dataset Description templates according to their preferences or requirements. ARGOS may be used for purposes other than research projects, such as on the occasion of trainings that familiarise scientists with the data management planning process.</p>
<br />
<h4>How can I use it?</h4>
<p>ARGOS is comprised of two main functionalities: DMP templates and Dataset Descriptions. Additional entities are Projects that link to funders and grants information.<br />ARGOS can be used for:
<br /><br /><u style="padding:20px;"> A. viewing/ consulting publicly released DMPs and Dataset Descriptions or Projects corresponding to DMPs</u><br /><br />
The tool offers options for publishing DMPs in two modes, private or public. To view public DMPs and Dataset Descriptions, there is no need for login to the platform.
<br /><br /><u style="padding:20px;"> B. writing and publishing a DMP</u><br /><br />
The tool helps researchers comply with mandates that may be attached to their grant proposal/ project funding. They can therefore choose from the most suitable to their needs template from the Dataset Descriptions collection and proceed with answering the corresponding questions. Once finalized, researchers can assign a DOI to their DMP, publish and eventually cite it.
<br /><br /><u style="padding:20px;"> C. practicing in writing DMPs and Dataset Descriptions</u><br /><br />
Given that Data Management Planning reflects the data management lifecycle and in accordance/ response to the increasing demand of the global scientific/ research community for training in Research Data Management (RDM), ARGOS may be used for educational purposes. Examples may refer to embedding DMP and DMP tools in specific curricula or even utilization of the tool for researchers and students familiarization with the concept and process, as part of library instructions’ sessions.
</p>
<br />
<h4>What is the difference between the “Wizard” and the “Expert” modes/ features?</h4>
<p>There are two ways of creating a DMP: the “Wizard” and the “Expert”. The DMP Wizard combines the most necessary fields of the DMP template and the Data Description template. It is an easy way of starting a DMP and completing a Dataset Description. The downside when using the Wizard is that it only supports one Dataset Description. To add more datasets documentation, someone must open the DMP from DMP Expert.
<br />DMP expert contains extra fields for describing the project, grant, funding, contributors and associations between DMP authors, etc. DMP Expert is advised for use when further modification and personalization is to take place.
</p>
</div>
<div mat-dialog-actions class="row">
<div class="ml-auto col-auto"><button mat-button mat-dialog-close mat-raised-button color="primary" (click)="cancel()">{{'FAQ.CLOSE' | translate}}</button></div>
</div>

4
dmp-frontend/src/app/ui/sidebar/sidebar-footer/faq/faq-dialog.component.scss
View File

@ -11,3 +11,7 @@
.close-btn { .close-btn {
cursor: pointer; cursor: pointer;
} }
.faq {
margin-bottom: 1.125rem;
}

48
dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.html
View File

@ -1,26 +1,28 @@
<div class="row d-flex flex-row"> <div class="glossary">
<div mat-dialog-title class="col-auto"> <div class="row d-flex flex-row">
{{'GLOSSARY.TITLE' | translate}} <div mat-dialog-title class="col-auto">
{{'GLOSSARY.TITLE' | translate}}
</div>
<div class="col-auto ml-auto close-btn" (click)="close()">
<mat-icon>close</mat-icon>
</div>
</div> </div>
<div class="col-auto ml-auto close-btn" (click)="close()"> <div mat-dialog-content class="row">
<mat-icon>close</mat-icon> <h4>DMP</h4>
</div> <p>A DMP - short for Data Management Plan - is a document describing the processes that the data have undergone and the tools used for their handling and storage during a research lifecycle. Most importantly, DMPs secure provenance and enable re-use of data by appointing data managers and by including information on how data can be re-used by others in the future. Therefore, a DMP is a living document which is modified according to the data developments of a project before it’s completed and handed over at the end of the project.
</div> Public funders increasingly contain DMPs in their grant proposals or policy funding requirements. A good paradigm is the European Commission demands for the production and delivery of DMPs for projects funded under the Horizon 2020 Funding Programme. On that note, and to encourage good data management practices uptake, many European institutions include DMPs in post-graduate researchers policies and offer relevant support to staff and students.
<div mat-dialog-content class="row">
<h4>DMP</h4>
<p>A DMP - short for Data Management Plan - is a document describing the processes that the data have undergone and the tools used for their handling and storage during a research lifecycle. Most importantly, DMPs secure provenance and enable re-use of data by appointing data managers and by including information on how data can be re-used by others in the future. Therefore, a DMP is a living document which is modified according to the data developments of a project before it’s completed and handed over at the end of the project.
Public funders increasingly contain DMPs in their grant proposals or policy funding requirements. A good paradigm is the European Commission demands for the production and delivery of DMPs for projects funded under the Horizon 2020 Funding Programme. On that note, and to encourage good data management practices uptake, many European institutions include DMPs in post-graduate researchers policies and offer relevant support to staff and students.
</p>
<h4>DMP template</h4>
<p>DMP template contains general but vital information about the name and the duration of the project that the DMP corresponds to, the contributing organisations and individuals as well as the datasets that are under the Dataset Description section. It also offers the possibility of describing datasets other than primary data generated, under “External References” section. A DMP template can have many Dataset Descriptions.
</p>
<h4>Dataset Description</h4>
<p>Dataset Description documents the management processes of datasets following funder’s or institution’s requirements. A dataset description is essentially a questionnaire template with underlying added value services for interoperability and machine readability of information which is developed based on the given requirements. Management requirements differ from funder to funder and from institution to institution, hence the growing collection of Dataset Descriptions to select from.
Moreover, a Dataset Description links to the documentation of one dataset, hence a DMP template may contain more than one dataset descriptions on the occasion when multiple datasets were used during the project. When documentation of some of the project’s datasets falls under additional requirements (e.g. projects receiving multiple grants from different sources), there is the possibility of describing datasets with more than one Dataset Description template.
</p> </p>
</div>
<div mat-dialog-actions class="row"> <h4>DMP template</h4>
<div class="ml-auto col-auto"><button mat-button mat-dialog-close mat-raised-button color="primary" (click)="cancel()">{{'GLOSSARY.CLOSE' | translate}}</button></div> <p>DMP template contains general but vital information about the name and the duration of the project that the DMP corresponds to, the contributing organisations and individuals as well as the datasets that are under the Dataset Description section. It also offers the possibility of describing datasets other than primary data generated, under “External References” section. A DMP template can have many Dataset Descriptions.
</p>
<h4>Dataset Description</h4>
<p>Dataset Description documents the management processes of datasets following funder’s or institution’s requirements. A dataset description is essentially a questionnaire template with underlying added value services for interoperability and machine readability of information which is developed based on the given requirements. Management requirements differ from funder to funder and from institution to institution, hence the growing collection of Dataset Descriptions to select from.
Moreover, a Dataset Description links to the documentation of one dataset, hence a DMP template may contain more than one dataset descriptions on the occasion when multiple datasets were used during the project. When documentation of some of the project’s datasets falls under additional requirements (e.g. projects receiving multiple grants from different sources), there is the possibility of describing datasets with more than one Dataset Description template.
</p>
</div>
<div mat-dialog-actions class="row">
<div class="ml-auto col-auto"><button mat-button mat-dialog-close mat-raised-button color="primary" (click)="cancel()">{{'GLOSSARY.CLOSE' | translate}}</button></div>
</div>
</div> </div>

4
dmp-frontend/src/app/ui/sidebar/sidebar-footer/glossary/glossary-dialog.component.scss
View File

@ -11,3 +11,7 @@
.close-btn { .close-btn {
cursor: pointer; cursor: pointer;
} }
.glossary {
margin-bottom: 1.125rem;
}

3
dmp-frontend/src/assets/i18n/en.json
View File

@ -658,7 +658,8 @@
}, },
"DATASET-TEMPLATE-LIST": { "DATASET-TEMPLATE-LIST": {
"TITLE": "Available Dataset Templates", "TITLE": "Available Dataset Templates",
"TEXT": "Dataset Profiles selected: " "TEXT": "Dataset Profiles selected: ",
"OK": "OK"
} }
}, },
"DMP-PROFILE-LISTING": { "DMP-PROFILE-LISTING": {