no message
This commit is contained in:
parent
b34c96b264
commit
d5a677184f
|
@ -77,8 +77,7 @@ public class DatasetWizardController extends BaseController {
|
||||||
public @ResponseBody
|
public @ResponseBody
|
||||||
ResponseEntity<ResponseItem<DatasetWizardModel>> getSingle(@PathVariable String id, @ClaimedAuthorities(claims = {ANONYMOUS}) Principal principal) {
|
ResponseEntity<ResponseItem<DatasetWizardModel>> getSingle(@PathVariable String id, @ClaimedAuthorities(claims = {ANONYMOUS}) Principal principal) {
|
||||||
try {
|
try {
|
||||||
DatasetWizardModel dataset = new DatasetManager().getSingle(this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao(), this.getApiContext().getOperationsContext().getDatasetRepository()
|
DatasetWizardModel dataset = new DatasetManager().getSingle(this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao(), this.getApiContext().getOperationsContext().getDatasetRepository(), id);
|
||||||
, id);
|
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DatasetWizardModel>().status(ApiMessageCode.NO_MESSAGE).payload(dataset));
|
return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DatasetWizardModel>().status(ApiMessageCode.NO_MESSAGE).payload(dataset));
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
ex.printStackTrace();
|
ex.printStackTrace();
|
||||||
|
|
|
@ -78,7 +78,7 @@ export class AppComponent implements OnInit {
|
||||||
// this language will be used as a fallback when a translation isn't found in the current language
|
// this language will be used as a fallback when a translation isn't found in the current language
|
||||||
this.translate.setDefaultLang('en');
|
this.translate.setDefaultLang('en');
|
||||||
|
|
||||||
this.cultureService.cultureSelected(environment.defaultCulture);
|
this.authentication.current() ? this.cultureService.cultureSelected(this.authentication.current().culture) : this.cultureService.cultureSelected(environment.defaultCulture);
|
||||||
|
|
||||||
//this.setupChangeListeners();
|
//this.setupChangeListeners();
|
||||||
}
|
}
|
||||||
|
|
|
@ -110,12 +110,12 @@ import { CultureService } from './utilities/culture/culture-service';
|
||||||
{
|
{
|
||||||
provide: MAT_DATE_LOCALE,
|
provide: MAT_DATE_LOCALE,
|
||||||
deps: [CultureService],
|
deps: [CultureService],
|
||||||
useFactory: (cultureService) => cultureService.getCurrentCulture().name
|
useFactory: (cultureService) => cultureService.getCurrentCulture()
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
provide: LOCALE_ID,
|
provide: LOCALE_ID,
|
||||||
deps: [CultureService],
|
deps: [CultureService],
|
||||||
useFactory: (cultureService) => cultureService.getCurrentCulture().name
|
useFactory: (cultureService) => cultureService.getCurrentCulture()
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
bootstrap: [AppComponent]
|
bootstrap: [AppComponent]
|
||||||
|
|
|
@ -50,6 +50,7 @@ export class DatasetPublicListingComponent implements OnInit {
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
|
||||||
|
|
||||||
this.route.params.subscribe(async (params: Params) => {
|
this.route.params.subscribe(async (params: Params) => {
|
||||||
this.dmpId = params['dmpId'];
|
this.dmpId = params['dmpId'];
|
||||||
this.criteria.setCriteria(this.getDefaultCriteria(this.dmpId));
|
this.criteria.setCriteria(this.getDefaultCriteria(this.dmpId));
|
||||||
|
@ -68,7 +69,7 @@ export class DatasetPublicListingComponent implements OnInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
rowClick(rowId: String) {
|
rowClick(rowId: String) {
|
||||||
this.router.navigate(['/datasets/edit/' + rowId]);
|
this.router.navigate(['/datasets/publicEdit/' + rowId]);
|
||||||
}
|
}
|
||||||
|
|
||||||
getDefaultCriteria(dmpId: String): DatasetCriteria {
|
getDefaultCriteria(dmpId: String): DatasetCriteria {
|
||||||
|
|
|
@ -36,7 +36,8 @@
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
<app-dataset-editor-component [formGroup]="formGroup"></app-dataset-editor-component>
|
<app-dataset-editor-component [formGroup]="formGroup"></app-dataset-editor-component>
|
||||||
<div class="navigation-buttons-container">
|
<div class="navigation-buttons-container">
|
||||||
<button matStepperNext mat-raised-button style="float:right;" color="primary">{{'DATASET-WIZARD.ACTIONS.NEXT' | translate}}</button>
|
<button matStepperNext mat-raised-button style="float:right;" color="primary">{{'DATASET-WIZARD.ACTIONS.NEXT' |
|
||||||
|
translate}}</button>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
@ -54,7 +55,7 @@
|
||||||
<app-external-item-listing *ngIf="formGroup.get('dataRepositories') && dataRepositoriesTemplate && externalSourcesConfiguration"
|
<app-external-item-listing *ngIf="formGroup.get('dataRepositories') && dataRepositoriesTemplate && externalSourcesConfiguration"
|
||||||
[options]="externalSourcesConfiguration.dataRepositories" placeholder="{{'DATASET-EDITOR.FIELDS.DATAREPOSITORIES' | translate}}"
|
[options]="externalSourcesConfiguration.dataRepositories" placeholder="{{'DATASET-EDITOR.FIELDS.DATAREPOSITORIES' | translate}}"
|
||||||
[parentTemplate]='dataRepositoriesTemplate' [displayFunction]='dataRepositoryDisplayFunc' [subtitleFunction]='dataRepositoryDisplaySubtitleFunc'
|
[parentTemplate]='dataRepositoriesTemplate' [displayFunction]='dataRepositoryDisplayFunc' [subtitleFunction]='dataRepositoryDisplaySubtitleFunc'
|
||||||
[formGroup]="formGroup.get('dataRepositories')" [autoCompleteConfiguration]="dataRepositoriesAutoCompleteConfiguration"
|
[formGroup]="formGroup.get('dataRepositories')" [viewOnly]='viewOnly' [autoCompleteConfiguration]="dataRepositoriesAutoCompleteConfiguration"
|
||||||
(onItemChange)="dataRepositoriesOnItemChange($event)">
|
(onItemChange)="dataRepositoriesOnItemChange($event)">
|
||||||
|
|
||||||
</app-external-item-listing>
|
</app-external-item-listing>
|
||||||
|
@ -87,7 +88,7 @@
|
||||||
<app-external-item-listing *ngIf="formGroup.get('externalDatasets') && externalDatasetsTemplate && externalSourcesConfiguration"
|
<app-external-item-listing *ngIf="formGroup.get('externalDatasets') && externalDatasetsTemplate && externalSourcesConfiguration"
|
||||||
[options]="externalSourcesConfiguration.externalDatasets" placeholder="{{'DATASET-EDITOR.FIELDS.EXTERNAL-DATASETS' | translate}}"
|
[options]="externalSourcesConfiguration.externalDatasets" placeholder="{{'DATASET-EDITOR.FIELDS.EXTERNAL-DATASETS' | translate}}"
|
||||||
[parentTemplate]='externalDatasetsTemplate' [displayFunction]='externalDatasetDisplayFunc' [subtitleFunction]='dataRepositoryDisplaySubtitleFunc'
|
[parentTemplate]='externalDatasetsTemplate' [displayFunction]='externalDatasetDisplayFunc' [subtitleFunction]='dataRepositoryDisplaySubtitleFunc'
|
||||||
[formGroup]="formGroup.get('externalDatasets')" [autoCompleteConfiguration]="externalDatasetAutoCompleteConfiguration"
|
[formGroup]="formGroup.get('externalDatasets')" [viewOnly]='viewOnly' [autoCompleteConfiguration]="externalDatasetAutoCompleteConfiguration"
|
||||||
(onItemChange)="externalDatasetsOnItemChange($event)">
|
(onItemChange)="externalDatasetsOnItemChange($event)">
|
||||||
|
|
||||||
</app-external-item-listing>
|
</app-external-item-listing>
|
||||||
|
@ -129,7 +130,7 @@
|
||||||
</mat-card-header>
|
</mat-card-header>
|
||||||
<app-external-item-listing *ngIf="formGroup.get('registries') && registriesTemplate && externalSourcesConfiguration" [options]="externalSourcesConfiguration.registries"
|
<app-external-item-listing *ngIf="formGroup.get('registries') && registriesTemplate && externalSourcesConfiguration" [options]="externalSourcesConfiguration.registries"
|
||||||
placeholder="{{'DATASET-EDITOR.FIELDS.REGISTRIES' | translate}}" [parentTemplate]='registriesTemplate' [displayFunction]='registriesDisplayFunc'
|
placeholder="{{'DATASET-EDITOR.FIELDS.REGISTRIES' | translate}}" [parentTemplate]='registriesTemplate' [displayFunction]='registriesDisplayFunc'
|
||||||
[formGroup]="formGroup.get('registries')" [subtitleFunction]='dataRepositoryDisplaySubtitleFunc' [autoCompleteConfiguration]="registriesAutoCompleteConfiguration"
|
[formGroup]="formGroup.get('registries')" [viewOnly]='viewOnly' [subtitleFunction]='dataRepositoryDisplaySubtitleFunc' [autoCompleteConfiguration]="registriesAutoCompleteConfiguration"
|
||||||
(onItemChange)="registriesOnItemChange($event)">
|
(onItemChange)="registriesOnItemChange($event)">
|
||||||
|
|
||||||
</app-external-item-listing>
|
</app-external-item-listing>
|
||||||
|
@ -156,7 +157,7 @@
|
||||||
</mat-card-header>
|
</mat-card-header>
|
||||||
<app-external-item-listing *ngIf="formGroup.get('services') && servicesTemplate && externalSourcesConfiguration" [options]="externalSourcesConfiguration.services"
|
<app-external-item-listing *ngIf="formGroup.get('services') && servicesTemplate && externalSourcesConfiguration" [options]="externalSourcesConfiguration.services"
|
||||||
placeholder="{{'DATASET-EDITOR.FIELDS.SERVICES' | translate}}" [parentTemplate]='servicesTemplate' [displayFunction]='servicesDisplayFunc'
|
placeholder="{{'DATASET-EDITOR.FIELDS.SERVICES' | translate}}" [parentTemplate]='servicesTemplate' [displayFunction]='servicesDisplayFunc'
|
||||||
[formGroup]="formGroup.get('services')" [subtitleFunction]='dataRepositoryDisplaySubtitleFunc' [autoCompleteConfiguration]="servicesAutoCompleteConfiguration"
|
[formGroup]="formGroup.get('services')" [viewOnly]='viewOnly' [subtitleFunction]='dataRepositoryDisplaySubtitleFunc' [autoCompleteConfiguration]="servicesAutoCompleteConfiguration"
|
||||||
(onItemChange)="servicesOnItemChange($event)">
|
(onItemChange)="servicesOnItemChange($event)">
|
||||||
|
|
||||||
</app-external-item-listing>
|
</app-external-item-listing>
|
||||||
|
@ -183,7 +184,7 @@
|
||||||
</mat-card-header>
|
</mat-card-header>
|
||||||
<app-external-item-listing *ngIf="formGroup.get('tags') && tagsTemplate && externalSourcesConfiguration" [options]="externalSourcesConfiguration.tags"
|
<app-external-item-listing *ngIf="formGroup.get('tags') && tagsTemplate && externalSourcesConfiguration" [options]="externalSourcesConfiguration.tags"
|
||||||
placeholder="{{'DATASET-EDITOR.FIELDS.TAGS' | translate}}" [parentTemplate]='tagsTemplate' [displayFunction]='tagsDisplayFunc'
|
placeholder="{{'DATASET-EDITOR.FIELDS.TAGS' | translate}}" [parentTemplate]='tagsTemplate' [displayFunction]='tagsDisplayFunc'
|
||||||
[formGroup]="formGroup.get('tags')" [subtitleFunction]='tagsDisplaySubtitleFunc' [autoCompleteConfiguration]="tagsAutoCompleteConfiguration"
|
[formGroup]="formGroup.get('tags')" [viewOnly]='viewOnly' [subtitleFunction]='tagsDisplaySubtitleFunc' [autoCompleteConfiguration]="tagsAutoCompleteConfiguration"
|
||||||
(onItemChange)="tagsOnItemChange($event)">
|
(onItemChange)="tagsOnItemChange($event)">
|
||||||
|
|
||||||
</app-external-item-listing>
|
</app-external-item-listing>
|
||||||
|
@ -204,7 +205,8 @@
|
||||||
|
|
||||||
<div class="navigation-buttons-container">
|
<div class="navigation-buttons-container">
|
||||||
<button matStepperPrevious mat-raised-button color="primary">{{'DATASET-WIZARD.ACTIONS.BACK' | translate}}</button>
|
<button matStepperPrevious mat-raised-button color="primary">{{'DATASET-WIZARD.ACTIONS.BACK' | translate}}</button>
|
||||||
<button matStepperNext mat-raised-button color="primary" style="float:right;" (click)="getDefinition()">{{'DATASET-WIZARD.ACTIONS.NEXT' | translate}}</button>
|
<button matStepperNext mat-raised-button color="primary" style="float:right;" (click)="getDefinition()">{{'DATASET-WIZARD.ACTIONS.NEXT'
|
||||||
|
| translate}}</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</mat-step>
|
</mat-step>
|
||||||
|
@ -213,7 +215,8 @@
|
||||||
<dynamic-form class="full-width" *ngIf="formGroup && datasetWizardModel && datasetWizardModel.datasetProfileDefinition" [form]="this.formGroup.get('datasetProfileDefinition')"
|
<dynamic-form class="full-width" *ngIf="formGroup && datasetWizardModel && datasetWizardModel.datasetProfileDefinition" [form]="this.formGroup.get('datasetProfileDefinition')"
|
||||||
[dataModel]="datasetWizardModel"></dynamic-form>
|
[dataModel]="datasetWizardModel"></dynamic-form>
|
||||||
<div class="navigation-buttons-container">
|
<div class="navigation-buttons-container">
|
||||||
<button style="margin-top:10px;" matStepperPrevious mat-raised-button color="primary">{{'DATASET-WIZARD.ACTIONS.BACK' | translate}}</button>
|
<button style="margin-top:10px;" matStepperPrevious mat-raised-button color="primary">{{'DATASET-WIZARD.ACTIONS.BACK'
|
||||||
|
| translate}}</button>
|
||||||
</div>
|
</div>
|
||||||
</mat-step>
|
</mat-step>
|
||||||
</mat-horizontal-stepper>
|
</mat-horizontal-stepper>
|
||||||
|
|
|
@ -46,8 +46,8 @@ import { DataManagementPlanListingModel } from '../../models/data-managemnt-plan
|
||||||
})
|
})
|
||||||
export class DatasetWizardComponent implements OnInit, IBreadCrumbComponent {
|
export class DatasetWizardComponent implements OnInit, IBreadCrumbComponent {
|
||||||
breadCrumbs: Observable<BreadcrumbItem[]>;
|
breadCrumbs: Observable<BreadcrumbItem[]>;
|
||||||
|
viewOnly = false;
|
||||||
@ViewChild('stepper') stepper: MatStepper;
|
@ViewChild('stepper') stepper: MatStepper;
|
||||||
|
|
||||||
//autocomplete Display Functions;
|
//autocomplete Display Functions;
|
||||||
externalDatasetDisplayFunc = (item) => item ? item.label : null;
|
externalDatasetDisplayFunc = (item) => item ? item.label : null;
|
||||||
registriesDisplayFunc = (item) => item ? item.label : null;
|
registriesDisplayFunc = (item) => item ? item.label : null;
|
||||||
|
@ -100,6 +100,12 @@ export class DatasetWizardComponent implements OnInit, IBreadCrumbComponent {
|
||||||
secondFormGroup: FormGroup;
|
secondFormGroup: FormGroup;
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
|
||||||
|
|
||||||
|
this.route
|
||||||
|
.data
|
||||||
|
.subscribe(v => this.viewOnly = v["public"]);
|
||||||
|
|
||||||
let dmpRequestItem: RequestItem<DataManagementPlanCriteria> = new RequestItem();
|
let dmpRequestItem: RequestItem<DataManagementPlanCriteria> = new RequestItem();
|
||||||
dmpRequestItem.criteria = new DataManagementPlanCriteria();
|
dmpRequestItem.criteria = new DataManagementPlanCriteria();
|
||||||
|
|
||||||
|
@ -168,6 +174,7 @@ export class DatasetWizardComponent implements OnInit, IBreadCrumbComponent {
|
||||||
]
|
]
|
||||||
}])
|
}])
|
||||||
this.formGroup = this.datasetWizardModel.buildForm();
|
this.formGroup = this.datasetWizardModel.buildForm();
|
||||||
|
if (this.viewOnly) this.formGroup.disable();
|
||||||
this.loadDatasetProfiles();
|
this.loadDatasetProfiles();
|
||||||
});
|
});
|
||||||
} else if (dmpId != null) {
|
} else if (dmpId != null) {
|
||||||
|
@ -202,6 +209,8 @@ export class DatasetWizardComponent implements OnInit, IBreadCrumbComponent {
|
||||||
} else {
|
} else {
|
||||||
this.datasetWizardModel = new DatasetWizardModel();
|
this.datasetWizardModel = new DatasetWizardModel();
|
||||||
this.formGroup = this.datasetWizardModel.buildForm()
|
this.formGroup = this.datasetWizardModel.buildForm()
|
||||||
|
if (this.viewOnly) this.formGroup.disable();
|
||||||
|
|
||||||
this.formGroup.get('dmp').valueChanges.subscribe(x => {
|
this.formGroup.get('dmp').valueChanges.subscribe(x => {
|
||||||
this.loadDatasetProfiles();
|
this.loadDatasetProfiles();
|
||||||
})
|
})
|
||||||
|
|
|
@ -16,10 +16,19 @@ export const DatasetRoutes: Routes = [
|
||||||
{
|
{
|
||||||
path: "edit/:id",
|
path: "edit/:id",
|
||||||
component: DatasetWizardComponent,
|
component: DatasetWizardComponent,
|
||||||
|
canActivate: [AuthGuard],
|
||||||
|
data: {
|
||||||
|
breadcrumb: true,
|
||||||
|
public: false
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: "publicEdit/:id",
|
||||||
|
component: DatasetWizardComponent,
|
||||||
//canActivate: [AuthGuard],
|
//canActivate: [AuthGuard],
|
||||||
data: {
|
data: {
|
||||||
breadcrumb: true
|
public: true
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "new",
|
path: "new",
|
||||||
|
|
|
@ -32,6 +32,7 @@ export class DynamicFormComponent implements OnInit {
|
||||||
@Input() path: string;
|
@Input() path: string;
|
||||||
@Input() form: FormGroup;
|
@Input() form: FormGroup;
|
||||||
id: string;
|
id: string;
|
||||||
|
|
||||||
// @Input() datasetId: string;
|
// @Input() datasetId: string;
|
||||||
pathName: string;
|
pathName: string;
|
||||||
pages: Array<number>;
|
pages: Array<number>;
|
||||||
|
@ -58,6 +59,7 @@ export class DynamicFormComponent implements OnInit {
|
||||||
|
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
|
||||||
let rules: Rule[] = JsonSerializer.fromJSONArray(this.dataModel.datasetProfileDefinition.rules, Rule);
|
let rules: Rule[] = JsonSerializer.fromJSONArray(this.dataModel.datasetProfileDefinition.rules, Rule);
|
||||||
this.visibilityRulesService.formGroup = this.form;
|
this.visibilityRulesService.formGroup = this.form;
|
||||||
this.visibilityRulesService.buildVisibilityRules(rules)
|
this.visibilityRulesService.buildVisibilityRules(rules)
|
||||||
|
|
|
@ -10,12 +10,14 @@ import { CommonModule } from '@angular/common';
|
||||||
|
|
||||||
|
|
||||||
import { SharedModule } from '../shared/shared.module'
|
import { SharedModule } from '../shared/shared.module'
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule, LOCALE_ID } from '@angular/core';
|
||||||
import { ProjectService } from '../services/project/project.service';
|
import { ProjectService } from '../services/project/project.service';
|
||||||
import { ProjectFileUploaderService } from '../services/files/project-file-uploader.service';
|
import { ProjectFileUploaderService } from '../services/files/project-file-uploader.service';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { BaseHttpModule } from '../utilities/cite-http-service-module/cite-http.module';
|
import { BaseHttpModule } from '../utilities/cite-http-service-module/cite-http.module';
|
||||||
import { MaterialModule } from '../shared/material/material.module';
|
import { MaterialModule } from '../shared/material/material.module';
|
||||||
|
import { CultureService } from '../utilities/culture/culture-service';
|
||||||
|
import { MAT_DATE_LOCALE } from '@angular/material';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
|
@ -50,6 +52,17 @@ import { MaterialModule } from '../shared/material/material.module';
|
||||||
ProjectService,
|
ProjectService,
|
||||||
ProjectFileUploaderService,
|
ProjectFileUploaderService,
|
||||||
/* ProjectResolver */
|
/* ProjectResolver */
|
||||||
|
CultureService,
|
||||||
|
{
|
||||||
|
provide: MAT_DATE_LOCALE,
|
||||||
|
deps: [CultureService],
|
||||||
|
useFactory: (cultureService) => cultureService.getCurrentCulture()
|
||||||
|
},
|
||||||
|
{
|
||||||
|
provide: LOCALE_ID,
|
||||||
|
deps: [CultureService],
|
||||||
|
useFactory: (cultureService) => cultureService.getCurrentCulture()
|
||||||
|
}
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-5">
|
<div class="col-md-5">
|
||||||
<mat-form-field >
|
<mat-form-field >
|
||||||
<mat-select placeholder="Sources" [(ngModel)]="choice" (selectionChange)="selectionChange($event)">
|
<mat-select placeholder="Sources" [(ngModel)]="choice" (selectionChange)="selectionChange($event)" [disabled]="viewOnly">
|
||||||
<mat-option *ngFor="let option of options" [value]="option.key">
|
<mat-option *ngFor="let option of options" [value]="option.key">
|
||||||
{{ option.label }}
|
{{ option.label }}
|
||||||
</mat-option>
|
</mat-option>
|
||||||
|
|
|
@ -27,6 +27,9 @@ export class ExternalItemListingComponent implements OnInit {
|
||||||
@Input()
|
@Input()
|
||||||
public disabled = true;
|
public disabled = true;
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
public viewOnly = false;
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
public titleKey: string;
|
public titleKey: string;
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ import { FigurecardComponent } from './components/figurecard/figurecard.componen
|
||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { FlexLayoutModule } from '@angular/flex-layout';
|
import { FlexLayoutModule } from '@angular/flex-layout';
|
||||||
|
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule, LOCALE_ID } from '@angular/core';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { NavigationComponent } from './components/navigation/navigation.component';
|
import { NavigationComponent } from './components/navigation/navigation.component';
|
||||||
import { SnackBarNotificationComponent } from './components/notificaiton/snack-bar-notification.component';
|
import { SnackBarNotificationComponent } from './components/notificaiton/snack-bar-notification.component';
|
||||||
|
@ -26,6 +26,8 @@ import { MultipleAutoCompleteComponent } from './components/autocompletes/multip
|
||||||
import { UserDialogComponent } from './components/user-dialog/user-dialog.component';
|
import { UserDialogComponent } from './components/user-dialog/user-dialog.component';
|
||||||
import { SearchBarComponent } from './components/search-bar/search-bar.component';
|
import { SearchBarComponent } from './components/search-bar/search-bar.component';
|
||||||
import { TimezoneInfoDisplayPipe } from '../utilities/culture/pipes/TimezoneInfoDisplayPipe';
|
import { TimezoneInfoDisplayPipe } from '../utilities/culture/pipes/TimezoneInfoDisplayPipe';
|
||||||
|
import { CultureService } from '../utilities/culture/culture-service';
|
||||||
|
import { MAT_DATE_LOCALE } from '@angular/material';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
|
@ -85,7 +87,8 @@ import { TimezoneInfoDisplayPipe } from '../utilities/culture/pipes/TimezoneInfo
|
||||||
],
|
],
|
||||||
entryComponents: [
|
entryComponents: [
|
||||||
UserDialogComponent
|
UserDialogComponent
|
||||||
]
|
],
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
export class SharedModule { }
|
export class SharedModule { }
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
<i class="fa fa-twitter"></i>
|
<i class="fa fa-twitter"></i>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<button *ngIf="hasB2AccessOauth()" mat-icon-button (click)="b2AccessLogin()">
|
<button *ngIf="hasB2AccessOauth()" class="b2access-button" mat-icon-button (click)="b2AccessLogin()">
|
||||||
<span class="iconmedium"></span>
|
<span class="iconmedium"></span>
|
||||||
<span></span>
|
<span></span>
|
||||||
</button>
|
</button>
|
||||||
|
|
|
@ -160,3 +160,8 @@ span.iconmedium {
|
||||||
width: 100px;
|
width: 100px;
|
||||||
height: 56px;
|
height: 56px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.b2access-button{
|
||||||
|
margin-top: 10px;
|
||||||
|
width: fit-content;
|
||||||
|
}
|
||||||
|
|
|
@ -64,7 +64,7 @@ export class UserProfileComponent implements OnInit {
|
||||||
timezone: new FormControl(result["additionalinfo"]["timezone"]),
|
timezone: new FormControl(result["additionalinfo"]["timezone"]),
|
||||||
culture: new FormControl(result["additionalinfo"]["culture"])
|
culture: new FormControl(result["additionalinfo"]["culture"])
|
||||||
})
|
})
|
||||||
this.formGroup.get('language').valueChanges.subscribe(x => { if (x) this.translate.use(x.value) })
|
//this.formGroup.get('language').valueChanges.subscribe(x => { if (x) this.translate.use(x.value) })
|
||||||
this.formGroup.get('timezone').valueChanges.subscribe(x => { if (x) this.timezones = this._filterTimezone(x) });
|
this.formGroup.get('timezone').valueChanges.subscribe(x => { if (x) this.timezones = this._filterTimezone(x) });
|
||||||
this.formGroup.get('culture').valueChanges.subscribe(x => { if (x) this.cultures = this._filterCulture(x) });
|
this.formGroup.get('culture').valueChanges.subscribe(x => { if (x) this.cultures = this._filterCulture(x) });
|
||||||
this.formGroup.disable()
|
this.formGroup.disable()
|
||||||
|
@ -123,6 +123,8 @@ export class UserProfileComponent implements OnInit {
|
||||||
this.userReferenceService.updateUserSettings(this.formGroup.value).subscribe(
|
this.userReferenceService.updateUserSettings(this.formGroup.value).subscribe(
|
||||||
x => {
|
x => {
|
||||||
this.editMode = false;
|
this.editMode = false;
|
||||||
|
this.translate.use(this.formGroup.value.language)
|
||||||
|
this.authService.current().culture = this.formGroup.value.culture.name
|
||||||
this.formGroup.disable();
|
this.formGroup.disable();
|
||||||
},
|
},
|
||||||
error => {
|
error => {
|
||||||
|
|
|
@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
|
||||||
import { Observable, Subject } from 'rxjs';
|
import { Observable, Subject } from 'rxjs';
|
||||||
import { CultureInfo } from './models/culture-info';
|
import { CultureInfo } from './models/culture-info';
|
||||||
import { registerLocaleData } from '@angular/common';
|
import { registerLocaleData } from '@angular/common';
|
||||||
|
import { AuthService } from '../../services/auth/auth.service';
|
||||||
|
|
||||||
const availableCultures: CultureInfo[] = require('../../../assets/resources/available-cultures.json');
|
const availableCultures: CultureInfo[] = require('../../../assets/resources/available-cultures.json');
|
||||||
|
|
||||||
|
@ -13,6 +14,7 @@ export class CultureService {
|
||||||
private currentCulture: CultureInfo;
|
private currentCulture: CultureInfo;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
|
private authService: AuthService
|
||||||
) {
|
) {
|
||||||
if (availableCultures) {
|
if (availableCultures) {
|
||||||
this.cultureValues = new Map<string, CultureInfo>();
|
this.cultureValues = new Map<string, CultureInfo>();
|
||||||
|
@ -63,7 +65,7 @@ export class CultureService {
|
||||||
return this.cultureChangeSubject.asObservable();
|
return this.cultureChangeSubject.asObservable();
|
||||||
}
|
}
|
||||||
|
|
||||||
getCurrentCulture(): CultureInfo {
|
getCurrentCulture(): String {
|
||||||
return this.currentCulture;
|
return this.authService.current() && this.authService.current().culture ? this.authService.current().culture : this.currentCulture.name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue