Project

General

Profile

« Previous | Next » 

Revision 56947

[mergeResultLandingPage | Library]:
1. alert.ts: Add input field 'classBody' to add class in modal (e.g. for width).
2. project.component & resultLanding.component: Call <metrics> only when the accordion in clicked.
3. resultLanding.component:
a. Bug fix: variable was used as string
b. Bioentities preprocessing not only for publications
c. metrics valid only when actually clicked
d. modal for other versions (deleted by inference) added in html only if there are other versions & use 'classBody' to set its width.

View differences:

resultLanding.component.ts
214 214
          this.piwiksub = this._piwikService.trackView(this.properties, this.resultLandingInfo.title/*.name*/, this.piwikSiteId).subscribe();
215 215
        }
216 216

  
217
        if(this.type == "publication") {
218
          let bioentitiesNum = 0;
219
          if (this.resultLandingInfo.bioentities != undefined) {
220
            this.resultLandingInfo.bioentities.forEach(function (value, key, map) {
221
              bioentitiesNum += value.size;
222
            });
223
          }
224
          this.bioentitiesNum = bioentitiesNum;
217
        let bioentitiesNum = 0;
218
        if (this.resultLandingInfo.bioentities != undefined) {
219
          this.resultLandingInfo.bioentities.forEach(function (value, key, map) {
220
            bioentitiesNum += value.size;
221
          });
225 222
        }
223
        this.bioentitiesNum = bioentitiesNum;
226 224

  
227 225
        let relatedResearchResultsNum = 0;
228 226
        if (this.resultLandingInfo.relatedResearchResults != undefined) {
......
263 261
          this.activeTab = "Software";
264 262
        } else {
265 263
          this.activeTab = "Metrics";
266
          this.metricsClicked = true;
264
          //this.metricsClicked = true;
267 265
        }
268 266
      },
269 267
      err => {
270 268
        this.handleError("Error getting "+this.type+" for id: " + this.id, err);
271 269

  
272 270
        if(this.type == "publication" || this.type == "software") {
273
          this.errorMessage = 'No "+this.type+" found';
271
          this.errorMessage = 'No '+this.type+' found';
274 272
        } else if(this.type == "dataset") {
275 273
          this.errorMessage += "No research data found";
276 274
        } else if(this.type == "orp") {

Also available in: Unified diff