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

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

This commit is contained in:
George Kalampokis 2020-11-13 18:26:53 +02:00
parent cbbfec2ccc b2ea14787c
commit 510142763e
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dmp-frontend/src/app/core/pipes/date-time-culture-format.pipe.ts
View File

@ -1,15 +1,13 @@
import { DatePipe, registerLocaleData } from '@angular/common'; import { DatePipe, registerLocaleData } from '@angular/common';
import localeDe from '@angular/common/locales/de';
import localeEs from '@angular/common/locales/es';
import localeSk from '@angular/common/locales/sk';
import localeTr from '@angular/common/locales/tr';
import { Pipe, PipeTransform } from '@angular/core'; import { Pipe, PipeTransform } from '@angular/core';
import { LangChangeEvent, TranslateService } from '@ngx-translate/core'; import { LangChangeEvent, TranslateService } from '@ngx-translate/core';
import 'moment-timezone'; import 'moment-timezone';
import { CultureInfo } from '../model/culture-info'; import { CultureInfo } from '../model/culture-info';
import { CultureService } from '../services/culture/culture-service';
import { LanguageService } from '../services/language/language.service'; import { LanguageService } from '../services/language/language.service';
import { LoggingService } from '../services/logging/logging-service';
import localeEs from '@angular/common/locales/es';
import localeDe from '@angular/common/locales/de';
import localeTr from '@angular/common/locales/tr';
import localeSk from '@angular/common/locales/sk';
const availableCultures: CultureInfo[] = require('../../../assets/localization/available-cultures.json'); const availableCultures: CultureInfo[] = require('../../../assets/localization/available-cultures.json');

27
dmp-frontend/src/app/ui/dataset/dataset-wizard/dataset-wizard.component.ts
View File

@ -641,21 +641,24 @@ export class DatasetWizardComponent extends BaseComponent implements OnInit, IBr
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 { } else {
this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data); this.datasetWizardModel = new DatasetWizardEditorModel().fromModel(data);
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.formGroup.get('datasetProfileDefinition')) { // setTimeout(() => { this.formGroup = null; });
this.formGroup.removeControl('datasetProfileDefinition');
this.getDefinition(data.profile.id);
this.maxStep = 1;
} else {
this.getDefinition(data.profile.id);
this.maxStep = 1;
}
setTimeout(() => { this.formGroup = null; });
setTimeout(() => { setTimeout(() => {
this.formGroup = this.datasetWizardModel.buildForm(); this.formGroup.get('id').patchValue(data.id);
this.formGroup.get('modified').patchValue(data.modified);
this.formGroupRawValue = JSON.parse(JSON.stringify(this.formGroup.getRawValue()));
this.hasChanges = false;
// this.formGroup = this.datasetWizardModel.buildForm();
// if (this.formGroup.get('datasetProfileDefinition')) {
// this.formGroup.removeControl('datasetProfileDefinition');
// this.getDefinition(data.profile.id);
// this.maxStep = 1;
// } else {
// this.getDefinition(data.profile.id);
// this.maxStep = 1;
// }
}); });
setTimeout(() => { setTimeout(() => {

2
dmp-frontend/src/app/ui/explore-dataset/explore-dataset.module.ts
View File

@ -1,4 +1,5 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { FormattingModule } from '@app/core/formatting.module';
import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module'; import { AutoCompleteModule } from '@app/library/auto-complete/auto-complete.module';
import { ExploreDatasetListingComponent } from '@app/ui/explore-dataset/explore-dataset-listing.component'; import { ExploreDatasetListingComponent } from '@app/ui/explore-dataset/explore-dataset-listing.component';
import { ExploreDatasetRoutingModule } from '@app/ui/explore-dataset/explore-dataset.routing'; import { ExploreDatasetRoutingModule } from '@app/ui/explore-dataset/explore-dataset.routing';
@ -15,6 +16,7 @@ import { DatasetOverviewModule } from '../dataset/overview/dataset-overview.modu
CommonFormsModule, CommonFormsModule,
AutoCompleteModule, AutoCompleteModule,
ExploreDatasetRoutingModule, ExploreDatasetRoutingModule,
FormattingModule,
DatasetOverviewModule DatasetOverviewModule
], ],
declarations: [ declarations: [