Project

General

Profile

« Previous | Next » 

Revision 60784

[Connect|Trunk]

Enermaps Integration:
- add property for enermaps url
- use proper id for the images

App:
-Set properly the redirect url (status manager)

View differences:

modules/uoa-connect-portal/trunk/src/app/community/community.component.html
504 504
                <div class="uk-width-expand uk-padding">
505 505
                  <search-tab [fetch]="fetchFeaturedDatasets" [resultType]="'dataset'"
506 506
                               [properties]="properties" customTitle="Featured Datasets"
507
                              [showImpactFactors]="false" [showImage]="true">
507
                              [showImpactFactors]="false" [showEnermaps]="true">
508 508
                  </search-tab>
509 509
                </div>
510 510
              </div>
......
558 558
                      [tabTitle]="'Ontology Mapping'"  [tabId]="'mapping'">
559 559
                <ng-container *ngTemplateOutlet="mapping_tab;"></ng-container>
560 560
              </my-tab>
561
              <my-tab *ngIf="properties.environment == 'development' && communityId == 'enermaps' &&
561
              <my-tab *ngIf="properties.environment != 'production' && communityId == 'enermaps' &&
562 562
              fetchFeaturedDatasets.searchUtils.totalResults > 0 && isEntityEnabled('dataset')"
563 563
                      [tabTitle]="'Featured datasets'"  [tabId]="'enermaps'" [tabNumber]="fetchFeaturedDatasets.searchUtils.totalResults">
564 564
                <ng-container *ngTemplateOutlet="enermaps_tab;"></ng-container>
modules/uoa-connect-portal/trunk/src/app/community/community.component.ts
291 291
        (this.fetchFeaturedDatasets.searchUtils.status == this.errorCodes.DONE && this.fetchFeaturedDatasets.searchUtils.totalResults > 0)
292 292
      )
293 293
    ) {
294
      this.fetchFeaturedDatasets.getResultsForCommunity("dataset", this.communityId, page, size, this.properties, "enermaps::selection");
294
      this.fetchFeaturedDatasets.getAllResultsForCommunity("dataset", this.communityId, page, size, this.properties, "enermaps::selection");
295 295
    }
296 296
    this.reloadFeaturedDatasets = false;
297 297
  }
......
309 309
      fetch = this.fetchOrps;
310 310
    } else if (resultType == "dataset" && contextId) {
311 311
      fetch = this.fetchFeaturedDatasets;
312
      this.fetchFeaturedDatasets.getAllResultsForCommunity("dataset", this.communityId, 0, 0, this.properties, contextId);
313
      return;
312 314
    }
313 315
    fetch.getNumForCommunity(resultType, this.communityId, this.properties, contextId);
314 316
  }
modules/uoa-connect-portal/trunk/src/app/app.component.ts
268 268
        this.router.navigate(['/user-info'], {
269 269
          queryParams: {
270 270
            "errorCode": LoginErrorCodes.NOT_LOGIN,
271
            "redirectUrl": this.router.url
271
            "redirectUrl": location.pathname+ location.search + location.hash
272 272
          }
273 273
        });
274 274
      } else {
modules/uoa-connect-portal/trunk/src/environments/environment.ts
20 20
  statisticsFrameAPIURL: 'https://beta.openaire.eu/stats/',
21 21
  statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
22 22
  useNewStatistisTool: true,
23
  enermapsURL:"http://enermaps.idiap.ch",
23 24
  impactFactorsAPIURL: 'https://bip-api.imsi.athenarc.gr/paper/scores/batch/',
24 25
  claimsAPIURL: 'http://dl170.madgik.di.uoa.gr:8180/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/',
25 26
  searchAPIURLLAst: 'https://beta.services.openaire.eu/search/v2/api/',

Also available in: Unified diff