Project

General

Profile

« Previous | Next » 

Revision 50568

Added by Sofia Baltzi over 6 years ago

Add - Get more recent publications

View differences:

modules/uoa-connect-portal/trunk/src/app/community/community.component.html
56 56
            </h3>
57 57
            <!--test-->
58 58
            <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
59
              <li *ngFor="let item of publicationsInfo; let i = index">
59 60
               <div class="uk-first-column">
60 61
                  <div class="el-item uk-panel">
61
                     <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
62
                        Aaltodoc Publication Archive
63
                     </h6>
64
                     <div class="el-meta uk-margin uk-text-meta">Aalto University</div>
65
                     <div class="el-content uk-margin"><span class="uk-label">IR</span>&nbsp;<span class=" uk-label uk-label-danger">Data</span>&nbsp;<span class="uk-label uk-label-success">OpenAIRE 3.0</span><br>
66
                        12469 datasets
67
                     </div>
62
                    <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
63
                      {{item.result["metadata"]["oaf:entity"]["oaf:result"]["title"]["content"]}}
64
                    </h6>
65
                      <div class="el-content uk-margin"><span class=" uk-label uk-label-danger">{{item.result["metadata"]["oaf:entity"]["oaf:result"]["bestaccessright"]["classid"]}}</span><br></div>
66
                      <!--authors-->
67
                      <div *ngFor='let item1 of item.result["metadata"]["oaf:entity"]["oaf:result"]["creator"]; let i = index'>
68
                        <div class="el-meta uk-margin uk-text-meta">{{item1["content"]}}</div>
69
                      </div>
70
                      <div class="el-meta uk-margin uk-text-meta"> {{item.result["metadata"]["oaf:entity"]["oaf:result"]["dateofacceptance"]}} </div>
71
                      <div class="text-justify descriptionText"> {{item.result["metadata"]["oaf:entity"]["oaf:result"]["description"]}} </div>
68 72
                  </div>
69 73
               </div>
74
              </li>
70 75
            </div>
71 76
            <!--end of test-->
72 77
            <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
......
105 110
               <span>Most recent research data</span>
106 111
            </h2>
107 112

  
113
            <!-- <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
114
              <li *ngFor="let item2 of researchDataInfo; let i = index">
115
               <div class="uk-first-column">
116
                  <div class="el-item uk-panel">
117
                    <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
118
                      {{item2.result["metadata"]["oaf:entity"]["oaf:result"]["title"]["content"]}}
119
                    </h6>
120
                      <div class="el-content uk-margin"><span class=" uk-label uk-label-danger">{{item2.result["metadata"]["oaf:entity"]["oaf:result"]["bestaccessright"]["classid"]}}</span><br></div>
121
                      <!--authors-->
122
                      <!-- <div *ngFor='let item3 of item2.result["metadata"]["oaf:entity"]["oaf:result"]["creator"]; let i = index'>
123
                        <div class="el-meta uk-margin uk-text-meta">{{item3["content"]}}</div>
124
                      </div>
125
                      <div class="el-meta uk-margin uk-text-meta"> {{item2.result["metadata"]["oaf:entity"]["oaf:result"]["dateofacceptance"]}} </div>
126
                      <div class="text-justify descriptionText"> {{item2.result["metadata"]["oaf:entity"]["oaf:result"]["description"]}} </div>
127
                  </div>
128
               </div>
129
              </li>
130
            </div> -->
131

  
108 132
            <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
109 133
               <div class="uk-first-column">
110 134
                  <div class="el-item uk-panel">
......
131 155
               <span>Most recent software</span>
132 156
            </h2>
133 157

  
158
            <!-- <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
159
              <li *ngFor="let item4 of publicationsInfo; let i = index">
160
               <div class="uk-first-column">
161
                  <div class="el-item uk-panel">
162
                    <h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom">
163
                      {{item4.result["metadata"]["oaf:entity"]["oaf:result"]["title"]["content"]}}
164
                    </h6>
165
                      <div class="el-content uk-margin"><span class=" uk-label uk-label-danger">{{item4.result["metadata"]["oaf:entity"]["oaf:result"]["bestaccessright"]["classid"]}}</span><br></div>
166
                      <!--authors-->
167
                      <!-- <div *ngFor='let item4 of item5.result["metadata"]["oaf:entity"]["oaf:result"]["creator"]; let i = index'>
