Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjustments on the PDF functionality #133

Merged
merged 4 commits into from
May 31, 2023
Merged

Adjustments on the PDF functionality #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99a9198
:bug: fix(PDF result detail) LFUB-539: link improved
yecksin May 19, 2023
24c2fa5
:bug: fix(PDF result detail) LFUB-539: submit_button improved to use …
yecksin May 19, 2023
d0ede98
🐛 fix(Excel Report): fixing delivery types grouping on result report.…
May 24, 2023
050b8e9
🐛 fix(Excel Report): fixing wrong condition on subselect. LFUB-595
May 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...src/app/pages/results/pages/result-detail/components/pdf-actions/pdf-actions.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ export class PdfActionsComponent {
}

get link() {
return `${environment.frontBaseUrl}/reports/result-details/${this.api.currentResultCode}?phase=1`;
return `${environment.frontBaseUrl}reports/result-details/${this.api.currentResultCode}?phase=1`;
}
}
20 changes: 11 additions & 9 deletions ...-pr-client/src/app/pages/results/pages/result-detail/panel-menu/panel-menu.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,17 @@
<app-pdf-actions (copyEvent)="copyEvent.emit()"></app-pdf-actions>
</div>

<div class="submit_button"
*ngIf="validateMember(this.api.dataControlSE?.myInitiativesList) != 6 && !this.api.rolesSE.readOnly">
<app-pr-button [ngClass]="{'globalDisabled': !this.greenChecksSE.submit}"
(click)="this.submissionModalSE.showModal = true;" text="Submit"
*ngIf="this.dataControlSE?.currentResult?.status == 0"></app-pr-button>
<app-pr-button text="Unsubmit" *ngIf="this.dataControlSE?.currentResult?.status == 1"
(click)="this.unsubmitModalSE.showModal = true;"></app-pr-button>
<div class="button_access_information" *ngIf="this.dataControlSE?.currentResult?.status == 0">
This button will be available once all sections are available.
<div>
<div class="submit_button"
*ngIf="validateMember(this.api.dataControlSE?.myInitiativesList) != 6 && !this.api.rolesSE.readOnly">
<app-pr-button [ngClass]="{'globalDisabled': !this.greenChecksSE.submit}"
(click)="this.submissionModalSE.showModal = true;" text="Submit"
*ngIf="this.dataControlSE?.currentResult?.status == 0"></app-pr-button>
<app-pr-button text="Unsubmit" *ngIf="this.dataControlSE?.currentResult?.status == 1"
(click)="this.unsubmitModalSE.showModal = true;"></app-pr-button>
<div class="button_access_information" *ngIf="this.dataControlSE?.currentResult?.status == 0">
This button will be available once all sections are available.
</div>
</div>
</div>

