Merge branch 'QAT-6182' into dev

Author: dolly-chhabriya-altius

src/main/java/cc/altius/FASP/dao/impl/ReportDaoImpl.java

@@ -702,7 +702,7 @@ public List<BudgetReportOutput> getBudgetReport(BudgetReportInput br, CustomUser
                 + "	SELECT " 
                 + "		st.BUDGET_ID, "
                 + "        SUM(IF(st.SHIPMENT_STATUS_ID IN (1), ((IFNULL(st.FREIGHT_COST,0)+IFNULL(st.PRODUCT_COST,0))*s.CONVERSION_RATE_TO_USD),0)) `PLANNED_BUDGET`, "
-                + "        SUM(IF(st.SHIPMENT_STATUS_ID IN (3,4,5,6,7,9), ((IFNULL(st.FREIGHT_COST,0)+IFNULL(st.PRODUCT_COST,0))*s.CONVERSION_RATE_TO_USD),0)) `ORDERED_BUDGET` "
+                + "        SUM(IF(st.SHIPMENT_STATUS_ID IN (3,4,5,6,7,9), ((IFNULL(st.FREIGHT_COST,0)+IFNULL(st.PRODUCT_COST,0))*s.CONVERSION_RATE_TO_USD),0)) `ORDERED_BUDGET`, SUM(IF(:programIds='' OR FIND_IN_SET(s.PROGRAM_ID, :programIds), 1, 0))  AS MATCH_COUNT "
                 + "FROM rm_shipment s "
                 + "LEFT JOIN rm_shipment_trans st ON "
                 + "	s.SHIPMENT_ID=st.SHIPMENT_ID "
@@ -712,12 +712,12 @@ public List<BudgetReportOutput> getBudgetReport(BudgetReportInput br, CustomUser
                 + "    AND st.ACTIVE "
                 + "    LEFT JOIN rm_program_planning_unit ppu ON ppu.PROGRAM_ID=s.PROGRAM_ID AND ppu.PLANNING_UNIT_ID=st.PLANNING_UNIT_ID "
                 + "    LEFT JOIN rm_planning_unit pu ON pu.PLANNING_UNIT_ID=st.PLANNING_UNIT_ID "
-                + "    WHERE ppu.ACTIVE AND pu.ACTIVE AND (:programIds='' OR FIND_IN_SET(s.PROGRAM_ID, :programIds)) "
+                + "    WHERE ppu.ACTIVE AND pu.ACTIVE "
                 + "GROUP BY st.BUDGET_ID) stc ON stc.BUDGET_ID=b.BUDGET_ID "
                 + "WHERE "
                 + "	TRUE AND b.ACTIVE "
                 + "     AND (:programIds='' OR FIND_IN_SET(bp.PROGRAM_ID, :programIds)) "
-                + "     AND stc.BUDGET_ID IS NOT NULL "
+                + "     AND stc.MATCH_COUNT > 0 "
                 + "     AND (:fundingSourceIds='' OR FIND_IN_SET(b.FUNDING_SOURCE_ID, :fundingSourceIds)) "
                 + "     AND (b.START_DATE BETWEEN :startDate AND :stopDate OR b.STOP_DATE BETWEEN :startDate AND :stopDate OR :startDate BETWEEN b.START_DATE AND b.STOP_DATE) ");
         this.aclService.addUserAclForRealm(sb, params, "b", curUser);

src/main/resources/incrementalSqlScripts/20260226-QAT-6182.sql

@@ -0,0 +1,7 @@
+INSERT INTO `fasp`.`ap_static_label`(`STATIC_LABEL_ID`,`LABEL_CODE`,`ACTIVE`) VALUES ( NULL,'static.budgetReport.budgetForMultiProgram','1'); 
+SELECT MAX(l.STATIC_LABEL_ID) INTO @MAX FROM ap_static_label l ;
+
+INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,1,'For multi-program budgets, the numbers in the graph/table represent the total budget amounts, regardless of which programs are selected in the program dropdown.');-- en
+INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,2,'Pour les budgets multiprogrammes, les chiffres du graphique/tableau représentent les montants budgétaires totaux, quels que soient les programmes sélectionnés dans la liste déroulante des programmes.');-- fr
+INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,3,'Para presupuestos multiprograma, los números en el gráfico/tabla representan los montos totales del presupuesto, independientemente de qué programas estén seleccionados en el menú desplegable de programas.');-- sp
+INSERT INTO ap_static_label_languages VALUES(NULL,@MAX,4,'Para orçamentos com vários programas, os números no gráfico/tabela representam os valores totais do orçamento, independentemente dos programas selecionados no menu suspenso de programas.');-- pr

src/main/resources/scriptsToBeRun/QAT-6182.txt

@@ -0,0 +1 @@
+20260226-QAT-6182.sql