168
                        <div class="el-meta uk-margin uk-text-meta">{{item4["content"]}}</div>
169
                      </div>
170
                      <div class="el-meta uk-margin uk-text-meta"> {{item4.result["metadata"]["oaf:entity"]["oaf:result"]["dateofacceptance"]}} </div>
171
                      <div class="text-justify descriptionText"> {{item4.result["metadata"]["oaf:entity"]["oaf:result"]["description"]}} </div>
172
                  </div>
173
               </div>
174
              </li>
175
            </div> -->
176

  
177

  
134 178
            <div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
135 179
               <div class="uk-first-column">
136 180
                  <div class="el-item uk-panel">
modules/uoa-connect-portal/trunk/src/app/community/community.service.ts
2 2
import { Http, Response, Headers, RequestOptions } from '@angular/http';
3 3
import { Observable } from 'rxjs/Rx';
4 4

  
5
import { PublicationInfo } from '../../publicationInfo';
5 6

  
6 7
@Injectable()
7 8
export class CommunityService {
......
26 27
                        .map(res => <any> res.json()).do(res => {console.log(res)});
27 28
    }
28 29

  
30
    getResearchDataInfo() {
31
        return this.http.get('http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/datasets?fq=communityid exact "egi"&sortBy=resultdateofacceptance,descending&format=json')
32
                        .map(res => <any> res.json()).map(res => res.results).do(res => {console.log(res)});
33
    }
34

  
29 35
    getNumberOfSoftware() {
30 36
        return this.http.get('http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/software/count?format=json&fq=communityid=egi')
31 37
                        .map(res => <any> res.json()).do(res => {console.log(res)});
32 38
    }
39

  
40
    getSoftwareInfo() {
41
        return this.http.get('http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/software?fq=communityid exact "egi"&sortBy=resultdateofacceptance,descending&format=json')
42
                        .map(res => <any> res.json()).map(res => res.results).do(res => {console.log(res)});
43
    }
44

  
45
    // getPublicationInfo(url: string) {
46
    //     return this.http.get(url).map(res => <any> res.json()).map(res => res.results).do(res => {console.log(res)});
47
    // }
48

  
33 49
}
modules/uoa-connect-portal/trunk/src/app/community/community.component.ts
9 9
import {Properties} from '../utils/properties';
10 10
import {CommunityService} from "./community.service";
11 11

  
12
//import { PublicationInfo } from '../../publicationInfo';
12 13

  
13 14
@Component({
14 15
    selector: 'community',
......
24 25
  public reasearchData=[];
25 26
  public software=[];
26 27
  public publicationsInfo=[];
28
  public researchDataInfo=[];
29
  public softwareInfo=[];
27 30

  
31
  //public publicationsInfo: PublicationInfo[] = [];
32

  
28 33
  constructor (
29 34
    private route: ActivatedRoute,
30 35
      private _router: Router,
......
75 80
                this.publicationsInfo = publicationsInfo;
76 81
                console.log(publicationsInfo);
77 82
      });
83

  
84
    this._communityService.getResearchDataInfo().subscribe(
85
      researchDataInfo => {
86
                this.researchDataInfo = researchDataInfo;
87
                console.log(researchDataInfo);
88
      });
89

  
90
    this._communityService.getSoftwareInfo().subscribe(
91
      softwareInfo => {
92
                this.softwareInfo = softwareInfo;
93
                console.log(softwareInfo);
94
      });
95

  
96
    // this._communityService
97
    //     .getPublicationInfo('http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/publications?fq=communityid exact "egi"&sortBy=resultdateofacceptance,descending&format=json')
98
    //     .subscribe(
99
    //
100
    //     });
78 101
  }
79 102
  public ngOnDestroy() {
80 103
    if(this.piwiksub){
modules/uoa-connect-portal/trunk/src/app/app.module.ts
26 26
    CookieLawModule,
27 27
    BrowserModule.withServerTransition({appId: 'my-app'}),
28 28
    RouterModule.forRoot([
29
      // { path: '', loadChildren: './community/community.module#CommunityModule'},
29 30
      { path: '', loadChildren: './home/home.module#HomeModule'},
30 31
      { path: 'home', loadChildren: './home/home.module#HomeModule'},
31 32
      { path: 'community', loadChildren: './community/community.module#CommunityModule'},

Also available in: Unified diff