Deployment

.github/workflows/NMSReportingSuite-deployment.yaml

@@ -0,0 +1,45 @@
+name: Build and Deploy to Staging
+on:
+  push:
+    branches:
+      - deployment
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-20.04
+    steps:
+      # Step 1: Check out the code
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Step 2: Set up Java
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+
+      # Step 3: Build the JAR
+      - name: Build with Maven
+        run: mvn clean install -f NMSReportingSuite/pom.xml
+
+      # Step 4: Build FrontEnd
+      - name: Install Frontend Dependencies and Build with Grunt
+        run: |
+          cd app
+          npm install
+          grunt package
+
+      # Step 5: Store deployment data
+      - uses: actions/upload-artifact@v4
+        with:
+          name: my-artifact
+          path: |
+            NMSReportingSuite/target/*.war
+            app/index.html
+            app/scripts/
+            app/views/
+            app/styles/
+            app/dist/
+
+

.gitignore

@@ -3,10 +3,7 @@ NMSReportingSuite/NMSReportingSuite.iml
 NMSReportingSuite/src/main/resources/app.properties
 NMSReportingSuite/target
 app/.idea/
-app/bower_components/
-app/scripts/global/urls.js
 app.zip
-app/node_modules/
 Email/NMSReportingSuite/.idea/
 Email/NMSReportingSuite/NMSReportingSuite.iml
 Email/NMSReportingSuite/src/main/resources/app.properties

NMSReportingSuite/src/main/java/com/beehyv/nmsreporting/business/AggregateKilkariReportsService.java

@@ -21,6 +21,10 @@ public interface AggregateKilkariReportsService {
 
     List<UsageDto> getUsageReport(ReportRequest reportRequest, User currentUser);
 
+    List<UsageDto> getMotherUsageReport(ReportRequest reportRequest, User currentUser);
+
+    List<UsageDto> getChildUsageReport(ReportRequest reportRequest, User currentUser);
+
     AggregateKilkariReportsDto getKilkariMessageListenershipReport(ReportRequest reportRequest);
 
     AggregateKilkariReportsDto getWhatsAppSubscriberCountReport(ReportRequest reportRequest);

NMSReportingSuite/src/main/java/com/beehyv/nmsreporting/business/impl/AggregateReportsServiceImpl.java

@@ -473,17 +473,18 @@ public void createSpecificAggreagateExcel(XSSFWorkbook workbook, AggregateExcelD
 
         spreadsheet.setColumnWidth(0, 4000);
 
-        for (int i = 1; i < 15; i++) {
-            spreadsheet.setColumnWidth(i, 6000);
+        for (int columnNumber = 1; columnNumber < 15; columnNumber++) {
+            spreadsheet.setColumnWidth(columnNumber, 6000);
         }
 
         XSSFRow row;
         int rowid = 8;
 
         if (gridData.getReportName().equalsIgnoreCase("Kilkari Message Matrix") || gridData.getReportName().equalsIgnoreCase("Kilkari Beneficiary Completion")
-        || gridData.getReportName().equalsIgnoreCase("Kilkari Usage") || gridData.getReportName().equalsIgnoreCase("Kilkari Call")) {
-            for (int i = 1; i < 15; i++) {
-                spreadsheet.setColumnWidth(i, 10000);
+        || gridData.getReportName().equalsIgnoreCase("Kilkari Usage") || gridData.getReportName().equalsIgnoreCase("Kilkari Call")
+                || gridData.getReportName().equalsIgnoreCase("Kilkari Usage Child") || gridData.getReportName().equalsIgnoreCase("Kilkari Usage Mother")) {
+            for (int columnNumber = 1; columnNumber < 15; columnNumber++) {
+                spreadsheet.setColumnWidth(columnNumber, 10000);
             }
         }
 
@@ -707,7 +708,7 @@ public void createSpecificAggreagateExcel(XSSFWorkbook workbook, AggregateExcelD
 //                    gridData.getReportName().equalsIgnoreCase("Kilkari Message Matrix")||
 //                    gridData.getReportName().equalsIgnoreCase("Kilkari Repeat Listener Month Wise")||
 //                    gridData.getReportName().equalsIgnoreCase("Kilkari Cumulative Summary")||
-//                    gridData.getReportName().equalsIgnoreCase("District-wise Performance of the State for Mobile Academy")){
+//                    gridData.getReportName().equalsIgnoreCase("Mobile Academy Performance Report")){
                 spreadsheet.autoSizeColumn(1);
 //            }
 
@@ -736,7 +737,7 @@ private Map<String,List<String>> getHeaderComment() {
                "Number of ASHAs who have successfully completed the course for the first time",
                "Number of ASHAs presently Subscribed in the Mobile Academy program but are yet to start or complete the course."
                ));
-       map.put("District-wise Performance of the State for Mobile Academy",Arrays.asList("State",
+       map.put("Mobile Academy Performance Report",Arrays.asList("State",
                "Number of ASHAs registered with the program.","Number of ASHA have started the course","% Started (of total registered)",
                "number of ASHAs who have passed the course (first successful completion only)",
                "% Completed (of total registered)","Number of ASHA have not started the course","% Not Started (of total registered)",
@@ -971,7 +972,7 @@ public void createSpecificAggreagatePdf(PDDocument document, AggregateExcelDto g
         float tableFont = 7;
         //contents.close();
 
-        if (gridData.getReportName().equalsIgnoreCase("District-wise Performance of the State for Mobile Academy") || gridData.getReportName().equalsIgnoreCase("Kilkari Repeat Listener Month Wise")) {
+        if (gridData.getReportName().equalsIgnoreCase("Mobile Academy Performance Report") || gridData.getReportName().equalsIgnoreCase("Kilkari Repeat Listener Month Wise")) {
             cellWidth = 10f;
             tableMargin = 60;
             tableFont = 7;
@@ -996,6 +997,12 @@ public void createSpecificAggreagatePdf(PDDocument document, AggregateExcelDto g
         } else if (gridData.getReportName().equalsIgnoreCase("Kilkari Usage")) {
             cellWidth = 20f;
             tableMargin = 40;
+        } else if (gridData.getReportName().equalsIgnoreCase("Kilkari Usage Mother")) {
+            cellWidth = 20f;
+            tableMargin = 40;
+        } else if (gridData.getReportName().equalsIgnoreCase("Kilkari Usage Child")) {
+            cellWidth = 20f;
+            tableMargin = 40;
         } else if (gridData.getReportName().equalsIgnoreCase("Kilkari Call")) {
             cellWidth = 10f;
             tableMargin = 30;

NMSReportingSuite/src/main/java/com/beehyv/nmsreporting/business/impl/AshaTargetFileServiceImpl.java

@@ -134,12 +134,12 @@ public TargetFileNotification generateTargetFile() {
                         case ASHACERTIFICATE:
                             productName = "MA Certificate Download through SMS";
                             messageText = formatCertificateMessage(beneficiary, SMS_CONTENT_ASHACERTIFICATE_PREFIX, languageCode);
-                            String otpMessage = formatCertificateOTPMessage(beneficiary, SMS_CONTENT_ASHACERTIFICATE_OTP_PREFIX, languageCode);
+//                            String otpMessage = formatCertificateOTPMessage(beneficiary, SMS_CONTENT_ASHACERTIFICATE_OTP_PREFIX, languageCode);
                              templateId = formatTemplateId(languageCode);
                             writeMessage(writer, msisdn, stateName, productName, templateId, messageText);
-                            writeMessage(writer, msisdn, stateName, productName, SMS_CONTENT_CERTIFICATETemplateId_OTP_PREFIX, otpMessage);
+//                            writeMessage(writer, msisdn, stateName, productName, SMS_CONTENT_CERTIFICATETemplateId_OTP_PREFIX, otpMessage);
                             flwIds.add(beneficiary.getAshaId());
-                            recordsWritten += 2;
+                            recordsWritten ++;
                             continue;
 
                         default:

NMSReportingSuite/src/main/java/com/beehyv/nmsreporting/controller/UserController.java

@@ -755,6 +755,20 @@ public Object getReport(@RequestBody ReportRequest reportRequest/*,HttpServletRe
             return aggregateResponseDto;
         }
 
+        if (reportRequest.getReportType().equals(ReportType.usageMother.getReportType())) {
+            aggregateResponseDto.setBreadCrumbData(breadCrumbs);
+            List<UsageDto> kilkariMotherUsageDtos = aggregateKilkariReportsService.getMotherUsageReport(reportRequest, currentUser);
+            aggregateResponseDto.setTableData(kilkariMotherUsageDtos);
+            return aggregateResponseDto;
+        }
+
+        if (reportRequest.getReportType().equals(ReportType.usageChild.getReportType())) {
+            aggregateResponseDto.setBreadCrumbData(breadCrumbs);
+            List<UsageDto> kilkariChildUsageDtos = aggregateKilkariReportsService.getChildUsageReport(reportRequest, currentUser);
+            aggregateResponseDto.setTableData(kilkariChildUsageDtos);
+            return aggregateResponseDto;
+        }
+
         if(reportRequest.getReportType().equals(ReportType.kilkariHomePageReport.getReportType())){
             LOGGER.debug("inside this home api");
             aggregateResponseDto.setBreadCrumbData(breadCrumbs);
@@ -1825,6 +1839,20 @@ public String downloadpdf1(HttpServletResponse response, @DefaultValue("") @Quer
                 "images/drop-down-2.png",
                 ReportType.usage.getServiceType(),showAggregateReports)
         );
+        kList.add(new Report(
+                ReportType.usageMother.getReportName(),
+                ReportType.usageMother.getReportType(),
+                ReportType.usageMother.getSimpleName(),
+                "images/drop-down-2.png",
+                ReportType.usageMother.getServiceType(),showAggregateReports)
+        );
+        kList.add(new Report(
+                ReportType.usageChild.getReportName(),
+                ReportType.usageChild.getReportType(),
+                ReportType.usageChild.getSimpleName(),
+                "images/drop-down-2.png",
+                ReportType.usageChild.getServiceType(),showAggregateReports)
+        );
         kList.add(new Report(
                 ReportType.kilkariCalls.getReportName(),
                 ReportType.kilkariCalls.getReportType(),

NMSReportingSuite/src/main/java/com/beehyv/nmsreporting/dao/KilkariUsageChildDao.java

@@ -0,0 +1,14 @@
+package com.beehyv.nmsreporting.dao;
+
+import com.beehyv.nmsreporting.model.KilkariUsageChild;
+
+import java.util.Date;
+
+/**
+ * Created by beehyv on 27/01/25.
+ */
+public interface KilkariUsageChildDao {
+
+    KilkariUsageChild getUsage(Integer locationId, String locationType, Date toDate, String periodType);
+
+}

NMSReportingSuite/src/main/java/com/beehyv/nmsreporting/dao/KilkariUsageMotherDao.java

@@ -0,0 +1,14 @@
+package com.beehyv.nmsreporting.dao;
+
+import com.beehyv.nmsreporting.model.KilkariUsageMother;
+
+import java.util.Date;
+
+/**
+ * Created by beehyv on 27/01/25.
+ */
+public interface KilkariUsageMotherDao {
+
+    KilkariUsageMother getUsage(Integer locationId, String locationType, Date toDate, String periodType);
+
+}

NMSReportingSuite/src/main/java/com/beehyv/nmsreporting/dao/impl/AggregateCumulativeBeneficiaryDaoImpl.java

@@ -37,11 +37,13 @@ public AggregateCumulativeBeneficiary getCumulativeBeneficiary(Long locationId,
         List<AggregateCumulativeBeneficiary> result = criteria.list();
         if(result.size() < 1){
             Long a = (long)0;
-            AggregateCumulativeBeneficiary aggregateCumulativeBeneficiary = new AggregateCumulativeBeneficiary(0,locationType,locationId,toDate,a,a,a,a,a,a,a,"",a);
+            AggregateCumulativeBeneficiary aggregateCumulativeBeneficiary = new AggregateCumulativeBeneficiary(0,locationType,locationId,toDate,a,a,a,a,a,a,a,a,a,"",a);
             return aggregateCumulativeBeneficiary;
         }
         AggregateCumulativeBeneficiary aggregateCumulativeBeneficiary = result.get(0);
         aggregateCumulativeBeneficiary.setJoinedSubscription(aggregateCumulativeBeneficiary.getJoinedSubscription() == null ? 0 : aggregateCumulativeBeneficiary.getJoinedSubscription());
+        aggregateCumulativeBeneficiary.setChildSubscriptionJoined(aggregateCumulativeBeneficiary.getChildSubscriptionJoined() == null ? 0 : aggregateCumulativeBeneficiary.getChildSubscriptionJoined());
+        aggregateCumulativeBeneficiary.setMotherSubscriptionJoined(aggregateCumulativeBeneficiary.getMotherSubscriptionJoined() == null ? 0 : aggregateCumulativeBeneficiary.getMotherSubscriptionJoined());
         aggregateCumulativeBeneficiary.setChildCompletion(aggregateCumulativeBeneficiary.getChildCompletion() == null ? 0 : aggregateCumulativeBeneficiary.getChildCompletion());
         aggregateCumulativeBeneficiary.setMotherCompletion(aggregateCumulativeBeneficiary.getMotherCompletion() == null ? 0 : aggregateCumulativeBeneficiary.getMotherCompletion());
         aggregateCumulativeBeneficiary.setLowListenership(aggregateCumulativeBeneficiary.getLowListenership() == null ? 0 : aggregateCumulativeBeneficiary.getLowListenership());

NMSReportingSuite/src/main/java/com/beehyv/nmsreporting/dao/impl/KilkariUsageChildDaoImpl.java

@@ -0,0 +1,47 @@
+package com.beehyv.nmsreporting.dao.impl;
+
+import com.beehyv.nmsreporting.dao.AbstractDao;
+import com.beehyv.nmsreporting.dao.KilkariUsageChildDao;
+
+import com.beehyv.nmsreporting.model.KilkariUsageChild;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by beehyv on 27/02/25.
+ */
+@Repository("usageChildDao")
+public class KilkariUsageChildDaoImpl extends AbstractDao<Integer, KilkariUsageChild> implements KilkariUsageChildDao {
+
+    @Override
+    public KilkariUsageChild getUsage(Integer locationId, String locationType, Date toDate, String periodType){
+
+        Criteria criteria = createEntityCriteria().addOrder(Order.asc("locationId"));
+        criteria.add(Restrictions.and(
+                Restrictions.eq("locationId",locationId.longValue()),
+                Restrictions.eq("locationType",locationType),
+                Restrictions.eq("periodType",periodType),
+                Restrictions.eq("date",toDate)
+        ));
+        List<KilkariUsageChild> result = criteria.list();
+        if(result.isEmpty()){
+            Long a = (long)0;
+            KilkariUsageChild kilkariUsageChild = new KilkariUsageChild(0,locationType,locationId.longValue(),toDate,a,a,a,a,a,a,a,"");
+            return kilkariUsageChild;
+        }
+        KilkariUsageChild kilkariUsageChild =  result.get(0);
+        kilkariUsageChild.setCalls_1_25(kilkariUsageChild.getCalls_1_25() == null ? 0 : kilkariUsageChild.getCalls_1_25());
+        kilkariUsageChild.setCalls_25_50(kilkariUsageChild.getCalls_25_50() == null ? 0 : kilkariUsageChild.getCalls_25_50());
+        kilkariUsageChild.setCalls_50_75(kilkariUsageChild.getCalls_50_75() == null ? 0 : kilkariUsageChild.getCalls_50_75());
+        kilkariUsageChild.setCalls_75_100(kilkariUsageChild.getCalls_75_100() == null ? 0 : kilkariUsageChild.getCalls_75_100());
+        kilkariUsageChild.setCalledInbox(kilkariUsageChild.getCalledInbox() == null ? 0 : kilkariUsageChild.getCalledInbox());
+        kilkariUsageChild.setAnsweredAtleastOneCall(kilkariUsageChild.getAnsweredAtleastOneCall() == null ? 0 : kilkariUsageChild.getAnsweredAtleastOneCall());
+        kilkariUsageChild.setTotalBeneficiariesCalled(kilkariUsageChild.getTotalBeneficiariesCalled() == null ? 0 : kilkariUsageChild.getTotalBeneficiariesCalled());
+        return kilkariUsageChild;
+    }
+}

NMSReportingSuite/src/main/java/com/beehyv/nmsreporting/dao/impl/KilkariUsageMotherDaoImpl.java

@@ -0,0 +1,47 @@
+package com.beehyv.nmsreporting.dao.impl;
+
+import com.beehyv.nmsreporting.dao.AbstractDao;
+import com.beehyv.nmsreporting.dao.KilkariUsageMotherDao;
+import com.beehyv.nmsreporting.model.KilkariUsageMother;
+import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by beehyv on 27/02/25.
+ */
+@Repository("usageMotherDao")
+public class KilkariUsageMotherDaoImpl extends AbstractDao<Integer, KilkariUsageMother> implements KilkariUsageMotherDao {
+
+    @Override
+    public KilkariUsageMother getUsage(Integer locationId, String locationType, Date toDate, String periodType){
+
+        Criteria criteria = createEntityCriteria().addOrder(Order.asc("locationId"));
+        criteria.add(Restrictions.and(
+                Restrictions.eq("locationId",locationId.longValue()),
+                Restrictions.eq("locationType",locationType),
+                Restrictions.eq("periodType",periodType),
+                Restrictions.eq("date",toDate)
+        ));
+        List<KilkariUsageMother> result = criteria.list();
+        if(result.isEmpty()){
+            Long a = (long)0;
+            KilkariUsageMother kilkariUsageMother = new KilkariUsageMother(0,locationType,locationId.longValue(),toDate,a,a,a,a,a,a,a,"");
+            return kilkariUsageMother;
+        }
+        KilkariUsageMother kilkariUsageMother =  result.get(0);
+        kilkariUsageMother.setCalls_1_25(kilkariUsageMother.getCalls_1_25() == null ? 0 : kilkariUsageMother.getCalls_1_25());
+        kilkariUsageMother.setCalls_25_50(kilkariUsageMother.getCalls_25_50() == null ? 0 : kilkariUsageMother.getCalls_25_50());
+        kilkariUsageMother.setCalls_50_75(kilkariUsageMother.getCalls_50_75() == null ? 0 : kilkariUsageMother.getCalls_50_75());
+        kilkariUsageMother.setCalls_75_100(kilkariUsageMother.getCalls_75_100() == null ? 0 : kilkariUsageMother.getCalls_75_100());
+        kilkariUsageMother.setCalledInbox(kilkariUsageMother.getCalledInbox() == null ? 0 : kilkariUsageMother.getCalledInbox());
+        kilkariUsageMother.setAnsweredAtleastOneCall(kilkariUsageMother.getAnsweredAtleastOneCall() == null ? 0 : kilkariUsageMother.getAnsweredAtleastOneCall());
+        kilkariUsageMother.setTotalBeneficiariesCalled(kilkariUsageMother.getTotalBeneficiariesCalled() == null ? 0 : kilkariUsageMother.getTotalBeneficiariesCalled());
+        return kilkariUsageMother;
+    }
+
+}

NMSReportingSuite/src/main/java/com/beehyv/nmsreporting/entity/KilkariAggregateBeneficiariesDto.java

@@ -19,6 +19,8 @@ public class KilkariAggregateBeneficiariesDto {
     private Long childCompletion;
     private Long calledInbox;
     private Long joinedSubscription;
+    private Long motherSubscriptionJoined;
+    private Long childSubscriptionJoined;
     private boolean link = false;
 
     public Integer getId() {
@@ -133,6 +135,22 @@ public void setJoinedSubscription(Long joinedSubscription) {
         this.joinedSubscription = joinedSubscription;
     }
 
+    public Long getChildSubscriptionJoined() {
+        return childSubscriptionJoined;
+    }
+
+    public void setChildSubscriptionJoined(Long childSubscriptionJoined) {
+        this.childSubscriptionJoined = childSubscriptionJoined;
+    }
+
+    public Long getMotherSubscriptionJoined() {
+        return motherSubscriptionJoined;
+    }
+
+    public void setMotherSubscriptionJoined(Long motherSubscriptionJoined) {
+        this.motherSubscriptionJoined = motherSubscriptionJoined;
+    }
+
     public boolean isLink() {
         return link;
     }

NMSReportingSuite/src/main/java/com/beehyv/nmsreporting/enums/EtlJobForNotifications.java

@@ -49,6 +49,14 @@ public enum EtlJobForNotifications {
     Kilkari_Usage_Report_Quarter(" KilkariUsageReportQuarter", "Kilkari Usage","QUARTERLY", "REPORTS"),
     Kilkari_Usage_Report_Year(" KilkariUsageReportYear", "Kilkari Usage","YEARLY", "REPORTS"),
     Kilkari_Usage_Report_FinancialYear(" KilkariUsageReportFinancialYear", "Kilkari Usage","FINANCIALYEAR", "REPORTS"),
+    Kilkari_Usage_Mother_Report_Monthly(" KilkariUsageMotherReportMonthly", "Kilkari Usage Mother","MONTHLY", "REPORTS"),
+    Kilkari_Usage_Mother_Report_Quarter(" KilkariUsageMotherReportQuarter", "Kilkari Usage Mother","QUARTERLY", "REPORTS"),
+    Kilkari_Usage_Mother_Report_Year(" KilkariUsageMotherReportYear", "Kilkari Usage Mother","YEARLY", "REPORTS"),
+    Kilkari_Usage_Mother_Report_FinancialYear(" KilkariUsageMotherReportFinancialYear", "Kilkari Usage Mother","FINANCIALYEAR", "REPORTS"),
+    Kilkari_Usage_Child_Report_Monthly(" KilkariUsageChildReportMonthly", "Kilkari Usage Child","MONTHLY", "REPORTS"),
+    Kilkari_Usage_Child_Report_Quarter(" KilkariUsageChildReportQuarter", "Kilkari Usage Child","QUARTERLY", "REPORTS"),
+    Kilkari_Usage_Child_Report_Year(" KilkariUsageChildReportYear", "Kilkari Usage Child","YEARLY", "REPORTS"),
+    Kilkari_Usage_Child_Report_FinancialYear(" KilkariUsageChildReportFinancialYear", "Kilkari Usage Child","FINANCIALYEAR", "REPORTS"),
     Kilkari_Thematic_Content_Monthly(" KilkariThematicContentMonthly", "Kilkari Thematic Content","MONTHLY", "REPORTS"),
     Kilkari_Thematic_Content_Quarter(" KilkariThematicContentQuarter", "Kilkari Thematic Content","QUARTERLY", "REPORTS"),
     Kilkari_Thematic_Content_Year(" KilkariThematicContentYear", "Kilkari Thematic Content","YEARLY", "REPORTS"),