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

Merge remote-tracking branch 'origin/Development' into Development

This commit is contained in:
George Kalampokis 2020-10-27 12:06:58 +02:00
parent 981eb48d89 5534f4f4a9
commit 22cc8bb3a3
15 changed files with 161 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.html
View File

@ -36,7 +36,7 @@
<div class="col-12">
<div class="heading">{{'DMP-EDITOR.FIELDS.TEMPLATES' | translate}}</div>
<mat-form-field>
<app-multiple-auto-complete required='true' [formControl]="this.data.formGroup.get('profiles')" placeholder="{{'DMP-EDITOR.FIELDS.SELECT-TEMPLATE' | translate}}" [configuration]="profilesAutoCompleteConfiguration">
<app-multiple-auto-complete required='true' [formControl]="this.data.formGroup.get('profiles')" placeholder="{{'DMP-EDITOR.FIELDS.SELECT-TEMPLATE' | translate}}" [configuration]="profilesAutoCompleteConfiguration" (optionActionClicked)="onPreviewTemplate($event)">
</app-multiple-auto-complete>
<mat-error *ngIf="data.formGroup.get('profiles').hasError('backendError')">
{{data.formGroup.get('profiles').getError('backendError').message}}</mat-error>

36
dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.ts
View File

@ -1,5 +1,5 @@
import { Component, Inject } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { DmpService } from '@app/core/services/dmp/dmp.service';
import { map, takeUntil } from 'rxjs/operators';
import { DmpModel } from '@app/core/model/dmp/dmp';
@ -11,13 +11,15 @@ import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile';
import { DataTableRequest } from '@app/core/model/data-table/data-table-request';
import { DatasetProfileCriteria } from '@app/core/query/dataset-profile/dataset-profile-criteria';
import { AvailableProfilesComponent } from '../../editor/available-profiles/available-profiles.component';
import { DatasetPreviewDialogComponent } from '../../dataset-preview/dataset-preview-dialog.component';
import { BaseComponent } from '@common/base/base.component';
@Component({
selector: 'app-clone-dialog',
templateUrl: './clone-dialog.component.html',
styleUrls: ['./clone-dialog.component.scss']
})
export class CloneDialogComponent {
export class CloneDialogComponent extends BaseComponent {
agreePrivacyPolicyNames = false;
initialItems = [];
@ -25,9 +27,12 @@ export class CloneDialogComponent {
constructor(
public dialogRef: MatDialogRef<CloneDialogComponent>,
private dialog: MatDialog,
private dmpService: DmpService,
@Inject(MAT_DIALOG_DATA) public data: any
) {
super();
this.selectionChanged(this.initialItems)
this.profilesAutoCompleteConfiguration = {
@ -78,4 +83,31 @@ export class CloneDialogComponent {
return this.dmpService.searchDMPProfiles(request);
}
onPreviewTemplate(event) {
const dialogRef = this.dialog.open(DatasetPreviewDialogComponent, {
width: '590px',
minHeight: '200px',
restoreFocus: false,
data: {
template: event
},
panelClass: 'custom-modalbox'
});
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
if (result) {
let profiles = this.data.formGroup.get('profiles').value;
profiles.push(event);
this.data.formGroup.get('profiles').setValue(profiles);
this.profilesAutoCompleteConfiguration = {
filterFn: this.filterProfiles.bind(this),
initialItems: (excludedItems: any[]) => this.filterProfiles('').pipe(map(result => result.filter(resultItem => (excludedItems || []).map(x => x.id).indexOf(resultItem.id) === -1))),
displayFn: (item) => item['label'],
titleFn: (item) => item['label'],
subtitleFn: (item) => item['description'],
popupItemActionIcon: 'visibility'
};
}
});
}
}

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

@ -31,17 +31,17 @@
</div>
<div class="upload-form col-sm-12 col-md-12">
<mat-form-field>
<app-multiple-auto-complete required='true' [(ngModel)]="dmpProfiles" placeholder="{{'DMP-EDITOR.FIELDS.DATASET-TEMPLATES' | translate}}" [configuration]="profilesAutoCompleteConfiguration">
<app-multiple-auto-complete required='true' [(ngModel)]="dmpProfiles" placeholder="{{'DMP-EDITOR.FIELDS.DATASET-TEMPLATES' | translate}}" [configuration]="profilesAutoCompleteConfiguration" (optionActionClicked)="onPreviewTemplate($event)">
</app-multiple-auto-complete>
</mat-form-field>
</div>
</div>
<div class="row mt-3">
<div class="col-auto ml-auto">
<button mat-button type="button" class="cancel-btn" (click)="confirm()" [disabled]="data.fileList.length === 0">{{'DMP-UPLOAD.ACTIONS.IMPORT' | translate}}</button>
<button mat-button type="button" class="cancel-btn" (click)="cancel()">{{'DMP-UPLOAD.ACTIONS.CANCEL' | translate}}</button>
</div>
<div class="col-auto">
<button mat-button type="button" class="next-btn" (click)="cancel()">{{'DMP-UPLOAD.ACTIONS.CANCEL' | translate}}</button>
<button mat-button type="button" (click)="confirm()" [disabled]="data.fileList.length === 0" [ngClass]="{'next-btn-disabled': data.fileList.length === 0, 'next-btn': data.fileList.length !== 0}">{{'DMP-UPLOAD.ACTIONS.IMPORT' | translate}}</button>
</div>
</div>
</div>

14
dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.scss
View File

@ -46,6 +46,20 @@
font-weight: 500;
}
.next-btn-disabled {
width: 100px;
height: 43px;
background: #ffffff 0% 0% no-repeat padding-box;
border: 1px solid #b5b5b5;
border-radius: 30px;
opacity: 1;
}
.next-btn:hover {
background: #129d99;
color: #ffffff;
}
.attach-btn {
top: -20px;
}

41
dmp-frontend/src/app/ui/dmp/listing/upload-dialogue/dmp-upload-dialogue.component.ts
View File

@ -1,19 +1,21 @@
import { Component, Inject } from '@angular/core';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { DmpService } from '../../../../core/services/dmp/dmp.service';
import { MultipleAutoCompleteConfiguration } from '@app/library/auto-complete/multiple/multiple-auto-complete-configuration';
import { map } from 'rxjs/operators';
import { map, takeUntil } from 'rxjs/operators';
import { Observable } from 'rxjs';
import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile';
import { DataTableRequest } from '@app/core/model/data-table/data-table-request';
import { DatasetProfileCriteria } from '@app/core/query/dataset-profile/dataset-profile-criteria';
import { DatasetPreviewDialogComponent } from '../../dataset-preview/dataset-preview-dialog.component';
import { BaseComponent } from '@common/base/base.component';
@Component({
selector: 'dmp-upload-dialogue',
templateUrl: './dmp-upload-dialogue.component.html',
styleUrls: ['./dmp-upload-dialogue.component.scss']
})
export class DmpUploadDialogue {
export class DmpUploadDialogue extends BaseComponent {
dmpTitle: string;
dmpProfiles: any[] = [];
files: File[] = [];
@ -31,8 +33,11 @@ export class DmpUploadDialogue {
constructor(
public dialogRef: MatDialogRef<DmpUploadDialogue>,
private _service: DmpService,
private dialog: MatDialog,
@Inject(MAT_DIALOG_DATA) public data: any,
) { }
) {
super();
}
cancel() {
this.data.success = false;
@ -79,6 +84,34 @@ export class DmpUploadDialogue {
this.dmpTitle = null;
}
onPreviewTemplate(event) {
const dialogRef = this.dialog.open(DatasetPreviewDialogComponent, {
width: '590px',
minHeight: '200px',
restoreFocus: false,
data: {
template: event
},
panelClass: 'custom-modalbox'
});
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
if (result) {
if(!this.dmpProfiles) {
this.dmpProfiles = [];
}
this.dmpProfiles.push(event);
this.profilesAutoCompleteConfiguration = {
filterFn: this.filterProfiles.bind(this),
initialItems: (excludedItems: any[]) => this.filterProfiles('').pipe(map(result => result.filter(resultItem => (excludedItems || []).map(x => x.id).indexOf(resultItem.id) === -1))),
displayFn: (item) => item['label'],
titleFn: (item) => item['label'],
subtitleFn: (item) => item['description'],
popupItemActionIcon: 'visibility'
};
}
});
}
filterProfiles(value: string): Observable<DatasetProfileModel[]> {
const request = new DataTableRequest<DatasetProfileCriteria>(null, null, { fields: ['+label'] });
const criteria = new DatasetProfileCriteria();

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

@ -118,7 +118,7 @@
<textarea #doi class="doi-txt">{{ dmp.doi }}</textarea>
</p>
<div class="d-flex justify-content-end">
<button (click)="copyDoi(doi)" mat-mini-fab class="mr-2 d-flex justify-content-center align-items-center" matTooltip="{{'DMP-LISTING.ACTIONS.CLONE' | translate}}" matTooltipPosition="above">
<button (click)="copyDoi(doi)" mat-mini-fab class="mr-2 d-flex justify-content-center align-items-center" matTooltip="{{'DMP-LISTING.ACTIONS.COPY' | translate}}" matTooltipPosition="above">
<mat-icon class="mat-mini-fab-icon">content_copy</mat-icon>
</button>
<button mat-mini-fab class="mr-2 d-flex justify-content-center align-items-center" matTooltip="{{'GRANT-EDITOR.ACTIONS.VISIT-WEBSITE' | translate}}" matTooltipPosition="above">

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

@ -750,7 +750,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
domElement.select();
document.execCommand('copy');
domElement.setSelectionRange(0, 0);
alert('Doi Copied to Clipboard');
this.uiNotificationService.snackBarNotification(this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-COPY-TO-CLIPBOARD'), SnackBarNotificationLevel.Success);
}
public getOrcidPath(): string {

107
dmp-frontend/src/app/ui/dmp/start-new-dataset-dialogue/start-new-dataset-dialog.component.scss
View File

@ -1,96 +1,101 @@
::ng-deep .mat-dialog-container {
border-radius: 8px;
border-radius: 8px;
}
.form-container {
width: 33rem;
min-height: 14rem;
padding: 0.28rem 0.34rem 0rem 0.625rem;
width: 33rem;
min-height: 14rem;
padding: 0.28rem 0.34rem 0rem 0.625rem;
}
.logo {
width: 8.44rem;
width: 8.44rem;
}
.close-icon {
cursor: pointer;
cursor: pointer;
}
.content {
margin: 2.17rem 0rem 1.1875rem 0rem;
margin: 2.17rem 0rem 1.1875rem 0rem;
}
.title,
.text {
font-size: 1.25rem;
font-weight: lighter;
color: #000000;
opacity: 0.8;
font-size: 1.25rem;
font-weight: lighter;
color: #000000;
opacity: 0.8;
}
.title {
text-align: left;
font-weight: 500;
font-size: 1.25rem;
letter-spacing: 0px;
color: #212121;
opacity: 1;
text-align: left;
font-weight: 500;
font-size: 1.25rem;
letter-spacing: 0px;
color: #212121;
opacity: 1;
}
.text {
margin-bottom: 2.9375rem;
line-height: 1.9rem;
margin-bottom: 2.9375rem;
line-height: 1.9rem;
}
.cancel-btn {
background: #ffffff 0% 0% no-repeat padding-box;
border: 1px solid #b5b5b5;
border-radius: 30px;
width: 101px;
height: 43px;
color: #212121;
font-weight: 500;
background: #ffffff 0% 0% no-repeat padding-box;
border: 1px solid #b5b5b5;
border-radius: 30px;
width: 101px;
height: 43px;
color: #212121;
font-weight: 500;
}
.next-btn {
background: #ffffff 0% 0% no-repeat padding-box;
border: 1px solid #129d99;
border-radius: 30px;
opacity: 1;
width: 101px;
height: 43px;
color: #129d99;
font-weight: 500;
background: #ffffff 0% 0% no-repeat padding-box;
border: 1px solid #129d99;
border-radius: 30px;
opacity: 1;
width: 101px;
height: 43px;
color: #129d99;
font-weight: 500;
}
.next-btn:hover {
background-color: #129d99;
color: white;
}
.disabled-btn {
border: 1px solid #b5b5b5;
border-radius: 30px;
opacity: 1;
width: 101px;
height: 43px;
color: #b5b5b5;
font-weight: 500;
border: 1px solid #b5b5b5;
border-radius: 30px;
opacity: 1;
width: 101px;
height: 43px;
color: #b5b5b5;
font-weight: 500;
}
.actions {
display: flex;
flex-direction: row;
display: flex;
flex-direction: row;
}
.new-dmp {
text-align: left;
text-decoration: underline;
letter-spacing: 0px;
color: #008887;
cursor: pointer;
text-align: left;
text-decoration: underline;
letter-spacing: 0px;
color: #008887;
cursor: pointer;
}
::ng-deep .dmp-form .mat-form-field-appearance-outline .mat-form-field-outline {
background: #fafafa !important;
background: #fafafa !important;
}
::ng-deep .dmp-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;
}

6
dmp-frontend/src/app/ui/dmp/start-new-dmp-dialogue/start-new-dmp-dialog.component.html
View File

@ -7,14 +7,12 @@
<h1 mat-dialog-title class="title">{{'NAV-BAR.START-NEW-DMP' | translate}}</h1>
<p class="text">{{'NAV-BAR.START-NEW-DMP-TXT' | translate}}</p>
<div class="actions">
<button type="button" class="normal-btn upload-btn d-flex flex-row align-items-center"
(click)="uploadFile($event)">
<button type="button" class="normal-btn upload-btn d-flex flex-row align-items-center" (click)="uploadFile($event)">
<mat-icon class="pr-2">file_upload</mat-icon>
{{ 'NAV-BAR.IMPORT-FROM-FILE' | translate }}
</button>
<p class="m-0">{{ 'QUICKWIZARD.CREATE-ADD.CREATE.QUICKWIZARD_CREATE.FIRST-STEP.OR' | translate }}</p>
<button type="button" class="normal-btn font-weight-bold d-flex flex-row align-items-center"
(click)="startWizard()">
<button type="button" class="normal-btn font-weight-bold d-flex flex-row align-items-center" (click)="startWizard()">
<mat-icon>chevron_right</mat-icon>
{{ 'NAV-BAR.START-WIZARD' | translate }}
</button>

2
dmp-frontend/src/assets/i18n/de.json
View File

@ -17,6 +17,7 @@
"SUCCESSFUL-LOGIN": "Anmeldung erfolgreich",
"SUCCESSFUL-LOGOUT": "Abmeldung erfolgreich",
"SUCCESSFUL-EMAIL-SEND": "E-Mail erfolgreich versendet",
"SUCCESSFUL-COPY-TO-CLIPBOARD": "Copied to Clipboard",
"UNSUCCESSFUL-LOGOUT": "Abmeldung fehlgeschlagen",
"UNSUCCESSFUL-LOGIN": "Anmeldung fehlgeschlagen",
"SUCCESSFUL-DATASET-PROFILE-DELETE": "Erfolgreich gelöscht",
@ -470,6 +471,7 @@
"START-NEW-VERSION": "Start New Version",
"VIEW-VERSION": "Alle DMP-Versionen",
"CLONE": "Klonen",
"COPY": "Kopieren",
"DELETE": "Löschen",
"DEPOSIT": "Deposit",
"EXPORT": "Exportieren",

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

@ -17,6 +17,7 @@
"SUCCESSFUL-LOGIN": "Successful Login",
"SUCCESSFUL-LOGOUT": "Successful Logout",
"SUCCESSFUL-EMAIL-SEND": "Email sent successfully",
"SUCCESSFUL-COPY-TO-CLIPBOARD": "Copied to Clipboard",
"UNSUCCESSFUL-LOGOUT": "Unsuccessful Logout",
"UNSUCCESSFUL-LOGIN": "Unsuccessful Login",
"SUCCESSFUL-DATASET-PROFILE-DELETE": "Successful Delete",
@ -470,6 +471,7 @@
"START-NEW-VERSION": "Start New Version",
"VIEW-VERSION": "All DMP Versions",
"CLONE": "Clone",
"COPY": "Copy",
"DELETE": "Delete",
"DEPOSIT": "Deposit",
"EXPORT": "Export",

2
dmp-frontend/src/assets/i18n/es.json
View File

@ -17,6 +17,7 @@
"SUCCESSFUL-LOGIN": "Inicio de sesión correcto",
"SUCCESSFUL-LOGOUT": "Cierre de sesión correcto",
"SUCCESSFUL-EMAIL-SEND": "El mensaje ha sido enviado correctamente",
"SUCCESSFUL-COPY-TO-CLIPBOARD": "Copied to Clipboard",
"UNSUCCESSFUL-LOGOUT": "Cierre de sesión fallido",
"UNSUCCESSFUL-LOGIN": "Inicio de sesión fallido",
"SUCCESSFUL-DATASET-PROFILE-DELETE": "Borrado correcto",
@ -470,6 +471,7 @@
"START-NEW-VERSION": "Iniciar una nueva versión",
"VIEW-VERSION": "Todas las versiones del PGD",
"CLONE": "Clonar",
"COPY": "Copiar",
"DELETE": "Borrar",
"DEPOSIT": "Depositar",
"EXPORT": "Exportar",

2
dmp-frontend/src/assets/i18n/gr.json
View File

@ -17,6 +17,7 @@
"SUCCESSFUL-LOGIN": "Επιτυχής σύνδεση",
"SUCCESSFUL-LOGOUT": "Επιτυχής αποσύνδεση",
"SUCCESSFUL-EMAIL-SEND": "Το email στάλθηκε επιτυχώς",
"SUCCESSFUL-COPY-TO-CLIPBOARD": "Copied to Clipboard",
"UNSUCCESSFUL-LOGOUT": "Αποτυχημένη αποσύνδεση",
"UNSUCCESSFUL-LOGIN": "Αποτυχημένη σύνδεση",
"SUCCESSFUL-DATASET-PROFILE-DELETE": "Επιτυχής διαγραφή",
@ -470,6 +471,7 @@
"START-NEW-VERSION": "Νέα Έκδοση",
"VIEW-VERSION": "Όλες οι Εκδόσεις Σχεδίων Διαχείρισης Δεδομένων",
"CLONE": "Κλώνος",
"COPY": "Αντιγραφή",
"DELETE": "Διαγραφή",
"DEPOSIT": "Κατάθεση",
"EXPORT": "Εξαγωγή",

2
dmp-frontend/src/assets/i18n/sk.json
View File

@ -17,6 +17,7 @@
"SUCCESSFUL-LOGIN": "Úspešné prihlásenie",
"SUCCESSFUL-LOGOUT": "Úspešné odhlásenie",
"SUCCESSFUL-EMAIL-SEND": "Email úspešne odoslaný",
"SUCCESSFUL-COPY-TO-CLIPBOARD": "Copied to Clipboard",
"UNSUCCESSFUL-LOGOUT": "Neúspešné odhlásenie",
"UNSUCCESSFUL-LOGIN": "Neúspešné prihlásenie",
"SUCCESSFUL-DATASET-PROFILE-DELETE": "Úspešne vymazané",
@ -470,6 +471,7 @@
"START-NEW-VERSION": "Začať novú verziu",
"VIEW-VERSION": "Všetky verzie DMP",
"CLONE": "Klonovať",
"COPY": "Kopírovať",
"DELETE": "Vymazať",
"DEPOSIT": "Vložiť",
"EXPORT": "Exportovať",

2
dmp-frontend/src/assets/i18n/tr.json
View File

@ -17,6 +17,7 @@
"SUCCESSFUL-LOGIN": "Başarılı Giriş",
"SUCCESSFUL-LOGOUT": "Başarılı Çıkış",
"SUCCESSFUL-EMAIL-SEND": "E-posta başarıyla gönderildi",
"SUCCESSFUL-COPY-TO-CLIPBOARD": "Copied to Clipboard",
"UNSUCCESSFUL-LOGOUT": "Başarısız Çıkış",
"UNSUCCESSFUL-LOGIN": "Başarısız Giriş",
"SUCCESSFUL-DATASET-PROFILE-DELETE": "Silme Başarılı",
@ -470,6 +471,7 @@
"START-NEW-VERSION": "Yeni Sürümü Başlat",
"VIEW-VERSION": "Tüm VYP Sürümleri",
"CLONE": "Çoğalt",
"COPY": "Kopyala",
"DELETE": "Sil",
"DEPOSIT": "Depozito",
"EXPORT": "Dışarı Aktar",