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

no message

This commit is contained in:
Ioannis Kalyvas 2018-07-24 12:04:12 +03:00
parent 518a2ffd3c
commit 14f9be46f0
17 changed files with 266 additions and 498 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -27,3 +27,7 @@ dmp-backend/data/target/
dmp-backend/queryable/target/ dmp-backend/queryable/target/
dmp-backend/elastic/target/ dmp-backend/elastic/target/
dmp-backend/queryengine/target/ dmp-backend/queryengine/target/
*.tar
*.gz
final/
temp/

BIN
dmp-backend/logging/target/logging-1.0-SNAPSHOT.jar
View File

Binary file not shown.

11
dmp-backend/logging/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
View File

@ -1,11 +0,0 @@
C:\Users\ikalyvas\Documents\OpenAIRE-EUDAT-DMP-service-pilot\dmp-backend\logging\src\main\java\eu\eudat\core\models\exception\ApiExceptionLoggingModel.java
C:\Users\ikalyvas\Documents\OpenAIRE-EUDAT-DMP-service-pilot\dmp-backend\logging\src\main\java\types\LoggingOutputType.java
C:\Users\ikalyvas\Documents\OpenAIRE-EUDAT-DMP-service-pilot\dmp-backend\logging\src\main\java\eu\eudat\core\models\AuditModel.java
C:\Users\ikalyvas\Documents\OpenAIRE-EUDAT-DMP-service-pilot\dmp-backend\logging\src\main\java\eu\eudat\core\models\LoggingModel.java
C:\Users\ikalyvas\Documents\OpenAIRE-EUDAT-DMP-service-pilot\dmp-backend\logging\src\main\java\eu\eudat\core\models\simple\SimpleAuditModel.java
C:\Users\ikalyvas\Documents\OpenAIRE-EUDAT-DMP-service-pilot\dmp-backend\logging\src\main\java\eu\eudat\core\logger\common\AbstractBatchLogger.java
C:\Users\ikalyvas\Documents\OpenAIRE-EUDAT-DMP-service-pilot\dmp-backend\logging\src\main\java\eu\eudat\core\models\simple\SimpleLoggingModel.java
C:\Users\ikalyvas\Documents\OpenAIRE-EUDAT-DMP-service-pilot\dmp-backend\logging\src\main\java\eu\eudat\core\logger\remote\http\HttpRemoteLogger.java
C:\Users\ikalyvas\Documents\OpenAIRE-EUDAT-DMP-service-pilot\dmp-backend\logging\src\main\java\eu\eudat\core\logger\Logger.java
C:\Users\ikalyvas\Documents\OpenAIRE-EUDAT-DMP-service-pilot\dmp-backend\logging\src\main\java\eu\eudat\core\models\exception\ExceptionLoggingModel.java
C:\Users\ikalyvas\Documents\OpenAIRE-EUDAT-DMP-service-pilot\dmp-backend\logging\src\main\java\types\LoggingType.java

6
dmp-backend/web/src/main/resources/application.properties
View File

@ -30,7 +30,7 @@ spring.mail.test-connection=false
spring.mail.properties.mail.smtp.auth=true spring.mail.properties.mail.smtp.auth=true
spring.mail.properties.mail.smtp.starttls.enable=true spring.mail.properties.mail.smtp.starttls.enable=true
mail.subject=Invitation to DMP Plan {dmpname} mail.subject=Invitation to DMP Plan {dmpname}
mail.content=You have been invited to {dmpname} data management plan.Follow the link http://dl043.madgik.di.uoa.gr:8080/invitation/{invitationID} to submit it mail.content=You have been invited to {dmpname} data management plan.Follow the link http://dl043.madgik.di.uoa.gr/invitation/{invitationID} to submit it
mail.from=citesagrdev@gmail.com mail.from=citesagrdev@gmail.com
########################FACEBOOK LOGIN Properties############################# ########################FACEBOOK LOGIN Properties#############################
facebook.login.clientId=110586756143149 facebook.login.clientId=110586756143149
@ -45,7 +45,7 @@ linkedin.login.redirect_uri=http://localhost:4200/login/linkedin
########################LINKEDIN LOGIN Properties############################# ########################LINKEDIN LOGIN Properties#############################
twitter.login.clientId=HiR4hQH9HNubKC5iKQy0l4mAZ twitter.login.clientId=HiR4hQH9HNubKC5iKQy0l4mAZ
twitter.login.clientSecret=9KZHgkqUO2QFnELSL14jeUvfUacWX23rqD8OW8X0xoRDXOSfKH twitter.login.clientSecret=9KZHgkqUO2QFnELSL14jeUvfUacWX23rqD8OW8X0xoRDXOSfKH
twitter.login.redirect_uri=http://localhost:4200/login/twitter twitter.login.redirect_uri=http://dl043.madgik.di.uoa.gr/login/twitter
########################Persistence/Hibernate/Batch############################## ########################Persistence/Hibernate/Batch##############################
spring.profiles.active=devel spring.profiles.active=devel
########################Persistence/Hibernate/Connection pool#################### ########################Persistence/Hibernate/Connection pool####################
@ -55,7 +55,7 @@ autouser.root.username=root
################################################################################# #################################################################################
b2access.externallogin.user_info_url=https://b2access-integration.fz-juelich.de:443/oauth2/userinfo b2access.externallogin.user_info_url=https://b2access-integration.fz-juelich.de:443/oauth2/userinfo
b2access.externallogin.access_token_url=https://b2access-integration.fz-juelich.de:443/oauth2/token b2access.externallogin.access_token_url=https://b2access-integration.fz-juelich.de:443/oauth2/token
b2access.externallogin.redirect_uri=http://dmp.eudat.org:4200/api/oauth/authorized/b2access b2access.externallogin.redirect_uri=http://dl043.madgik.di.uoa.gr/api/oauth/authorized/b2access
b2access.externallogin.clientid=eudatdmptool b2access.externallogin.clientid=eudatdmptool
b2access.externallogin.clientSecret=A3b*1*92 b2access.externallogin.clientSecret=A3b*1*92
################################################################################# #################################################################################

12
dmp-frontend/src/app/app.component.scss
View File

@ -1,3 +1,15 @@
.example-container { .example-container {
background: rgb(250, 248, 248); background: rgb(250, 248, 248);
} }
.fixed {
position: fixed;
top: 0; /* Sets the sticky toolbar to be on top */
z-index: 1000;
width: 100%;
}
.main-container{
margin-top: 64px;
padding-top: 10px;
}

450
dmp-frontend/src/app/dmps/editor/dmp-editor.component.ts
View File

@ -24,7 +24,6 @@ import { AddResearchersComponent } from "../../shared/components/add-researchers
import { ViewContainerRef } from '@angular/core'; import { ViewContainerRef } from '@angular/core';
import { TdDialogService } from '@covalent/core'; import { TdDialogService } from '@covalent/core';
import { AvailableProfilesComponent } from "../../shared/components/available-profiles/available-profiles.component"; import { AvailableProfilesComponent } from "../../shared/components/available-profiles/available-profiles.component";
import { AutoCompleteChipConfiguration } from "../../shared/components/autocompleteChips/AutoCompleteChipConfiguration";
import { BaseCriteria } from "../../models/criteria/BaseCriteria"; import { BaseCriteria } from "../../models/criteria/BaseCriteria";
import { DataManagementPlanProfileService } from "../../services/data-management-plan-profile/datamanagement-profile.service"; import { DataManagementPlanProfileService } from "../../services/data-management-plan-profile/datamanagement-profile.service";
import { DataManagementPlanProfileListingModel } from "../../models/data-management-plan-profile/DataManagementPlanProfileListingModel"; import { DataManagementPlanProfileListingModel } from "../../models/data-management-plan-profile/DataManagementPlanProfileListingModel";
@ -35,276 +34,271 @@ import { IBreadCrumbComponent } from "../../shared/components/breadcrumb/definit
import { BreadcrumbItem } from "../../shared/components/breadcrumb/definition/breadcrumb-item"; import { BreadcrumbItem } from "../../shared/components/breadcrumb/definition/breadcrumb-item";
@Component({ @Component({
selector: 'app-dmp-editor-component', selector: 'app-dmp-editor-component',
templateUrl: 'dmp-editor.component.html', templateUrl: 'dmp-editor.component.html',
styleUrls: ['./dmp-editor.component.scss'], styleUrls: ['./dmp-editor.component.scss'],
encapsulation: ViewEncapsulation.None encapsulation: ViewEncapsulation.None
}) })
export class DataManagementPlanEditorComponent implements AfterViewInit, IBreadCrumbComponent { export class DataManagementPlanEditorComponent implements AfterViewInit, IBreadCrumbComponent {
breadCrumbs: Observable<BreadcrumbItem[]>; breadCrumbs: Observable<BreadcrumbItem[]>;
isNew = true; isNew = true;
textCtrl = new FormControl(); textCtrl = new FormControl();
dataManagementPlan: DataManagementPlanModel; dataManagementPlan: DataManagementPlanModel;
formGroup: FormGroup = null; formGroup: FormGroup = null;
filteringOrganisationsAsync: boolean = false; filteringOrganisationsAsync: boolean = false;
filteringResearchersAsync: boolean = false; filteringResearchersAsync: boolean = false;
filteredProfilesAsync: boolean = false; filteredProfilesAsync: boolean = false;
filteredOrganisations: ExternalSourcesItemModel[]; filteredOrganisations: ExternalSourcesItemModel[];
filteredResearchers: ExternalSourcesItemModel[]; filteredResearchers: ExternalSourcesItemModel[];
filteredProfiles: DatasetProfileModel[]; filteredProfiles: DatasetProfileModel[];
projectAutoCompleteConfiguration: AutoCompleteConfiguration; projectAutoCompleteConfiguration: AutoCompleteConfiguration;
organisationsAutoCompleteConfiguration: AutoCompleteChipConfiguration; createNewVersion;
createNewVersion; associatedUsers: Array<DmpUsersModel>
associatedUsers: Array<DmpUsersModel> filteredOptions: Observable<DataManagementPlanProfileListingModel>
filteredOptions: Observable<DataManagementPlanProfileListingModel>
constructor( constructor(
private dmpProfileService: DataManagementPlanProfileService, private dmpProfileService: DataManagementPlanProfileService,
private dataManagementPlanService: DataManagementPlanService, private dataManagementPlanService: DataManagementPlanService,
private projectService: ProjectService, private projectService: ProjectService,
private externalSourcesService: ExternalSourcesService, private externalSourcesService: ExternalSourcesService,
private route: ActivatedRoute, private route: ActivatedRoute,
public snackBar: MatSnackBar, public snackBar: MatSnackBar,
public router: Router, public router: Router,
public language: TranslateService, public language: TranslateService,
private _service: DataManagementPlanService, private _service: DataManagementPlanService,
public dialog: MatDialog, public dialog: MatDialog,
private _dialogService: TdDialogService, private _dialogService: TdDialogService,
private _viewContainerRef: ViewContainerRef, private _viewContainerRef: ViewContainerRef,
private languageResolverService: LanguageResolverService private languageResolverService: LanguageResolverService
) { ) {
this.filteredOptions = dmpProfileService.getAll({ criteria: new DataManagementPlanProfileCriteria() }); this.filteredOptions = dmpProfileService.getAll({ criteria: new DataManagementPlanProfileCriteria() });
} }
ngAfterViewInit() { ngAfterViewInit() {
this.route.params.subscribe((params: Params) => { this.route.params.subscribe((params: Params) => {
const itemId = params['id']; const itemId = params['id'];
let projectRequestItem: RequestItem<ProjectCriteria> = new RequestItem(); let projectRequestItem: RequestItem<ProjectCriteria> = new RequestItem();
projectRequestItem.criteria = new ProjectCriteria(); projectRequestItem.criteria = new ProjectCriteria();
let organisationRequestItem: RequestItem<BaseCriteria> = new RequestItem(); let organisationRequestItem: RequestItem<BaseCriteria> = new RequestItem();
organisationRequestItem.criteria = new BaseCriteria(); organisationRequestItem.criteria = new BaseCriteria();
this.projectAutoCompleteConfiguration = new AutoCompleteConfiguration(this.projectService.getWithExternal.bind(this.projectService), projectRequestItem); this.projectAutoCompleteConfiguration = new AutoCompleteConfiguration(this.projectService.getWithExternal.bind(this.projectService), projectRequestItem);
this.organisationsAutoCompleteConfiguration = new AutoCompleteChipConfiguration(this.externalSourcesService.searchDMPOrganizations.bind(this.externalSourcesService), organisationRequestItem);
if (itemId != null) { if (itemId != null) {
this.isNew = false; this.isNew = false;
this.dataManagementPlanService.getSingle(itemId).map(data => data as DataManagementPlanModel) this.dataManagementPlanService.getSingle(itemId).map(data => data as DataManagementPlanModel)
.subscribe(async data => { .subscribe(async data => {
this.dataManagementPlan = JsonSerializer.fromJSONObject(data, DataManagementPlanModel); this.dataManagementPlan = JsonSerializer.fromJSONObject(data, DataManagementPlanModel);
this.formGroup = this.dataManagementPlan.buildForm(); this.formGroup = this.dataManagementPlan.buildForm();
if (this.formGroup.get("profile") && this.formGroup.get("profile").value) { if (this.formGroup.get("profile") && this.formGroup.get("profile").value) {
this.textCtrl.patchValue(this.formGroup.get("profile").value); this.textCtrl.patchValue(this.formGroup.get("profile").value);
} }
this.breadCrumbs = Observable.of([ this.breadCrumbs = Observable.of([
{ {
parentComponentName: "DataManagementPlanListingComponent", parentComponentName: "DataManagementPlanListingComponent",
label: 'DMPs', label: 'DMPs',
url: "dmps", url: "dmps",
notFoundResolver: [await this.projectService.getSingle(this.dataManagementPlan.project.id).map(x => ({ label: x.label, url: '/projects/edit/' + x.id }) as BreadcrumbItem).toPromise()] notFoundResolver: [await this.projectService.getSingle(this.dataManagementPlan.project.id).map(x => ({ label: x.label, url: '/projects/edit/' + x.id }) as BreadcrumbItem).toPromise()]
} }
] ]
) )
this.associatedUsers = data.associatedUsers; this.associatedUsers = data.associatedUsers;
}); });
} else { } else {
this.dataManagementPlan = new DataManagementPlanModel(); this.dataManagementPlan = new DataManagementPlanModel();
setTimeout(async () => { setTimeout(async () => {
this.formGroup = this.dataManagementPlan.buildForm(); this.formGroup = this.dataManagementPlan.buildForm();
if (this.formGroup.get("profile") && this.formGroup.get("profile").value) { if (this.formGroup.get("profile") && this.formGroup.get("profile").value) {
this.textCtrl.patchValue(this.formGroup.get("profile").value); this.textCtrl.patchValue(this.formGroup.get("profile").value);
} }
this.breadCrumbs = Observable.of([ this.breadCrumbs = Observable.of([
{ {
parentComponentName: "DataManagementPlanListingComponent", parentComponentName: "DataManagementPlanListingComponent",
label: 'DMPs', label: 'DMPs',
url: "dmps", url: "dmps",
} }
]) ])
}); });
} }
}); });
this.route this.route
.queryParams .queryParams
.subscribe(params => { .subscribe(params => {
this.createNewVersion = params["clone"]; this.createNewVersion = params["clone"];
}); });
} }
formSubmit(): void { formSubmit(): void {
//this.touchAllFormFields(this.formGroup); //this.touchAllFormFields(this.formGroup);
if (!this.isFormValid()) { return; } if (!this.isFormValid()) { return; }
this.onSubmit(); this.onSubmit();
} }
public isFormValid() { public isFormValid() {
return this.formGroup.valid; return this.formGroup.valid;
} }
onSubmit(): void { onSubmit(): void {
this.dataManagementPlanService.createDataManagementPlan(this.formGroup.value).subscribe( this.dataManagementPlanService.createDataManagementPlan(this.formGroup.value).subscribe(
complete => this.onCallbackSuccess(), complete => this.onCallbackSuccess(),
error => this.onCallbackError(error) error => this.onCallbackError(error)
) )
} }
onCallbackSuccess(): void { onCallbackSuccess(): void {
this.snackBar.openFromComponent(SnackBarNotificationComponent, { this.snackBar.openFromComponent(SnackBarNotificationComponent, {
data: { message: this.isNew ? 'GENERAL.SNACK-BAR.SUCCESSFUL-CREATION' : 'GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE', language: this.language }, data: { message: this.isNew ? 'GENERAL.SNACK-BAR.SUCCESSFUL-CREATION' : 'GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE', language: this.language },
duration: 3000, duration: 3000,
}) })
this.router.navigate(['/dmps']); this.router.navigate(['/dmps']);
} }
onCallbackError(error: any) { onCallbackError(error: any) {
this.setErrorModel(error.error); this.setErrorModel(error.error);
//this.validateAllFormFields(this.formGroup); //this.validateAllFormFields(this.formGroup);
} }
public setErrorModel(errorModel: BaseErrorModel) { public setErrorModel(errorModel: BaseErrorModel) {
Object.keys(errorModel).forEach(item => { Object.keys(errorModel).forEach(item => {
(<any>this.dataManagementPlan.errorModel)[item] = (<any>errorModel)[item]; (<any>this.dataManagementPlan.errorModel)[item] = (<any>errorModel)[item];
}) })
} }
public cancel(): void { public cancel(): void {
this.router.navigate(['/dmps']); this.router.navigate(['/dmps']);
} }
public invite(): void { public invite(): void {
this.router.navigate(['/invite/' + this.dataManagementPlan.id]); this.router.navigate(['/invite/' + this.dataManagementPlan.id]);
} }
filterOrganisations(value: string): void { filterOrganisations(value: string): void {
this.filteredOrganisations = undefined; this.filteredOrganisations = undefined;
if (value) { if (value) {
this.filteringOrganisationsAsync = true; this.filteringOrganisationsAsync = true;
this.externalSourcesService.searchDMPOrganizations(value).subscribe(items => { this.externalSourcesService.searchDMPOrganizations(value).subscribe(items => {
this.filteredOrganisations = items; this.filteredOrganisations = items;
this.filteringOrganisationsAsync = false; this.filteringOrganisationsAsync = false;
// this.filteredOrganisations = items.filter((filteredObj: any) => { // this.filteredOrganisations = items.filter((filteredObj: any) => {
// return this.objectsModel ? this.objectsModel.indexOf(filteredObj) < 0 : true; // return this.objectsModel ? this.objectsModel.indexOf(filteredObj) < 0 : true;
// }); // });
}); });
} }
} }
filterResearchers(value: string): void { filterResearchers(value: string): void {
this.filteredResearchers = undefined; this.filteredResearchers = undefined;
if (value) { if (value) {
this.filteringResearchersAsync = true; this.filteringResearchersAsync = true;
this.externalSourcesService.searchDMPResearchers({ criteria: { name: value, like: null } }).subscribe(items => { this.externalSourcesService.searchDMPResearchers({ criteria: { name: value, like: null } }).subscribe(items => {
this.filteredResearchers = items; this.filteredResearchers = items;
this.filteringResearchersAsync = false; this.filteringResearchersAsync = false;
}); });
} }
} }
filterProfiles(value: string): void { filterProfiles(value: string): void {
this.filteredProfiles = undefined; this.filteredProfiles = undefined;
if (value) { if (value) {
this.filteredProfilesAsync = true; this.filteredProfilesAsync = true;
const request = new RequestItem<DatasetProfileCriteria>(); const request = new RequestItem<DatasetProfileCriteria>();
let criteria = new DatasetProfileCriteria(); let criteria = new DatasetProfileCriteria();
criteria.like = value; criteria.like = value;
request.criteria = criteria; request.criteria = criteria;
this._service.searchDMPProfiles(request).subscribe(items => { this._service.searchDMPProfiles(request).subscribe(items => {
this.filteredProfiles = items; this.filteredProfiles = items;
this.filteredProfilesAsync = false; this.filteredProfilesAsync = false;
}); });
} }
} }
addResearcher(rowId: any, rowName: any) { addResearcher(rowId: any, rowName: any) {
let dialogRef = this.dialog.open(AddResearchersComponent, { let dialogRef = this.dialog.open(AddResearchersComponent, {
height: '255px', height: '255px',
width: '700px', width: '700px',
data: { data: {
dmpId: rowId, dmpId: rowId,
dmpName: rowName dmpName: rowName
} }
}); });
} }
availableProfiles() { availableProfiles() {
let dialogRef = this.dialog.open(AvailableProfilesComponent, { let dialogRef = this.dialog.open(AvailableProfilesComponent, {
height: '355px', height: '355px',
width: '700px', width: '700px',
data: { data: {
profiles: this.formGroup.get("profiles")
}
});
} return false;
}); }
dialogRef.afterClosed().subscribe(result => {
this.formGroup.get("profiles").setValue(result);
});
return false; openConfirm(dmpLabel, id): void {
} this._dialogService.openConfirm({
message: 'Are you sure you want to delete the "' + dmpLabel + '"',
openConfirm(dmpLabel, id): void { disableClose: true || false, // defaults to false
this._dialogService.openConfirm({ viewContainerRef: this._viewContainerRef, //OPTIONAL
message: 'Are you sure you want to delete the "' + dmpLabel + '"', title: 'Confirm', //OPTIONAL, hides if not provided
disableClose: true || false, // defaults to false cancelButton: 'No', //OPTIONAL, defaults to 'CANCEL'
viewContainerRef: this._viewContainerRef, //OPTIONAL acceptButton: 'Yes' //OPTIONAL, defaults to 'ACCEPT'
title: 'Confirm', //OPTIONAL, hides if not provided // width: '500px', //OPTIONAL, defaults to 400px
cancelButton: 'No', //OPTIONAL, defaults to 'CANCEL' }).afterClosed().subscribe((accept: boolean) => {
acceptButton: 'Yes' //OPTIONAL, defaults to 'ACCEPT' if (accept) {
// width: '500px', //OPTIONAL, defaults to 400px this.dataManagementPlanService.delete(id).subscribe(() => {
}).afterClosed().subscribe((accept: boolean) => { this.router.navigate(['/dmps'])
if (accept) { });
this.dataManagementPlanService.delete(id).subscribe(() => { } else {
this.router.navigate(['/dmps']) // DO SOMETHING ELSE
}); }
} else { });
// DO SOMETHING ELSE }
}
});
}
selectOption(option: any) { selectOption(option: any) {
this.dataManagementPlan.definition = null; this.dataManagementPlan.definition = null;
this.formGroup.get("profile").patchValue(option, { emitEvent: false }) this.formGroup.get("profile").patchValue(option, { emitEvent: false })
this.dmpProfileService.getSingle(option.id).subscribe(result => { this.dmpProfileService.getSingle(option.id).subscribe(result => {
this.dataManagementPlan.definition = result.definition; this.dataManagementPlan.definition = result.definition;
}) })
} }
displayWith(item: any) { displayWith(item: any) {
if (!item) return null; if (!item) return null;
return item["label"]; return item["label"];
} }
redirectToProject() { redirectToProject() {
this.router.navigate(["projects/edit/" + this.dataManagementPlan.project.id]) this.router.navigate(["projects/edit/" + this.dataManagementPlan.project.id])
} }
redirectToDatasets() { redirectToDatasets() {
this.router.navigate(["datasets/dmp/" + this.dataManagementPlan.id]) this.router.navigate(["datasets/dmp/" + this.dataManagementPlan.id])
} }
newVersion(id: String, label: String) { newVersion(id: String, label: String) {
this.router.navigate(['/dmps/new_version/' + id, { dmpLabel: label }]); this.router.navigate(['/dmps/new_version/' + id, { dmpLabel: label }]);
} }
clone(id: String) { clone(id: String) {
this.router.navigate(['/dmps/clone/' + id]); this.router.navigate(['/dmps/clone/' + id]);
} }
} }

