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

Merge branch 'new-theme' of code-repo.d4science.org:MaDgIK/openaire-library into new-theme

This commit is contained in:
Konstantinos Triantafyllou 2022-04-19 16:44:28 +03:00
parent e8cb2adf44 e2a5fd4c9e
commit 479e247ee0
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
claims/directLinking/directLinking.component.ts
View File

@ -55,12 +55,6 @@ export class DirectLinkingComponent {
if (this.type != null && this.showOptions.linkTo != null) {
this.type = (this.validEntityTypes.indexOf(this.type) != -1) ? this.type : 'publication';
this.showOptions.linkTo = (this.validEntityTypes.indexOf(this.showOptions.linkTo) != -1 || this.showOptions.linkTo == "result") ? this.showOptions.linkTo : 'project';
// this.show = (this.linkTo != "entity") ? "claim" : "entity";
// this.linkType = this.linkTo;
// let isInlineResult: boolean = false; // is a link entity - entity
// if ((this.type == "publication" || this.type == "dataset" || this.type == "software") && ((this.linkTo == "publication" || this.linkTo == "dataset" || this.linkTo == "software" || this.linkTo == "orp") || this.linkTo == "entity")) {
// isInlineResult = true;
// }
this.localStoragePrefix = (this.communityId ? (this.communityId + "_") : '') + this.type.substr(0, 3) + "_" + this.showOptions.linkTo.substr(0, 3) + "_";
if (localStorage.getItem(this.localStoragePrefix + "results")) {

14
claims/linking/linkingGeneric.component.html
View File

@ -1,14 +1,12 @@
<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
<stepper>
<step [status]="stepStatus('source')" stepId="source" stepNumber="1"
<step *ngIf="!inlineEntity" [status]="stepStatus('source')" stepId="source" stepNumber="1"
[stepText]="'Find Sources'" (stepChanged)="stepHasChanged($event)"
[active]="this.showOptions.show" [showStepLine]="false"></step>
<!-- <step-line [status]="stepStatus('source')"></step-line>-->
<step [status]="stepStatus('target')" stepId="target" [stepNumber]="inlineEntity?1:2"
[stepText]="'Link Source' + (inlineEntity?'':'s') + ' to Entities'"
(stepChanged)="stepHasChanged($event)" [active]="this.showOptions.show"
[showStepLine]="true"></step>
<!-- <step-line [status]="stepStatus('target')"></step-line>-->
[showStepLine]="!inlineEntity"></step>
<step [status]="stepStatus('claim')" stepId="claim" [stepNumber]="inlineEntity?2:3"
[stepText]="'Summarize and finish'"
(stepChanged)="stepHasChanged($event)" [active]="this.showOptions.show"
@ -83,7 +81,8 @@
({{(sources.length + (inlineEntity?1:0)) |
number}})
</a></li>
<li [class.uk-disabled]="sources.length == 0" [class.uk-active]="showOptions.basketShowLinksTo"
<li [class.uk-disabled]="sources.length == 0 && !inlineEntity"
[class.uk-active]="showOptions.basketShowLinksTo"
(click)="showOptions.basketswitchToLinkTo()"><a href="#">Link to <span
*ngIf="results.length
> 0">(
@ -165,6 +164,7 @@
<div *ngIf="showOptions.show=='source'"
class=" nextStep uk-margin-small-top uk-padding-small " [class.active]="(sources.length)>0" [class.disabled]="(sources.length) == 0"
[class.uk-disabled]="(sources.length) == 0"
(click)="stepHasChanged('target') ">
<div class=" uk-margin-remove uk-text-center">
STEP 2 - LINK SOURCES TO ENTITIES
@ -177,7 +177,9 @@
</div>
<div *ngIf="showOptions.show!='source'"
class=" nextStep uk-margin-small-top uk-padding-small " [class.active]="(results.length)>0" [class.disabled]="(results.length) == 0"
class=" nextStep uk-margin-small-top uk-padding-small "
[class.active]="(results.length)>0" [class.disabled]="(results.length) == 0"
[class.uk-disabled]="(results.length) == 0"
style="height:auto !important; " (click)="stepHasChanged('claim')">
<div class="uk-margin-remove uk-text-center">

2
claims/linking/linkingGeneric.component.ts
View File

@ -181,7 +181,7 @@ export class LinkingGenericComponent {
return 'active';
}else if(this.results.length > 0){
return 'done';
}else if(this.sources.length == 0){
}else if(this.sources.length == 0 && !this.inlineEntity){
return 'disabled';
}else{
return 'default';