Merge pull request #821 from egovernments/ISTE-159-Remarks-Remove

ISTE -159 - Remarks removed
egovernments · Jun 20, 2024 · d1e2b16 · d1e2b16
2 parents 66974d1 + b215fdb
commit d1e2b16
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/frontend/mgramseva/lib/providers/consumer_details_provider.dart b/frontend/mgramseva/lib/providers/consumer_details_provider.dart
@@ -313,7 +313,7 @@ class ConsumerProvider with ChangeNotifier {
           "aadharNumber": waterconnection.addharCtrl.text.trim().isEmpty
               ? null
               : waterconnection.addharCtrl.text.trim(),
-          "remarks": property.owners?.first.remarks
+          "remarks": waterconnection.status == "Inactive" ?  property.owners?.first.remarks : ""
         });
       } else {
         waterconnection.additionalDetails!.locality =
@@ -338,8 +338,8 @@ class ConsumerProvider with ChangeNotifier {
             waterconnection.previousReading;
         waterconnection.additionalDetails!.propertyType = property.propertyType;
 
-        waterconnection.additionalDetails!.remarks =
-            property.owners?.first.remarks;
+        waterconnection.additionalDetails!.remarks =  waterconnection.status == "Inactive" ?
+            property.owners?.first.remarks : "";
       }
 
       try {

diff --git a/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart b/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart
@@ -654,13 +654,15 @@ class _ConsumerDetailsState extends State<ConsumerDetails> {
                                   (consumerProvider.waterconnection.status ==
                                       "Inactive"),
                               child: Consumer<ConsumerProvider>(
-                                  builder: (_, consumerProvider, child) {
-                                property.owners!.first.consumerRemarksCtrl
-                                    .text = consumerProvider.waterconnection
-                                        .additionalDetails!.remarks ??
-                                    "";
+                                  builder: (_, consumerProvider, child) {                                    
+
+                                  property.owners!.first.consumerRemarksCtrl
+                                      .text = consumerProvider.waterconnection
+                                          .additionalDetails!.remarks ??
+                                      "";
+
+
                                 return BuildTextField(
-
                                   i18.consumer.CONSUMER_REMARKS,
                                   property.owners!.first.consumerRemarksCtrl,
                                   validator: (val) =>