Name change for MA cumulative and new Kilkari report based on Ministry reccommendation

Author: jithin

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

@@ -657,7 +657,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("MA Cumulative Summary")){
+//                    gridData.getReportName().equalsIgnoreCase("District-wise Performance of the State for Mobile Academy")){
                 spreadsheet.autoSizeColumn(1);
 //            }
 
@@ -886,7 +886,7 @@ public void createSpecificAggreagatePdf(PDDocument document, AggregateExcelDto g
         float tableFont = 7;
         //contents.close();
 
-        if (gridData.getReportName().equalsIgnoreCase("MA Cumulative Summary") || gridData.getReportName().equalsIgnoreCase("Kilkari Repeat Listener Month Wise")) {
+        if (gridData.getReportName().equalsIgnoreCase("District-wise Performance of the State for Mobile Academy") || gridData.getReportName().equalsIgnoreCase("Kilkari Repeat Listener Month Wise")) {
             cellWidth = 10f;
             tableMargin = 60;
             tableFont = 7;

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

@@ -13,15 +13,15 @@ public enum ReportType {
 //    sixWeeks("sixWeeks");
     messageMatrix("Kilkari_Message_Matrix","Kilkari Message Matrix","KILKARI","Kilkari Message Matrix Report", "Message Matrix"),
     kilkariCalls("Kilkari_Call","Kilkari Call","KILKARI","Kilkari Call Report", "Call Report"),
-    kilkariCallsWithBeneficiaries("Kilkari_Call_With_Beneficiaries","Kilkari Call With Beneficiaries","KILKARI","Kilkari Call Report With Beneficiaries", "Call Report With Beneficiaries"),
+    kilkariCallsWithBeneficiaries("District-wise Performance of the State for Kilkari","District-wise Performance of the State for Kilkari","KILKARI","District-wise Performance of the State for Kilkari", "District-wise Performance of the State for Kilkari"),
     listeningMatrix("Kilkari_Listening_Matrix","Kilkari Listening Matrix","KILKARI","Kilkari Listening Matrix Report", "Listening Matrix"),
     beneficiary("Kilkari_Aggregate_Beneficiaries","Kilkari Aggregate Beneficiaries","KILKARI","Kilkari Aggregate Beneficiaries Report", "Aggregate Beneficiaries"),
     usage("Kilkari_Usage","Kilkari Usage","KILKARI","Kilkari Usage Report", "Usage Report"),
     beneficiaryCompletion("Kilkari_Beneficiary_Completion","Kilkari Beneficiary Completion","KILKARI","Kilkari Beneficiary Completion Report", "Beneficiary Completion"),
     kilkariCumulative("Kilkari_Cumulative_Summary","Kilkari Cumulative Summary","KILKARI","Kilkari Cumulative Summary Aggregate Report", "Cumulative Summary"),
     maPerformance("MA_Performance","MA Performance","MOBILE_ACADEMY","MA Performance Aggregate Report", "Performance Report"),
     maSubscriber("MA_Subscriber","MA Subscriber","MOBILE_ACADEMY","MA Subscriber Aggregate Report", "Subscriber Report"),
-    maCumulative("MA_Cumulative_Summary","MA Cumulative Summary","MOBILE_ACADEMY","MA Cumulative Summery Aggregate Report", "Cumulative Summary"),
+    maCumulative("District-wise Performance of the State for Mobile Academy","District-wise Performance of the State for Mobile Academy","MOBILE_ACADEMY","District-wise Performance of the State for Mobile Academy", "District-wise Performance of the State for Mobile Academy"),
     maCourse("MA_Cumulative_Course_Completion", "Course Completion", "MOBILE_ACADEMY","MA Completion Line-Listing Report", "Course Completion"),
     maAnonymous("MA_Anonymous_Users", "Circle wise Anonymous Users", "MOBILE_ACADEMY", "MA Circle Wise Anonymous Line-Listing Report", "Circle wise Anonymous Users"),
     maInactive("MA_Cumulative_Inactive_Users", "Cumulative Inactive Users", "MOBILE_ACADEMY", "MA Inactive Users Line-Listing Report", "Cumulative Inactive Users"),

app/scripts/controllers/main.js

@@ -424,10 +424,10 @@
 
 			$scope.disableCursor = function(){
 
-            				return (($state.current.name)===("MA Cumulative Summary"))||(($state.current.name)===("MA Subscriber"))||
+            				return (($state.current.name)===("District-wise Performance of the State for Mobile Academy"))||(($state.current.name)===("MA Subscriber"))||
                                                                       (($state.current.name)===("MA Performance"))||(($state.current.name)===("Kilkari Cumulative Summary"))||
                                                                       (($state.current.name)===("Kilkari Beneficiary Completion"))||(($state.current.name)===("Kilkari Usage"))||
-                                                                      (($state.current.name)===("Kilkari Call"))||(($state.current.name)===("Kilkari Call With Beneficiaries"))||(($state.current.name)===("Kilkari Message Matrix"))||
+                                                                      (($state.current.name)===("Kilkari Call"))||(($state.current.name)===("District-wise Performance of the State for Kilkari"))||(($state.current.name)===("Kilkari Message Matrix"))||
                                                                       (($state.current.name)===("Kilkari Listening Matrix"))||(($state.current.name)===("Kilkari Thematic Content"))||
                                                                       (($state.current.name)===("Kilkari Repeat Listener"))||(($state.current.name)===("Kilkari Subscriber"))||
                                                                       (($state.current.name)===("Kilkari Message Listenership"))||(($state.current.name)===("Kilkari Aggregate Beneficiaries"));