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

Merge conflicts

This commit is contained in:
Konstantinos Triantafyllou 2024-02-20 11:04:04 +02:00
parent 37a678d571 4fcd35fccd
commit 083f14c394
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/app.component.ts
View File

@ -238,8 +238,10 @@ export class AppComponent extends ResearcherBaseComponent implements OnInit, Aft
}
staticUserItems() {
if(this.properties.environment != "beta"){
this.userMenuItems.push(new MenuItem("myorcidlinks", "My Orcid links", "", "/my-orcid-links", false, [], null, {}, null, null, null, null));
}
this.userMenuItems.push(
new MenuItem("myorcidlinks", "My Orcid links", "", "/my-orcid-links", false, [], null, {}, null, null, null, null),
new MenuItem("myclaims", "My links", "", "/participate/myclaims", false, [], null, {}, null, null, null, null),
new MenuItem("claims", "Link", "", "/participate/claim", false, [], null, {}, null, null, null, null),
new MenuItem("upload-dois", "Upload DOIs", "", "/upload-dois", false, [], null, {}, null, null, null, null)

2
src/app/public-logs/public-logs.component.ts
View File

@ -29,7 +29,7 @@ import {LogService} from "../openaireLibrary/utils/log/log.service";
<ng-container *ngFor="let month of months ">
<ng-container *ngIf="show(year, month) ">
<li *ngIf=" !(year == today.getFullYear() && month == today.getMonth()+1)">
<a [href]="properties.logServiceUrl + 'webstats/' + year + '/' + month " target="_blank"> {{month}}/{{year}}</a>
<a [href]="properties.logServiceUrl + 'webstats/' + year + '/' + (month<10?'0'+month:month) " target="_blank"> {{month}}/{{year}}</a>
</li>
</ng-container>
</ng-container>

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

@ -41,7 +41,7 @@
<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}} {{openaireEntities.RESULTS}}</div>
<!-- <div *ngIf="author.resultsCount && author.resultsCount > 0">{{author.resultsCount}} {{openaireEntities.RESULTS}}</div></div>-->
<div class="uk-text-truncate" *ngIf="author.institutions">{{author.institutions.join(", ")}}</div>
</div>
</div>

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

@ -178,7 +178,8 @@ private getOpenaireResultsFor(start, end){
}
}
private getOpenaireResultsObs(author){
let param = '(authorid="' + StringUtils.URIEncode(author.id) + '")';
let param = '(authorid="' + StringUtils.URIEncode(author.id) + '")'
+' and (country exact "IE")';
return this._searchResearchResultsService.numOfResearchOutcomes(param, properties, null).pipe(map(res => {
author.resultsCount = res;
return author;