Revision 61249
Added by Konstantina Galouni over 3 years ago
| modules/uoa-services-library/trunk/ng-openaire-library/src/app/landingPages/organization/organization.component.ts | ||
|---|---|---|
| 480 | 480 |
}, |
| 481 | 481 |
err => {
|
| 482 | 482 |
this.handleError("Error getting number of publications for project with id: " + projects[index].id, err);
|
| 483 |
this.closeLoading(); |
|
| 483 | 484 |
})); |
| 484 | 485 |
} |
| 485 | 486 |
}, |
| ... | ... | |
| 512 | 513 |
} |
| 513 | 514 |
|
| 514 | 515 |
private openLoading() {
|
| 516 |
this.closeDownloadReportModal(); |
|
| 517 |
this.closeDownloadFunderReportModal(); |
|
| 518 |
|
|
| 515 | 519 |
if (this.loading) {
|
| 516 | 520 |
this.loading.open(); |
| 517 | 521 |
} |
| ... | ... | |
| 596 | 600 |
this.downloadReportModal.alertTitle = "Download content report"; |
| 597 | 601 |
this.downloadReportModal.open(); |
| 598 | 602 |
} |
| 603 |
|
|
| 604 |
closeDownloadReportModal() {
|
|
| 605 |
this.downloadReportModal.cancel(); |
|
| 606 |
} |
|
| 599 | 607 |
|
| 600 | 608 |
openDownloadFunderReportModal() {
|
| 601 | 609 |
this.funder = this.fetchProjects.funders[0]; |
| ... | ... | |
| 605 | 613 |
this.downloadFunderReportModal.open(); |
| 606 | 614 |
} |
| 607 | 615 |
|
| 616 |
closeDownloadFunderReportModal() {
|
|
| 617 |
this.downloadFunderReportModal.cancel(); |
|
| 618 |
} |
|
| 619 |
|
|
| 608 | 620 |
public getParamsForSearchLink(type: string = "") {
|
| 609 | 621 |
if(type) {
|
| 610 | 622 |
return this.routerHelper.createQueryParams(['f0', 'fv0', 'type', 'qf', 'sortBy'], ['relorganizationid', this.organizationId, type, 'false', 'resultdateofacceptance,descending']); |
| modules/uoa-services-library/trunk/ng-openaire-library/src/app/landingPages/project/project.component.ts | ||
|---|---|---|
| 503 | 503 |
this.downloadReportModal.open(); |
| 504 | 504 |
} |
| 505 | 505 |
|
| 506 |
|
|
| 507 |
public closeDownloadReportModal() {
|
|
| 508 |
this.downloadReportModal.cancel(); |
|
| 509 |
} |
|
| 510 |
|
|
| 506 | 511 |
private createHeaders(type: string) {
|
| 507 | 512 |
this.openLoading(); |
| 508 | 513 |
this.setMessageLoading("Downloading HTML file");
|
| ... | ... | |
| 700 | 705 |
} |
| 701 | 706 |
|
| 702 | 707 |
private openLoading() {
|
| 708 |
this.closeDownloadReportModal(); |
|
| 709 |
|
|
| 703 | 710 |
if (this.loading) {
|
| 704 | 711 |
this.loading.open(); |
| 705 | 712 |
} |
Also available in: Unified diff
[Trunk | Library]: organization.component.ts & project.component.ts: [Bug fix] Close report modal when opening loading modal (after clicking on some download button).