PFM-4087

egovernments · Oct 16, 2023 · 626dd10 · 626dd10
1 parent 3de2b20
commit 626dd10
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/frontend/mgramseva/lib/providers/reports_provider.dart b/frontend/mgramseva/lib/providers/reports_provider.dart
@@ -88,7 +88,6 @@ class ReportsProvider with ChangeNotifier {
     TableHeader(i18.common.STATUS),
     TableHeader(i18.common.INACTIVATED_DATE),
     TableHeader(i18.common.INACTIVATED_BY_NAME),
-    TableHeader(i18.common.INACTIVATED_BY_UUID),
   ];
 
   void onChangeOfPageLimit(
@@ -172,7 +171,6 @@ class ReportsProvider with ChangeNotifier {
       TableData('${data.status??'-'}'),
       TableData('${inactivatedDate ?? '-'}'),
       TableData('${inactivatedBy ?? '-'}'),
-      TableData('${data.inactivatedByUuid ?? ''}'),
     ]);
   }
   void callNotifier() {
@@ -322,7 +320,8 @@ class ReportsProvider with ChangeNotifier {
               optionalData: [
                 'Demand Report',
                 '$selectedBillPeriod',
-                '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(commonProvider.userDetails!.selectedtenant!.code!)} ${commonProvider.userDetails?.selectedtenant?.code?.substring(3)}',
+                '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(commonProvider.userDetails!.selectedtenant!.code!)}',
+                '${commonProvider.userDetails?.selectedtenant?.code?.substring(3)}',
                 'Downloaded On ${DateFormats.timeStampToDate(DateTime.now().millisecondsSinceEpoch, format: 'dd/MMM/yyyy')}'
               ]);
         } else {
@@ -387,7 +386,8 @@ class ReportsProvider with ChangeNotifier {
               optionalData: [
                 'Collection Report',
                 '$selectedBillPeriod',
-                '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(commonProvider.userDetails!.selectedtenant!.code!)} ${commonProvider.userDetails?.selectedtenant?.code?.substring(3)}',
+                '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(commonProvider.userDetails!.selectedtenant!.code!)}',
+                '${commonProvider.userDetails?.selectedtenant?.code?.substring(3)}',
                 'Downloaded On ${DateFormats.timeStampToDate(DateTime.now().millisecondsSinceEpoch, format: 'dd/MMM/yyyy')}'
               ]);
         } else {
@@ -450,9 +450,10 @@ class ReportsProvider with ChangeNotifier {
               title:
               'InactiveConsumers_${commonProvider.userDetails?.selectedtenant?.code?.substring(3)}_${selectedBillPeriod.toString().replaceAll('/', '_')}',
               optionalData: [
-                'Collection Report',
+                'Inactive Consumer Report',
                 '$selectedBillPeriod',
-                '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(commonProvider.userDetails!.selectedtenant!.code!)} ${commonProvider.userDetails?.selectedtenant?.code?.substring(3)}',
+                '${ApplicationLocalizations.of(navigatorKey.currentContext!).translate(commonProvider.userDetails!.selectedtenant!.code!)}',
+                '${commonProvider.userDetails?.selectedtenant?.code?.substring(3)}',
                 'Downloaded On ${DateFormats.timeStampToDate(DateTime.now().millisecondsSinceEpoch, format: 'dd/MMM/yyyy')}'
               ]);
         } else {

diff --git a/frontend/mgramseva/lib/repository/reports_repo.dart b/frontend/mgramseva/lib/repository/reports_repo.dart
@@ -108,10 +108,10 @@ class ReportsRepo extends BaseService{
         requestInfo: requestInfo,
         body: {},
         method: RequestType.POST);
-    if (res != null && res['InactiveConsumerReportData'] != null) {
+    if (res != null && res['InactiveConsumerReport'] != null) {
       try {
         inactiveConsumers = [];
-        res['InactiveConsumerReportData'].forEach((val){
+        res['InactiveConsumerReport'].forEach((val){
           inactiveConsumers?.add(InactiveConsumerReportData.fromJson(val));
         });
       } catch (e) {