diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html index a85436ba8..dba577e25 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html @@ -143,7 +143,7 @@

{{ roleDisplay(user) }}

- diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss index 6b918f358..e80bc3a5a 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.scss @@ -55,7 +55,7 @@ height: 2.3em; background-color: #129D99; border-radius: 4px; - flex-direction: rows; + flex-direction: row; justify-content: space-between; border: none; } diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts index adb861816..6e1a22ef4 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts @@ -370,6 +370,14 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { }); } + removeUserFromDmp() { + // return this.dmpService.removeUserFromDmp().pipe(takeUntil(this._destroyed)) + // .subscribe( + // complete => { this.onCallbackSuccess() }, + // error => this.onDeleteCallbackError(error) + // ); + } + } diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.html b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.html index 7b57c6b4a..48c5bcdc9 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.html +++ b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.html @@ -1,16 +1,47 @@ -
+
+ +
+ close +
+
+

{{'DMP-LISTING.ACTIONS.INVITE-AUTHORS' | translate}}

+
+
+ + + + {{email}} + cancel + + + + +
+ +
+
+ +
+ + + + - +
--> + + - - + + - -
+ \ No newline at end of file diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.scss b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.scss index e69de29bb..cee86fde2 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.scss +++ b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.scss @@ -0,0 +1,56 @@ +.form-container { + width: 530px; + height: 228px; + padding: 4.5px 5.5px 14px 18px; + // margin: 28.5px 29.5px 38px 42px; +} + +.close-icon { + cursor: pointer; +} + +.title { + // text-align: left; + font-size: 38px; + font-weight: lighter; + color: #000000; + opacity: 0.8; + margin-bottom: 32px; +} + +.content { + width: 496px; + margin: 0px; + padding: 0px; +} + +.input { + border: 2px black; +} + +.mat-form-field { + background: #FAFAFA; + border: 1px solid #D1D1D1; + border-radius: 4px; +} + +::ng-deep .mat-form-field-underline { + display: none; +} + +::ng-deep .multiple-auto-complete[_ngcontent-mut-c19] { + display: none; +} + +.invite-btn{ + width: 6.64em; + height: 2.93em; + background: #FFFFFF; + border: 1px solid #B5B5B5; + border-radius: 30px; + font-weight: bold; + letter-spacing: -0.35px; + color: #B5B5B5; + margin-bottom: 1px; + } + diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.ts b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.ts index bbda70d88..20936c1c8 100644 --- a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.ts +++ b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.ts @@ -18,6 +18,7 @@ import { map, takeUntil } from 'rxjs/operators'; @Component({ selector: 'app-invitation-component', templateUrl: 'dmp-invitation.component.html', + styleUrls: ['./dmp-invitation.component.scss'], }) export class DmpInvitationDialogComponent extends BaseComponent implements OnInit { @@ -91,6 +92,10 @@ export class DmpInvitationDialogComponent extends BaseComponent implements OnIni ); } + closeDialog(): void { + this.dialogRef.close(); + } + filterUsers(value: string): Observable { this.filteredUsers = undefined; this.filteredUsersAsync = true; diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html index e69f6c004..c28357438 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html @@ -50,13 +50,13 @@ matTooltip="{{'DMP-LISTING.ACTIONS.CLONE' | translate}}" matTooltipPosition="above"> content_copy - - @@ -154,8 +154,8 @@

{{ 'DMP-LISTING.ACTIONS.EXPORT' | translate }}

-
+
@@ -206,8 +206,7 @@

{{ roleDisplay(user) }}

-
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts index d29c8be25..11ad516ae 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts @@ -566,25 +566,14 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { this.location.back(); } - removeCollaborator(id: string) { - const dialogRef = this.dialog.open(ConfirmationDialogComponent, { - maxWidth: '300px', - data: { - message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-USER'), - confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.REMOVE'), - cancelButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CANCEL'), - isDeleteConfirmation: false - } - }); - dialogRef.afterClosed().subscribe(result => { - if (result) { - this.formGroup.get('users').setValue(this.formGroup.get('users').value.filter(function (val, index, arr) { - return val.id !== id; - })); - } - }); + removeUserFromDmp() { + // return this.dmpService.updateUsers(this.dmp.id, this.dmp.users).pipe(takeUntil(this._destroyed)) + // .subscribe( + // complete => { this.onCallbackSuccess() }, + // error => this.onDeleteCallbackError(error) + // ); } - + copyDoi(doi) { console.log(doi.nativeElement.innerHTML); let domElement = doi.nativeElement as HTMLInputElement; @@ -593,14 +582,14 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { domElement.setSelectionRange(0, 0); alert('Doi Copied to Clipboard'); } - + public getOrcidPath(): string { return this.configurationService.orcidPath; } - checkLockStatus(id: string){ + checkLockStatus(id: string) { this.lockService.checkLockStatus(id).pipe(takeUntil(this._destroyed)) - .subscribe(lockStatus => this.lockStatus = lockStatus); + .subscribe(lockStatus => this.lockStatus = lockStatus); } getUserFromDMP(): any { @@ -610,7 +599,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { } } - + // advancedClicked() { // const dialogRef = this.dialog.open(ExportMethodDialogComponent, { // maxWidth: '500px', diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index b556ceb4f..ec53721ec 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -419,6 +419,7 @@ "NEW-WITH-WIZARD": "New DMP using the wizard", "EDIT": "Edit", "INVITE": "Invite Contributors", + "INVITE-AUTHORS": "Invite authors", "INVITE-SHORT": "Invite", "ADD-DATASET": "Add Dataset Description To DMP", "ADD-DATASET-DESCRIPTION": "Add dataset description", @@ -914,6 +915,7 @@ "TITLE": "Send Invitations for ", "AUTOCOMPLETE-USER": "User", "AUTOCOMPLETE-EMAIL": "Email", + "AUTOCOMPLETE-USER-EMAIL": "Kat or kat@example.com", "ACTIONS": { "SEND-INVITATION": "Send Invitations", "CANCEL": "Cancel" diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json index 02fa89ccd..d35ec3b29 100644 --- a/dmp-frontend/src/assets/i18n/es.json +++ b/dmp-frontend/src/assets/i18n/es.json @@ -418,6 +418,7 @@ "NEW-WITH-WIZARD": "Nuevo PGD utilizando el asistente", "EDIT": "Editar", "INVITE": "Invitar a participantes", + "INVITE-AUTHORS": "Invitar a autores", "INVITE-SHORT": "Invitar", "ADD-DATASET-SHORT": "Añadir Dataset", "ADD-DATASET-DESCRIPTION": "Añadir la descripción del Dataset", @@ -909,6 +910,7 @@ "TITLE": "Enviar invitaciones para ", "AUTOCOMPLETE-USER": "Usuario", "AUTOCOMPLETE-EMAIL": "Email", + "AUTOCOMPLETE-USER-EMAIL": "Kat o kat@example.com", "ACTIONS": { "SEND-INVITATION": "Enviar invitaciones", "CANCEL": "Cancelar" diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json index 4f696bf13..40d99556e 100644 --- a/dmp-frontend/src/assets/i18n/gr.json +++ b/dmp-frontend/src/assets/i18n/gr.json @@ -418,6 +418,7 @@ "NEW-WITH-WIZARD": "Νέο Σχέδιο Διαχείρισης Δεδομένων χρησιμοποιώντας τον wizard", "EDIT": "Επεξεργασία", "INVITE": "Πρόσκληση Συνεργατών", + "INVITE-AUTHORS": "Πρόσκληση συγγραφέων", "INVITE-SHORT": "Πρόσκληση", "ADD-DATASET": "Προσθήκη Περιγραφής Συνόλου Δεδομένων στο Σχέδιο Διαχείρισης Δεδομένων", "ADD-DATASET-SHORT": "Προσθήκη Συνόλου Δεδομένων", @@ -910,6 +911,7 @@ "TITLE": "Αποστολή Προσκλήσεων για", "AUTOCOMPLETE-USER": "Χρήστης", "AUTOCOMPLETE-EMAIL": "Email", + "AUTOCOMPLETE-USER-EMAIL": "Kat ή kat@example.com", "ACTIONS": { "SEND-INVITATION": "Αποστολή Προσκλήσεων", "CANCEL": "Ακύρωση"