MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Library | Trunk]: Fix types on landing header. Add message if result summary does not exist 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59150 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2020-07-21 09:17:50 +00:00
parent e3a33ba2b5
commit 048e3b99b5
4 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app.module.ts
View File

@ -1,24 +1,21 @@
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { SharedModule } from './shared/shared.module';
import { BrowserModule } from '@angular/platform-browser';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { APP_BASE_HREF, CommonModule } from '@angular/common';
import { HttpClientModule } from '@angular/common/http';
import { RouterModule } from '@angular/router';
import { AppComponent } from './app.component';
import {NgModule} from '@angular/core';
import {SharedModule} from './shared/shared.module';
import {BrowserModule} from '@angular/platform-browser';
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
import {CommonModule} from '@angular/common';
import {HttpClientModule} from '@angular/common/http';
import {AppComponent} from './app.component';
import {NavigationBarModule} from './sharedComponents/navigationBar.module';
import { CookieLawModule } from './sharedComponents/cookie-law/cookie-law.module';
import { BottomModule } from './sharedComponents/bottom.module';
import {CookieLawModule} from './sharedComponents/cookie-law/cookie-law.module';
import {BottomModule} from './sharedComponents/bottom.module';
// import { ErrorModule } from './error/error.module';
import { ConfigurationService } from './utils/configuration/configuration.service';
import {ConfigurationService} from './utils/configuration/configuration.service';
import {MainSearchModule} from './searchPages/find/mainSearch.module';
import {ResultLandingModule} from "./landingPages/result/resultLanding.module";
import {DataProviderModule} from './landingPages/dataProvider/dataProvider.module';
import {ProjectModule} from './landingPages/project/project.module';
import {OrganizationModule} from './landingPages/organization/organization.module';
import {ReloadModule} from './reload/reload.module';
import {ErrorModule} from './error/error.module';
import {SearchResearchResultsModule} from './searchPages/simple/searchResearchResults.module';
@ -47,9 +44,9 @@ import {ClaimsByTokenModule} from './claims/claimsByToken/claimsByToken.module';
import {DirectLinkingModule} from './claims/directLinking/directLinking.module';
import {LinkingGenericModule} from './claims/linking/linkingGeneric.module';
import{ HtmlProjectReportModule} from './landingPages/htmlProjectReport/htmlProjectReport.module';
import {IsRouteEnabled} from './error/isRouteEnabled.guard';
import { AppRoutingModule } from './app-routing.module';
import {HtmlProjectReportModule} from './landingPages/htmlProjectReport/htmlProjectReport.module';
import {AppRoutingModule} from './app-routing.module';
@NgModule({
imports: [

2
landingPages/landing-utils/landing-header/landing-header.component.ts
View File

@ -12,7 +12,7 @@ import {AlertModal} from "../../../utils/modal/alert";
{{entityType}}
</span>
<span *ngIf="types && removeUnknown(types, true).length > 0">
{{(entityType)?' . ':'' + removeUnknown(types, true).join(' . ')}}
{{(entityType?' . ':'') + removeUnknown(types, true).join(' . ')}}
</span>
<span>
<span *ngIf="startDate || endDate">

8
landingPages/result/resultLanding.component.html
View File

@ -124,6 +124,11 @@
<div class="main-tabs-div">
<ng-template #summary_tab>
<div class="uk-grid uk-margin-remove">
<div *ngIf="!hasPrimaryInfo" class="uk-width-expand uk-padding">
<div class="uk-animation-fade uk-alert uk-alert-primary" role="alert">
No summary information available
</div>
</div>
<div *ngIf="hasPrimaryInfo" class="uk-width-expand uk-padding">
<!-- Description -->
<div *ngIf="resultLandingInfo.description" class="uk-margin-medium-bottom">
@ -184,8 +189,7 @@
</div>
</div>
</div>
<div *ngIf="hasSecondaryInfo"
[class]="hasPrimaryInfo?'uk-width-1-3@m uk-width-1-1 right-column uk-padding-remove':'uk-padding-remove uk-width-expand'">
<div *ngIf="hasSecondaryInfo" class="uk-width-1-3@m uk-width-1-1 right-column uk-padding-remove">
<div *ngIf="resultLandingInfo.fundedByProjects && resultLandingInfo.fundedByProjects.length > 0 ||
resultLandingInfo.contexts && resultLandingInfo.contexts.length >0"
class="uk-padding uk-padding-remove-bottom">

2
landingPages/result/resultLanding.component.ts
View File

@ -15,7 +15,7 @@ import {Location} from "@angular/common";
import {MetricsService} from "../../services/metrics.service";
import {RelationResult, ResultPreview} from "../../utils/result-preview/result-preview";
import {IndexInfoService} from "../../utils/indexInfo.service";
import {FormBuilder, FormGroup} from "@angular/forms";
import {FormBuilder} from "@angular/forms";
import {StringUtils} from "../../utils/string-utils.class";
import {properties} from "../../../../environments/environment";
import {ISVocabulariesService} from "../../utils/staticAutoComplete/ISVocabularies.service";