MaDgIK
/
irish-monitor
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge branch 'master' of code-repo.d4science.org:MaDgIK/irish-monitor

This commit is contained in:
Konstantinos Triantafyllou 2023-12-06 13:58:04 +02:00
parent c64b1213ac df86a2a5f7
commit c549507a22
5 changed files with 59 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/app-routing.module.ts
View File

@ -27,7 +27,8 @@ const routes: Routes = [
},
{
path: 'researcher',
loadChildren: () => import('./researcher/researcher.module').then(m => m.ResearcherModule)
loadChildren: () => import('./researcher/researcher.module').then(m => m.ResearcherModule),
data: {title: Irish.METADATA_PREFIX}
},
{
path: 'repository',

70
src/app/researcher/researcher.component.ts
View File

@ -17,43 +17,47 @@ import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sideb
@Component({
selector: 'researcher',
template: `
<loading *ngIf="loading" class="uk-position-center"></loading>
<div *ngIf="!loading">
<div class="uk-banner">
<div class="uk-container uk-container-large">
<div class="uk-padding-small uk-padding-remove-vertical">
<div *ngIf="authorId && author">
<div class="uk-margin-top uk-margin-bottom uk-grid uk-flex uk-flex-middle">
<div>
<span class="uk-border uk-border-circle uk-padding-small uk-text-meta uk-margin-small-right"
width="16px" height="16px">
<span uk-icon="user"></span></span>
</div>
<div class="uk-padding-remove-left">
{{author.authorGivenName}} {{author.authorFamilyName}}
<br>
<span *ngIf="totalResults > 0">{{totalResults}} research outcomes <span
*ngIf="openResults && totalResults">({{getPercentage()}}% open access)</span></span>
<span *ngIf="author.institutions">{{author.institutions.join(", ")}} </span>
</div>
</div>
<div class="uk-text-xsmall uk-text-secondary uk-margin-medium-top">
<img src="assets/common-assets/common/ORCIDiD_icon16x16.png" alt="orcid"
loading="lazy" style="width:16px; height:16px; margin-right: 3px;">
<a [href]="properties.orcidURL + author.id" target="_blank" class="uk-link uk-text-primary">
{{properties.orcidURL + author.id}}</a></div>
</div>
<h1 *ngIf="!authorId" class="uk-h2">Researchers</h1>
<loading *ngIf="loading" class="uk-position-center"></loading>
<div *ngIf="!loading">
<div class="uk-banner">
<div class="uk-container uk-container-large">
<div class="uk-padding-small uk-padding-remove-vertical">
<div *ngIf="authorId && author" class="uk-width-1-1 uk-flex">
<div class="uk-width-expand">
<div class="uk-grid uk-grid-small uk-flex-middle" uk-grid>
<div>
<div class="uk-card uk-card-primary uk-border-circle uk-padding-small">
<icon [name]="'person'" [ratio]="4.5" [flex]="true"></icon>
</div>
</div>
<div class="uk-width-expand uk-margin-small-left">
<div class="uk-h5 uk-margin-xsmall-bottom uk-text-truncate">{{author.authorGivenName}} {{author.authorFamilyName}}</div>
<div class="uk-text-xsmall uk-text-bold uk-margin-bottom">
<div *ngIf="totalResults > 0">{{totalResults}} research outcomes</div>
<div *ngIf="author.institutions" class="uk-text-truncate">{{author.institutions.join(", ")}} </div>
</div>
<div class="uk-flex uk-flex-middle uk-text-small uk-text-italic">
<img src="assets/common-assets/common/ORCIDiD_icon16x16.png" alt="orcid"
loading="lazy" style="width:16px; height:16px;" class="uk-margin-xsmall-right">
<a [href]="properties.orcidURL + author.id" target="_blank">
{{properties.orcidURL + author.id}}
</a>
</div>
</div>
</div>
</div>
<div *ngIf="openResults && totalResults" class="uk-width-auto">
<span>{{getPercentage()}}% open access</span>
</div>
</div>
<h1 *ngIf="!authorId" class="uk-h4 uk-margin-small-bottom">Researcher Monitors</h1>
</div>
<div class="uk-section uk-container">
<router-outlet></router-outlet>
</div>
</div>
</div>
<div class="uk-section uk-container">
<router-outlet></router-outlet>
</div>
</div>
`
})
export class ResearcherComponent extends BaseComponent implements OnInit {

3
src/app/researcher/researcher.module.ts
View File

@ -5,6 +5,7 @@ import {ResearcherComponent} from "./researcher.component";
import {SearchOrcidServiceModule} from "../openaireLibrary/claims/claim-utils/service/searchOrcidService.module";
import {SearchResearchResultsServiceModule} from "../openaireLibrary/services/searchResearchResultsService.module";
import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
import {IconsModule} from '../openaireLibrary/utils/icons/icons.module';
const routes: Route[] = [
{
@ -17,7 +18,7 @@ const routes: Route[] = [
];
@NgModule({
imports: [CommonModule, RouterModule.forChild(routes), SearchOrcidServiceModule, SearchResearchResultsServiceModule, LoadingModule],
imports: [CommonModule, RouterModule.forChild(routes), SearchOrcidServiceModule, SearchResearchResultsServiceModule, LoadingModule, IconsModule],
declarations: [ResearcherComponent],
exports: [ResearcherComponent],
})

33
src/app/researcher/search-researcher/search-researcher.component.html
View File

@ -3,7 +3,7 @@
[searchInputClass]="'inner background'" (searchEmitter)="searchByKeyword()" (valueChange)="checkForReset()" class="uk-width-xlarge@l uk-width-large@m"></div>
</div>
<div class="uk-margin-top">
<div class="uk-margin-large-top">
<div *ngIf="orcidStatus == errorCodes.ERROR" class="uk-alert uk-alert-warning" role="alert">An Error Occured</div>
<div *ngIf="orcidStatus == errorCodes.NOT_AVAILABLE" class="uk-alert uk-alert-danger"
role="alert">Service not available
@ -21,30 +21,29 @@
Authors found (with OpenAIRE results):{{authorsToShow.length}} <br>
page: {{page}}<br>
</div>-->
<div class="uk-grid uk-child-width-1-3">
<div *ngFor=" let author of authorsToShow.slice(0,page*size>authorsToShow.length?authorsToShow.length:page*size)" class="uk-padding-small">
<div class="uk-grid uk-grid-small uk-child-width-1-3@l uk-child-width-1-2@m" uk-grid>
<div *ngFor=" let author of authorsToShow.slice(0,page*size>authorsToShow.length?authorsToShow.length:page*size)">
<div *ngIf="author.resultsCount > 0" class="uk-card uk-card-default uk-card-hover uk-padding-small">
<a [routerLink]="'./'+author.id+''" class="uk-link-reset">
<div class="uk-margin-top uk-margin-bottom uk-grid uk-flex uk-flex-middle">
<div class="uk-margin-top uk-margin-bottom uk-grid uk-flex-middle" uk-grid>
<div>
<span class="uk-border uk-border-circle uk-padding-small uk-text-meta uk-margin-small-right" width="16px" height="16px">
<span uk-icon="user"></span></span>
<div class="uk-border uk-border-circle uk-text-meta uk-padding-xsmall uk-margin-small-right">
<icon [name]="'person'" [ratio]="2" [flex]="true"></icon>
</div>
</div>
<div class="uk-padding-remove-left uk-text-truncate uk-width-expand">
{{author.authorGivenName}} {{author.authorFamilyName}}
<br>
<span class="uk-text-primary uk-text-xsmall">
<span *ngIf="author.resultsCount && author.resultsCount > 0">{{author.resultsCount}} research outcomes</span>
<br>
<span *ngIf="author.institutions">{{author.institutions.join(", ")}}</span>
</span>
<div class="uk-padding-remove-left uk-width-expand">
<div class="uk-h6 uk-margin-xsmall-bottom uk-text-truncate">{{author.authorGivenName}} {{author.authorFamilyName}}</div>
<div class="uk-text-primary uk-text-xsmall uk-text-bold">
<div *ngIf="author.resultsCount && author.resultsCount > 0">{{author.resultsCount}} research outcomes</div>
<div class="uk-text-truncate" *ngIf="author.institutions">{{author.institutions.join(", ")}}</div>
</div>
</div>
</div>
</div>
</a>
<div class="uk-text-xsmall uk-text-secondary uk-margin-medium-top">
<div class="uk-margin-top uk-text-small uk-text-italic">
<img src="assets/common-assets/common/ORCIDiD_icon16x16.png" alt="orcid"
loading="lazy" style="width:16px; height:16px; margin-right: 3px;">
<a [href]="properties.orcidURL + author.id" target="_blank" class="uk-link uk-text-primary">
<a [href]="properties.orcidURL + author.id" target="_blank" class="uk-link-text">
{{properties.orcidURL + author.id}}</a></div>
<!-- <div>Research outcomes:{{author.resultsCount}}</div>-->

3
src/app/researcher/search-researcher/search-researcher.module.ts
View File

@ -8,6 +8,7 @@ import {SearchOrcidServiceModule} from "../../openaireLibrary/claims/claim-utils
import {SearchResearchResultsServiceModule} from "../../openaireLibrary/services/searchResearchResultsService.module";
import {LoadingModule} from "../../openaireLibrary/utils/loading/loading.module";
import {RouterModule} from "@angular/router";
import {IconsModule} from '../../openaireLibrary/utils/icons/icons.module';
@ -15,7 +16,7 @@ import {RouterModule} from "@angular/router";
declarations: [SearchResearcherComponent],
imports: [
CommonModule, SearchResearcherRoutingModule, SearchInputModule, MatSelectModule, SearchOrcidServiceModule, SearchResearchResultsServiceModule, LoadingModule,
RouterModule
RouterModule, IconsModule
]
})