MaDgIK
/
connect-admin
13
0
Fork 0
Code Issues Pull Requests Projects Releases 9 Wiki Activity

[Admin]: Fix bug when you just logged in and no commutnities appeared on wellcome page. Add mining profiles order by date on mining tool 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@57020 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2019-09-10 12:27:29 +00:00
parent be434dc75f
commit 07b827f6e9
2 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
interactiveminingv3.tgz
View File

Binary file not shown.

11
src/app/pages/wellcome/wellcome.component.ts
View File

@ -15,7 +15,10 @@ import {HelperFunctions} from '../../openaireLibrary/utils/HelperFunctions.class
uk-scrollspy="{"target":"[uk-scrollspy-class]","cls":"uk-animation-fade","delay":false}" uk-scrollspy="{"target":"[uk-scrollspy-class]","cls":"uk-animation-fade","delay":false}"
tm-header-transparent="light" tm-header-transparent-placeholder="" tm-header-transparent="light" tm-header-transparent-placeholder=""
uk-height-viewport="offset-top: true"> uk-height-viewport="offset-top: true">
<div *ngIf="communities.length == 0" class="uk-container uk-container-large uk-section uk-margin-large-top"> <div class="uk-container uk-container-large uk-section">
<div *ngIf="showLoading" class="uk-animation-fade uk-margin-top uk-width-1-1" role="alert"><span>
class="loading-gif uk-align-center"></span></div>
<div *ngIf="communities.length == 0 && !showLoading" class="uk-container uk-container-large uk-section uk-margin-top">
<div class="uk-width-1-2@m uk-width-1-1@s"> <div class="uk-width-1-2@m uk-width-1-1@s">
<div class="uk-h1">Build an Open Research <b>Gateway</b> for your <b>Community</b></div> <div class="uk-h1">Build an Open Research <b>Gateway</b> for your <b>Community</b></div>
<h4 class="uk-margin-remove-top">Turn Open Science into practice</h4> <h4 class="uk-margin-remove-top">Turn Open Science into practice</h4>
@ -28,7 +31,7 @@ import {HelperFunctions} from '../../openaireLibrary/utils/HelperFunctions.class
HOW</a> HOW</a>
</div> </div>
</div> </div>
<div *ngIf="communities.length > 0" class="uk-container uk-container-large uk-section"> <div *ngIf="communities.length > 0 && !showLoading" class="uk-container uk-container-large uk-section-small">
<div class="uk-container"> <div class="uk-container">
<div class="uk-grid-match uk-grid-small uk-child-width-1-4@m uk-child-width-1-2@s uk-child-width-1-1@xs <div class="uk-grid-match uk-grid-small uk-child-width-1-4@m uk-child-width-1-2@s uk-child-width-1-1@xs
uk-text-center uk-margin-large-top" uk-grid uk-height-match="div > div > .uk-card-media-top"> uk-text-center uk-margin-large-top" uk-grid uk-height-match="div > div > .uk-card-media-top">
@ -77,17 +80,20 @@ import {HelperFunctions} from '../../openaireLibrary/utils/HelperFunctions.class
</div> </div>
</div> </div>
</div> </div>
</div>
` `
}) })
export class WellcomeComponent implements OnInit { export class WellcomeComponent implements OnInit {
properties: EnvProperties = null; properties: EnvProperties = null;
public communities: CommunityInfo[] = []; public communities: CommunityInfo[] = [];
showLoading: boolean;
constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService, private _communitiesService: CommunitiesService) { constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService, private _communitiesService: CommunitiesService) {
} }
ngOnInit() { ngOnInit() {
this.showLoading = true;
this.propertiesService.loadEnvironment().then(es => { this.propertiesService.loadEnvironment().then(es => {
this.propertiesService.setEnvProperties(es); this.propertiesService.setEnvProperties(es);
this.properties = this.propertiesService.envSpecific; this.properties = this.propertiesService.envSpecific;
@ -116,6 +122,7 @@ export class WellcomeComponent implements OnInit {
} }
} }
} }
this.showLoading = false;
}); });
}); });
} }