From 2df5fc85709581456797e07b66ceff613c6daa09 Mon Sep 17 00:00:00 2001
From: "argiro.kokogiannaki"
 <argiro.kokogiannaki@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Fri, 11 Nov 2016 10:24:00 +0000
Subject: [PATCH] Enhance pubs/data info in claiming

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@44443 d315682c-612b-4755-9ff5-7f18f6832af3
---
 .../claim-utils/claimDataset.component.ts     | 24 ++++++++-----
 .../claimPublication.component.html           | 36 ++++++++++++-------
 .../claim-utils/claimPublication.component.ts |  9 +++--
 3 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/portal-2/src/app/claimPages/claim-utils/claimDataset.component.ts b/portal-2/src/app/claimPages/claim-utils/claimDataset.component.ts
index ba23cd03..e0acad3d 100644
--- a/portal-2/src/app/claimPages/claim-utils/claimDataset.component.ts
+++ b/portal-2/src/app/claimPages/claim-utils/claimDataset.component.ts
@@ -36,11 +36,14 @@ import { ErrorCodes} from '../../utils/properties/openaireProperties';
 -->
                      <ul *ngIf="dataciteResults.length > 0 "  class="list-group">
                         <li *ngFor=" let item of dataciteResults "  [class]="(isSelected(item.doi))?'list-group-item panel-footer':'list-group-item'" >
-                         <span >
+                         <div >
                           <a *ngIf="item.doi" target="_blank" href="{{'http://dx.doi.org/'+item.doi}}" >{{item.title}}</a>
                           <span *ngIf="!item.doi" >{{item.title}}</span>
-                        </span>
-                         <span  *ngIf="!isSelected(item.doi)" (click)="add(item, item.doi,'dataset','datacite',item.title,'http://dx.doi.org/'+item.doi, null,'OPEN')" aria-hidden="true" class= " btn glyphicon glyphicon-plus"></span>
+                          <span  *ngIf="!isSelected(item.doi)" (click)="add(item, item.doi,'dataset','datacite',item.title,'http://dx.doi.org/'+item.doi, null,'OPEN')" aria-hidden="true" class= " btn glyphicon glyphicon-plus"></span>
+                        </div>
+                        <span  *ngIf="item.publisher" class="sub-title-elements">Publisher: {{item.publisher}}</span>
+                        <div *ngIf="item.creator" class="sub-title-elements">Authors: <span *ngFor="let author of item.creator let i = index">{{author}}{{(i < (item.creator.length-1))?"; ":""}}</span></div>
+
                        </li>
                    </ul>
 
@@ -55,12 +58,15 @@ import { ErrorCodes} from '../../utils/properties/openaireProperties';
                 <div >
                   <ul *ngIf="openaireResults.length > 0 "  class="list-group">
                      <li *ngFor=" let result of openaireResults " [class]="(isSelected(result.id))?'list-group-item panel-footer':'list-group-item'">
-                      <span >
-                     <a *ngIf="result['title'].url" target="_blank" [href]="result['title'].url" >{{result['title'].name}}</a>
-                     <span *ngIf="!result['title'].url" >{{result['title'].name}}</span>
-                     </span>
-                      <span *ngIf="!isSelected(result.id)"
-                      (click)="add(result, result.id, 'dataset', 'openaire', result['title'].name,  result['title'].url, result.year, result['title'].accessMode)" aria-hidden="true" class= " btn glyphicon glyphicon-plus"></span>
+                      <div >
+                       <a *ngIf="result['title'].url" target="_blank" [href]="result['title'].url" >{{result['title'].name}}</a>
+                       <span *ngIf="!result['title'].url" >{{result['title'].name}}</span>
+                       <span *ngIf="!isSelected(result.id)"
+                       (click)="add(result, result.id, 'dataset', 'openaire', result['title'].name,  result['title'].url, result.year, result['title'].accessMode)" aria-hidden="true" class= " btn glyphicon glyphicon-plus"></span>
+                     </div>
+                      <span  *ngIf="result.publisher" class="sub-title-elements">Publisher: {{result.publisher}}</span><span *ngIf="(result.year)">({{result.year}})</span>
+                      <div *ngIf="result.authors" class="sub-title-elements">Authors: <span *ngFor="let author of result.authors let i = index">{{author.name}}{{(i < (result.authors.length-1))?"; ":""}}</span></div>
+
                     </li>
                 </ul>
                 <div *ngIf="openaireResults.length == 0" class = "alert alert-info " > No results found  </div>
diff --git a/portal-2/src/app/claimPages/claim-utils/claimPublication.component.html b/portal-2/src/app/claimPages/claim-utils/claimPublication.component.html
index 64fe33f4..9be05844 100644
--- a/portal-2/src/app/claimPages/claim-utils/claimPublication.component.html
+++ b/portal-2/src/app/claimPages/claim-utils/claimPublication.component.html
@@ -18,11 +18,15 @@
          <div >
            <ul *ngIf="crossrefResults.length > 0 "  class="list-group">
               <li *ngFor=" let item of crossrefResults " [class]="(isSelected(item.DOI))?'list-group-item panel-footer':'list-group-item'">
-               <span >
-              <a *ngIf="item.URL" target="_blank" href="{{item.URL}}" >{{item.title}}</a>
-              <span *ngIf="!item.URL" >{{item.title}}</span>
-              </span>
-               <span *ngIf="!isSelected(item.DOI)" (click)="add(item, item.DOI, 'crossref', 'publication', item.URL, item.title, item.created['date-time'],'OPEN')" aria-hidden="true" class= " btn glyphicon glyphicon-plus"></span>
+               <div >
+                <a *ngIf="item.URL" target="_blank" href="{{item.URL}}" >{{item.title}}</a>
+                <span *ngIf="!item.URL" >{{item.title}}</span>
+                <span *ngIf="!isSelected(item.DOI)" (click)="add(item, item.DOI, 'crossref', 'publication', item.URL, item.title, item.created['date-time'],'OPEN')" aria-hidden="true" class= " btn glyphicon glyphicon-plus"></span>
+              </div>
+              <span *ngIf="item.publisher" class="sub-title-elements">Publisher: {{item.publisher}}</span><span *ngIf="(item['published-print'] && item['published-print']['date-parts'] && item['published-print']['date-parts'][0])">({{(item['published-print']['date-parts'][0][0])?item['published-print']['date-parts'][0][0]:item['published-print']['date-parts'][0]}})</span>
+              <div *ngIf="item.author" class="sub-title-elements">Authors: <span *ngFor="let author of item.author  let i = index">{{author.family}} {{author.given}}{{(i < (item.author.length-1))?"; ":""}}</span></div>
+              <div *ngIf="item.editor" class="sub-title-elements">Editors: <span *ngFor="let author of item.editor  let i = index">{{author.family}} {{author.given}}{{(i < (item.editor.length-1))?"; ":""}}</span></div>
+
              </li>
          </ul>
        </div>
@@ -40,11 +44,14 @@
         <div >
           <ul *ngIf="openaireResults.length > 0 "  class="list-group">
              <li *ngFor=" let result of openaireResults " [class]="(isSelected(result.id))?'list-group-item panel-footer':'list-group-item'">
-              <span >
-             <a *ngIf="result['title'].url" target="_blank" [href]="result['title'].url" >{{result['title'].name}}</a>
-             <span *ngIf="!result['title'].url" >{{result['title'].name}}</span>
-             </span>
-              <span *ngIf="!isSelected(result.id)" (click)="add(result, result.id, 'openaire', 'publication', result['title'].url, result['title'].name, result.year,result['title'].accessMode)" aria-hidden="true" class= " btn glyphicon glyphicon-plus"></span>
+              <div >
+               <a *ngIf="result['title'].url" target="_blank" [href]="result['title'].url" >{{result['title'].name}}</a>
+               <span *ngIf="!result['title'].url" >{{result['title'].name}}</span>
+               <span *ngIf="!isSelected(result.id)" (click)="add(result, result.id, 'openaire', 'publication', result['title'].url, result['title'].name, result.year,result['title'].accessMode)" aria-hidden="true" class= " btn glyphicon glyphicon-plus"></span>
+             </div>
+             <span  *ngIf="result.publisher" class="sub-title-elements">Publisher: {{result.publisher}}</span><span *ngIf="(result.year)">({{result.year}})</span>
+             <div *ngIf="result.authors" class="sub-title-elements">Authors: <span *ngFor="let author of result.authors let i = index">{{author.name}}{{(i < (result.authors.length-1))?"; ":""}}</span></div>
+
             </li>
         </ul>
       </div>
@@ -84,8 +91,13 @@
                    <div >
                     <ul *ngIf="orcidResultsNum >0  && orcidResultsToShow.length > 0 "  class="list-group">
                        <li *ngFor=" let item of orcidResultsToShow "  [class]="(isSelected(authorId+'-'+item['put-code']))?'list-group-item panel-footer':'list-group-item'">
-                        <span *ngIf="!item.URL" >{{item['work-title']['title'].value}}</span>
-                         <span *ngIf="!isSelected(authorId+item['put-code'])" (click)="add(item,authorId+'-'+item['put-code'],'orcid', 'publication', '', item['work-title']['title'].value, item['publication-date']?item['publication-date'].year.value :null,'OPEN')" aria-hidden="true" class= " btn glyphicon glyphicon-plus"></span>
+                         <div>
+                          <span *ngIf="!item.URL" >{{item['work-title']['title'].value}}</span>
+                          <span *ngIf="!isSelected(authorId+item['put-code'])" (click)="add(item,authorId+'-'+item['put-code'],'orcid', 'publication', '', item['work-title']['title'].value, item['publication-date']?item['publication-date'].year.value :null,'OPEN')" aria-hidden="true" class= " btn glyphicon glyphicon-plus"></span>
+                        </div>
+                        <span  *ngIf="item['journal-title'] && item['journal-title'].value " class="sub-title-elements">Journal: {{item['journal-title'].value}}</span><span *ngIf="(item['publication-date']&&item['publication-date'].year&&item['publication-date'].year.value)"> ({{item['publication-date'].year.value}})</span>
+                        <div *ngIf="item.contributors" class="sub-title-elements">Authors: <span *ngFor="let author of item.contributors let i = index">{{author}}{{(i < (item.contributors.length-1))?"; ":""}}</span></div>
+
                       </li>
                     </ul>
                     <div *ngIf="orcidResultsNum == 0" class = "alert alert-info " > No results found  </div>
diff --git a/portal-2/src/app/claimPages/claim-utils/claimPublication.component.ts b/portal-2/src/app/claimPages/claim-utils/claimPublication.component.ts
index 1484167f..7fffefa7 100644
--- a/portal-2/src/app/claimPages/claim-utils/claimPublication.component.ts
+++ b/portal-2/src/app/claimPages/claim-utils/claimPublication.component.ts
@@ -106,9 +106,9 @@ private   getCrossrefResults (term: string, size : number, page : number)  {
                                 this.crossrefResultsNum = data['total-results'];
                                 this.crossrefStatus = this.errorCodes.DONE;
 
+                            }else{
+                              this.crossrefStatus = this.errorCodes.ERROR;
                             }
-                            this.crossrefStatus = this.errorCodes.ERROR;
-
                         },
                         err =>{
                            console.error(err.status);
@@ -116,6 +116,8 @@ private   getCrossrefResults (term: string, size : number, page : number)  {
                          }
 
                     );
+                }else{
+                  this.crossrefStatus = this.errorCodes.DONE;
                 }
             }
          },
@@ -149,8 +151,9 @@ private   getCrossrefResults (term: string, size : number, page : number)  {
                 this.crossrefResultsNum = data['total-results'];
                 this.crossrefStatus = this.errorCodes.DONE;
 
+            }else{
+              this.crossrefStatus = this.errorCodes.ERROR;
             }
-            this.crossrefStatus = this.errorCodes.ERROR;
 
          },
         err => {