Merge branch 'dev'

Author: dolly-chhabriya-altius

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>cc.altius.FASP.rest.webservice</groupId>
     <artifactId>FASP</artifactId>
-    <version>2.124[5824]</version>
+    <version>2.125[5827]</version>
     <name>QAT</name>
     <description>Quantification Analytics Tool</description>
     <packaging>jar</packaging>

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

@@ -1820,7 +1820,7 @@ public List<NotificationSummaryDTO> getNotificationSummary(CustomUserDetails cur
                 + " COUNT(DISTINCT(n.`NOTIFICATION_ID`)) as NOTIFICATION_COUNT "
                 + " FROM rm_erp_notification n "
                 + " LEFT JOIN rm_shipment_linking sl ON sl.SHIPMENT_LINKING_ID=n.SHIPMENT_LINKING_ID "
-                + " LEFT JOIN vw_program p ON p.`PROGRAM_ID`=s.`PROGRAM_ID` "
+                + " LEFT JOIN vw_program p ON p.`PROGRAM_ID`=sl.`PROGRAM_ID` "
                 + " left join rm_shipment s on s.SHIPMENT_ID=sl.CHILD_SHIPMENT_ID "
                 + " left join rm_shipment_trans st on st.SHIPMENT_ID=s.SHIPMENT_ID and st.VERSION_ID=s.MAX_VERSION_ID "
                 + " left join rm_program_planning_unit ppu on ppu.PROGRAM_ID = sl.PROGRAM_ID AND ppu.PLANNING_UNIT_ID=st.PLANNING_UNIT_ID "

src/main/resources/application.properties

@@ -31,8 +31,8 @@ syncExpiresOn=15
 
 info.app.name=QAT
 info.app.description=Quantification Analytics Tool
-info.app.version=2.124[5824]
-info.app.frontEndVersion=[13938]
+info.app.version=2.125[5827]
+info.app.frontEndVersion=[13942]
 management.endpoints.web.exposure.include=*
 management.info.env.enabled = true
 management.endpoint.sessions.enabled=true

src/main/resources/incrementalSqlScripts/20260330-QAT-6317.sql

@@ -0,0 +1,14 @@
+INSERT INTO `fasp`.`ap_label`(`LABEL_ID`,`LABEL_EN`,`LABEL_FR`,`LABEL_SP`,`LABEL_PR`,`CREATED_BY`,`CREATED_DATE`,`LAST_MODIFIED_BY`,`LAST_MODIFIED_DATE`,`SOURCE_ID`) VALUES ( NULL,'SP - View Stock Status Snapshort (Global) Report ',NULL,NULL,NULL,'1',NOW(),'1',NOW(),'1');
+SELECT MAX(l.LABEL_ID) INTO @MAX FROM ap_label l ;
+INSERT INTO `fasp`.`us_business_function`(`BUSINESS_FUNCTION_ID`,`LABEL_ID`,`CREATED_BY`,`CREATED_DATE`,`LAST_MODIFIED_BY`,`LAST_MODIFIED_DATE`) VALUES ( 'ROLE_BF_STOCK_STATUS_SNAPSHOT_GLOBAL_REPORT',@MAX,'1',NOW(),'1',NOW());
+
+INSERT INTO `fasp`.`us_role_business_function`(`ROLE_BUSINESS_FUNCTION_ID`,`ROLE_ID`,`BUSINESS_FUNCTION_ID`,`CREATED_BY`,`CREATED_DATE`,`LAST_MODIFIED_BY`,`LAST_MODIFIED_DATE`) VALUES ( NULL,'ROLE_TRAINER_ADMIN','ROLE_BF_STOCK_STATUS_SNAPSHOT_GLOBAL_REPORT','1',NOW(),'1',NOW());
+INSERT INTO `fasp`.`us_role_business_function`(`ROLE_BUSINESS_FUNCTION_ID`,`ROLE_ID`,`BUSINESS_FUNCTION_ID`,`CREATED_BY`,`CREATED_DATE`,`LAST_MODIFIED_BY`,`LAST_MODIFIED_DATE`) VALUES ( NULL,'ROLE_INTERNAL_USER','ROLE_BF_STOCK_STATUS_SNAPSHOT_GLOBAL_REPORT','1',NOW(),'1',NOW());
+INSERT INTO `fasp`.`us_role_business_function`(`ROLE_BUSINESS_FUNCTION_ID`,`ROLE_ID`,`BUSINESS_FUNCTION_ID`,`CREATED_BY`,`CREATED_DATE`,`LAST_MODIFIED_BY`,`LAST_MODIFIED_DATE`) VALUES ( NULL,'ROLE_REALM_ADMIN','ROLE_BF_STOCK_STATUS_SNAPSHOT_GLOBAL_REPORT','1',NOW(),'1',NOW());
+INSERT INTO `fasp`.`us_role_business_function`(`ROLE_BUSINESS_FUNCTION_ID`,`ROLE_ID`,`BUSINESS_FUNCTION_ID`,`CREATED_BY`,`CREATED_DATE`,`LAST_MODIFIED_BY`,`LAST_MODIFIED_DATE`) VALUES ( NULL,'ROLE_PROGRAM_USER','ROLE_BF_STOCK_STATUS_SNAPSHOT_GLOBAL_REPORT','1',NOW(),'1',NOW());
+INSERT INTO `fasp`.`us_role_business_function`(`ROLE_BUSINESS_FUNCTION_ID`,`ROLE_ID`,`BUSINESS_FUNCTION_ID`,`CREATED_BY`,`CREATED_DATE`,`LAST_MODIFIED_BY`,`LAST_MODIFIED_DATE`) VALUES ( NULL,'ROLE_REPORT_USER','ROLE_BF_STOCK_STATUS_SNAPSHOT_GLOBAL_REPORT','1',NOW(),'1',NOW());
+INSERT INTO `fasp`.`us_role_business_function`(`ROLE_BUSINESS_FUNCTION_ID`,`ROLE_ID`,`BUSINESS_FUNCTION_ID`,`CREATED_BY`,`CREATED_DATE`,`LAST_MODIFIED_BY`,`LAST_MODIFIED_DATE`) VALUES ( NULL,'ROLE_PROGRAM_ADMIN','ROLE_BF_STOCK_STATUS_SNAPSHOT_GLOBAL_REPORT','1',NOW(),'1',NOW());
+
+UPDATE `fasp`.`ap_security` SET `BF` = 'ROLE_BF_STOCK_STATUS_REPORT' WHERE (`SECURITY_ID` = '565');
+UPDATE `fasp`.`ap_security` SET `BF` = 'ROLE_BF_STOCK_STATUS_REPORT' WHERE (`SECURITY_ID` = '566');
+UPDATE `fasp`.`ap_security` SET `BF` = 'ROLE_BF_STOCK_STATUS_SNAPSHOT_GLOBAL_REPORT' WHERE (`SECURITY_ID` = '568');

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

@@ -0,0 +1 @@
+20260330-QAT-6317.sql

src/main/resources/scriptsToBeRun/scriptsToBeRun.txt

@@ -1,2 +1 @@
-20260125-QAT-6036.sql
-20260326-QAT-6307.sql
+20260330-QAT-6317.sql

src/main/resources/version.properties

@@ -1,5 +1,5 @@
 # To change this license header, choose License Headers in Project Properties.
 # To change this template file, choose Tools | Templates
 # and open the template in the editor.
-version.major=2.124
-version.minor=5824
+version.major=2.125
+version.minor=5827

src/main/resources/versionInfo.txt

@@ -1,3 +1,10 @@
+APP Version: 2.124.5824
+Front End Version: 13942
+Date: 2026-03-31
+QAT-6298
+QAT-6307
+QAT-6317
+
 APP Version: 2.124.5824
 Front End Version: 13938
 Date: 2026-03-27