Merge pull request #20 from motech-implementations/new_kilkari_report_and_ma_cumulative_changes

MA report name change in html files

Author: penugonda

app/views/reports.html

@@ -189,7 +189,7 @@
 			<div class="row" data-ng-hide= "!isAggregateReport() ">
 				<div class="col-xs-12 left">
 
-					<div class="form-group col-xs-2" data-ng-hide = "report.name == 'MA Cumulative Summary' || report.reportEnum == 'Kilkari_Cumulative_Summary'">
+					<div class="form-group col-xs-2" data-ng-hide = "report.name == 'District-wise Performance of the State for Mobile Academy' || report.reportEnum == 'Kilkari_Cumulative_Summary'">
 						<label> Period Type</label><br>
 						<div class="btn-group " data-uib-dropdown data-dropdown-append-to-body >
 							<button id="btn-append-to-body9" type="button"  class="btn btn-sm btn-default"  data-uib-dropdown-toggle >
@@ -209,7 +209,7 @@
 						</div>
 					</div>
 
-                    <div class="form-group col-xs-2" data-ng-hide = " periodDisplayType == '' || (report.name == 'MA Cumulative Summary' ||  report.reportEnum == 'Kilkari_Cumulative_Summary' || periodDisplayType == 'Current Period' ) ">
+                    <div class="form-group col-xs-2" data-ng-hide = " periodDisplayType == '' || (report.name == 'District-wise Performance of the State for Mobile Academy' ||  report.reportEnum == 'Kilkari_Cumulative_Summary' || periodDisplayType == 'Current Period' ) ">
                         <label>{{periodTypeContent}}</label><br>
                         <p class="input-group" data-ng-class="{disabled :disableDate() }" data-ng-disabled="disableDate()">
                             <input type="text" class="form-control input input-sm" data-uib-datepicker-popup="{{dateFormat}}" data-ng-model="dt1" is-open="popup2.opened" datepicker-options="datePickerOptions"  data-ng-required = "true" close-text="Close" alt-input-formats="altInputFormats" data-ng-disabled='disableDate()' readonly />
@@ -225,7 +225,7 @@
 						</ul>
                     </div>
 
-                    <div class="form-group col-xs-2" data-ng-hide = " (report.name != 'MA Cumulative Summary' &&  report.reportEnum != 'Kilkari_Cumulative_Summary' && periodDisplayType != 'Custom Range')">
+                    <div class="form-group col-xs-2" data-ng-hide = " (report.name != 'District-wise Performance of the State for Mobile Academy' &&  report.reportEnum != 'Kilkari_Cumulative_Summary' && periodDisplayType != 'Custom Range')">
                         <label>End Date</label><br>
                         <p class="input-group" data-ng-class="{disabled :disableDate() }" data-ng-disabled="disableDate()">
                             <input type="text" class="form-control input input-sm" data-uib-datepicker-popup="{{dateFormat}}" data-ng-model="dt2" is-open="popup3.opened" datepicker-options="endDatePickerOptions"  data-ng-required= "true" close-text="Close" alt-input-formats="altInputFormats" data-ng-disabled='disableDate()' readonly />
@@ -321,7 +321,7 @@
     <div class="reportheader" data-ng-hide="hideGrid">
         <p class="ng-binding" style="display: inline-block;"> {{reportHeaderName}} Report</p>
 		<div style="display: inline-block;float: right">
-			<i class="glyphicon glyphicon-calendar aggregate-calender"> <span data-ng-if=" report.name != 'MA Cumulative Summary' && report.reportEnum != 'Kilkari_Cumulative_Summary' " class="calender-date">{{ headerFromDate | date:'dd/MM/y'}}</span> <span class="calender-date" style="font-size: 13px" data-ng-if=" report.name == 'MA Cumulative Summary' || report.reportEnum == 'Kilkari_Cumulative_Summary' ">Up</span><span class="calender-date">to</span> <span class="calender-date">{{headerToDate | date:'dd/MM/y'}}</span></i>
+			<i class="glyphicon glyphicon-calendar aggregate-calender"> <span data-ng-if=" report.name != 'District-wise Performance of the State for Mobile Academy' && report.reportEnum != 'Kilkari_Cumulative_Summary' " class="calender-date">{{ headerFromDate | date:'dd/MM/y'}}</span> <span class="calender-date" style="font-size: 13px" data-ng-if=" report.name == 'District-wise Performance of the State for Mobile Academy' || report.reportEnum == 'Kilkari_Cumulative_Summary' ">Up</span><span class="calender-date">to</span> <span class="calender-date">{{headerToDate | date:'dd/MM/y'}}</span></i>
 			<img alt="export to excel" data-ng-click = "exportToExcel()" style="float: right;margin-right: 7px; cursor : pointer" src="images/export3.png">
 			<img alt="export to csv" data-ng-click = "exportCsv()" style="float: right;margin-right: 7px; cursor : pointer" src="images/export1.png">
 			<img alt="export to pdf" data-ng-hide="isIE9()"data-ng-click = "exportPdf()" style="float: right;margin-right: 7px; cursor : pointer" src="images/export2.png">

