Move communities.service to openaireLibrary and change imports
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@51227 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
sofia.baltzi
parent
0f04e7229a
commit
f39df4d185
|
|
@ -1,28 +1,26 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { SharedModule } from './shared/shared.module';
|
||||
import { BrowserModule } from '@angular/platform-browser';
|
||||
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
||||
import { APP_BASE_HREF, CommonModule } from '@angular/common';
|
||||
import { HttpModule } from '@angular/http';
|
||||
import { RouterModule } from '@angular/router';
|
||||
import { AppComponent } from './app.component';
|
||||
import {NgModule} from '@angular/core';
|
||||
import {FormsModule} from '@angular/forms';
|
||||
import {APP_BASE_HREF, CommonModule} from '@angular/common';
|
||||
import {HttpModule} from '@angular/http';
|
||||
import {RouterModule} from '@angular/router';
|
||||
import {BrowserModule} from '@angular/platform-browser';
|
||||
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
|
||||
|
||||
import {AppComponent} from './app.component';
|
||||
import {OpenaireErrorPageComponent} from './error/errorPage.component';
|
||||
|
||||
import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module';
|
||||
import { CookieLawModule } from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module';
|
||||
import {AppRoutingModule} from './app-routing.module';
|
||||
import {SharedModule} from './shared/shared.module';
|
||||
import {CookieLawModule} from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module';
|
||||
import {BottomModule} from './openaireLibrary/sharedComponents/bottom.module';
|
||||
import {FeedbackModule} from './openaireLibrary/sharedComponents/feedback/feedback.module';
|
||||
import {ErrorModule} from './openaireLibrary/error/error.module';
|
||||
import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module';
|
||||
|
||||
import {BottomModule} from './openaireLibrary/sharedComponents/bottom.module';
|
||||
import {FeedbackModule} from './openaireLibrary/sharedComponents/feedback/feedback.module';
|
||||
import { EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
|
||||
import {EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
|
||||
|
||||
import { ErrorModule} from './openaireLibrary/error/error.module';
|
||||
|
||||
import { OpenaireErrorPageComponent } from './error/errorPage.component';
|
||||
import { AppRoutingModule } from './app-routing.module';
|
||||
|
||||
import { CommunityService } from './openaireLibrary/connect/community/community.service';
|
||||
import { CommunitiesService } from './communities/communities.service';
|
||||
import {CommunityService} from './openaireLibrary/connect/community/community.service';
|
||||
import {CommunitiesService} from './openaireLibrary/connect/communities/communities.service';
|
||||
//import { LibSearchProjectsModule } from './searchPages/simple/searchProjects.module';
|
||||
|
||||
@NgModule({
|
||||
|
|
@ -32,17 +30,17 @@ import { CommunitiesService } from './communities/communities.service';
|
|||
NoopAnimationsModule,
|
||||
CommonModule,
|
||||
HttpModule,
|
||||
ErrorModule,
|
||||
NavigationBarModule, FeedbackModule, BottomModule,
|
||||
ErrorModule,
|
||||
NavigationBarModule, FeedbackModule, BottomModule,
|
||||
CookieLawModule,
|
||||
BrowserModule.withServerTransition({appId: 'my-app'}),
|
||||
AppRoutingModule//,LibSearchProjectsModule
|
||||
AppRoutingModule//,LibSearchProjectsModule
|
||||
|
||||
],
|
||||
declarations: [ AppComponent, OpenaireErrorPageComponent],
|
||||
exports: [ AppComponent ],
|
||||
providers:[EnvironmentSpecificResolver, CommunityService, CommunitiesService ],
|
||||
bootstrap: [AppComponent]
|
||||
providers:[EnvironmentSpecificResolver, CommunityService, CommunitiesService ],
|
||||
bootstrap: [AppComponent]
|
||||
})
|
||||
//
|
||||
export class AppModule {}
|
||||
|
|
|
|||
|
|
@ -1,21 +1,26 @@
|
|||
import {Component, Input, Output, EventEmitter, ViewChild, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
|
||||
import {Observable} from 'rxjs/Observable';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {Location} from '@angular/common';
|
||||
import "rxjs/add/observable/zip";
|
||||
import { EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
|
||||
import { ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes';
|
||||
import {Properties} from '../utils/properties';
|
||||
import {Component, Input, Output, EventEmitter} from '@angular/core';
|
||||
import {ViewChild, ChangeDetectionStrategy} from '@angular/core';
|
||||
import {ViewEncapsulation} from '@angular/core';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {Location} from '@angular/common';
|
||||
|
||||
import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
|
||||
import {Meta} from '../openaireLibrary/sharedComponents/metaService';
|
||||
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
|
||||
import {CommunitiesService} from './communities.service';
|
||||
import {Observable} from 'rxjs/Observable';
|
||||
import "rxjs/add/observable/zip";
|
||||
|
||||
import {Properties} from '../utils/properties';
|
||||
import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
|
||||
import {ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes';
|
||||
|
||||
import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
|
||||
import {Meta} from '../openaireLibrary/sharedComponents/metaService';
|
||||
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
|
||||
import {CommunitiesService} from '../openaireLibrary/connect/communities/communities.service';
|
||||
|
||||
@Component({
|
||||
selector: 'communities',
|
||||
templateUrl: 'communities.component.html',
|
||||
})
|
||||
|
||||
export class CommunitiesComponent {
|
||||
public piwiksub: any;
|
||||
public subfunders: any;
|
||||
|
|
@ -26,7 +31,7 @@ export class CommunitiesComponent {
|
|||
public communitiesResults = null;
|
||||
|
||||
constructor (
|
||||
private route: ActivatedRoute,
|
||||
private route: ActivatedRoute,
|
||||
private _router: Router,
|
||||
private location: Location, private _meta: Meta,
|
||||
private _piwikService:PiwikService,
|
||||
|
|
@ -34,7 +39,6 @@ export class CommunitiesComponent {
|
|||
private config: ConfigurationService
|
||||
) {
|
||||
var description = "open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects ";
|
||||
|
||||
var title = "OpenAIRE";
|
||||
|
||||
this._meta.setTitle(title);
|
||||
|
|
@ -52,14 +56,12 @@ export class CommunitiesComponent {
|
|||
if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
|
||||
this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE").subscribe();
|
||||
}
|
||||
|
||||
});
|
||||
this._communitiesService.getCommunities('https://dev-openaire.d4science.org/openaire/community/communities').subscribe(
|
||||
communitiesResults => {
|
||||
this.communitiesResults = communitiesResults;
|
||||
//console.log(communitiesResults);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
public ngOnDestroy() {
|
||||
|
|
|
|||
|
|
@ -1,34 +1,35 @@
|
|||
import { NgModule} from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { RouterModule } from '@angular/router';
|
||||
import {NgModule} from '@angular/core';
|
||||
import {CommonModule} from '@angular/common';
|
||||
import {FormsModule} from '@angular/forms';
|
||||
import {RouterModule} from '@angular/router';
|
||||
|
||||
import{CommunitiesRoutingModule} from './communities-routing.module';
|
||||
import{CommunitiesComponent} from './communities.component';
|
||||
import {CommunitiesRoutingModule} from './communities-routing.module';
|
||||
import {SubscribeModule} from '../utils/subscribe/subscribe.module';
|
||||
|
||||
import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {CommunitiesComponent} from './communities.component';
|
||||
|
||||
import {CommunitiesService} from './communities.service';
|
||||
import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
|
||||
import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
|
||||
import {Meta} from '../openaireLibrary/sharedComponents/metaService';
|
||||
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
|
||||
import {SubscribeModule} from '../utils/subscribe/subscribe.module';
|
||||
import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
|
||||
import {Meta} from '../openaireLibrary/sharedComponents/metaService';
|
||||
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
|
||||
import {CommunitiesService} from '../openaireLibrary/connect/communities/communities.service';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule, RouterModule,
|
||||
CommunitiesRoutingModule, SubscribeModule
|
||||
CommunitiesRoutingModule, SubscribeModule
|
||||
],
|
||||
declarations: [
|
||||
CommunitiesComponent
|
||||
],
|
||||
providers:[
|
||||
FreeGuard, PreviousRouteRecorder, ConfigurationService, Meta, PiwikService, CommunitiesService
|
||||
FreeGuard, PreviousRouteRecorder, ConfigurationService,
|
||||
Meta, PiwikService, CommunitiesService
|
||||
],
|
||||
exports: [
|
||||
CommunitiesComponent
|
||||
]
|
||||
]
|
||||
})
|
||||
export class CommunitiesModule { }
|
||||
|
|
|
|||
|
|
@ -1,107 +0,0 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
import { Http, Response, Headers, RequestOptions } from '@angular/http';
|
||||
import { Observable } from 'rxjs/Rx';
|
||||
|
||||
import { CommunityInfo } from '../openaireLibrary/connect/community/communityInfo';
|
||||
|
||||
@Injectable()
|
||||
export class CommunitiesService {
|
||||
|
||||
constructor(private http:Http) {
|
||||
}
|
||||
|
||||
getCommunities(url: string) {
|
||||
return this.http.get(url).map(res => <any> res.json()).map(res => this.parseCommunities(res));
|
||||
}
|
||||
|
||||
parseCommunities(data: any): CommunityInfo[] {
|
||||
let communities: CommunityInfo[] = [];
|
||||
|
||||
let length = Array.isArray(data) ? data.length :1;
|
||||
|
||||
for (let i=0; i<length; i++) {
|
||||
let resData = Array.isArray(data) ? data[i] : data;
|
||||
|
||||
var result: CommunityInfo = new CommunityInfo();
|
||||
|
||||
if(Array.isArray(resData)) {
|
||||
result['title'] = resData[0].name;
|
||||
result['shortTitle'] = resData[0].shortName;
|
||||
result['communityId'] = resData[0].id;
|
||||
result['queryId'] = resData[0].queryId;
|
||||
result['logoUrl'] = resData[0].logoUrl;
|
||||
result['description'] = resData[0].description;
|
||||
result['date'] = resData[0].creationDate;
|
||||
|
||||
if(resData[0].managers != null) {
|
||||
if(result['managers'] == undefined) {
|
||||
result['managers'] = new Array<string>();
|
||||
}
|
||||
|
||||
let managers = resData[0].managers;
|
||||
let length = Array.isArray(managers) ? managers.length : 1;
|
||||
|
||||
for(let i=0; i<length; i++) {
|
||||
let manager = Array.isArray(managers) ? managers[i] : managers;
|
||||
result.managers[i] = manager;
|
||||
}
|
||||
}
|
||||
|
||||
if(resData[0].subjects != null) {
|
||||
if(result['subjects'] == undefined) {
|
||||
result['subjects'] = new Array<string>();
|
||||
}
|
||||
|
||||
let subjects = resData[0].subjects;
|
||||
let length = Array.isArray(subjects) ? subjects.length : 1;
|
||||
|
||||
for(let i=0; i<length; i++) {
|
||||
let subject = Array.isArray(subjects) ? subjects[i] : subjects;
|
||||
result.subjects[i] = subject;
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
result['title'] = resData.name;
|
||||
result['shortTitle'] = resData.shortName;
|
||||
result['communityId'] = resData.id;
|
||||
result['queryId'] = resData.queryId;
|
||||
result['logoUrl'] = resData.logoUrl;
|
||||
result['description'] = resData.description;
|
||||
result['date'] = resData.creationDate;
|
||||
|
||||
if(resData.managers != null) {
|
||||
if(result['managers'] == undefined) {
|
||||
result['managers'] = new Array<string>();
|
||||
}
|
||||
|
||||
let managers = resData.managers;
|
||||
let length = Array.isArray(managers) ? managers.length : 1;
|
||||
|
||||
for(let i=0; i<length; i++) {
|
||||
let manager = Array.isArray(managers) ? managers[i] : managers;
|
||||
result.managers[i] = manager;
|
||||
}
|
||||
}
|
||||
|
||||
if(resData.subjects != null) {
|
||||
if(result['subjects'] == undefined) {
|
||||
result['subjects'] = new Array<string>();
|
||||
}
|
||||
|
||||
let subjects = resData.subjects;
|
||||
let length = Array.isArray(subjects) ? subjects.length : 1;
|
||||
|
||||
for(let i=0; i<length; i++) {
|
||||
let subject = Array.isArray(subjects) ? subjects[i] : subjects;
|
||||
result.subjects[i] = subject;
|
||||
}
|
||||
}
|
||||
}
|
||||
communities.push(result);
|
||||
}
|
||||
|
||||
return communities;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,25 +1,29 @@
|
|||
import {Component} from '@angular/core';
|
||||
import {Observable} from 'rxjs/Observable';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {Location} from '@angular/common';
|
||||
|
||||
import {Component} from '@angular/core';
|
||||
import {Observable} from 'rxjs/Observable';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {Location} from '@angular/common';
|
||||
import "rxjs/add/observable/zip";
|
||||
import { EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
|
||||
import { ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes';
|
||||
|
||||
import {Properties} from '../utils/properties';
|
||||
import {CommunityService} from "../openaireLibrary/connect/community/community.service";
|
||||
import {CommunitiesService} from "../communities/communities.service";
|
||||
import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
|
||||
import {Meta} from '../openaireLibrary/sharedComponents/metaService';
|
||||
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
|
||||
import{ StatisticsService} from '../utils/services/statistics.service';
|
||||
import {StatisticsSummary} from "./statisticsEntities";
|
||||
import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
|
||||
import {ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes';
|
||||
|
||||
import {StatisticsSummary} from "./statisticsEntities";
|
||||
|
||||
import {Properties} from '../utils/properties';
|
||||
import {StatisticsService} from '../utils/services/statistics.service';
|
||||
|
||||
import {CommunityService} from "../openaireLibrary/connect/community/community.service";
|
||||
import {CommunitiesService} from "../openaireLibrary/connect/communities/communities.service";
|
||||
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
|
||||
import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
|
||||
import {Meta} from '../openaireLibrary/sharedComponents/metaService';
|
||||
|
||||
@Component({
|
||||
selector: 'statistics',
|
||||
templateUrl: 'statistics.component.html',
|
||||
})
|
||||
|
||||
export class StatisticsComponent {
|
||||
public piwiksub: any;
|
||||
public subfunders: any;
|
||||
|
|
@ -31,8 +35,9 @@ export class StatisticsComponent {
|
|||
public communityInfo = null;
|
||||
public statistics: StatisticsSummary;
|
||||
charts = null;
|
||||
|
||||
constructor (
|
||||
private route: ActivatedRoute,
|
||||
private route: ActivatedRoute,
|
||||
private _router: Router,
|
||||
private location: Location, private _meta: Meta, private _piwikService:PiwikService,
|
||||
private config: ConfigurationService,
|
||||
|
|
@ -91,6 +96,7 @@ export class StatisticsComponent {
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
private createCharts(){
|
||||
this.charts = {
|
||||
graphs: {
|
||||
|
|
@ -146,7 +152,6 @@ export class StatisticsComponent {
|
|||
load:false}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,36 +1,37 @@
|
|||
import { NgModule} from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { RouterModule } from '@angular/router';
|
||||
import {NgModule} from '@angular/core';
|
||||
import {CommonModule} from '@angular/common';
|
||||
import {FormsModule} from '@angular/forms';
|
||||
import {RouterModule} from '@angular/router';
|
||||
|
||||
import{StatisticsRoutingModule} from './statistics-routing.module';
|
||||
import{StatisticsComponent} from './statistics.component';
|
||||
import { StatisticsService } from '../utils/services/statistics.service';
|
||||
import { CommunityService } from '../openaireLibrary/connect/community/community.service';
|
||||
import { CommunitiesService } from '../communities/communities.service';
|
||||
import {IFrameModule} from '../openaireLibrary/utils/iframe.module';
|
||||
import {StatisticsRoutingModule} from './statistics-routing.module';
|
||||
import {IFrameModule} from '../openaireLibrary/utils/iframe.module';
|
||||
|
||||
import {StatisticsComponent} from './statistics.component';
|
||||
|
||||
import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
|
||||
import {Meta} from '../openaireLibrary/sharedComponents/metaService';
|
||||
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
|
||||
import {StatisticsService} from '../utils/services/statistics.service';
|
||||
import {CommunityService} from '../openaireLibrary/connect/community/community.service';
|
||||
import {CommunitiesService} from '../openaireLibrary/connect/communities/communities.service';
|
||||
import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
|
||||
import {Meta} from '../openaireLibrary/sharedComponents/metaService';
|
||||
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
|
||||
|
||||
import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule, RouterModule,
|
||||
StatisticsRoutingModule, IFrameModule
|
||||
StatisticsRoutingModule, IFrameModule
|
||||
],
|
||||
declarations: [
|
||||
StatisticsComponent
|
||||
],
|
||||
],
|
||||
providers:[
|
||||
FreeGuard, PreviousRouteRecorder, ConfigurationService, Meta, PiwikService, CommunityService, CommunitiesService, StatisticsService
|
||||
],
|
||||
FreeGuard, PreviousRouteRecorder, ConfigurationService, Meta,
|
||||
PiwikService, CommunityService, CommunitiesService, StatisticsService
|
||||
],
|
||||
exports: [
|
||||
StatisticsComponent
|
||||
]
|
||||
]
|
||||
})
|
||||
export class StatisticsModule { }
|
||||
|
|
|
|||
Loading…
Reference in New Issue