1. Change configuration of Zenodo to production.
2. Add default multiplicity placeholder and remove tooltip 3. Disable reordering of fields if template is finalized. 4. Create Dataset Wizard: Add prefilling functionality
This commit is contained in:
parent
814a9b2fee
commit
c8b388b546
|
@ -1013,7 +1013,7 @@
|
||||||
<label>Zenodo</label>
|
<label>Zenodo</label>
|
||||||
<ordinal>1</ordinal>
|
<ordinal>1</ordinal>
|
||||||
<type>External</type>
|
<type>External</type>
|
||||||
<url>https://sandbox.zenodo.org/api/records/?page={page}&size={pageSize}&q="{like}"</url>
|
<url>https://zenodo.org/api/records/?page={page}&size={pageSize}&q="{like}"</url>
|
||||||
<firstPage>1</firstPage>
|
<firstPage>1</firstPage>
|
||||||
<contenttype>application/json</contenttype>
|
<contenttype>application/json</contenttype>
|
||||||
<data>
|
<data>
|
||||||
|
@ -1028,7 +1028,7 @@
|
||||||
</urlConfig>
|
</urlConfig>
|
||||||
</prefillingSearch>
|
</prefillingSearch>
|
||||||
<prefillingGet>
|
<prefillingGet>
|
||||||
<url>https://sandbox.zenodo.org/api/records/{id}</url>
|
<url>https://zenodo.org/api/records/{id}</url>
|
||||||
<mappings>
|
<mappings>
|
||||||
<mapping source="metadata.title" target="label" />
|
<mapping source="metadata.title" target="label" />
|
||||||
<mapping source="metadata.description" target="description" />
|
<mapping source="metadata.description" target="description" />
|
||||||
|
|
|
@ -45,6 +45,7 @@ import { UserService } from './services/user/user.service';
|
||||||
import { CollectionUtils } from './services/utilities/collection-utils.service';
|
import { CollectionUtils } from './services/utilities/collection-utils.service';
|
||||||
import { TypeUtils } from './services/utilities/type-utils.service';
|
import { TypeUtils } from './services/utilities/type-utils.service';
|
||||||
import { SpecialAuthGuard } from './special-auth-guard.service';
|
import { SpecialAuthGuard } from './special-auth-guard.service';
|
||||||
|
import {PrefillingService} from "@app/core/services/prefilling.service";
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
// This is shared module that provides all the services. Its imported only once on the AppModule.
|
// This is shared module that provides all the services. Its imported only once on the AppModule.
|
||||||
|
@ -118,7 +119,8 @@ export class CoreServiceModule {
|
||||||
deps: [ConfigurationService, HttpClient],
|
deps: [ConfigurationService, HttpClient],
|
||||||
multi: true
|
multi: true
|
||||||
},
|
},
|
||||||
LanguageInfoService
|
LanguageInfoService,
|
||||||
|
PrefillingService
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
export interface Prefilling {
|
||||||
|
pid: string;
|
||||||
|
name: string;
|
||||||
|
tag: string;
|
||||||
|
}
|
|
@ -0,0 +1,25 @@
|
||||||
|
import {Injectable} from "@angular/core";
|
||||||
|
import {HttpClient, HttpHeaders} from "@angular/common/http";
|
||||||
|
import {BaseHttpService} from "@app/core/services/http/base-http.service";
|
||||||
|
import {ConfigurationService} from "@app/core/services/configuration/configuration.service";
|
||||||
|
import {Observable} from "rxjs";
|
||||||
|
import {Prefilling} from "@app/core/model/dataset/prefilling";
|
||||||
|
import {DatasetWizardModel} from "@app/core/model/dataset/dataset-wizard";
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class PrefillingService {
|
||||||
|
private readonly actionUrl: string;
|
||||||
|
private headers = new HttpHeaders();
|
||||||
|
|
||||||
|
constructor(private http: BaseHttpService, private httpClient: HttpClient, private configurationService: ConfigurationService) {
|
||||||
|
this.actionUrl = configurationService.server + 'prefilling/';
|
||||||
|
}
|
||||||
|
|
||||||
|
public getPrefillingList(like: string, configId: string): Observable<Prefilling[]> {
|
||||||
|
return this.http.get<Prefilling[]>(this.actionUrl + 'list?configId=' + encodeURIComponent(configId) + '&like=' + encodeURIComponent(like), { headers: this.headers });
|
||||||
|
}
|
||||||
|
|
||||||
|
public getPrefillingDataset(pid: string, profileId: string, configId: string): Observable<DatasetWizardModel> {
|
||||||
|
return this.http.get<DatasetWizardModel>(this.actionUrl + '/generate/' + encodeURIComponent(pid) + '?configId=' + encodeURIComponent(configId) + '&profileId=' + encodeURIComponent(profileId), { headers: this.headers });
|
||||||
|
}
|
||||||
|
}
|
|
@ -981,11 +981,11 @@ export class DatasetProfileEditorCompositeFieldComponent extends BaseComponent i
|
||||||
}
|
}
|
||||||
|
|
||||||
canGoUp(index: number): boolean {
|
canGoUp(index: number): boolean {
|
||||||
return index > 0;
|
return index > 0 && !this.viewOnly;
|
||||||
}
|
}
|
||||||
|
|
||||||
canGoDown(index: number): boolean {
|
canGoDown(index: number): boolean {
|
||||||
return index < (this.fieldsArray.length - 1);
|
return index < (this.fieldsArray.length - 1) && !this.viewOnly;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,52 +1,59 @@
|
||||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
import {Component, OnInit, ViewChild} from '@angular/core';
|
||||||
import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms';
|
import {AbstractControl, FormArray, FormControl, FormGroup} from '@angular/forms';
|
||||||
import { MatDialog } from '@angular/material/dialog';
|
import {MatDialog} from '@angular/material/dialog';
|
||||||
import { MatSnackBar } from '@angular/material/snack-bar';
|
import {MatSnackBar} from '@angular/material/snack-bar';
|
||||||
import { ActivatedRoute, Router } from '@angular/router';
|
import {ActivatedRoute, Router} from '@angular/router';
|
||||||
import { DatasetStatus } from '@app/core/common/enum/dataset-status';
|
import {DatasetStatus} from '@app/core/common/enum/dataset-status';
|
||||||
import { DmpStatus } from '@app/core/common/enum/dmp-status';
|
import {DmpStatus} from '@app/core/common/enum/dmp-status';
|
||||||
import { DataTableRequest } from '@app/core/model/data-table/data-table-request';
|
import {DataTableRequest} from '@app/core/model/data-table/data-table-request';
|
||||||
import { DatasetProfileModel } from '@app/core/model/dataset/dataset-profile';
|
import {DatasetProfileModel} from '@app/core/model/dataset/dataset-profile';
|
||||||
import { DmpModel } from '@app/core/model/dmp/dmp';
|
import {DmpModel} from '@app/core/model/dmp/dmp';
|
||||||
import { DmpListingModel } from '@app/core/model/dmp/dmp-listing';
|
import {DmpListingModel} from '@app/core/model/dmp/dmp-listing';
|
||||||
import { DatasetProfileCriteria } from '@app/core/query/dataset-profile/dataset-profile-criteria';
|
import {DatasetProfileCriteria} from '@app/core/query/dataset-profile/dataset-profile-criteria';
|
||||||
import { DmpCriteria } from '@app/core/query/dmp/dmp-criteria';
|
import {DmpCriteria} from '@app/core/query/dmp/dmp-criteria';
|
||||||
import { RequestItem } from '@app/core/query/request-item';
|
import {RequestItem} from '@app/core/query/request-item';
|
||||||
import { DatasetWizardService } from '@app/core/services/dataset-wizard/dataset-wizard.service';
|
import {DatasetWizardService} from '@app/core/services/dataset-wizard/dataset-wizard.service';
|
||||||
import { DmpService } from '@app/core/services/dmp/dmp.service';
|
import {DmpService} from '@app/core/services/dmp/dmp.service';
|
||||||
import { ExternalSourcesConfigurationService } from '@app/core/services/external-sources/external-sources-configuration.service';
|
import {ExternalSourcesConfigurationService} from '@app/core/services/external-sources/external-sources-configuration.service';
|
||||||
import { ExternalSourcesService } from '@app/core/services/external-sources/external-sources.service';
|
import {ExternalSourcesService} from '@app/core/services/external-sources/external-sources.service';
|
||||||
import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service';
|
import {
|
||||||
import { SingleAutoCompleteConfiguration } from '@app/library/auto-complete/single/single-auto-complete-configuration';
|
SnackBarNotificationLevel,
|
||||||
import { DatasetCopyDialogueComponent } from '@app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component';
|
UiNotificationService
|
||||||
import { DatasetWizardEditorModel } from '@app/ui/dataset/dataset-wizard/dataset-wizard-editor.model';
|
} from '@app/core/services/notification/ui-notification-service';
|
||||||
import { BreadcrumbItem } from '@app/ui/misc/breadcrumb/definition/breadcrumb-item';
|
import {SingleAutoCompleteConfiguration} from '@app/library/auto-complete/single/single-auto-complete-configuration';
|
||||||
import { IBreadCrumbComponent } from '@app/ui/misc/breadcrumb/definition/IBreadCrumbComponent';
|
import {DatasetCopyDialogueComponent} from '@app/ui/dataset/dataset-wizard/dataset-copy-dialogue/dataset-copy-dialogue.component';
|
||||||
import { DatasetDescriptionFormEditorModel } from '@app/ui/misc/dataset-description-form/dataset-description-form.model';
|
import {DatasetWizardEditorModel} from '@app/ui/dataset/dataset-wizard/dataset-wizard-editor.model';
|
||||||
import { Link, LinkToScroll, TableOfContents } from '@app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents';
|
import {BreadcrumbItem} from '@app/ui/misc/breadcrumb/definition/breadcrumb-item';
|
||||||
import { BaseComponent } from '@common/base/base.component';
|
import {IBreadCrumbComponent} from '@app/ui/misc/breadcrumb/definition/IBreadCrumbComponent';
|
||||||
import { FormService } from '@common/forms/form-service';
|
import {DatasetDescriptionFormEditorModel} from '@app/ui/misc/dataset-description-form/dataset-description-form.model';
|
||||||
import { FormValidationErrorsDialogComponent } from '@common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component';
|
import {
|
||||||
import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model';
|
Link,
|
||||||
import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component';
|
LinkToScroll,
|
||||||
import { TranslateService } from '@ngx-translate/core';
|
TableOfContents
|
||||||
|
} from '@app/ui/misc/dataset-description-form/tableOfContentsMaterial/table-of-contents';
|
||||||
|
import {FormService} from '@common/forms/form-service';
|
||||||
|
import {FormValidationErrorsDialogComponent} from '@common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component';
|
||||||
|
import {ValidationErrorModel} from '@common/forms/validation/error-model/validation-error-model';
|
||||||
|
import {ConfirmationDialogComponent} from '@common/modules/confirmation-dialog/confirmation-dialog.component';
|
||||||
|
import {TranslateService} from '@ngx-translate/core';
|
||||||
import * as FileSaver from 'file-saver';
|
import * as FileSaver from 'file-saver';
|
||||||
import { Observable, of as observableOf, interval} from 'rxjs';
|
import {interval, Observable, of as observableOf} from 'rxjs';
|
||||||
import { catchError, debounceTime, filter, map, takeUntil } from 'rxjs/operators';
|
import {catchError, debounceTime, filter, map, takeUntil} from 'rxjs/operators';
|
||||||
import { LockService } from '@app/core/services/lock/lock.service';
|
import {LockService} from '@app/core/services/lock/lock.service';
|
||||||
import { Location } from '@angular/common';
|
import {Location} from '@angular/common';
|
||||||
import { LockModel } from '@app/core/model/lock/lock.model';
|
import {LockModel} from '@app/core/model/lock/lock.model';
|
||||||
import { Guid } from '@common/types/guid';
|
import {Guid} from '@common/types/guid';
|
||||||
import { isNullOrUndefined } from '@app/utilities/enhancers/utils';
|
import {isNullOrUndefined} from '@app/utilities/enhancers/utils';
|
||||||
import { AuthService } from '@app/core/services/auth/auth.service';
|
import {AuthService} from '@app/core/services/auth/auth.service';
|
||||||
import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
|
import {ConfigurationService} from '@app/core/services/configuration/configuration.service';
|
||||||
import { SaveType } from '@app/core/common/enum/save-type';
|
import {SaveType} from '@app/core/common/enum/save-type';
|
||||||
import { DatasetWizardModel } from '@app/core/model/dataset/dataset-wizard';
|
import {DatasetWizardModel} from '@app/core/model/dataset/dataset-wizard';
|
||||||
import { MatomoService } from '@app/core/services/matomo/matomo-service';
|
import {MatomoService} from '@app/core/services/matomo/matomo-service';
|
||||||
import { HttpClient } from '@angular/common/http';
|
import {HttpClient} from '@angular/common/http';
|
||||||
import { VisibilityRulesService } from '@app/ui/misc/dataset-description-form/visibility-rules/visibility-rules.service';
|
import {VisibilityRulesService} from '@app/ui/misc/dataset-description-form/visibility-rules/visibility-rules.service';
|
||||||
import { PopupNotificationDialogComponent } from '@app/library/notification/popup/popup-notification.component';
|
import {PopupNotificationDialogComponent} from '@app/library/notification/popup/popup-notification.component';
|
||||||
import { CheckDeactivateBaseComponent } from '@app/library/deactivate/deactivate.component';
|
import {CheckDeactivateBaseComponent} from '@app/library/deactivate/deactivate.component';
|
||||||
|
import {PrefillDatasetComponent} from "@app/ui/dataset/dataset-wizard/prefill-dataset/prefill-dataset.component";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-dataset-wizard-component',
|
selector: 'app-dataset-wizard-component',
|
||||||
|
@ -95,14 +102,14 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
tocScrollTop: number;
|
tocScrollTop: number;
|
||||||
links: Link[] = [];
|
links: Link[] = [];
|
||||||
//the table seraches for elements to scroll on page with id (TOCENTRY_ID_PREFIX+fieldsetId<Tocentry>)
|
//the table seraches for elements to scroll on page with id (TOCENTRY_ID_PREFIX+fieldsetId<Tocentry>)
|
||||||
TOCENTRY_ID_PREFIX="TocEntRy";
|
TOCENTRY_ID_PREFIX = "TocEntRy";
|
||||||
showtocentriesErrors = false;
|
showtocentriesErrors = false;
|
||||||
@ViewChild('table0fContents') table0fContents: TableOfContents;
|
@ViewChild('table0fContents') table0fContents: TableOfContents;
|
||||||
hintErrors: boolean = false;
|
hintErrors: boolean = false;
|
||||||
datasetIsOnceSaved = false;
|
datasetIsOnceSaved = false;
|
||||||
|
|
||||||
fieldsetIdWithFocus:string;
|
fieldsetIdWithFocus: string;
|
||||||
visRulesService:VisibilityRulesService;
|
visRulesService: VisibilityRulesService;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private datasetWizardService: DatasetWizardService,
|
private datasetWizardService: DatasetWizardService,
|
||||||
|
@ -131,7 +138,9 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
this.route
|
this.route
|
||||||
.data
|
.data
|
||||||
.pipe(takeUntil(this._destroyed))
|
.pipe(takeUntil(this._destroyed))
|
||||||
.subscribe(v => this.viewOnly = v['public']);
|
.subscribe(v => {
|
||||||
|
this.viewOnly = v['public'];
|
||||||
|
});
|
||||||
|
|
||||||
const dmpRequestItem: RequestItem<DmpCriteria> = new RequestItem();
|
const dmpRequestItem: RequestItem<DmpCriteria> = new RequestItem();
|
||||||
dmpRequestItem.criteria = new DmpCriteria();
|
dmpRequestItem.criteria = new DmpCriteria();
|
||||||
|
@ -161,51 +170,53 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
this.datasetWizardService.getSingle(this.itemId)
|
this.datasetWizardService.getSingle(this.itemId)
|
||||||
.pipe(takeUntil(this._destroyed))
|
.pipe(takeUntil(this._destroyed))
|
||||||
.subscribe(data => {
|
.subscribe(data => {
|
||||||
this.lockService.checkLockStatus(data.id).pipe(takeUntil(this._destroyed)).subscribe(lockStatus => {
|
this.lockService.checkLockStatus(data.id).pipe(takeUntil(this._destroyed)).subscribe(lockStatus => {
|
||||||
this.lockStatus = lockStatus;
|
this.lockStatus = lockStatus;
|
||||||
this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data);
|
this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data);
|
||||||
this.needsUpdate();
|
this.needsUpdate();
|
||||||
this.breadCrumbs = observableOf([
|
this.breadCrumbs = observableOf([
|
||||||
{
|
{
|
||||||
parentComponentName: null,
|
parentComponentName: null,
|
||||||
label: this.datasetWizardModel.label,
|
label: this.datasetWizardModel.label,
|
||||||
url: '/datasets/edit/' + this.datasetWizardModel.id,
|
url: '/datasets/edit/' + this.datasetWizardModel.id,
|
||||||
notFoundResolver: [
|
notFoundResolver: [
|
||||||
{
|
{
|
||||||
parentComponentName: null,
|
parentComponentName: null,
|
||||||
label: this.language.instant('NAV-BAR.MY-DATASET-DESCRIPTIONS').toUpperCase(),
|
label: this.language.instant('NAV-BAR.MY-DATASET-DESCRIPTIONS').toUpperCase(),
|
||||||
url: '/datasets'
|
url: '/datasets'
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}]);
|
}]);
|
||||||
this.formGroup = this.datasetWizardModel.buildForm();
|
this.formGroup = this.datasetWizardModel.buildForm();
|
||||||
this.formGroupRawValue = JSON.parse(JSON.stringify(this.formGroup.getRawValue()));
|
this.formGroupRawValue = JSON.parse(JSON.stringify(this.formGroup.getRawValue()));
|
||||||
this.editMode = this.datasetWizardModel.status === DatasetStatus.Draft;
|
this.editMode = this.datasetWizardModel.status === DatasetStatus.Draft;
|
||||||
if (this.datasetWizardModel.status === DatasetStatus.Finalized || lockStatus) {
|
if (this.datasetWizardModel.status === DatasetStatus.Finalized || lockStatus) {
|
||||||
this.formGroup.disable();
|
this.formGroup.disable();
|
||||||
this.viewOnly = true;
|
this.viewOnly = true;
|
||||||
}
|
}
|
||||||
if (!lockStatus && !isNullOrUndefined(this.authService.current())) {
|
if (!lockStatus && !isNullOrUndefined(this.authService.current())) {
|
||||||
this.lock = new LockModel(data.id, this.authService.current());
|
this.lock = new LockModel(data.id, this.authService.current());
|
||||||
|
|
||||||
this.lockService.createOrUpdate(this.lock).pipe(takeUntil(this._destroyed)).subscribe(async result => {
|
this.lockService.createOrUpdate(this.lock).pipe(takeUntil(this._destroyed)).subscribe(async result => {
|
||||||
this.lock.id = Guid.parse(result);
|
this.lock.id = Guid.parse(result);
|
||||||
interval(this.configurationService.lockInterval).pipe(takeUntil(this._destroyed)).subscribe(() => this.pumpLock());
|
interval(this.configurationService.lockInterval).pipe(takeUntil(this._destroyed)).subscribe(() => this.pumpLock());
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
// if (this.viewOnly) { this.formGroup.disable(); } // For future use, to make Dataset edit like DMP.
|
// if (this.viewOnly) { this.formGroup.disable(); } // For future use, to make Dataset edit like DMP.
|
||||||
this.loadDatasetProfiles();
|
this.loadDatasetProfiles();
|
||||||
this.registerFormListeners();
|
this.registerFormListeners();
|
||||||
|
|
||||||
if(lockStatus){
|
if (lockStatus) {
|
||||||
this.dialog.open(PopupNotificationDialogComponent,{data:{
|
this.dialog.open(PopupNotificationDialogComponent, {
|
||||||
title:this.language.instant('DATASET-WIZARD.LOCKED.TITLE'),
|
data: {
|
||||||
message:this.language.instant('DATASET-WIZARD.LOCKED.MESSAGE')
|
title: this.language.instant('DATASET-WIZARD.LOCKED.TITLE'),
|
||||||
}, maxWidth:'30em'});
|
message: this.language.instant('DATASET-WIZARD.LOCKED.MESSAGE')
|
||||||
}
|
}, maxWidth: '30em'
|
||||||
// this.availableProfiles = this.datasetWizardModel.dmp.profiles;
|
});
|
||||||
})
|
}
|
||||||
},
|
// this.availableProfiles = this.datasetWizardModel.dmp.profiles;
|
||||||
|
})
|
||||||
|
},
|
||||||
error => {
|
error => {
|
||||||
switch (error.status) {
|
switch (error.status) {
|
||||||
case 403:
|
case 403:
|
||||||
|
@ -232,7 +243,24 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
this.formGroupRawValue = JSON.parse(JSON.stringify(this.formGroup.getRawValue()));
|
this.formGroupRawValue = JSON.parse(JSON.stringify(this.formGroup.getRawValue()));
|
||||||
this.editMode = this.datasetWizardModel.status === DatasetStatus.Draft;
|
this.editMode = this.datasetWizardModel.status === DatasetStatus.Draft;
|
||||||
this.formGroup.get('dmp').disable();
|
this.formGroup.get('dmp').disable();
|
||||||
|
const dialogRef = this.dialog.open(PrefillDatasetComponent, {
|
||||||
|
width: '590px',
|
||||||
|
minHeight: '200px',
|
||||||
|
restoreFocus: false,
|
||||||
|
data: {
|
||||||
|
availableProfiles: this.formGroup.get('dmp').value.profiles,
|
||||||
|
},
|
||||||
|
panelClass: 'custom-modalbox'
|
||||||
|
});
|
||||||
|
dialogRef.afterClosed().subscribe(result => {
|
||||||
|
if(result) {
|
||||||
|
this.datasetWizardModel = this.datasetWizardModel.fromModel(result);
|
||||||
|
this.datasetWizardModel.dmp = data;
|
||||||
|
this.formGroup = this.datasetWizardModel.buildForm();
|
||||||
|
this.formGroupRawValue = JSON.parse(JSON.stringify(this.formGroup.getRawValue()));
|
||||||
|
this.formGroup.get('dmp').disable();
|
||||||
|
}
|
||||||
|
})
|
||||||
this.loadDatasetProfiles();
|
this.loadDatasetProfiles();
|
||||||
this.registerFormListeners();
|
this.registerFormListeners();
|
||||||
// this.availableProfiles = data.profiles;
|
// this.availableProfiles = data.profiles;
|
||||||
|
@ -319,11 +347,11 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
this.isNew = false;
|
this.isNew = false;
|
||||||
this.datasetWizardService.getSinglePublic(this.publicId)
|
this.datasetWizardService.getSinglePublic(this.publicId)
|
||||||
.pipe(takeUntil(this._destroyed)).pipe(
|
.pipe(takeUntil(this._destroyed)).pipe(
|
||||||
catchError((error: any) => {
|
catchError((error: any) => {
|
||||||
this.uiNotificationService.snackBarNotification(error.error.message, SnackBarNotificationLevel.Error);
|
this.uiNotificationService.snackBarNotification(error.error.message, SnackBarNotificationLevel.Error);
|
||||||
this.router.navigate(['/datasets/publicEdit/' + this.publicId]);
|
this.router.navigate(['/datasets/publicEdit/' + this.publicId]);
|
||||||
return observableOf(null);
|
return observableOf(null);
|
||||||
}))
|
}))
|
||||||
.subscribe(data => {
|
.subscribe(data => {
|
||||||
if (data) {
|
if (data) {
|
||||||
this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data);
|
this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data);
|
||||||
|
@ -334,8 +362,16 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
this.editMode = this.datasetWizardModel.status === DatasetStatus.Draft;
|
this.editMode = this.datasetWizardModel.status === DatasetStatus.Draft;
|
||||||
this.formGroup.get('dmp').setValue(this.datasetWizardModel.dmp);
|
this.formGroup.get('dmp').setValue(this.datasetWizardModel.dmp);
|
||||||
const breadcrumbs = [];
|
const breadcrumbs = [];
|
||||||
breadcrumbs.push({ parentComponentName: null, label: this.language.instant('NAV-BAR.PUBLIC DATASETS'), url: '/explore' });
|
breadcrumbs.push({
|
||||||
breadcrumbs.push({ parentComponentName: null, label: this.datasetWizardModel.label, url: '/datasets/publicEdit/' + this.datasetWizardModel.id });
|
parentComponentName: null,
|
||||||
|
label: this.language.instant('NAV-BAR.PUBLIC DATASETS'),
|
||||||
|
url: '/explore'
|
||||||
|
});
|
||||||
|
breadcrumbs.push({
|
||||||
|
parentComponentName: null,
|
||||||
|
label: this.datasetWizardModel.label,
|
||||||
|
url: '/datasets/publicEdit/' + this.datasetWizardModel.id
|
||||||
|
});
|
||||||
this.breadCrumbs = observableOf(breadcrumbs);
|
this.breadCrumbs = observableOf(breadcrumbs);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -456,7 +492,7 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
.subscribe(x => {
|
.subscribe(x => {
|
||||||
this.formChanged();
|
this.formChanged();
|
||||||
});
|
});
|
||||||
// this._listenersSubscription.add(datasetProfileDefinitionSubscription);
|
// this._listenersSubscription.add(datasetProfileDefinitionSubscription);
|
||||||
}
|
}
|
||||||
|
|
||||||
// this._listenersSubscription.add(dmpSubscription);
|
// this._listenersSubscription.add(dmpSubscription);
|
||||||
|
@ -466,6 +502,7 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
// this._listenersSubscription.add(uriSubscription);
|
// this._listenersSubscription.add(uriSubscription);
|
||||||
// this._listenersSubscription.add(tagsSubscription);
|
// this._listenersSubscription.add(tagsSubscription);
|
||||||
}
|
}
|
||||||
|
|
||||||
// private _unregisterFormListeners(){
|
// private _unregisterFormListeners(){
|
||||||
// this._listenersSubscription.unsubscribe();
|
// this._listenersSubscription.unsubscribe();
|
||||||
// this._listenersSubscription = new Subscription();
|
// this._listenersSubscription = new Subscription();
|
||||||
|
@ -475,8 +512,7 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
if (dmp) {
|
if (dmp) {
|
||||||
this.formGroup.get('profile').enable();
|
this.formGroup.get('profile').enable();
|
||||||
this.loadDatasetProfiles();
|
this.loadDatasetProfiles();
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
this.availableProfiles = [];
|
this.availableProfiles = [];
|
||||||
this.formGroup.get('profile').reset();
|
this.formGroup.get('profile').reset();
|
||||||
this.formGroup.get('profile').disable();
|
this.formGroup.get('profile').disable();
|
||||||
|
@ -495,7 +531,7 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
searchDmp(query: string): Observable<DmpListingModel[]> {
|
searchDmp(query: string): Observable<DmpListingModel[]> {
|
||||||
const fields: Array<string> = new Array<string>();
|
const fields: Array<string> = new Array<string>();
|
||||||
fields.push('-created');
|
fields.push('-created');
|
||||||
const dmpDataTableRequest: DataTableRequest<DmpCriteria> = new DataTableRequest(0, null, { fields: fields });
|
const dmpDataTableRequest: DataTableRequest<DmpCriteria> = new DataTableRequest(0, null, {fields: fields});
|
||||||
dmpDataTableRequest.criteria = new DmpCriteria();
|
dmpDataTableRequest.criteria = new DmpCriteria();
|
||||||
dmpDataTableRequest.criteria.like = query;
|
dmpDataTableRequest.criteria.like = query;
|
||||||
dmpDataTableRequest.criteria.status = DmpStatus.Draft;
|
dmpDataTableRequest.criteria.status = DmpStatus.Draft;
|
||||||
|
@ -531,7 +567,6 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
this.formGroup.get('status').setValue(DmpStatus.Draft);
|
this.formGroup.get('status').setValue(DmpStatus.Draft);
|
||||||
this.onCallbackError(error);
|
this.onCallbackError(error);
|
||||||
}
|
}
|
||||||
|
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
this.publicMode ? this.router.navigate(['/explore']) : this.router.navigate(['/datasets']);
|
this.publicMode ? this.router.navigate(['/explore']) : this.router.navigate(['/datasets']);
|
||||||
|
@ -542,8 +577,9 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
getDatasetDisplay(item: any): string {
|
getDatasetDisplay(item: any): string {
|
||||||
if (!this.publicMode) {
|
if (!this.publicMode) {
|
||||||
return (item['status'] ? this.language.instant('TYPES.DATASET-STATUS.FINALISED').toUpperCase() : this.language.instant('TYPES.DATASET-STATUS.DRAFT').toUpperCase()) + ': ' + item['label'];
|
return (item['status'] ? this.language.instant('TYPES.DATASET-STATUS.FINALISED').toUpperCase() : this.language.instant('TYPES.DATASET-STATUS.DRAFT').toUpperCase()) + ': ' + item['label'];
|
||||||
|
} else {
|
||||||
|
return item['label'];
|
||||||
}
|
}
|
||||||
else { return item['label']; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
getDefinition(profileId: string) {
|
getDefinition(profileId: string) {
|
||||||
|
@ -570,11 +606,11 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
|
|
||||||
// this.formGroup.addControl('datasetProfileDefinition', datasetProfileDefinitionForm);
|
// this.formGroup.addControl('datasetProfileDefinition', datasetProfileDefinitionForm);
|
||||||
this.formGroup.get('datasetProfileDefinition').valueChanges
|
this.formGroup.get('datasetProfileDefinition').valueChanges
|
||||||
.pipe(debounceTime(600))
|
.pipe(debounceTime(600))
|
||||||
.pipe(takeUntil(this._destroyed))
|
.pipe(takeUntil(this._destroyed))
|
||||||
.subscribe(x => {
|
.subscribe(x => {
|
||||||
this.formChanged();
|
this.formChanged();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -616,7 +652,6 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
submit(saveType?: SaveType) {
|
submit(saveType?: SaveType) {
|
||||||
this.scrollTop = document.getElementById('dataset-editor-form').scrollTop;
|
this.scrollTop = document.getElementById('dataset-editor-form').scrollTop;
|
||||||
this.tocScrollTop = document.getElementById('stepper-options').scrollTop;
|
this.tocScrollTop = document.getElementById('stepper-options').scrollTop;
|
||||||
|
@ -632,17 +667,22 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private _getErrorMessage(formControl: AbstractControl, name: string): string[] {
|
private _getErrorMessage(formControl: AbstractControl, name: string): string[] {
|
||||||
const errors: string[] = [];
|
const errors: string[] = [];
|
||||||
Object.keys(formControl.errors).forEach(key => {
|
Object.keys(formControl.errors).forEach(key => {
|
||||||
if (key === 'required') { errors.push(this.language.instant(name + ": " + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.REQUIRED'))); }
|
if (key === 'required') {
|
||||||
|
errors.push(this.language.instant(name + ": " + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.REQUIRED')));
|
||||||
|
}
|
||||||
// if (key === 'required') { errors.push(this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.THIS-FIELD') + ' "' + this.getPlaceHolder(formControl) + '" ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.HAS-ERROR') + ', ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.REQUIRED')); }
|
// if (key === 'required') { errors.push(this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.THIS-FIELD') + ' "' + this.getPlaceHolder(formControl) + '" ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.HAS-ERROR') + ', ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.REQUIRED')); }
|
||||||
else if (key === 'email') { errors.push(this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.THIS-FIELD') + ' "' + name + '" ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.HAS-ERROR') + ', ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.EMAIL')); }
|
else if (key === 'email') {
|
||||||
else if (key === 'min') { errors.push(this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.THIS-FIELD') + ' "' + name + '" ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.HAS-ERROR') + ', ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.MIN-VALUE', { 'min': formControl.getError('min').min })); }
|
errors.push(this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.THIS-FIELD') + ' "' + name + '" ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.HAS-ERROR') + ', ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.EMAIL'));
|
||||||
else if (key === 'max') { errors.push(this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.THIS-FIELD') + ' "' + name + '" ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.HAS-ERROR') + ', ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.MAX-VALUE', { 'max': formControl.getError('max').max })); }
|
} else if (key === 'min') {
|
||||||
else { errors.push(this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.THIS-FIELD') + ' "' + name + '" ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.HAS-ERROR') + ', ' + formControl.errors[key].message); }
|
errors.push(this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.THIS-FIELD') + ' "' + name + '" ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.HAS-ERROR') + ', ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.MIN-VALUE', {'min': formControl.getError('min').min}));
|
||||||
|
} else if (key === 'max') {
|
||||||
|
errors.push(this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.THIS-FIELD') + ' "' + name + '" ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.HAS-ERROR') + ', ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.MAX-VALUE', {'max': formControl.getError('max').max}));
|
||||||
|
} else {
|
||||||
|
errors.push(this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.THIS-FIELD') + ' "' + name + '" ' + this.language.instant('GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.HAS-ERROR') + ', ' + formControl.errors[key].message);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
return errors;
|
return errors;
|
||||||
}
|
}
|
||||||
|
@ -661,11 +701,10 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private _buildSemiFormErrorMessages(): string[] {//not including datasetProfileDefinition
|
||||||
private _buildSemiFormErrorMessages(): string[]{//not including datasetProfileDefinition
|
|
||||||
const errmess: string[] = [];
|
const errmess: string[] = [];
|
||||||
Object.keys(this.formGroup.controls).forEach(controlName=>{
|
Object.keys(this.formGroup.controls).forEach(controlName => {
|
||||||
if(controlName != 'datasetProfileDefinition' && this.formGroup.get(controlName).invalid){
|
if (controlName != 'datasetProfileDefinition' && this.formGroup.get(controlName).invalid) {
|
||||||
errmess.push(...this._buildErrorMessagesForAbstractControl(this.formGroup.get(controlName), controlName));
|
errmess.push(...this._buildErrorMessagesForAbstractControl(this.formGroup.get(controlName), controlName));
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -674,16 +713,16 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
}
|
}
|
||||||
|
|
||||||
// takes as an input an abstract control and gets its error messages[]
|
// takes as an input an abstract control and gets its error messages[]
|
||||||
private _buildErrorMessagesForAbstractControl(aControl: AbstractControl, controlName: string):string[]{
|
private _buildErrorMessagesForAbstractControl(aControl: AbstractControl, controlName: string): string[] {
|
||||||
const errmess:string[] = [];
|
const errmess: string[] = [];
|
||||||
|
|
||||||
if(aControl.invalid){
|
if (aControl.invalid) {
|
||||||
|
|
||||||
if(aControl.errors){
|
if (aControl.errors) {
|
||||||
//check if has placeholder
|
//check if has placeholder
|
||||||
if( (<any>aControl).nativeElement !== undefined && (<any>aControl).nativeElement !== null){
|
if ((<any>aControl).nativeElement !== undefined && (<any>aControl).nativeElement !== null) {
|
||||||
const placeholder = this._getPlaceHolder(aControl);
|
const placeholder = this._getPlaceHolder(aControl);
|
||||||
if(placeholder){
|
if (placeholder) {
|
||||||
controlName = placeholder;
|
controlName = placeholder;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -695,19 +734,19 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
/*in case the aControl is FormControl then the it should have provided its error messages above.
|
/*in case the aControl is FormControl then the it should have provided its error messages above.
|
||||||
No need to check case of FormControl below*/
|
No need to check case of FormControl below*/
|
||||||
|
|
||||||
if(aControl instanceof FormGroup){
|
if (aControl instanceof FormGroup) {
|
||||||
|
|
||||||
const fg = aControl as FormGroup;
|
const fg = aControl as FormGroup;
|
||||||
//check children
|
//check children
|
||||||
Object.keys(fg.controls).forEach(controlName=>{
|
Object.keys(fg.controls).forEach(controlName => {
|
||||||
errmess.push(...this._buildErrorMessagesForAbstractControl(fg.get(controlName), controlName));
|
errmess.push(...this._buildErrorMessagesForAbstractControl(fg.get(controlName), controlName));
|
||||||
});
|
});
|
||||||
}else if(aControl instanceof FormArray){
|
} else if (aControl instanceof FormArray) {
|
||||||
|
|
||||||
const fa = aControl as FormArray;
|
const fa = aControl as FormArray;
|
||||||
|
|
||||||
fa.controls.forEach((control,index)=>{
|
fa.controls.forEach((control, index) => {
|
||||||
errmess.push(... this._buildErrorMessagesForAbstractControl(control, `${controlName} --> ${index+1}`));
|
errmess.push(...this._buildErrorMessagesForAbstractControl(control, `${controlName} --> ${index + 1}`));
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -718,8 +757,8 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
|
|
||||||
save(saveType?: SaveType) {
|
save(saveType?: SaveType) {
|
||||||
|
|
||||||
Object.keys(this.formGroup.controls).forEach(controlName=>{
|
Object.keys(this.formGroup.controls).forEach(controlName => {
|
||||||
if(controlName == 'datasetProfileDefinition'){
|
if (controlName == 'datasetProfileDefinition') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.formService.touchAllFormFields(this.formGroup.get(controlName));
|
this.formService.touchAllFormFields(this.formGroup.get(controlName));
|
||||||
|
@ -738,17 +777,17 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
}
|
}
|
||||||
|
|
||||||
private showValidationErrorsDialog(projectOnly?: boolean, errmess?: string[]) {
|
private showValidationErrorsDialog(projectOnly?: boolean, errmess?: string[]) {
|
||||||
if(errmess){
|
if (errmess) {
|
||||||
const dialogRef = this.dialog.open(FormValidationErrorsDialogComponent, {
|
const dialogRef = this.dialog.open(FormValidationErrorsDialogComponent, {
|
||||||
disableClose: true,
|
disableClose: true,
|
||||||
autoFocus: false,
|
autoFocus: false,
|
||||||
restoreFocus: false,
|
restoreFocus: false,
|
||||||
data: {
|
data: {
|
||||||
errorMessages:errmess,
|
errorMessages: errmess,
|
||||||
projectOnly: projectOnly
|
projectOnly: projectOnly
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}else{
|
} else {
|
||||||
|
|
||||||
const dialogRef = this.dialog.open(FormValidationErrorsDialogComponent, {
|
const dialogRef = this.dialog.open(FormValidationErrorsDialogComponent, {
|
||||||
disableClose: true,
|
disableClose: true,
|
||||||
|
@ -782,21 +821,23 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
reverse() {
|
reverse() {
|
||||||
|
|
||||||
this.dialog.open(ConfirmationDialogComponent, {
|
this.dialog.open(ConfirmationDialogComponent, {
|
||||||
data:{
|
data: {
|
||||||
message: this.language.instant('DATASET-WIZARD.ACTIONS.UNDO-FINALIZATION-QUESTION'),
|
message: this.language.instant('DATASET-WIZARD.ACTIONS.UNDO-FINALIZATION-QUESTION'),
|
||||||
confirmButton: this.language.instant('DATASET-WIZARD.ACTIONS.CONFIRM'),
|
confirmButton: this.language.instant('DATASET-WIZARD.ACTIONS.CONFIRM'),
|
||||||
cancelButton: this.language.instant('DATASET-WIZARD.ACTIONS.REJECT'),
|
cancelButton: this.language.instant('DATASET-WIZARD.ACTIONS.REJECT'),
|
||||||
},
|
},
|
||||||
maxWidth: '30em'
|
maxWidth: '30em'
|
||||||
})
|
})
|
||||||
.afterClosed()
|
.afterClosed()
|
||||||
.pipe(
|
.pipe(
|
||||||
filter(x=> x),
|
filter(x => x),
|
||||||
takeUntil(this._destroyed)
|
takeUntil(this._destroyed)
|
||||||
).subscribe( _ => {
|
).subscribe(_ => {
|
||||||
this.viewOnly = false;
|
this.viewOnly = false;
|
||||||
this.datasetWizardModel.status = DatasetStatus.Draft;
|
this.datasetWizardModel.status = DatasetStatus.Draft;
|
||||||
setTimeout(x => { this.formGroup = null; });
|
setTimeout(x => {
|
||||||
|
this.formGroup = null;
|
||||||
|
});
|
||||||
setTimeout(x => {
|
setTimeout(x => {
|
||||||
this.formGroup = this.datasetWizardModel.buildForm();
|
this.formGroup = this.datasetWizardModel.buildForm();
|
||||||
this.registerFormListeners();
|
this.registerFormListeners();
|
||||||
|
@ -804,7 +845,6 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
saveFinalize() {
|
saveFinalize() {
|
||||||
|
@ -813,8 +853,8 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
if (!this.isSemiFormValid(this.formGroup) || (this.table0fContents && this.table0fContents.hasVisibleInvalidFields())) {
|
if (!this.isSemiFormValid(this.formGroup) || (this.table0fContents && this.table0fContents.hasVisibleInvalidFields())) {
|
||||||
// this.showValidationErrorsDialog();
|
// this.showValidationErrorsDialog();
|
||||||
this.dialog.open(FormValidationErrorsDialogComponent, {
|
this.dialog.open(FormValidationErrorsDialogComponent, {
|
||||||
data:{
|
data: {
|
||||||
errorMessages:[this.language.instant('DATASET-WIZARD.MESSAGES.MISSING-FIELDS')]
|
errorMessages: [this.language.instant('DATASET-WIZARD.MESSAGES.MISSING-FIELDS')]
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -845,11 +885,17 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
this.uiNotificationService.snackBarNotification(this.isNew ? this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-CREATION') : this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success);
|
this.uiNotificationService.snackBarNotification(this.isNew ? this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-CREATION') : this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-UPDATE'), SnackBarNotificationLevel.Success);
|
||||||
if (data) {
|
if (data) {
|
||||||
if (saveType === this.saveAnd.addNew) {
|
if (saveType === this.saveAnd.addNew) {
|
||||||
this.router.navigate(['/reload']).then(() => { this.router.navigate(['/datasets', 'new', this.formGroup.get('dmp').value.id]); })
|
this.router.navigate(['/reload']).then(() => {
|
||||||
|
this.router.navigate(['/datasets', 'new', this.formGroup.get('dmp').value.id]);
|
||||||
|
})
|
||||||
} else if (saveType === this.saveAnd.close) {
|
} else if (saveType === this.saveAnd.close) {
|
||||||
this.router.navigate(['/reload']).then(() => { this.router.navigate(['/plans', 'edit', this.formGroup.get('dmp').value.id]); });
|
this.router.navigate(['/reload']).then(() => {
|
||||||
|
this.router.navigate(['/plans', 'edit', this.formGroup.get('dmp').value.id]);
|
||||||
|
});
|
||||||
} else if (saveType === SaveType.finalize) {
|
} else if (saveType === SaveType.finalize) {
|
||||||
this.router.navigate(['/reload']).then(() => { this.router.navigate(['/datasets', 'edit', data.id]); });
|
this.router.navigate(['/reload']).then(() => {
|
||||||
|
this.router.navigate(['/datasets', 'edit', data.id]);
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data);
|
this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data);
|
||||||
this.editMode = this.datasetWizardModel.status === DatasetStatus.Draft;
|
this.editMode = this.datasetWizardModel.status === DatasetStatus.Draft;
|
||||||
|
@ -884,10 +930,10 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
}
|
}
|
||||||
|
|
||||||
onCallbackError(error: any) {
|
onCallbackError(error: any) {
|
||||||
const errmes = error && error.message? error.message as string : null;
|
const errmes = error && error.message ? error.message as string : null;
|
||||||
let feedbackMessage = this.language.instant('DATASET-EDITOR.ERRORS.ERROR-OCCURED');
|
let feedbackMessage = this.language.instant('DATASET-EDITOR.ERRORS.ERROR-OCCURED');
|
||||||
if(errmes){
|
if (errmes) {
|
||||||
feedbackMessage += errmes;
|
feedbackMessage += errmes;
|
||||||
}
|
}
|
||||||
this.uiNotificationService.snackBarNotification(feedbackMessage, SnackBarNotificationLevel.Warning);
|
this.uiNotificationService.snackBarNotification(feedbackMessage, SnackBarNotificationLevel.Warning);
|
||||||
this.setErrorModel(error.error);
|
this.setErrorModel(error.error);
|
||||||
|
@ -903,7 +949,7 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
this.datasetWizardService.downloadPDF(this.downloadDocumentId)
|
this.datasetWizardService.downloadPDF(this.downloadDocumentId)
|
||||||
.pipe(takeUntil(this._destroyed))
|
.pipe(takeUntil(this._destroyed))
|
||||||
.subscribe(response => {
|
.subscribe(response => {
|
||||||
const blob = new Blob([response.body], { type: 'application/pdf' });
|
const blob = new Blob([response.body], {type: 'application/pdf'});
|
||||||
const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
|
const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
|
||||||
|
|
||||||
FileSaver.saveAs(blob, filename);
|
FileSaver.saveAs(blob, filename);
|
||||||
|
@ -914,7 +960,7 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
this.datasetWizardService.downloadDOCX(this.downloadDocumentId)
|
this.datasetWizardService.downloadDOCX(this.downloadDocumentId)
|
||||||
.pipe(takeUntil(this._destroyed))
|
.pipe(takeUntil(this._destroyed))
|
||||||
.subscribe(response => {
|
.subscribe(response => {
|
||||||
const blob = new Blob([response.body], { type: 'application/msword' });
|
const blob = new Blob([response.body], {type: 'application/msword'});
|
||||||
const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
|
const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
|
||||||
|
|
||||||
FileSaver.saveAs(blob, filename);
|
FileSaver.saveAs(blob, filename);
|
||||||
|
@ -926,7 +972,7 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
this.datasetWizardService.downloadXML(this.downloadDocumentId)
|
this.datasetWizardService.downloadXML(this.downloadDocumentId)
|
||||||
.pipe(takeUntil(this._destroyed))
|
.pipe(takeUntil(this._destroyed))
|
||||||
.subscribe(response => {
|
.subscribe(response => {
|
||||||
const blob = new Blob([response.body], { type: 'application/xml' });
|
const blob = new Blob([response.body], {type: 'application/xml'});
|
||||||
const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
|
const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
|
||||||
|
|
||||||
FileSaver.saveAs(blob, filename);
|
FileSaver.saveAs(blob, filename);
|
||||||
|
@ -1046,7 +1092,7 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
.subscribe(result => {
|
.subscribe(result => {
|
||||||
if (result && result.datasetProfileExist) {
|
if (result && result.datasetProfileExist) {
|
||||||
const newDmpId = result.formControl.value.id
|
const newDmpId = result.formControl.value.id
|
||||||
this.router.navigate(['/datasets/copy/' + result.datasetId], { queryParams: { newDmpId: newDmpId } });
|
this.router.navigate(['/datasets/copy/' + result.datasetId], {queryParams: {newDmpId: newDmpId}});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -1055,8 +1101,7 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
if (this.datasetWizardModel.isProfileLatestVersion || (this.datasetWizardModel.status === DatasetStatus.Finalized)
|
if (this.datasetWizardModel.isProfileLatestVersion || (this.datasetWizardModel.status === DatasetStatus.Finalized)
|
||||||
|| (this.datasetWizardModel.isProfileLatestVersion == undefined && this.datasetWizardModel.status == undefined)) {
|
|| (this.datasetWizardModel.isProfileLatestVersion == undefined && this.datasetWizardModel.status == undefined)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1081,6 +1126,7 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
}
|
}
|
||||||
|
|
||||||
linkToScroll: LinkToScroll;
|
linkToScroll: LinkToScroll;
|
||||||
|
|
||||||
onStepFound(linkToScroll: LinkToScroll) {
|
onStepFound(linkToScroll: LinkToScroll) {
|
||||||
this.linkToScroll = linkToScroll;
|
this.linkToScroll = linkToScroll;
|
||||||
}
|
}
|
||||||
|
@ -1097,15 +1143,15 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
}
|
}
|
||||||
|
|
||||||
public changeStep(index: number, dataset?: FormControl) {
|
public changeStep(index: number, dataset?: FormControl) {
|
||||||
if(this.step != index){ //view is changing
|
if (this.step != index) { //view is changing
|
||||||
this.resetScroll();
|
this.resetScroll();
|
||||||
}
|
}
|
||||||
this.step = index;
|
this.step = index;
|
||||||
}
|
}
|
||||||
|
|
||||||
public nextStep() {
|
public nextStep() {
|
||||||
if(this.step < this.maxStep){//view is changing
|
if (this.step < this.maxStep) {//view is changing
|
||||||
if(this.step === 0 && this.table0fContents){
|
if (this.step === 0 && this.table0fContents) {
|
||||||
this.table0fContents.seekToFirstElement();
|
this.table0fContents.seekToFirstElement();
|
||||||
}
|
}
|
||||||
this.step++;
|
this.step++;
|
||||||
|
@ -1115,7 +1161,7 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
}
|
}
|
||||||
|
|
||||||
public previousStep() {
|
public previousStep() {
|
||||||
if(this.step > 0){
|
if (this.step > 0) {
|
||||||
this.resetScroll();
|
this.resetScroll();
|
||||||
this.step--;
|
this.step--;
|
||||||
}
|
}
|
||||||
|
@ -1136,9 +1182,9 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
// this.hasChanges = false;
|
// this.hasChanges = false;
|
||||||
// this.hintErrors = false;
|
// this.hintErrors = false;
|
||||||
let messageText = "";
|
let messageText = "";
|
||||||
let confirmButtonText ="";
|
let confirmButtonText = "";
|
||||||
let cancelButtonText = "";
|
let cancelButtonText = "";
|
||||||
let isDeleteConfirmation = false;
|
let isDeleteConfirmation = false;
|
||||||
|
|
||||||
if (this.isNew && !this.datasetIsOnceSaved) {
|
if (this.isNew && !this.datasetIsOnceSaved) {
|
||||||
|
|
||||||
|
@ -1173,14 +1219,9 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
// this.isDiscarded = false;
|
// this.isDiscarded = false;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
|
const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
|
||||||
restoreFocus: false,
|
restoreFocus: false,
|
||||||
data: {
|
data: {
|
||||||
|
@ -1189,7 +1230,7 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
cancelButton: cancelButtonText,
|
cancelButton: cancelButtonText,
|
||||||
isDeleteConfirmation: true
|
isDeleteConfirmation: true
|
||||||
},
|
},
|
||||||
maxWidth:'40em'
|
maxWidth: '40em'
|
||||||
});
|
});
|
||||||
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
|
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
|
||||||
if (result) {
|
if (result) {
|
||||||
|
@ -1198,8 +1239,6 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// this.isDiscarded = false;
|
// this.isDiscarded = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1219,13 +1258,15 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
this.links = currentLinks;
|
this.links = currentLinks;
|
||||||
}
|
}
|
||||||
|
|
||||||
printForm(){
|
printForm() {
|
||||||
console.log(this.formGroup);
|
console.log(this.formGroup);
|
||||||
}
|
}
|
||||||
printFormValue(){
|
|
||||||
|
printFormValue() {
|
||||||
console.log(this.formGroup.value);
|
console.log(this.formGroup.value);
|
||||||
}
|
}
|
||||||
touchForm(){
|
|
||||||
|
touchForm() {
|
||||||
this.formGroup.markAllAsTouched();
|
this.formGroup.markAllAsTouched();
|
||||||
this.showtocentriesErrors = true;
|
this.showtocentriesErrors = true;
|
||||||
}
|
}
|
||||||
|
@ -1234,7 +1275,6 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
// this.tocentries = this.getTocEntries(this.formGroup.get('datasetProfileDefinition')); //TODO
|
// this.tocentries = this.getTocEntries(this.formGroup.get('datasetProfileDefinition')); //TODO
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// get tocentries(){
|
// get tocentries(){
|
||||||
// const form = this.formGroup.get('datasetProfileDefinition')
|
// const form = this.formGroup.get('datasetProfileDefinition')
|
||||||
// if(!form) return null;
|
// if(!form) return null;
|
||||||
|
@ -1336,7 +1376,6 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
// });
|
// });
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// result.forEach((entry,i)=>{
|
// result.forEach((entry,i)=>{
|
||||||
|
|
||||||
// const sections = entry.form.get('sections') as FormArray;
|
// const sections = entry.form.get('sections') as FormArray;
|
||||||
|
@ -1356,6 +1395,4 @@ export class DatasetWizardComponent extends CheckDeactivateBaseComponent impleme
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,50 @@
|
||||||
|
<div class="template-container">
|
||||||
|
<div mat-dialog-title class="row d-flex m-0 header">
|
||||||
|
<span class="template-title align-self-center">{{'DATASET-CREATE-WIZARD.PREFILL-STEP.TITLE' | translate}}</span>
|
||||||
|
<span class="ml-auto align-self-center" (click)="closeDialog()"><mat-icon
|
||||||
|
class="close-icon">close</mat-icon></span>
|
||||||
|
</div>
|
||||||
|
<div *ngIf="progressIndication" class="progress-bar">
|
||||||
|
<mat-progress-bar color="primary" mode="indeterminate"></mat-progress-bar>
|
||||||
|
</div>
|
||||||
|
<div mat-dialog-content *ngIf="prefillForm" [formGroup]="prefillForm" class="definition-content">
|
||||||
|
<div class="row d-flex align-items-center justify-content-center" [class.pb-4]="isPrefilled">
|
||||||
|
<button mat-raised-button type="button" class="empty-btn"
|
||||||
|
(click)="closeDialog()">{{'DATASET-CREATE-WIZARD.PREFILL-STEP.EMPTY' | translate}}</button>
|
||||||
|
<div class="ml-2 mr-2">{{'DATASET-CREATE-WIZARD.PREFILL-STEP.OR' | translate}}</div>
|
||||||
|
<button mat-raised-button type="button" class="prefill-btn"
|
||||||
|
(click)="isPrefilled = true">{{'DATASET-CREATE-WIZARD.PREFILL-STEP.PREFILL' | translate}}</button>
|
||||||
|
</div>
|
||||||
|
<div *ngIf="isPrefilled" class="row">
|
||||||
|
<div class="col-12 pl-0 pr-0 pb-2 d-flex flex-row">
|
||||||
|
<h4 class="col-auto heading">{{'DATASET-CREATE-WIZARD.PREFILL-STEP.PROFILE' | translate}}</h4>
|
||||||
|
</div>
|
||||||
|
<mat-form-field class="col-md-12">
|
||||||
|
<mat-select placeholder="{{'DATASET-CREATE-WIZARD.PREFILL-STEP.PROFILE'| translate}}" [required]="true" [compareWith]="compareWith" formControlName="profile">
|
||||||
|
<mat-option *ngFor="let profile of data.availableProfiles" [value]="profile">
|
||||||
|
{{profile.label}}
|
||||||
|
</mat-option>
|
||||||
|
</mat-select>
|
||||||
|
<mat-error *ngIf="prefillForm.get('profile').hasError('backendError')">{{prefillForm.get('profile').getError('backendError').message}}</mat-error>
|
||||||
|
</mat-form-field>
|
||||||
|
</div>
|
||||||
|
<div *ngIf="isPrefilled" class="row">
|
||||||
|
<div class="col-12 pl-0 pr-0 pb-2 d-flex flex-row">
|
||||||
|
<h4 class="col-auto heading">{{'DATASET-CREATE-WIZARD.PREFILL-STEP.PREFILLED-DATASET' | translate}}</h4>
|
||||||
|
</div>
|
||||||
|
<mat-form-field class="col-md-12">
|
||||||
|
<app-single-auto-complete [required]="true" [formControl]="prefillForm.get('prefill')"
|
||||||
|
placeholder="{{'DATASET-CREATE-WIZARD.PREFILL-STEP.SEARCH' | translate}}"
|
||||||
|
[configuration]="prefillAutoCompleteConfiguration">
|
||||||
|
</app-single-auto-complete>
|
||||||
|
</mat-form-field>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div *ngIf="isPrefilled">
|
||||||
|
<div class="col-auto d-flex pb-4 pt-2">
|
||||||
|
<button mat-raised-button type="button" class="prefill-btn ml-auto" [disabled]="prefillForm.invalid"
|
||||||
|
(click)="next()">{{'DATASET-CREATE-WIZARD.PREFILL-STEP.NEXT' | translate}}</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
|
@ -0,0 +1,57 @@
|
||||||
|
.template-container {
|
||||||
|
.header {
|
||||||
|
display: flex;
|
||||||
|
width: 100%;
|
||||||
|
height: 60px;
|
||||||
|
background-color: #f7dd72;
|
||||||
|
color: #212121;
|
||||||
|
font-size: 1.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.template-title {
|
||||||
|
margin-left: 37px;
|
||||||
|
white-space: nowrap;
|
||||||
|
width: 480px;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
|
.close-icon {
|
||||||
|
cursor: pointer;
|
||||||
|
margin-right: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.close-icon:hover {
|
||||||
|
background-color: #fefefe6e !important;
|
||||||
|
border-radius: 50%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.definition-content {
|
||||||
|
display: block;
|
||||||
|
margin: 0;
|
||||||
|
padding: 25px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.empty-btn, .prefill-btn {
|
||||||
|
background: #f7dd72 0 0 no-repeat padding-box;
|
||||||
|
border: 1px solid #f7dd72;
|
||||||
|
border-radius: 30px;
|
||||||
|
opacity: 1;
|
||||||
|
width: 101px;
|
||||||
|
height: 43px;
|
||||||
|
color: #212121;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.prefill-btn:disabled {
|
||||||
|
background: #a1a1a1 0 0 no-repeat padding-box;
|
||||||
|
border: 1px solid #a1a1a1;
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.empty-btn {
|
||||||
|
background: #ffffff 0 0 no-repeat padding-box;
|
||||||
|
border: 1px solid #a1a1a1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,76 @@
|
||||||
|
import {Component, Inject, OnInit} from "@angular/core";
|
||||||
|
import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
|
||||||
|
import {takeUntil} from "rxjs/operators";
|
||||||
|
import {ProgressIndicationService} from "@app/core/services/progress-indication/progress-indication-service";
|
||||||
|
import {BaseComponent} from "@common/base/base.component";
|
||||||
|
import {SingleAutoCompleteConfiguration} from "@app/library/auto-complete/single/single-auto-complete-configuration";
|
||||||
|
import {Observable} from "rxjs";
|
||||||
|
import {Prefilling} from "@app/core/model/dataset/prefilling";
|
||||||
|
import {PrefillingService} from "@app/core/services/prefilling.service";
|
||||||
|
import {FormBuilder, FormGroup, Validators} from "@angular/forms";
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'prefill-dataset-component',
|
||||||
|
templateUrl: 'prefill-dataset.component.html',
|
||||||
|
styleUrls: ['prefill-dataset.component.scss']
|
||||||
|
})
|
||||||
|
export class PrefillDatasetComponent extends BaseComponent implements OnInit {
|
||||||
|
|
||||||
|
progressIndication = false;
|
||||||
|
prefillAutoCompleteConfiguration: SingleAutoCompleteConfiguration;
|
||||||
|
configId: string = "zenodo";
|
||||||
|
isPrefilled: boolean = false;
|
||||||
|
prefillForm: FormGroup;
|
||||||
|
|
||||||
|
constructor(public dialogRef: MatDialogRef<PrefillDatasetComponent>,
|
||||||
|
private prefillingService: PrefillingService,
|
||||||
|
private progressIndicationService: ProgressIndicationService,
|
||||||
|
private fb: FormBuilder,
|
||||||
|
@Inject(MAT_DIALOG_DATA) public data: any) {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.progressIndicationService.getProgressIndicationObservable().pipe(takeUntil(this._destroyed)).subscribe(x => {
|
||||||
|
setTimeout(() => { this.progressIndication = x; });
|
||||||
|
});
|
||||||
|
this.prefillForm = this.fb.group({
|
||||||
|
type: this.fb.control(false),
|
||||||
|
profile: this.fb.control('', Validators.required),
|
||||||
|
prefill: this.fb.control(null, Validators.required)
|
||||||
|
})
|
||||||
|
if(this.data.availableProfiles && this.data.availableProfiles.length === 1) {
|
||||||
|
this.prefillForm.get('profile').patchValue(this.data.availableProfiles[0]);
|
||||||
|
}
|
||||||
|
this.prefillAutoCompleteConfiguration = {
|
||||||
|
filterFn: this.searchDatasets.bind(this),
|
||||||
|
initialItems: (extraData) => this.searchDatasets(''),
|
||||||
|
displayFn: (item) => (item['name'].length > 60)?(item['name'].substr(0, 60) + "..." ):item['name'],
|
||||||
|
titleFn: (item) => item['name'],
|
||||||
|
subtitleFn: (item) => item['pid']
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public compareWith(object1: any, object2: any) {
|
||||||
|
return object1 && object2 && object1.id === object2.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
searchDatasets(query: string): Observable<Prefilling[]> {
|
||||||
|
return this.prefillingService.getPrefillingList(query, this.configId);
|
||||||
|
}
|
||||||
|
|
||||||
|
next() {
|
||||||
|
if(this.isPrefilled) {
|
||||||
|
this.prefillingService.getPrefillingDataset(this.prefillForm.get('prefill').value.pid, this.prefillForm.get('profile').value.id, this.configId).subscribe(wizard => {
|
||||||
|
wizard.profile = this.prefillForm.get('profile').value;
|
||||||
|
this.closeDialog(wizard);
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
this.closeDialog();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
closeDialog(result = null): void {
|
||||||
|
this.dialogRef.close(result);
|
||||||
|
}
|
||||||
|
}
|
|
@ -28,6 +28,7 @@ import { DatasetCopyDialogModule } from './dataset-wizard/dataset-copy-dialogue/
|
||||||
import { DatasetCriteriaDialogComponent } from './listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component';
|
import { DatasetCriteriaDialogComponent } from './listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component';
|
||||||
import { DatasetOverviewModule } from './overview/dataset-overview.module';
|
import { DatasetOverviewModule } from './overview/dataset-overview.module';
|
||||||
import {RichTextEditorModule} from "@app/library/rich-text-editor/rich-text-editor.module";
|
import {RichTextEditorModule} from "@app/library/rich-text-editor/rich-text-editor.module";
|
||||||
|
import {PrefillDatasetComponent} from "@app/ui/dataset/dataset-wizard/prefill-dataset/prefill-dataset.component";
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
|
@ -62,6 +63,7 @@ import {RichTextEditorModule} from "@app/library/rich-text-editor/rich-text-edit
|
||||||
DatasetUploadDialogue,
|
DatasetUploadDialogue,
|
||||||
DatasetListingItemComponent,
|
DatasetListingItemComponent,
|
||||||
DatasetCriteriaDialogComponent,
|
DatasetCriteriaDialogComponent,
|
||||||
|
PrefillDatasetComponent
|
||||||
],
|
],
|
||||||
entryComponents: [
|
entryComponents: [
|
||||||
DatasetExternalDataRepositoryDialogEditorComponent,
|
DatasetExternalDataRepositoryDialogEditorComponent,
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
::ng-deep .mat-icon-button {
|
::ng-deep .mat-icon-button {
|
||||||
height: 30px !important;
|
|
||||||
font-size: 12px !important;
|
font-size: 12px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,12 +20,12 @@
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="(compositeFieldFormGroup.get('multiplicity').value.max - 1) > (compositeFieldFormGroup.get('multiplicityItems').length)"
|
<div *ngIf="(compositeFieldFormGroup.get('multiplicity').value.max - 1) > (compositeFieldFormGroup.get('multiplicityItems').length)"
|
||||||
class="col-12 mt-1 ml-0 mr-0 addOneFieldButton">
|
class="col-12 mt-1 ml-0 mr-0 addOneFieldButton">
|
||||||
<span matTooltip="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-ADD-ONE-FIELD' | translate}}"
|
<span class="pointer d-inline-flex align-items-center">
|
||||||
class="pointer d-inline-flex align-items-center">
|
|
||||||
<button mat-icon-button color="primary" (click)="addMultipleField(i)" [disabled]="compositeFieldFormGroup.disabled">
|
<button mat-icon-button color="primary" (click)="addMultipleField(i)" [disabled]="compositeFieldFormGroup.disabled">
|
||||||
<mat-icon>add_circle</mat-icon>
|
<mat-icon>add_circle</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
<span class="mt-1" *ngIf="compositeFieldFormGroup.get('multiplicity').value.placeholder">{{compositeFieldFormGroup.get('multiplicity').value.placeholder}}</span>
|
<span class="mt-1" *ngIf="compositeFieldFormGroup.get('multiplicity').value.placeholder">{{compositeFieldFormGroup.get('multiplicity').value.placeholder}}</span>
|
||||||
|
<span class="mt-1" *ngIf="!compositeFieldFormGroup.get('multiplicity').value.placeholder">{{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-ADD-ONE-FIELD' | translate}}</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<mat-form-field *ngIf="compositeFieldFormGroup.get('hasCommentField').value" class="col-12 mb-2" [formGroup]="compositeFieldFormGroup">
|
<mat-form-field *ngIf="compositeFieldFormGroup.get('hasCommentField').value" class="col-12 mb-2" [formGroup]="compositeFieldFormGroup">
|
||||||
|
|
|
@ -32,12 +32,12 @@
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="(compositeFieldFormGroup.get('multiplicity').value.max - 1) > (compositeFieldFormGroup.get('multiplicityItems').length)"
|
<div *ngIf="(compositeFieldFormGroup.get('multiplicity').value.max - 1) > (compositeFieldFormGroup.get('multiplicityItems').length)"
|
||||||
class="col-12 mt-1 ml-0 mr-0 addOneFieldButton">
|
class="col-12 mt-1 ml-0 mr-0 addOneFieldButton">
|
||||||
<span matTooltip="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-ADD-ONE-FIELD' | translate}}"
|
<span class="pointer d-inline-flex align-items-center">
|
||||||
class="pointer d-inline-flex align-items-center">
|
|
||||||
<button mat-icon-button color="primary" (click)="addMultipleField(i)" [disabled]="compositeFieldFormGroup.disabled">
|
<button mat-icon-button color="primary" (click)="addMultipleField(i)" [disabled]="compositeFieldFormGroup.disabled">
|
||||||
<mat-icon>add_circle</mat-icon>
|
<mat-icon>add_circle</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
<span class="mt-1" *ngIf="compositeFieldFormGroup.get('multiplicity').value.placeholder">{{compositeFieldFormGroup.get('multiplicity').value.placeholder}}</span>
|
<span class="mt-1" *ngIf="compositeFieldFormGroup.get('multiplicity').value.placeholder">{{compositeFieldFormGroup.get('multiplicity').value.placeholder}}</span>
|
||||||
|
<span class="mt-1" *ngIf="!compositeFieldFormGroup.get('multiplicity').value.placeholder">{{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-ADD-ONE-FIELD' | translate}}</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<mat-form-field *ngIf="compositeFieldFormGroup.get('hasCommentField').value" class="col-12 mb-2" [formGroup]="compositeFieldFormGroup">
|
<mat-form-field *ngIf="compositeFieldFormGroup.get('hasCommentField').value" class="col-12 mb-2" [formGroup]="compositeFieldFormGroup">
|
||||||
|
@ -101,12 +101,12 @@
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="(fieldsetEntry.form.get('multiplicity').value.max - 1) > (fieldsetEntry.form.get('multiplicityItems').length)"
|
<div *ngIf="(fieldsetEntry.form.get('multiplicity').value.max - 1) > (fieldsetEntry.form.get('multiplicityItems').length)"
|
||||||
class="col-12 mt-1 ml-0 mr-0 addOneFieldButton">
|
class="col-12 mt-1 ml-0 mr-0 addOneFieldButton">
|
||||||
<span matTooltip="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-ADD-ONE-FIELD' | translate}}"
|
<span class="pointer d-inline-flex align-items-center">
|
||||||
class="pointer d-inline-flex align-items-center">
|
|
||||||
<button mat-icon-button color="primary" (click)="addMultipleField(i)" [disabled]="fieldsetEntry.form.disabled">
|
<button mat-icon-button color="primary" (click)="addMultipleField(i)" [disabled]="fieldsetEntry.form.disabled">
|
||||||
<mat-icon>add_circle</mat-icon>
|
<mat-icon>add_circle</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
<span class="mt-1" *ngIf="fieldsetEntry.form.get('multiplicity').value.placeholder">{{fieldsetEntry.form.get('multiplicity').value.placeholder}}</span>
|
<span class="mt-1" *ngIf="fieldsetEntry.form.get('multiplicity').value.placeholder">{{fieldsetEntry.form.get('multiplicity').value.placeholder}}</span>
|
||||||
|
<span class="mt-1" *ngIf="!fieldsetEntry.form.get('multiplicity').value.placeholder">{{'DATASET-PROFILE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.MULTIPLICITY-ADD-ONE-FIELD' | translate}}</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<mat-form-field *ngIf="fieldsetEntry.form.get('hasCommentField').value" class="col-12 mb-2" [formGroup]="fieldsetEntry.form">
|
<mat-form-field *ngIf="fieldsetEntry.form.get('hasCommentField').value" class="col-12 mb-2" [formGroup]="fieldsetEntry.form">
|
||||||
|
|
|
@ -367,7 +367,8 @@
|
||||||
"ADDITIONAL-INFORMATION": "Additional Information",
|
"ADDITIONAL-INFORMATION": "Additional Information",
|
||||||
"MULTIPLICITY-MIN": "Multiplicity Min",
|
"MULTIPLICITY-MIN": "Multiplicity Min",
|
||||||
"MULTIPLICITY-MAX": "Multiplicity Max",
|
"MULTIPLICITY-MAX": "Multiplicity Max",
|
||||||
"MULTIPLICITY-ADD-ONE-FIELD": "Add one more fieldset",
|
"MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text",
|
||||||
|
"MULTIPLICITY-ADD-ONE-FIELD": "Add more",
|
||||||
"ORDER": "Order",
|
"ORDER": "Order",
|
||||||
"COMMENT-PLACEHOLDER": "Please Specify",
|
"COMMENT-PLACEHOLDER": "Please Specify",
|
||||||
"COMMENT-HINT": "Provide additional information or justification about your selection",
|
"COMMENT-HINT": "Provide additional information or justification about your selection",
|
||||||
|
@ -1269,6 +1270,16 @@
|
||||||
"FIRST-STEP": {
|
"FIRST-STEP": {
|
||||||
"TITLE": "DMP",
|
"TITLE": "DMP",
|
||||||
"PLACEHOLDER": "Bestehenden DMP auswählen"
|
"PLACEHOLDER": "Bestehenden DMP auswählen"
|
||||||
|
},
|
||||||
|
"PREFILL-STEP": {
|
||||||
|
"TITLE": "Initialize your Dataset",
|
||||||
|
"PREFILL": "Prefill",
|
||||||
|
"OR": "OR",
|
||||||
|
"EMPTY": "Empty",
|
||||||
|
"PROFILE": "Dataset Template",
|
||||||
|
"PREFILLED-DATASET": "Prefilled Dataset",
|
||||||
|
"SEARCH": "Search a Dataset",
|
||||||
|
"NEXT": "Next"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"INVITATION-EDITOR": {
|
"INVITATION-EDITOR": {
|
||||||
|
|
|
@ -368,7 +368,7 @@
|
||||||
"MULTIPLICITY-MIN": "Multiplicity Min",
|
"MULTIPLICITY-MIN": "Multiplicity Min",
|
||||||
"MULTIPLICITY-MAX": "Multiplicity Max",
|
"MULTIPLICITY-MAX": "Multiplicity Max",
|
||||||
"MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text",
|
"MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text",
|
||||||
"MULTIPLICITY-ADD-ONE-FIELD": "Add one more fieldset",
|
"MULTIPLICITY-ADD-ONE-FIELD": "Add more",
|
||||||
"ORDER": "Order",
|
"ORDER": "Order",
|
||||||
"COMMENT-PLACEHOLDER": "Please Specify",
|
"COMMENT-PLACEHOLDER": "Please Specify",
|
||||||
"COMMENT-HINT": "Provide additional information or justification about your selection",
|
"COMMENT-HINT": "Provide additional information or justification about your selection",
|
||||||
|
@ -386,7 +386,6 @@
|
||||||
"VIEW-STYLE": "Type",
|
"VIEW-STYLE": "Type",
|
||||||
"MULTIPLICITY-MIN": "Multiplicity Min",
|
"MULTIPLICITY-MIN": "Multiplicity Min",
|
||||||
"MULTIPLICITY-MAX": "Multiplicity Max",
|
"MULTIPLICITY-MAX": "Multiplicity Max",
|
||||||
"MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text",
|
|
||||||
"ORDER": "Order",
|
"ORDER": "Order",
|
||||||
"DEFAULT-VALUE": "Default Value",
|
"DEFAULT-VALUE": "Default Value",
|
||||||
"VALIDATION": "Validation",
|
"VALIDATION": "Validation",
|
||||||
|
@ -1271,6 +1270,16 @@
|
||||||
"FIRST-STEP": {
|
"FIRST-STEP": {
|
||||||
"TITLE": "DMP",
|
"TITLE": "DMP",
|
||||||
"PLACEHOLDER": "Pick an existing DMP"
|
"PLACEHOLDER": "Pick an existing DMP"
|
||||||
|
},
|
||||||
|
"PREFILL-STEP": {
|
||||||
|
"TITLE": "Initialize your Dataset",
|
||||||
|
"PREFILL": "Prefill",
|
||||||
|
"OR": "OR",
|
||||||
|
"EMPTY": "Empty",
|
||||||
|
"PROFILE": "Dataset Template",
|
||||||
|
"PREFILLED-DATASET": "Prefilled Dataset",
|
||||||
|
"SEARCH": "Search a Dataset",
|
||||||
|
"NEXT": "Next"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"INVITATION-EDITOR": {
|
"INVITATION-EDITOR": {
|
||||||
|
|
|
@ -367,7 +367,8 @@
|
||||||
"ADDITIONAL-INFORMATION": "Información adicional",
|
"ADDITIONAL-INFORMATION": "Información adicional",
|
||||||
"MULTIPLICITY-MIN": "Multiplicidad mínima",
|
"MULTIPLICITY-MIN": "Multiplicidad mínima",
|
||||||
"MULTIPLICITY-MAX": "Multiplicidad máxima",
|
"MULTIPLICITY-MAX": "Multiplicidad máxima",
|
||||||
"MULTIPLICITY-ADD-ONE-FIELD": "Añadir un elemento más",
|
"MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text",
|
||||||
|
"MULTIPLICITY-ADD-ONE-FIELD": "Add more",
|
||||||
"ORDER": "Orden",
|
"ORDER": "Orden",
|
||||||
"COMMENT-PLACEHOLDER": "Por favir especifique",
|
"COMMENT-PLACEHOLDER": "Por favir especifique",
|
||||||
"COMMENT-HINT": "Proporcione información adicional o justifique su selección",
|
"COMMENT-HINT": "Proporcione información adicional o justifique su selección",
|
||||||
|
@ -1269,6 +1270,16 @@
|
||||||
"FIRST-STEP": {
|
"FIRST-STEP": {
|
||||||
"TITLE": "PGD",
|
"TITLE": "PGD",
|
||||||
"PLACEHOLDER": "Seleccione un PGD existente"
|
"PLACEHOLDER": "Seleccione un PGD existente"
|
||||||
|
},
|
||||||
|
"PREFILL-STEP": {
|
||||||
|
"TITLE": "Initialize your Dataset",
|
||||||
|
"PREFILL": "Prefill",
|
||||||
|
"OR": "OR",
|
||||||
|
"EMPTY": "Empty",
|
||||||
|
"PROFILE": "Dataset Template",
|
||||||
|
"PREFILLED-DATASET": "Prefilled Dataset",
|
||||||
|
"SEARCH": "Search a Dataset",
|
||||||
|
"NEXT": "Next"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"INVITATION-EDITOR": {
|
"INVITATION-EDITOR": {
|
||||||
|
|
|
@ -367,7 +367,8 @@
|
||||||
"ADDITIONAL-INFORMATION": "Επιπλέον Πληροφορίες",
|
"ADDITIONAL-INFORMATION": "Επιπλέον Πληροφορίες",
|
||||||
"MULTIPLICITY-MIN": "Ελάχιστη τιμή Min",
|
"MULTIPLICITY-MIN": "Ελάχιστη τιμή Min",
|
||||||
"MULTIPLICITY-MAX": "Μέγιστη τιμή Max",
|
"MULTIPLICITY-MAX": "Μέγιστη τιμή Max",
|
||||||
"MULTIPLICITY-ADD-ONE-FIELD": "Προσθήκη ακόμα ενός πεδίου",
|
"MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text",
|
||||||
|
"MULTIPLICITY-ADD-ONE-FIELD": "Add more",
|
||||||
"ORDER": "Εντολή",
|
"ORDER": "Εντολή",
|
||||||
"COMMENT-PLACEHOLDER": "Παρακαλώ προσδιορίστε",
|
"COMMENT-PLACEHOLDER": "Παρακαλώ προσδιορίστε",
|
||||||
"COMMENT-HINT": "Προσθέστε επιπλέον πληροφορίες ή αιτιολόγηση σχετικά με την επιλογή σας",
|
"COMMENT-HINT": "Προσθέστε επιπλέον πληροφορίες ή αιτιολόγηση σχετικά με την επιλογή σας",
|
||||||
|
@ -1269,6 +1270,16 @@
|
||||||
"FIRST-STEP": {
|
"FIRST-STEP": {
|
||||||
"TITLE": "Σχέδιο Διαχείρισης Δεδομένων",
|
"TITLE": "Σχέδιο Διαχείρισης Δεδομένων",
|
||||||
"PLACEHOLDER": "Επιλέξτε ένα Σχέδιο Διαχείρισης Δεδομένων από τη συλλογή σας"
|
"PLACEHOLDER": "Επιλέξτε ένα Σχέδιο Διαχείρισης Δεδομένων από τη συλλογή σας"
|
||||||
|
},
|
||||||
|
"PREFILL-STEP": {
|
||||||
|
"TITLE": "Initialize your Dataset",
|
||||||
|
"PREFILL": "Prefill",
|
||||||
|
"OR": "OR",
|
||||||
|
"EMPTY": "Empty",
|
||||||
|
"PROFILE": "Dataset Template",
|
||||||
|
"PREFILLED-DATASET": "Prefilled Dataset",
|
||||||
|
"SEARCH": "Search a Dataset",
|
||||||
|
"NEXT": "Next"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"INVITATION-EDITOR": {
|
"INVITATION-EDITOR": {
|
||||||
|
|
|
@ -367,7 +367,8 @@
|
||||||
"ADDITIONAL-INFORMATION": "Informação Adicional",
|
"ADDITIONAL-INFORMATION": "Informação Adicional",
|
||||||
"MULTIPLICITY-MIN": "Multiplicidade Min",
|
"MULTIPLICITY-MIN": "Multiplicidade Min",
|
||||||
"MULTIPLICITY-MAX": "Multiplicidade Máx",
|
"MULTIPLICITY-MAX": "Multiplicidade Máx",
|
||||||
"MULTIPLICITY-ADD-ONE-FIELD": "Adicionar mais um conjunto de campos",
|
"MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text",
|
||||||
|
"MULTIPLICITY-ADD-ONE-FIELD": "Add more",
|
||||||
"ORDER": "Ordem",
|
"ORDER": "Ordem",
|
||||||
"COMMENT-PLACEHOLDER": "Por favor especifique",
|
"COMMENT-PLACEHOLDER": "Por favor especifique",
|
||||||
"COMMENT-HINT": "Disponibilize informação ou justificação adicional sobre a sua seleção",
|
"COMMENT-HINT": "Disponibilize informação ou justificação adicional sobre a sua seleção",
|
||||||
|
@ -1269,6 +1270,16 @@
|
||||||
"FIRST-STEP": {
|
"FIRST-STEP": {
|
||||||
"TITLE": "PGD",
|
"TITLE": "PGD",
|
||||||
"PLACEHOLDER": "Selecione um PGD existente"
|
"PLACEHOLDER": "Selecione um PGD existente"
|
||||||
|
},
|
||||||
|
"PREFILL-STEP": {
|
||||||
|
"TITLE": "Initialize your Dataset",
|
||||||
|
"PREFILL": "Prefill",
|
||||||
|
"OR": "OR",
|
||||||
|
"EMPTY": "Empty",
|
||||||
|
"PROFILE": "Dataset Template",
|
||||||
|
"PREFILLED-DATASET": "Prefilled Dataset",
|
||||||
|
"SEARCH": "Search a Dataset",
|
||||||
|
"NEXT": "Next"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"INVITATION-EDITOR": {
|
"INVITATION-EDITOR": {
|
||||||
|
|
|
@ -367,7 +367,8 @@
|
||||||
"ADDITIONAL-INFORMATION": "Additional Information",
|
"ADDITIONAL-INFORMATION": "Additional Information",
|
||||||
"MULTIPLICITY-MIN": "Multiplicity Min",
|
"MULTIPLICITY-MIN": "Multiplicity Min",
|
||||||
"MULTIPLICITY-MAX": "Multiplicity Max",
|
"MULTIPLICITY-MAX": "Multiplicity Max",
|
||||||
"MULTIPLICITY-ADD-ONE-FIELD": "Add one more fieldset",
|
"MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text",
|
||||||
|
"MULTIPLICITY-ADD-ONE-FIELD": "Add more",
|
||||||
"ORDER": "Order",
|
"ORDER": "Order",
|
||||||
"COMMENT-PLACEHOLDER": "Please Specify",
|
"COMMENT-PLACEHOLDER": "Please Specify",
|
||||||
"COMMENT-HINT": "Provide additional information or justification about your selection",
|
"COMMENT-HINT": "Provide additional information or justification about your selection",
|
||||||
|
@ -1269,6 +1270,16 @@
|
||||||
"FIRST-STEP": {
|
"FIRST-STEP": {
|
||||||
"TITLE": "DMP",
|
"TITLE": "DMP",
|
||||||
"PLACEHOLDER": "Vybrať existujúci DMP."
|
"PLACEHOLDER": "Vybrať existujúci DMP."
|
||||||
|
},
|
||||||
|
"PREFILL-STEP": {
|
||||||
|
"TITLE": "Initialize your Dataset",
|
||||||
|
"PREFILL": "Prefill",
|
||||||
|
"OR": "OR",
|
||||||
|
"EMPTY": "Empty",
|
||||||
|
"PROFILE": "Dataset Template",
|
||||||
|
"PREFILLED-DATASET": "Prefilled Dataset",
|
||||||
|
"SEARCH": "Search a Dataset",
|
||||||
|
"NEXT": "Next"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"INVITATION-EDITOR": {
|
"INVITATION-EDITOR": {
|
||||||
|
|
|
@ -367,7 +367,8 @@
|
||||||
"ADDITIONAL-INFORMATION": "Dodatne informacije",
|
"ADDITIONAL-INFORMATION": "Dodatne informacije",
|
||||||
"MULTIPLICITY-MIN": "Višestrukost, minimalno polja",
|
"MULTIPLICITY-MIN": "Višestrukost, minimalno polja",
|
||||||
"MULTIPLICITY-MAX": "Višestrukost, maksimalno polja",
|
"MULTIPLICITY-MAX": "Višestrukost, maksimalno polja",
|
||||||
"MULTIPLICITY-ADD-ONE-FIELD": "Dodajte jedan ili više skupova polja",
|
"MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text",
|
||||||
|
"MULTIPLICITY-ADD-ONE-FIELD": "Add more",
|
||||||
"ORDER": "Redosled",
|
"ORDER": "Redosled",
|
||||||
"COMMENT-PLACEHOLDER": "Navedite",
|
"COMMENT-PLACEHOLDER": "Navedite",
|
||||||
"COMMENT-HINT": "Navedite dodatne informacije ili obrazložite izbor",
|
"COMMENT-HINT": "Navedite dodatne informacije ili obrazložite izbor",
|
||||||
|
@ -1269,6 +1270,16 @@
|
||||||
"FIRST-STEP": {
|
"FIRST-STEP": {
|
||||||
"TITLE": "Plan upravljanja podacima",
|
"TITLE": "Plan upravljanja podacima",
|
||||||
"PLACEHOLDER": "Odaberite postojeći Plan"
|
"PLACEHOLDER": "Odaberite postojeći Plan"
|
||||||
|
},
|
||||||
|
"PREFILL-STEP": {
|
||||||
|
"TITLE": "Initialize your Dataset",
|
||||||
|
"PREFILL": "Prefill",
|
||||||
|
"OR": "OR",
|
||||||
|
"EMPTY": "Empty",
|
||||||
|
"PROFILE": "Dataset Template",
|
||||||
|
"PREFILLED-DATASET": "Prefilled Dataset",
|
||||||
|
"SEARCH": "Search a Dataset",
|
||||||
|
"NEXT": "Next"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"INVITATION-EDITOR": {
|
"INVITATION-EDITOR": {
|
||||||
|
|
|
@ -367,7 +367,8 @@
|
||||||
"ADDITIONAL-INFORMATION": "Ek Bilgi",
|
"ADDITIONAL-INFORMATION": "Ek Bilgi",
|
||||||
"MULTIPLICITY-MIN": "En az Çokluk",
|
"MULTIPLICITY-MIN": "En az Çokluk",
|
||||||
"MULTIPLICITY-MAX": "En fazla Çokluk",
|
"MULTIPLICITY-MAX": "En fazla Çokluk",
|
||||||
"MULTIPLICITY-ADD-ONE-FIELD": "Bir alan seti daha ekle",
|
"MULTIPLICITY-PLACEHOLDER": "Multiplicity Placeholder Text",
|
||||||
|
"MULTIPLICITY-ADD-ONE-FIELD": "Add more",
|
||||||
"ORDER": "Düzen",
|
"ORDER": "Düzen",
|
||||||
"COMMENT-PLACEHOLDER": "Lütfen Belirtiniz",
|
"COMMENT-PLACEHOLDER": "Lütfen Belirtiniz",
|
||||||
"COMMENT-HINT": "Seçiminiz hakkında gerekçe veya ek bilgi veriniz",
|
"COMMENT-HINT": "Seçiminiz hakkında gerekçe veya ek bilgi veriniz",
|
||||||
|
@ -1269,6 +1270,16 @@
|
||||||
"FIRST-STEP": {
|
"FIRST-STEP": {
|
||||||
"TITLE": "VYP",
|
"TITLE": "VYP",
|
||||||
"PLACEHOLDER": "Mevcut olan bir VYP seçin"
|
"PLACEHOLDER": "Mevcut olan bir VYP seçin"
|
||||||
|
},
|
||||||
|
"PREFILL-STEP": {
|
||||||
|
"TITLE": "Initialize your Dataset",
|
||||||
|
"PREFILL": "Prefill",
|
||||||
|
"OR": "OR",
|
||||||
|
"EMPTY": "Empty",
|
||||||
|
"PROFILE": "Dataset Template",
|
||||||
|
"PREFILLED-DATASET": "Prefilled Dataset",
|
||||||
|
"SEARCH": "Search a Dataset",
|
||||||
|
"NEXT": "Next"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"INVITATION-EDITOR": {
|
"INVITATION-EDITOR": {
|
||||||
|
|
Loading…
Reference in New Issue