app/views/userManual_mobileAcademyAgg.html

@@ -10,7 +10,7 @@
         <h2 class="user-manual-header">Mobile Academy Aggregate Reports</h2>
         <div style="color: #0071bc; font-size: 16px">
             <p>
-            <div data-ng-click="func('csr')"><u>MA Cumulative Summary Report</u></div>
+            <div data-ng-click="func('csr')"><u>District-wise Performance of the State for Mobile Academy Report</u></div>
             </p>
             <p>
             <div data-ng-click="func('sr')"><u>MA Subscriber Report</u></div>
@@ -26,7 +26,7 @@ <h2 class="user-manual-header">Mobile Academy Aggregate Reports</h2>
             <div style="display: inline-block" class="imageModify"><b>Mobile Academy Aggregate Report</b><br>
                 <div data-ng-hide="selectRole != 1 && selectRole !=5"><!--National User-->
                     <div data-ng-hide="param!=='csr'" style="display: inline-block">
-                        <p style="font-size: 30px"><b>MA Cumulative Summary Report</b></p><br>
+                        <p style="font-size: 30px"><b>District-wise Performance of the State for Mobile Academy Report</b></p><br>
                         <p>This report provides the performance of the Mobile Academy project from the launch date of
                             the service in the state to till date. It gives information about the number of ASHAs
                             registered with the program, the number of ASHAs that have started the course, the number of
@@ -239,7 +239,7 @@ <h2 class="user-manual-header">Mobile Academy Aggregate Reports</h2>
                 </div>
                 <div data-ng-hide="selectRole != 2 && selectRole != 6">
                     <div data-ng-hide="param!=='csr'" style="display: inline-block">
-                        <p style="font-size: 30px"><b>MA Cumulative Summary Report</b></p><br>
+                        <p style="font-size: 30px"><b>District-wise Performance of the State for Mobile Academy Report</b></p><br>
                         <p>This report provides the performance of the Mobile Academy project from the launch date of
                             the service in the state to till date. It gives information about the number of ASHAs
                             registered with the program, the number of ASHAs that have started the course, the number of
@@ -452,7 +452,7 @@ <h2 class="user-manual-header">Mobile Academy Aggregate Reports</h2>
                 </div>
                 <div data-ng-hide="selectRole != 3 && selectRole != 7"><!--Disrict User-->
                     <div data-ng-hide="param!=='csr'" style="display: inline-block">
-                        <p style="font-size: 30px"><b>MA Cumulative Summary Report</b></p><br>
+                        <p style="font-size: 30px"><b>District-wise Performance of the State for Mobile Academy Report</b></p><br>
                         <p>This report provides the performance of the Mobile Academy project from the launch date of
                             the service in the state to till date. It gives information about the number of ASHAs
                             registered with the program, the number of ASHAs that have started the course, the number of
@@ -665,7 +665,7 @@ <h2 class="user-manual-header">Mobile Academy Aggregate Reports</h2>
                 </div>
                 <div data-ng-hide="selectRole !=4">
                     <div data-ng-hide="param!=='csr'" style="display: inline-block">
-                        <p style="font-size: 30px"><b>MA Cumulative Summary Report</b></p><br>
+                        <p style="font-size: 30px"><b>District-wise Performance of the State for Mobile Academy Report</b></p><br>
                         <p>This report provides the performance of the Mobile Academy project from the launch date of
                             the service in the state to till date. It gives information about the number of ASHAs
                             registered with the program, the number of ASHAs that have started the course, the number of