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[5810]</version>
+    <version>2.124[5824]</version>
     <name>QAT</name>
     <description>Quantification Analytics Tool</description>
     <packaging>jar</packaging>

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

@@ -197,12 +197,16 @@ public List<DashboardTop> getDashboardTop(String[] programIds, CustomUserDetails
         List<DashboardTop> edList = this.namedParameterJdbcTemplate.query(sqlBuilder.toString(), params, new DashboardTopRowMapper());
         Date curMonth = DateUtils.getStartOfMonthVariable(DateUtils.addMonths(DateUtils.getCurrentDateObject(DateUtils.EST), -1 * curUser.getRealm().getNoOfMonthsInPastForTopDashboard()));
         Date endMonth = DateUtils.getEndOfMonthVariable(DateUtils.addMonths(DateUtils.getCurrentDateObject(DateUtils.EST), curUser.getRealm().getNoOfMonthsInFutureForTopDashboard() - 1));
+        Date curMonthForScore = DateUtils.getStartOfMonthVariable(DateUtils.addMonths(DateUtils.getCurrentDateObject(DateUtils.EST), 0));
+        Date endMonthForScore = DateUtils.getEndOfMonthVariable(DateUtils.addMonths(DateUtils.getCurrentDateObject(DateUtils.EST), 17));
         edList.forEach(ed -> {
             String sql1 = "SELECT SUM(IF(s1.`SUM_STOCK_OUT`>0,1,0)) `PRODUCTS_WITH_STOCK_OUT` FROM (SELECT sma.PROGRAM_ID, sma.PLANNING_UNIT_ID, SUM(IF(sma.MOS=0,1,0)) `SUM_STOCK_OUT` FROM vw_program p LEFT JOIN rm_program_planning_unit ppu ON p.PROGRAM_ID=ppu.PROGRAM_ID AND ppu.ACTIVE LEFT JOIN rm_planning_unit pu ON ppu.PLANNING_UNIT_ID=pu.PLANNING_UNIT_ID AND pu.ACTIVE LEFT JOIN rm_supply_plan_amc sma ON p.PROGRAM_ID=sma.PROGRAM_ID AND p.CURRENT_VERSION_ID=sma.VERSION_ID AND pu.PLANNING_UNIT_ID=sma.PLANNING_UNIT_ID WHERE p.PROGRAM_ID=:programId AND sma.TRANS_DATE BETWEEN :curMonth AND :endMonth group by sma.PROGRAM_ID, sma.PLANNING_UNIT_ID) s1 GROUP BY s1.PROGRAM_ID";
             Map<String, Object> eParams = new HashMap<>();
             eParams.put("programId", ed.getProgram().getId());
             eParams.put("curMonth", curMonth);
             eParams.put("endMonth", endMonth);
+            eParams.put("curMonthForScore", curMonthForScore);
+            eParams.put("endMonthForScore", endMonthForScore);
             String sql2 = "SELECT SUM(ROUND(p1.EXPIRED_STOCK*st.RATE,0)) EXPIRED_VALUE "
                     + "    FROM ( "
                     + "        SELECT "
@@ -231,7 +235,7 @@ public List<DashboardTop> getDashboardTop(String[] programIds, CustomUserDetails
 
             }
 
-            String sqlString = "CALL getDashboardStockStatus(:curMonth, :endMonth, :programId)";
+            String sqlString = "CALL getDashboardStockStatus(:curMonthForScore, :endMonthForScore, :programId)";
             ed.setStockStatus(this.namedParameterJdbcTemplate.queryForObject(sqlString, eParams, new DashboardStockStatusRowMapper()));
 
             sqlString = "CALL getDashboardForecastConsumptionProblems(:programId)";
@@ -252,17 +256,21 @@ public List<DashboardTop> getDashboardTop(String[] programIds, CustomUserDetails
     @Override
     public DashboardBottom getDashboardBottom(int programId, String startDate, String stopDate, int displayShipmentsBy, CustomUserDetails curUser) throws ParseException {
         DashboardBottom db = new DashboardBottom();
-        String sqlString = "CALL getDashboardStockStatus(:startDate, :stopDate, :programId)";
+        Date curMonthForScore = DateUtils.getStartOfMonthVariable(DateUtils.addMonths(DateUtils.getCurrentDateObject(DateUtils.EST), 0));
+        Date endMonthForScore = DateUtils.getEndOfMonthVariable(DateUtils.addMonths(DateUtils.getCurrentDateObject(DateUtils.EST), 17));
+        String sqlString = "CALL getDashboardStockStatus(:curMonthForScore, :endMonthForScore, :programId)";
         Map<String, Object> params = new HashMap<>();
         params.put("programId", programId);
         params.put("startDate", startDate);
         params.put("stopDate", DateUtils.getEndOfMonthVariable(stopDate));
+        params.put("curMonthForScore", curMonthForScore);
+        params.put("endMonthForScore", endMonthForScore);
         params.put("curDate", DateUtils.getCurrentDateString(DateUtils.EST, DateUtils.YMD));
         params.put("curStartOfMonth", DateUtils.getStartOfMonthString(DateUtils.YMD));
         params.put("curEndOfMonth", DateUtils.getEndOfMonthString(DateUtils.YMD));
         db.setStockStatus(this.namedParameterJdbcTemplate.queryForObject(sqlString, params, new DashboardStockStatusRowMapper()));
 
-        sqlString = "CALL getDashboardStockOutCount(:startDate, :stopDate, :programId, -1)";
+        sqlString = "CALL getDashboardStockOutCount(:curMonthForScore, :endMonthForScore, :programId, -1)";
 //        logger.debug(LogUtils.buildStringForLog(sqlString, params));
         db.getStockStatus().setPuStockOutList(this.namedParameterJdbcTemplate.query(sqlString, params, new DashboardPuWithCountRowMapper()).stream().filter(d -> d.getCount() > 0).collect(Collectors.toList()));
 //        logger.debug(LogUtils.buildStringForLog("completed", params));
@@ -313,14 +321,16 @@ public DashboardBottom getDashboardBottom(int programId, String startDate, Strin
 
     @Override
     public DashboardForLoadProgram getDashboardForLoadProgram(int programId, int versionId, int noOfMonthsInPastForBottom, int noOfMonthsInFutureForBottom, int noOfMonthsInPastForTop, int noOfMonthsInFutureForTop, CustomUserDetails curUser) throws ParseException {
+        Date curMonthForScore = DateUtils.getStartOfMonthVariable(DateUtils.addMonths(DateUtils.getCurrentDateObject(DateUtils.EST), 0));
+        Date endMonthForScore = DateUtils.getEndOfMonthVariable(DateUtils.addMonths(DateUtils.getCurrentDateObject(DateUtils.EST), 17));
         DashboardForLoadProgram db = new DashboardForLoadProgram();
         db.setCurDate(DateUtils.getCurrentDateObject(DateUtils.EST));
         db.setStartDateBottom(DateUtils.getStartOfMonthVariable(DateUtils.addMonths(DateUtils.getCurrentDateObject(DateUtils.EST), -1 * noOfMonthsInPastForBottom)));
         db.setStopDateBottom(DateUtils.getEndOfMonthVariable(DateUtils.addMonths(DateUtils.getCurrentDateObject(DateUtils.EST), noOfMonthsInFutureForBottom - 1)));
         db.setStartDateTop(DateUtils.getStartOfMonthVariable(DateUtils.addMonths(DateUtils.getCurrentDateObject(DateUtils.EST), -1 * noOfMonthsInPastForTop)));
         db.setStopDateTop(DateUtils.getEndOfMonthVariable(DateUtils.addMonths(DateUtils.getCurrentDateObject(DateUtils.EST), noOfMonthsInFutureForTop - 1)));
 
-        String sqlString = "CALL getDashboardStockStatusForLoadProgram(:startDateBottom, :stopDateBottom, :programId, :versionId)";
+        String sqlString = "CALL getDashboardStockStatusForLoadProgram(:curMonthForScore, :endMonthForScore, :programId, :versionId)";
         Map<String, Object> params = new HashMap<>();
         params.put("programId", programId);
         params.put("versionId", versionId);
@@ -331,6 +341,8 @@ public DashboardForLoadProgram getDashboardForLoadProgram(int programId, int ver
         params.put("curDate", db.getCurDate());
         params.put("curStartOfMonth", DateUtils.getStartOfMonthString(DateUtils.YMD));
         params.put("curEndOfMonth", DateUtils.getEndOfMonthString(DateUtils.YMD));
+        params.put("curMonthForScore", curMonthForScore);
+        params.put("endMonthForScore", endMonthForScore);
         this.namedParameterJdbcTemplate.query(sqlString, params, new DashboardStockStatusForLoadProgramResultSetExtractor(db));
 
         sqlString = "SELECT p1.*, st.`RATE` FROM (SELECT "
@@ -363,7 +375,7 @@ public DashboardForLoadProgram getDashboardForLoadProgram(int programId, int ver
         this.namedParameterJdbcTemplate.query(sqlString, params, new DashboardQplForLoadProgramResultSetExtractor(db, 3));
         sqlString = "CALL getDashboardShipmentProblemsForLoadProgram(:programId, :versionId, :curEndOfMonth)";
         this.namedParameterJdbcTemplate.query(sqlString, params, new DashboardQplForLoadProgramResultSetExtractor(db, 4));
-        sqlString = "CALL getDashboardStockOutCount(:startDateTop, :stopDateTop, :programId, :versionId)";
+        sqlString = "CALL getDashboardStockOutCount(:curMonthForScore, :endMonthForScore, :programId, :versionId)";
         this.namedParameterJdbcTemplate.query(sqlString, params, new DashboardTopStockOutForLoadProgramResultSetExtractor(db));
         sqlString = "CALL getDashboardExpiriesList(:startDateTop, :stopDateTop, :programId, :versionId)";
         this.namedParameterJdbcTemplate.query(sqlString, params, new DashboardTopExpiriesForLoadProgramResultSetExtractor(db));

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

@@ -1787,8 +1787,11 @@ public int getNotificationCount(CustomUserDetails curUser) {
 //        System.out.println("ids%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" + programIds);
         sql = "SELECT COUNT(*) FROM ( "
                 + "SELECT n.`NOTIFICATION_ID` FROM rm_erp_notification n "
-                + " LEFT JOIN rm_shipment_linking s ON s.SHIPMENT_LINKING_ID=n.SHIPMENT_LINKING_ID "
-                + " WHERE n.`ACTIVE` AND s.ACTIVE AND n.`ADDRESSED`=0 AND s.`PROGRAM_ID` IN (" + programIds + ") GROUP BY n.`NOTIFICATION_ID` ) AS a;";
+                + " LEFT JOIN rm_shipment_linking sl ON sl.SHIPMENT_LINKING_ID=n.SHIPMENT_LINKING_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 "
+                + " WHERE n.`ACTIVE` AND sl.ACTIVE AND n.`ADDRESSED`=0 AND sl.`PROGRAM_ID` IN (" + programIds + ") and ppu.PROGRAM_PLANNING_UNIT_ID IS NOT NULL and ppu.ACTIVE GROUP BY n.`NOTIFICATION_ID` ) AS a;";
         return this.jdbcTemplate.queryForObject(sql, Integer.class);
     }
 
@@ -1813,14 +1816,17 @@ public List<NotificationSummaryDTO> getNotificationSummary(CustomUserDetails cur
         }
         programIds = programIds.substring(0, programIds.lastIndexOf(","));
 //        System.out.println("ids 1%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" + programIds);
-        sql = "SELECT s.`PROGRAM_ID`,p.`LABEL_ID`,p.`LABEL_EN`,p.`LABEL_FR`,p.`LABEL_SP`,p.`LABEL_PR`, "
+        sql = "SELECT sl.`PROGRAM_ID`,p.`LABEL_ID`,p.`LABEL_EN`,p.`LABEL_FR`,p.`LABEL_SP`,p.`LABEL_PR`, "
                 + " COUNT(DISTINCT(n.`NOTIFICATION_ID`)) as NOTIFICATION_COUNT "
                 + " FROM rm_erp_notification n "
-                + " LEFT JOIN rm_shipment_linking s ON s.SHIPMENT_LINKING_ID=n.SHIPMENT_LINKING_ID "
+                + " 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` "
-                + " WHERE n.`ACTIVE` AND s.ACTIVE AND n.`ADDRESSED`=0 "
-                + " AND s.`PROGRAM_ID` IN (" + programIds + ") "
-                + " GROUP BY s.`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 "
+                + " WHERE n.`ACTIVE` AND sl.ACTIVE AND n.`ADDRESSED`=0 and ppu.PROGRAM_PLANNING_UNIT_ID IS NOT NULL and ppu.ACTIVE "
+                + " AND sl.`PROGRAM_ID` IN (" + programIds + ") "
+                + " GROUP BY sl.`PROGRAM_ID` ;";
         return this.jdbcTemplate.query(sql, new NotificationSummaryDTORowMapper());
     }
 

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

@@ -113,7 +113,7 @@ public List<RealmProblem> getProblemListByRealmId(int realmId, CustomUserDetails
 
     @Override
     public List<ProblemReport> getProblemReportList(int programId, int versionId, CustomUserDetails curUser) {
-        String sql = this.problemReportSql + " AND rp.ACTIVE ORDER BY prr.PROBLEM_REPORT_ID, prt.PROBLEM_REPORT_TRANS_ID";
+        String sql = this.problemReportSql + " ORDER BY prr.PROBLEM_REPORT_ID, prt.PROBLEM_REPORT_TRANS_ID";
         Map<String, Object> params = new HashMap<>();
         params.put("programId", programId);
         params.put("versionId", versionId);

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[5810]
-info.app.frontEndVersion=[13897]
+info.app.version=2.124[5824]
+info.app.frontEndVersion=[13938]
 management.endpoints.web.exposure.include=*
 management.info.env.enabled = true
 management.endpoint.sessions.enabled=true