3
dmp-frontend/src/app/dmps/wizard/editor/dmp-wizard-editor.component.ts
View File

@ -19,7 +19,6 @@ import { TranslateService } from "@ngx-translate/core";
import { DataSource } from "@angular/cdk/table"; import { DataSource } from "@angular/cdk/table";
import { Observable } from "rxjs/Observable"; import { Observable } from "rxjs/Observable";
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { AutoCompleteChipConfiguration } from "../../../shared/components/autocompleteChips/AutoCompleteChipConfiguration";
import { BaseCriteria } from '../../../models/criteria/BaseCriteria'; import { BaseCriteria } from '../../../models/criteria/BaseCriteria';
@ -43,7 +42,6 @@ export class DataManagementPlanWizardEditorComponent implements AfterViewInit {
filteredProfiles: DatasetProfileModel[]; filteredProfiles: DatasetProfileModel[];
projectAutoCompleteConfiguration: AutoCompleteConfiguration; projectAutoCompleteConfiguration: AutoCompleteConfiguration;
organisationsAutoCompleteConfiguration: AutoCompleteChipConfiguration;
createNewVersion; createNewVersion;
associatedUsers: Array<DmpUsersModel> associatedUsers: Array<DmpUsersModel>
labelDisabled: boolean = false; labelDisabled: boolean = false;
@ -69,7 +67,6 @@ export class DataManagementPlanWizardEditorComponent implements AfterViewInit {
let organisationRequestItem: RequestItem<BaseCriteria> = new RequestItem(); let organisationRequestItem: RequestItem<BaseCriteria> = new RequestItem();
organisationRequestItem.criteria = new BaseCriteria(); organisationRequestItem.criteria = new BaseCriteria();
this.organisationsAutoCompleteConfiguration = new AutoCompleteChipConfiguration(this.externalSourcesService.searchDMPOrganizations.bind(this.externalSourcesService), organisationRequestItem);
this.route.data.subscribe(value => { this.route.data.subscribe(value => {
if (value.clone == false && this.formGroup.get("label").value) { if (value.clone == false && this.formGroup.get("label").value) {

19
dmp-frontend/src/app/homepage/homepage.component.html
View File

@ -8,25 +8,22 @@
</div> </div>
<div class="row" style="margin-top: 30px"> <div class="row" style="margin-top: 30px">
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12 col-md-offset-1"> <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12 col-md-offset-1">
<app-figurecard title={{dashboardStatisticsData.totalProjectCount}} headerIcon="list" [category]="this.isAuthenticated() ? 'My Projects' : 'Projects'" <app-figurecard title={{dashboardStatisticsData.totalDataManagementPlanCount}} headerIcon="mode_edit" [category]="this.isAuthenticated() ? 'DASHBOARD.MY-DMPS' : 'DASHBOARD.DMPS' "
[hasFootContent]="this.isAuthenticated()" [footContent]="this.isAuthenticated() ? 'Open My Projects' : 'Open Projects'" routelLink='/dmps' footerIcon="open_in_new" linearColor="linear-gradient(60deg, #ef5350, #e53935)" boxShadow="0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(244, 67, 54, 0.4)">
</app-figurecard>
</div>
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12 ">
<app-figurecard title={{dashboardStatisticsData.totalProjectCount}} headerIcon="list" [category]="this.isAuthenticated() ? 'DASHBOARD.MY-PROJECTS' : 'DASHBOARD.PROJECTS' "
routelLink='/projects' footerIcon="open_in_new" linearColor="linear-gradient(60deg, #ffa726, #fb8c00)" boxShadow="0 4px 20px 0 rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 152, 0, 0.4)"> routelLink='/projects' footerIcon="open_in_new" linearColor="linear-gradient(60deg, #ffa726, #fb8c00)" boxShadow="0 4px 20px 0 rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(255, 152, 0, 0.4)">
</app-figurecard> </app-figurecard>
</div> </div>
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12"> <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
<app-figurecard title={{dashboardStatisticsData.totalDataManagementPlanCount}} headerIcon="mode_edit" [category]="this.isAuthenticated() ? 'My DMPs' : 'DMPs'" <app-figurecard title={{dashboardStatisticsData.totalDataSetCount}} headerIcon="subject" [category]="this.isAuthenticated() ? 'DASHBOARD.MY-DATASETS' : 'DASHBOARD.DATASETS'"
[hasFootContent]="this.isAuthenticated()" [footContent]="this.isAuthenticated() ? 'Open My DMPs' : 'Open DMPs'" routelLink='/dmps'
footerIcon="open_in_new" linearColor="linear-gradient(60deg, #ef5350, #e53935)" boxShadow="0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(244, 67, 54, 0.4)">
</app-figurecard>
</div>
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
<app-figurecard title={{dashboardStatisticsData.totalDataSetCount}} headerIcon="subject" [category]="this.isAuthenticated() ? 'My Datasets' : 'Datasets'"
[hasFootContent]="this.isAuthenticated()" [footContent]="this.isAuthenticated() ? 'Open My Datasets' : 'Open Datasets'"
routelLink='/datasets' footerIcon="open_in_new" linearColor="linear-gradient(60deg, #26c6da, #00acc1)" boxShadow="0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(0, 188, 212, 0.4)"> routelLink='/datasets' footerIcon="open_in_new" linearColor="linear-gradient(60deg, #26c6da, #00acc1)" boxShadow="0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(0, 188, 212, 0.4)">
</app-figurecard> </app-figurecard>
</div> </div>
</div> </div>
<div *ngIf="this.isAuthenticated()" class="row" style="margin-top: 30px"> <div *ngIf="this.isAuthenticated()" class="row">
<div class="col-lg-9 col-md-12 col-sm-12 col-xs-12 col-md-offset-1"> <div class="col-lg-9 col-md-12 col-sm-12 col-xs-12 col-md-offset-1">
<app-recent-activity></app-recent-activity> <app-recent-activity></app-recent-activity>
</div> </div>

11
dmp-frontend/src/app/shared/components/autocompleteChips/AutoCompleteChipConfiguration.ts
View File

@ -1,11 +0,0 @@
import { BaseCriteria } from "../../../models/criteria/BaseCriteria";
import { RequestItem } from "../../../models/criteria/RequestItem";
export class AutoCompleteChipConfiguration {
public callback: Function;
public requestItem: RequestItem<any>;
constructor(callback: Function, requestItem: RequestItem<any>) {
this.callback = callback;
this.requestItem = requestItem;
}
}

21
dmp-frontend/src/app/shared/components/autocompleteChips/autocompleteChips.component.html
View File

@ -1,21 +0,0 @@
<mat-form-field>
<mat-chip-list #chipList [required]="required">
<mat-chip *ngFor="let item of selectedItems" (remove)="remove(item)">
{{item.name}}
<mat-icon matChipRemove>cancel</mat-icon>
</mat-chip>
<input matInput [matChipInputFor]="chipList" [matAutocomplete]="auto" [formControl]="control" placeholder="{{placeholder}}"
[required]="required" #chipInput>
</mat-chip-list>
<mat-error *ngIf="control['errors']['required']">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
<mat-progress-spinner matSuffix mode="indeterminate" *ngIf="loading" [diameter]="22"></mat-progress-spinner>
<mat-autocomplete #auto="matAutocomplete" [displayWith]="displayWith.bind(this)" (optionSelected)="this.optionSelected($event)">
<mat-option *ngFor="let item of filteredItems " [value]="item">
<span *ngIf="titleKey">{{item[titleKey]}}</span>
<span *ngIf="subtitleKey">{{item[subtitleKey]}}</span>
</mat-option>
<!-- <mat-option *ngIf="filteredItems.length == 0" value="das">
<span>{{'GENERAL.AUTOCOMPLETE.NO-ITEMS' | translate}}</span>
</mat-option> -->
</mat-autocomplete>
</mat-form-field>

30
dmp-frontend/src/app/shared/components/autocompleteChips/autocompleteChips.component.scss
View File

@ -1,30 +0,0 @@
.autocomplete-input {
width: 100%;
}
.autocomplete-progress {
overflow: initial !important;
}
.autocomplete {
mat-form-field {
width: 100%;
padding: 3px;
}
.mat-card {
margin: 16px 0;
}
.left-button {
float: left;
}
}
.input-table {
table-layout: fixed;
}
.full-width {
width: 100%;
}

167
dmp-frontend/src/app/shared/components/autocompleteChips/autocompleteChips.component.ts
View File

@ -1,167 +0,0 @@
import { any } from 'codelyzer/util/function';
import { FormControl, FormGroupDirective, NgForm, FormGroup, FormBuilder } from '@angular/forms';
import { Observable } from 'rxjs/Rx';
import { setTimeout } from 'timers';
import { Component, EventEmitter, Input, OnInit, Output, ViewChild, ElementRef } from '@angular/core';
import 'rxjs/add/operator/debounceTime';
import 'rxjs/add/operator/map';
import { AutoCompleteChipConfiguration } from './AutoCompleteChipConfiguration';
import { ErrorStateMatcher, MatInput } from '@angular/material';
@Component({
selector: 'auto-complete-chip',
templateUrl: './autocompleteChips.component.html',
styleUrls: ['./autocompleteChips.component.scss']
})
export class AutocompleteChipComponent implements OnInit {
@Input()
configuration: AutoCompleteChipConfiguration;
@Input()
titleKey: String;
@Input()
subtitleKey: String;
@Input()
delay: number = 700;
@Input()
placeholder: String;
filteredItems: any[];
@Input()
required: boolean;
@Input()
disabled: boolean = false;
@Input()
multiChips: boolean = false;
// @Input() selectedDropdownItem: AutoCompleteItem;
// @Output() selectedDropdownItemChange = new EventEmitter<AutoCompleteItem>();
// @Output()
// output: EventEmitter<AutoCompleteItem> = new EventEmitter<AutoCompleteItem>();
@Input() control: FormControl;
// @Input() createNew = false;
term = new FormControl();
// @Input()
// ClickFunctionCall: Function;
@ViewChild('chipInput') chipInput: MatInput;
loading = false;
hasSelectedItem = false;
selectedItems: any[] = [];
constructor() {
}
ngOnInit() {
const valueChanges = this.term.valueChanges.share();
valueChanges.subscribe(searchTerm => {
if (this.hasSelectedItem) {
this.resetFormControlValue();
} else {
this.loading = true;
}
});
valueChanges
.debounceTime(this.delay)
.distinctUntilChanged()
.switchMap(val => {
if (this.hasSelectedItem || typeof(val) !== "string") {
this.loading = false;
return this.filteredItems = [];
} else if (typeof(val)== "string") {
this.configuration.requestItem.criteria.like = val;
return this.configuration.callback(this.configuration.requestItem).map(result => {
this.filteredItems = (<any[]>result)
this.loading = false;
})
}
}).subscribe()
}
resetFormControlValue() {
this.hasSelectedItem = false;
this.term.setValue(null);
}
// // listingItemToDropDown(item: DropdownListingItem): AutoCompleteItem {
// // return (item as DropdownListingItem).toDropdownList();
// // }
optionSelected(event: any) {
this.hasSelectedItem = true;
this.selectedItems.push(event.option.value)
this.chipInput['nativeElement'].value = '';
this.control.setValue(this.selectedItems, { emitEvent: false });
//this.filteredItems = this.selectedItems;
//this.selectedDropdownItemChange.emit(event.option.value);
//this.form.updateValueAndValidity();
//this.options = [event.option.value];
//this.loading = false;
}
remove(item: any) {
// this.selectedItems.filter(function(selitem){
// return selitem.id != item.id;
// });
const index: number = this.selectedItems.indexOf(item);
if (index !== -1) {
this.selectedItems.splice(index, 1);
}
this.control.setValue(this.selectedItems);
if (this.selectedItems.length == 0) this.hasSelectedItem = false;
}
// inputOnChange(term: string) {
// //this.form.patchValue({ value: null, description: '', text: '' });
// //this.form.updateValueAndValidity();
// this.configuration.criteria.like = term;
// this.configuration.callback(this.configuration.criteria)
// .map((res: any) => this.mapper(res))
// .subscribe(
// (res: AutoCompleteItem[]) => {
// this.options = res;
// },
// null,
// () => { this.loading = false });
// }
displayWith(value: any): String {
if (!value) return '';
if (value.lenght) {
value.forEach(element => {
element['' + this.titleKey];
});
return value;
}
else return value['' + this.titleKey];
}
// displayFn(item: AutoCompleteItem): string {
// return item.text ? item.text : '';
// }
//fieldHasErrors(control: FormControl, form: FormGroupDirective | NgForm): boolean {
// return this.errorStateMatcher(control, form);
// }
}
export class AutoCompleteErrorStateMatcher implements ErrorStateMatcher {
isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
const isFormSubmitted = form && form.submitted;
const isControlInvalid = control && control.invalid && (control.dirty || control.touched || isFormSubmitted);
const isFormInvalid = form && form.enabled && form.invalid && (form.dirty || form.touched || isFormSubmitted)
return !!(isControlInvalid || isFormInvalid);
}
}

5
dmp-frontend/src/app/shared/components/available-profiles/available-profiles.component.ts
View File

@ -29,6 +29,7 @@ export class AvailableProfilesComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
this.formGroup = this.data["profiles"];
this.datasetService.getDatasetProfiles().subscribe(data => { this.datasetService.getDatasetProfiles().subscribe(data => {
this.profiles = JsonSerializer.fromJSONArray(data, DatasetProfileModel) this.profiles = JsonSerializer.fromJSONArray(data, DatasetProfileModel)
} }
@ -46,7 +47,7 @@ export class AvailableProfilesComponent implements OnInit {
selectedElement.label = element.value.label; selectedElement.label = element.value.label;
this.selectedProfiles.push(selectedElement) this.selectedProfiles.push(selectedElement)
}) })
this.formGroup.setValue(this.selectedProfiles)
this.dialogRef.close(this.selectedProfiles); this.dialogRef.close();
} }
} }

2
dmp-frontend/src/app/shared/components/figurecard/figurecard.component.html
View File

@ -3,7 +3,7 @@
<i class="material-icons">{{ headerIcon }}</i> <i class="material-icons">{{ headerIcon }}</i>
</div> </div>
<div class="card-content"> <div class="card-content">
<p class="category">{{ category }}</p> <p class="category">{{ category | translate }}</p>
<h3 class="title">{{ title }}</h3> <h3 class="title">{{ title }}</h3>
</div> </div>
<div *ngIf="hasFootContent" class="card-footer"> <div *ngIf="hasFootContent" class="card-footer">

5
dmp-frontend/src/app/shared/shared.module.ts
View File

@ -14,7 +14,6 @@ import { ProjectCriteriaComponent } from './components/criteria/projects/project
import { DatasetCriteriaComponent } from './components/criteria/datasets/datasets-criteria.component'; import { DatasetCriteriaComponent } from './components/criteria/datasets/datasets-criteria.component';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { DataManagementPlanCriteriaComponent } from './components/criteria/data-management-plan/dmp-criteria.component'; import { DataManagementPlanCriteriaComponent } from './components/criteria/data-management-plan/dmp-criteria.component';
import { AutocompleteChipComponent } from '../shared/components/autocompleteChips/autocompleteChips.component';
import { FileUploaderComponent } from '../shared/components/file-uploader/file-uploader.component'; import { FileUploaderComponent } from '../shared/components/file-uploader/file-uploader.component';
import { UrlListingComponent } from '../shared/components/url-listing/url-listing.component'; import { UrlListingComponent } from '../shared/components/url-listing/url-listing.component';
import { NgForLimitPipe } from './pipes/ngforlimit/ngforlimit.pipe'; import { NgForLimitPipe } from './pipes/ngforlimit/ngforlimit.pipe';
@ -46,7 +45,6 @@ import { BreadcrumbComponent } from './components/breadcrumb/breadcrumb.componen
FigurecardComponent, FigurecardComponent,
BaseCriteriaComponent, BaseCriteriaComponent,
FileUploaderComponent, FileUploaderComponent,
AutocompleteChipComponent,
UrlListingComponent, UrlListingComponent,
NgForLimitPipe, NgForLimitPipe,
AutoCompleteComponent, AutoCompleteComponent,
@ -69,8 +67,7 @@ import { BreadcrumbComponent } from './components/breadcrumb/breadcrumb.componen
AutocompleteComponent, AutocompleteComponent,
FigurecardComponent, FigurecardComponent,
BaseCriteriaComponent, BaseCriteriaComponent,
FileUploaderComponent, FileUploaderComponent,
AutocompleteChipComponent,
UrlListingComponent, UrlListingComponent,
NgForLimitPipe, NgForLimitPipe,
AutoCompleteComponent, AutoCompleteComponent,

16
dmp-frontend/src/assets/lang/en.json
View File

@ -24,7 +24,7 @@
"NAV-BAR": { "NAV-BAR": {
"TITLE": "OpenDMPS", "TITLE": "OpenDMPS",
"PROJECTS": "Projects", "PROJECTS": "Projects",
"DMPS": "Plans", "DMPS": "DMPs",
"DATASETS": "Datasets", "DATASETS": "Datasets",
"USERS": "Users", "USERS": "Users",
"DATASETS-ADMIN": "Dataset Profiles", "DATASETS-ADMIN": "Dataset Profiles",
@ -175,7 +175,6 @@
}, },
"CRITERIA": { "CRITERIA": {
"FILTERS": "Filters", "FILTERS": "Filters",
"PROJECTS": { "PROJECTS": {
"LIKE": "Search", "LIKE": "Search",
"PERIOD-FROM": "Project Start", "PERIOD-FROM": "Project Start",
@ -259,7 +258,6 @@
"SOURCE": "Source", "SOURCE": "Source",
"OUTPUT": "Output" "OUTPUT": "Output"
} }
}, },
"ADDRESEARCHERS-EDITOR": { "ADDRESEARCHERS-EDITOR": {
"TITLE": "Add a Researcher", "TITLE": "Add a Researcher",
@ -296,15 +294,23 @@
}, },
"HOMEPAGE": { "HOMEPAGE": {
"OPEN-DMPS": { "OPEN-DMPS": {
"STATS": "OpenDMPS Statistics" "STATS": "OpenDMPS DashBoard"
}, },
"MY-DMPS": { "MY-DMPS": {
"STATS": "My Statistics" "STATS": "My DashBoard"
} }
}, },
"ABOUT": { "ABOUT": {
"TITLE": "-Our Mission-", "TITLE": "-Our Mission-",
"MAIN-CONTENT": "Our goal is to make your research data FAIR, that is findable, accessible,interoperable and re-usable. These principles precede implementation choices and do not necessarily suggest any specific technology, standard, or implementationsolution.", "MAIN-CONTENT": "Our goal is to make your research data FAIR, that is findable, accessible,interoperable and re-usable. These principles precede implementation choices and do not necessarily suggest any specific technology, standard, or implementationsolution.",
"CONTRIBUTORS": "Contributors" "CONTRIBUTORS": "Contributors"
},
"DASHBOARD": {
"MY-PROJECTS": "My Projects",
"PROJECTS": "Projects",
"MY-DMPS": "My DMPs",
"DMPS": "DMPs",
"MY-DATASETS": "My Datasets",
"DATASETS": "Datasets"
} }
} }

2
dmp-frontend/src/environments/environment.prod.ts
View File

@ -1,6 +1,6 @@
export const environment = { export const environment = {
production: true, production: true,
Server: 'http://localhost:8080/api/', Server: 'http://dl043.madgik.di.uoa.gr:8080/api/',
App: 'http://dl043.madgik.di.uoa.gr/', App: 'http://dl043.madgik.di.uoa.gr/',
HelpServiceUrl: 'http://dl043.madgik.di.uoa.gr:5555/' HelpServiceUrl: 'http://dl043.madgik.di.uoa.gr:5555/'
}; };