Revision 58284
Added by Konstantina Galouni about 4 years ago
| dataProvider.component.ts | ||
|---|---|---|
| 96 | 96 |
private reloadRelatedDatasources: boolean = true; |
| 97 | 97 |
|
| 98 | 98 |
// Organizations variables for view more/less functionality |
| 99 |
public thresholdOrganizations: number = 10;
|
|
| 100 |
public showNumOrganizations: number = 10;
|
|
| 99 |
public thresholdOrganizations: number = 20;
|
|
| 100 |
public showNumOrganizations: number = 20;
|
|
| 101 | 101 |
|
| 102 | 102 |
// Subjects variables for view more/less functionality |
| 103 | 103 |
public thresholdSubjects: number = 20; |
| ... | ... | |
| 273 | 273 |
|
| 274 | 274 |
private initTabs() {
|
| 275 | 275 |
|
| 276 |
if (this.dataProviderInfo.tabs != undefined && this.dataProviderInfo.tabs.length > 0) {
|
|
| 276 |
//if (this.dataProviderInfo.tabs != undefined && this.dataProviderInfo.tabs.length > 0) {
|
|
| 277 | 277 |
this.reloadPublications = true; |
| 278 | 278 |
this.reloadDatasets = true; |
| 279 | 279 |
this.reloadSoftware = true; |
| ... | ... | |
| 317 | 317 |
// this.fetchAggregatorsSoftware = new FetchResearchResults(this._searchResearchResultsService); |
| 318 | 318 |
// this.fetchAggregatorsOrps = new FetchResearchResults(this._searchResearchResultsService); |
| 319 | 319 |
this.fetchAggregatorsResults = new FetchResearchResults(this._searchResearchResultsService); |
| 320 |
} |
|
| 320 |
//}
|
|
| 321 | 321 |
// if (this.dataProviderInfo.resultsBy == "collectedFrom") {
|
| 322 | 322 |
// //this.paramsForSearchLink = "?collectedFrom="+this.datasourceId+"&co=and"; |
| 323 | 323 |
// this.paramsForSearchLink = this.routerHelper.createQueryParams(['f0', 'fv0'], ["collectedfromdatasourceid", this.datasourceId]); |
| ... | ... | |
| 346 | 346 |
} |
| 347 | 347 |
|
| 348 | 348 |
private count(page: number, size: number) {
|
| 349 |
for (let i = 0; i < this.dataProviderInfo.tabs.length; i++) {
|
|
| 350 |
let content: string = this.dataProviderInfo.tabs[i].content; |
|
| 349 |
//for (let i = 0; i < this.dataProviderInfo.tabs.length; i++) {
|
|
| 350 |
//let content: string = this.dataProviderInfo.tabs[i].content;
|
|
| 351 | 351 |
|
| 352 |
if (content == 'publicationsTab') {
|
|
| 352 |
//if (content == 'publicationsTab') {
|
|
| 353 | 353 |
this.countPublications(page, size); |
| 354 |
} else if (content == 'datasetsTab') {
|
|
| 354 |
//} else if (content == 'datasetsTab') {
|
|
| 355 | 355 |
this.countDatasets(page, size); |
| 356 |
} else if (content == 'softwareTab') {
|
|
| 356 |
//} else if (content == 'softwareTab') {
|
|
| 357 | 357 |
this.countSoftware(page, size); |
| 358 |
} else if (content == 'orpsTab') {
|
|
| 358 |
//} else if (content == 'orpsTab') {
|
|
| 359 | 359 |
this.countOrps(page, size); |
| 360 |
} else if (content == 'projectsTab') {
|
|
| 360 |
//} else if (content == 'projectsTab') {
|
|
| 361 | 361 |
this.countProjects(page, size); |
| 362 |
} else if (content == 'datasourcesTab') {
|
|
| 362 |
//} else if (content == 'datasourcesTab') {
|
|
| 363 | 363 |
this.countDatasources(page, size); |
| 364 |
}// else if(content=='relatedDatasourcesTab') {
|
|
| 364 |
//}// else if(content=='relatedDatasourcesTab') {
|
|
| 365 | 365 |
// this.countRelatedDatasources(page, size); |
| 366 | 366 |
//} |
| 367 |
} |
|
| 367 |
//}
|
|
| 368 | 368 |
} |
| 369 | 369 |
|
| 370 | 370 |
public search(content: string, page: number, size: number) {
|
Also available in: Unified diff
[Trunk | Library]
1. result-preview.component.html: [Bug fix] fixes in spaces between comma separated values.
2. dataProviderInfo.ts & dataProvider.service.ts: Add and parse also acronym for "organizations".
3. searchProjects.service.ts & searchDataproviders.service.ts: If organization has no name, add "[no title available]".
4. dataProvider.component.ts: initialize "showNumOrganizations" to 20 | [Bug fix] Initialize and count all tabs no matter what the type is.
5. dataProvider.component.html:
a. Show acronym for organizations and name in tooltip |
b. [Bug fix] date for "Last update of records in OpenAIRE" under the card in right column of page.
c. [Bug fix] In statisticsTab pass inputs for fetchSoftware and fetchOther.
6. statisticsTab.component.ts: [Bug fix] New inputs for fetchSoftware and fetchOther - pass their status in errorMessages | no checks for showing charts (needs more investigation).
7. project.component.html:
a. [Bug fix] date for "Last update of records in OpenAIRE" under the card in right column of page.
b. [Bug fix] For statistics check also fetchSoftware and fetchOther.