Project

General

Profile

« Previous | Next » 

Revision 57552

[Explore|Trunk]

Home page:
correct interlinked numbers - make separate query to get new numbers
Robots.txt :
Remove cache disallow: for beta it is disallowed due to 'Disallow: /'

View differences:

modules/uoa-services-portal/trunk/explore/src/app/home/home.component.html
87 87
                                  <span class="uk-text-bold">{{publicationsSize.number|number}}{{publicationsSize.size}}
88 88
                                    publications</span><span> deduplicated</span>
89 89
                                </span>
90
                                <span *ngIf="type=='dataset' && showDatasets && datasetsSize">
91
                                  <span class="uk-text-bold">{{datasetsSize.number|number}}{{datasetsSize.size}}
90
                                <span *ngIf="type=='dataset' && showDatasets && datasetsLinkedSize">
91
                                  <span class="uk-text-bold">{{datasetsLinkedSize.number|number}}{{datasetsLinkedSize.size}}
92 92
                                    datasets</span><span> interlinked with publications</span>
93 93
                                </span>
94 94
                                <span *ngIf="type=='software' && showSoftware && softwareSize">
95
                                  <span class="uk-text-bold">{{softwareSize.number|number}}{{softwareSize.size}} research software</span><span> interlinked with publications</span>
95
                                  <span class="uk-text-bold">{{softwareLinkedSize.number|number}}{{softwareLinkedSize.size}} research software</span><span> interlinked with publications</span>
96 96
                                </span>
97 97
                                <!--                              <span *ngIf="type=='other' && showOrp && otherSize">-->
98 98
                                <!--                                <span class="uk-h2">{{otherSize.number|number}}{{otherSize.size}}</span>-->
modules/uoa-services-portal/trunk/explore/src/app/home/home.component.ts
119 119

  
120 120
  public publicationsSize:any = null;
121 121
  public datasetsSize:any = null;
122
  public datasetsLinkedSize:any = null;
123
  public softwareLinkedSize:any = null;
122 124
  public softwareSize: any = null;
123 125
  public otherSize: any = null;
124 126
  public fundersSize:any = null;
......
137 139
  properties: EnvProperties;
138 140
  public readMore: boolean = false;
139 141
public subPub;public subData;public subProjects;public subOrg; public subDataPr;
140
  public subSoft;
142
  public subSoft;public subDataLinked; public subSoftLinked;
141 143
  public subOrp;
142 144
  trelloImg: string = 'trello.svg';
143 145
  trelloImg2: string = 'trello.svg';
......
244 246
        if(this.subData){
245 247
          this.subData.unsubscribe();
246 248
        }
249
      if(this.subDataLinked){
250
        this.subDataLinked.unsubscribe();
251
      }
252
    if(this.subSoftLinked){
253
      this.subSoftLinked.unsubscribe();
254
    }
247 255
    //     if(this.subProjects){
248 256
    //       this.subProjects.unsubscribe();
249 257
    //     }
......
283 291
                 this.handleError("Error getting number of research data", err);
284 292
               }
285 293
         );
294
        this.subDataLinked = this._searchResearchResultsService.numOfSearchResultsLinkedToPub("dataset", this.properties).subscribe(
295
          data => {
296
            if(data && data != null && data > 0 ){
297
              this.datasetsLinkedSize = NumberUtils.roundNumber(data);
298
            }
299
          },
300
          err => {
301
            //console.log(err);
302
            this.handleError("Error getting number of linkedresearch data", err);
303
          }
304
        );
305

  
286 306
       }
287 307
     if (this.showSoftware) {
288 308
       this.subSoft = this._searchResearchResultsService.numOfSearchResults("software", "", this.properties).subscribe(
......
297 317
           this.handleError("Error getting number of software data", err);
298 318
         }
299 319
       );
320
       this.subSoftLinked = this._searchResearchResultsService.numOfSearchResultsLinkedToPub("software", this.properties).subscribe(
321
         data => {
322
           if(data && data != null && data > 0 ){
323
             this.softwareLinkedSize = NumberUtils.roundNumber(data);
324
           }
325
         },
326
         err => {
327
           //console.log(err);
328
           this.handleError("Error getting number of linked software", err);
329
         }
330
       );
300 331
     }
301 332
     if (this.showOrp) {
302 333
       this.subOrp = this._searchResearchResultsService.numOfSearchResults("other", "", this.properties).subscribe(
modules/uoa-services-portal/trunk/explore/src/robots.txt
1 1
User-Agent: *
2
Disallow: /cache
3 2
Disallow: /upload
4 3
Disallow: /participate/direct-claim
5 4
Disallow: /myclaims

Also available in: Unified diff