[Monitor Dashboard | Trunk]: Fix langind modules imports
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59114 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
70397bb5e7
commit
29c98d8bcd
|
@ -4,6 +4,7 @@ import { MonitorDataProviderComponent } from './dataProvider.component';
|
||||||
import {DataProviderRoutingModule} from './dataProvider-routing.module';
|
import {DataProviderRoutingModule} from './dataProvider-routing.module';
|
||||||
import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
|
import {CommonModule} from "@angular/common";
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [DataProviderModule, DataProviderRoutingModule, CommonModule],
|
imports: [DataProviderModule, DataProviderRoutingModule, CommonModule],
|
||||||
|
|
|
@ -1,14 +1,15 @@
|
||||||
import { NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import { MonitorDatasetComponent } from './dataset.component';
|
import {MonitorDatasetComponent} from './dataset.component';
|
||||||
import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {DatasetRoutingModule} from './dataset-routing.module';
|
import {DatasetRoutingModule} from './dataset-routing.module';
|
||||||
import {ResultLandingModule} from "../../../openaireLibrary/landingPages/result/resultLanding.module";
|
import {ResultLandingModule} from "../../../openaireLibrary/landingPages/result/resultLanding.module";
|
||||||
import {CommonModule} from "@angular/common";
|
import {CommonModule} from "@angular/common";
|
||||||
@NgModule({
|
|
||||||
|
@NgModule({
|
||||||
imports: [DatasetRoutingModule, ResultLandingModule, CommonModule],
|
imports: [DatasetRoutingModule, ResultLandingModule, CommonModule],
|
||||||
declarations:[MonitorDatasetComponent],
|
declarations:[MonitorDatasetComponent],
|
||||||
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
|
providers:[FreeGuard, PreviousRouteRecorder],
|
||||||
exports:[MonitorDatasetComponent]
|
exports:[MonitorDatasetComponent]
|
||||||
})
|
})
|
||||||
export class LibDatasetModule { }
|
export class LibDatasetModule { }
|
||||||
|
|
|
@ -4,8 +4,9 @@ import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previo
|
||||||
import { MonitorSoftwareComponent } from './software.component';
|
import { MonitorSoftwareComponent } from './software.component';
|
||||||
import {SoftwareRoutingModule} from './software-routing.module';
|
import {SoftwareRoutingModule} from './software-routing.module';
|
||||||
import {ResultLandingModule} from "../../../openaireLibrary/landingPages/result/resultLanding.module";
|
import {ResultLandingModule} from "../../../openaireLibrary/landingPages/result/resultLanding.module";
|
||||||
|
import {CommonModule} from "@angular/common";
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [SoftwareRoutingModule, ResultLandingModule],
|
imports: [SoftwareRoutingModule, ResultLandingModule, CommonModule],
|
||||||
declarations:[MonitorSoftwareComponent],
|
declarations:[MonitorSoftwareComponent],
|
||||||
providers:[FreeGuard, PreviousRouteRecorder],
|
providers:[FreeGuard, PreviousRouteRecorder],
|
||||||
exports:[MonitorSoftwareComponent]
|
exports:[MonitorSoftwareComponent]
|
||||||
|
|
|
@ -1,12 +1,32 @@
|
||||||
import {Component} from '@angular/core';
|
import {Component} from '@angular/core';
|
||||||
|
import {ActivatedRoute, Router} from "@angular/router";
|
||||||
|
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'monitor-software',
|
selector: 'monitor-software',
|
||||||
template: `
|
template: `
|
||||||
<div id="page_content">
|
<div id="page_content">
|
||||||
<result-landing type="software"></result-landing>
|
<result-landing *ngIf="initialized" type="software"></result-landing>
|
||||||
</div>
|
</div>
|
||||||
`,
|
`,
|
||||||
})
|
})
|
||||||
export class MonitorSoftwareComponent {
|
export class MonitorSoftwareComponent {
|
||||||
|
initialized: boolean = false;
|
||||||
|
|
||||||
|
constructor(private route: ActivatedRoute,
|
||||||
|
private router: Router,
|
||||||
|
private stakeholderService: StakeholderService) {
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.route.params.subscribe(params => {
|
||||||
|
if (params['stakeholder']) {
|
||||||
|
this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
|
||||||
|
if (stakeholder) {
|
||||||
|
this.initialized = true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue