Project

General

Profile

« Previous | Next » 

Revision 61321

[Branch angular-11 | Library]:
1. dataProviderInfo.ts: Added field "fundedContent" and updated "aggregationStatus: {"fulltexts": string};".
2. searchResearchResults.service.ts: Added method "countCollectedResultsWithFundingInfo()" to get number of research outcomes related to any project and collected from specific datasoure.
3. dataProvider.service.ts: Updated methods "getDataproviderAggregationStatus()" and "parseDataproviderAggregationStatus()" to parse "fulltexts" (new GET API call used).
4. dataProvider.component.ts: Added method "countResultsWithFundingInfo()" and updated method "hasAggregationStatusInfo()".
5. dataProvider.component.html: Deleted info "Latest data aggregation" and show "dataProviderInfo.fundedContent" instead of "dataProviderInfo.aggregationStatus.fundedContent".

View differences:

dataProvider.component.html
121 121
                    <showPublisher [journal]="dataProviderInfo.journal" [properties]="properties"></showPublisher>
122 122
                  </ul>
123 123

  
124
                  <div *ngIf="hasAggregationStatusInfo"
124
                  <div *ngIf="hasAggregationStatusInfo || dataProviderInfo.fundedContent"
125 125
                       class="uk-margin-medium-bottom uk-animation-fade uk-animation-fast">
126
                      <span *ngIf="dataProviderInfo.aggregationStatus.fulltexts && dataProviderInfo.aggregationStatus.fulltexts != -1"
126
                      <span *ngIf="dataProviderInfo.aggregationStatus?.fulltexts && dataProviderInfo.aggregationStatus?.fulltexts != -1"
127 127
                            class="uk-margin-right">
128 128
                        <span class="uk-text-muted">Collected full-texts: </span>
129 129
                        {{dataProviderInfo.aggregationStatus.fulltexts | number}}
130 130
                      </span>
131
                    <span *ngIf="dataProviderInfo.aggregationStatus.fundedContent && dataProviderInfo.aggregationStatus.fundedContent != -1"
131
                    <span *ngIf="dataProviderInfo.fundedContent && dataProviderInfo.fundedContent > 0"
132 132
                          class="uk-display-inline-block">
133 133
                        <span class="uk-text-muted">Results with funding information: </span>
134
                      {{dataProviderInfo.aggregationStatus.fundedContent | number}}
134
                      {{dataProviderInfo.fundedContent | number}}
135 135
                      </span>
136
                    <span *ngIf="dataProviderInfo.aggregationStatus.lastUpdateDate"
137
                          class="uk-display-inline-block">
138
                        <span class="uk-text-muted">Latest data aggregation: </span>
139
                      {{dataProviderInfo.aggregationStatus.lastUpdateDate | date}}
140
                      </span>
136
<!--                    <span *ngIf="dataProviderInfo.aggregationStatus.lastUpdateDate"-->
137
<!--                          class="uk-display-inline-block">-->
138
<!--                        <span class="uk-text-muted">Latest data aggregation: </span>-->
139
<!--                      {{dataProviderInfo.aggregationStatus.lastUpdateDate | date}}-->
140
<!--                      </span>-->
141 141
                  </div>
142
                  <div *ngIf="!aggregationStatusIsInitialized"
142
                  <div *ngIf="!aggregationStatusIsInitialized || !dataProviderInfo.fundedContent"
143 143
                       class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert">
144 144
                    <span class="loading-gif  uk-align-center"></span>
145 145
                  </div>

Also available in: Unified diff