MaDgIK
/
connect
13
0
Fork 0
Code Issues Pull Requests Projects Releases 12 Wiki Activity

Change parseResults for communities and url for parsing communities 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@50950 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
sofia.baltzi 2018-02-27 15:52:00 +00:00
parent e7edd72071
commit 0c58b059c7
3 changed files with 15 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/communities/communities.component.ts
View File

@ -58,15 +58,7 @@ properties:EnvProperties;
}); });
// waiting... for response from Claudio this._communitiesService.getResults('https://dev-openaire.d4science.org/openaire/community/communities').subscribe(
// this._communitiesService.getResults('https://dev-openaire.d4science.org/openaire/community/communities').subscribe(
// communitiesResults => {
// this.communitiesResults = communitiesResults;
// console.log(communitiesResults);
// });
// this is a draft
this._communitiesService.getResults('http://rudie.di.uoa.gr:8080/uoa-admin-tools/mock/communities/').subscribe(
communitiesResults => { communitiesResults => {
this.communitiesResults = communitiesResults; this.communitiesResults = communitiesResults;
console.log(communitiesResults); console.log(communitiesResults);

48
src/app/communities/communities.service.ts
View File

@ -18,33 +18,6 @@ export class CommunitiesService {
return this.http.get(url).map(res => <any> res.json()).map(res => this.parseCommunities(id,res)); return this.http.get(url).map(res => <any> res.json()).map(res => this.parseCommunities(id,res));
} }
// this is for https://dev-openaire.d4science.org/openaire/community/communities
// parseResults(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['logoUrl'] = resData[0].logoUrl;
// result['description'] = resData[0].description;
// } else {
// result['title'] = resData.name;
// result['logoUrl'] = resData.logoUrl;
// result['description'] = resData.description;
// }
// communities.push(result);
// }
//
// return communities;
// }
//this is for http://rudie.di.uoa.gr:8080/uoa-admin-tools/mock/communities/
parseResults(data: any): CommunityInfo[] { parseResults(data: any): CommunityInfo[] {
let communities: CommunityInfo[] = []; let communities: CommunityInfo[] = [];
@ -58,14 +31,14 @@ export class CommunitiesService {
if(Array.isArray(resData)) { if(Array.isArray(resData)) {
result['title'] = resData[0].name; result['title'] = resData[0].name;
result['shortTitle'] = resData[0].shortName; result['shortTitle'] = resData[0].shortName;
result['communityId'] = resData[0].communityId; result['communityId'] = resData[0].id;
result['logoUrl'] = resData[0].logo; result['logoUrl'] = resData[0].logoUrl;
result['description'] = resData[0].description; result['description'] = resData[0].description;
} else { } else {
result['title'] = resData.name; result['title'] = resData.name;
result['shortTitle'] = resData.shortName; result['shortTitle'] = resData.shortName;
result['communityId'] = resData.communityId; result['communityId'] = resData.id;
result['logoUrl'] = resData.logo; result['logoUrl'] = resData.logoUrl;
result['description'] = resData.description; result['description'] = resData.description;
} }
communities.push(result); communities.push(result);
@ -74,6 +47,7 @@ export class CommunitiesService {
return communities; return communities;
} }
parseCommunities(id:string, data:any): CommunityInfo[] { parseCommunities(id:string, data:any): CommunityInfo[] {
let community: CommunityInfo[] = []; let community: CommunityInfo[] = [];
@ -87,24 +61,24 @@ export class CommunitiesService {
var result: CommunityInfo = new CommunityInfo(); var result: CommunityInfo = new CommunityInfo();
if(Array.isArray(resData) && id == resData[0].communityId) { if(Array.isArray(resData) && id == resData[0].id) {
notFound = false; notFound = false;
result['title'] = resData[0].name; result['title'] = resData[0].name;
result['shortTitle'] = resData[0].shortName; result['shortTitle'] = resData[0].shortName;
result['communityId'] = resData[0].communityId; result['communityId'] = resData[0].id;
result['logoUrl'] = resData[0].logo; result['logoUrl'] = resData[0].logoUrl;
result['description'] = resData[0].description; result['description'] = resData[0].description;
} else if(!Array.isArray(resData) && id == resData.communityId) { } else if(!Array.isArray(resData) && id == resData.id) {
notFound = false; notFound = false;
result['title'] = resData.name; result['title'] = resData.name;
result['shortTitle'] = resData.shortName; result['shortTitle'] = resData.shortName;
result['communityId'] = resData.communityId; result['communityId'] = resData.id;
result['logoUrl'] = resData.logo; result['logoUrl'] = resData.logoUrl;
result['description'] = resData.description; result['description'] = resData.description;
} }
community.push(result); community.push(result);

6
src/app/community/community.component.ts
View File

@ -104,13 +104,13 @@ export class CommunityComponent {
this.route.queryParams.subscribe( this.route.queryParams.subscribe(
communityId => { communityId => {
this.communityId = communityId['communityId']; this.communityId = communityId['communityId'];
console.log(communityId); //console.log(communityId);
}); });
this._communitiesService.getCommunity(this.communityId,'http://rudie.di.uoa.gr:8080/uoa-admin-tools/mock/communities/').subscribe ( this._communitiesService.getCommunity(this.communityId,'https://dev-openaire.d4science.org/openaire/community/communities').subscribe (
communityInfo => { communityInfo => {
this.communityInfo = communityInfo; this.communityInfo = communityInfo;
console.log(communityInfo); //console.log(communityInfo);
}); });
} }