Expand Down
22 changes: 12 additions & 10 deletions onecgiar-pr-server/src/api/results/result.repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,8 +919,8 @@ left join results_by_inititiative rbi3 on rbi3.result_id = r.id
GROUP_CONCAT(distinct CONCAT('(',ci6.official_code,' - ',ci6.short_name,'): ', 'Toc Level: ' ,IFNULL(tl2.name , 'Not provider'), ', ToC result title:' ,IFNULL(tr2.title, 'Not provider')) SEPARATOR ', ') as "ToC Mapping (Contributting initiatives)",
-- section 3
if(r.no_applicable_partner=1, "No", "Yes") as "Are partners applicable?",
/* GROUP_CONCAT(DISTINCT concat('(',prt.name, ', Delivery type(s): ', prt.deliveries_type,')') SEPARATOR ', ') as "Partners (with delivery type)",*/
if(rt.id <> 6,(select GROUP_CONCAT(DISTINCT concat('• ',concat(if(coalesce(ci7.acronym, '') = '', '', concat(ci7.acronym, ' - ')), ci7.name), '; Delivery type(s): ', pdt.name) SEPARATOR '\n')
if(rt.id <> 6,(select GROUP_CONCAT(DISTINCT concat('• ', q1.partner) SEPARATOR '\n')
from (select concat(concat(if(coalesce(ci7.acronym, '') = '', '', concat(ci7.acronym, ' - ')), ci7.name), '; Delivery type(s): ', group_concat(distinct pdt.name separator ', ')) as partner
FROM results_by_institution rbi
left join result_by_institutions_by_deliveries_type rbibdt
on rbibdt.result_by_institution_id = rbi.id
Expand All @@ -932,16 +932,17 @@ left join results_by_inititiative rbi3 on rbi3.result_id = r.id
WHERE rbi.result_id = r.id
and rbi.institution_roles_id = 2
and rbi.is_active > 0
GROUP by rbi.result_id), 'Not Applicable') as "Partners (with delivery type) for non-KP results",
if(rt.id = 6, (SELECT group_concat(distinct concat('• CGSpace Institution: ', rkmi.intitution_name, '; Mapped institution: ', if(rbi.id is null, 'None', concat(concat(if(coalesce(ci8.acronym, '') = '', '', concat(ci8.acronym, ' - ')), ci8.name), '; Delivery type(s): ', pdt.name))) separator '\n')
GROUP by rbi.result_id, ci7.id) as q1), 'Not Applicable') as "Partners (with delivery type) for non-KP results",
if(rt.id = 6, (SELECT group_concat(distinct concat('• ', q1.partner) separator '\n')
from ( select concat('CGSpace Institution: ', rkmi.intitution_name, '; Mapped institution: ', if(rbi.id is null, 'None', concat(concat(if(coalesce(ci8.acronym, '') = '', '', concat(ci8.acronym, ' - ')), ci8.name), '; Delivery type(s): ', group_concat(distinct pdt.name separator ', ')))) as partner
FROM results_kp_mqap_institutions rkmi
left join results_knowledge_product rkp on rkmi.result_knowledge_product_id = rkp.result_knowledge_product_id and rkp.is_active > 0
left join results_by_institution rbi on rkmi.results_by_institutions_id = rbi.id and rbi.is_active > 0 and rbi.institution_roles_id = 2
left join result_by_institutions_by_deliveries_type rbibdt on rbibdt.result_by_institution_id = rbi.id and rbibdt.is_active > 0
left join clarisa_institutions ci8 on ci8.id = rbi.institutions_id
left JOIN partner_delivery_type pdt on pdt.id = rbibdt.partner_delivery_type_id
WHERE rkmi.is_active > 0 and rkp.results_id = r.id
GROUP by rkp.results_id), 'Not Applicable') as "Partners (with delivery type) for KP results",
GROUP by rkp.results_id, rbi.institutions_id, rkmi.intitution_name, rkmi.results_by_institutions_id) as q1), 'Not Applicable') as "Partners (with delivery type) for KP results",
-- section 4
(SELECT if(cgs.name is null, 'Not Provided', (if(cgs.id = 3, 'National', cgs.name)))
FROM clarisa_geographic_scope cgs
Expand Down Expand Up @@ -1101,8 +1102,8 @@ left join clarisa_countries cc3
GROUP_CONCAT(distinct CONCAT('(',ci6.official_code,' - ',ci6.short_name,'): ', 'Toc Level: ' ,IFNULL(tl2.name , 'Not provider'), ', ToC result title:' ,IFNULL(tr2.title, 'Not provider')) SEPARATOR ', ') as "ToC Mapping (Contributting initiatives)",
-- section 3
if(r.no_applicable_partner=1, "No", "Yes") as "Are partners applicable?",
/* GROUP_CONCAT(DISTINCT concat('(',prt.name, ', Delivery type(s): ', prt.deliveries_type,')') SEPARATOR ', ') as "Partners (with delivery type)",*/
if(rt.id <> 6,(select GROUP_CONCAT(DISTINCT concat('• ',concat(if(coalesce(ci7.acronym, '') = '', '', concat(ci7.acronym, ' - ')), ci7.name), '; Delivery type(s): ', pdt.name) SEPARATOR '\n')
if(rt.id <> 6,(select GROUP_CONCAT(DISTINCT concat('• ', q1.partner) SEPARATOR '\n')
from (select concat(concat(if(coalesce(ci7.acronym, '') = '', '', concat(ci7.acronym, ' - ')), ci7.name), '; Delivery type(s): ', group_concat(distinct pdt.name separator ', ')) as partner
FROM results_by_institution rbi
left join result_by_institutions_by_deliveries_type rbibdt
on rbibdt.result_by_institution_id = rbi.id
Expand All @@ -1114,16 +1115,17 @@ left join clarisa_countries cc3
WHERE rbi.result_id = r.id
and rbi.institution_roles_id = 2
and rbi.is_active > 0
GROUP by rbi.result_id), 'Not Applicable') as "Partners (with delivery type) for non-KP results",
if(rt.id = 6, (SELECT group_concat(distinct concat('• CGSpace Institution: ', rkmi.intitution_name, '; Mapped institution: ', if(rbi.id is null, 'None', concat(concat(if(coalesce(ci8.acronym, '') = '', '', concat(ci8.acronym, ' - ')), ci8.name), '; Delivery type(s): ', pdt.name))) separator '\n')
GROUP by rbi.result_id, ci7.id) as q1), 'Not Applicable') as "Partners (with delivery type) for non-KP results",
if(rt.id = 6, (SELECT group_concat(distinct concat('• ', q1.partner) separator '\n')
from ( select concat('CGSpace Institution: ', rkmi.intitution_name, '; Mapped institution: ', if(rbi.id is null, 'None', concat(concat(if(coalesce(ci8.acronym, '') = '', '', concat(ci8.acronym, ' - ')), ci8.name), '; Delivery type(s): ', group_concat(distinct pdt.name separator ', ')))) as partner
FROM results_kp_mqap_institutions rkmi
left join results_knowledge_product rkp on rkmi.result_knowledge_product_id = rkp.result_knowledge_product_id and rkp.is_active > 0
left join results_by_institution rbi on rkmi.results_by_institutions_id = rbi.id and rbi.is_active > 0 and rbi.institution_roles_id = 2
left join result_by_institutions_by_deliveries_type rbibdt on rbibdt.result_by_institution_id = rbi.id and rbibdt.is_active > 0
left join clarisa_institutions ci8 on ci8.id = rbi.institutions_id
left JOIN partner_delivery_type pdt on pdt.id = rbibdt.partner_delivery_type_id
WHERE rkmi.is_active > 0 and rkp.results_id = r.id
GROUP by rkp.results_id), 'Not Applicable') as "Partners (with delivery type) for KP results",
GROUP by rkp.results_id, rbi.institutions_id, rkmi.intitution_name, rkmi.results_by_institutions_id) as q1), 'Not Applicable') as "Partners (with delivery type) for KP results",
-- section 4
(SELECT if(cgs.name is null, 'Not Provided', (if(cgs.id = 3, 'National', cgs.name)))
FROM clarisa_geographic_scope cgs
Expand Down