Rcf 849 (#424)

* qa-platform to collab Signed-off-by: piyush-shukla03_infosys <[email protected]> * Fixed dropdown validation issue Signed-off-by: piyush-shukla03_infosys <[email protected]> * Removed border for gender language labels Signed-off-by: piyush-shukla03_infosys <[email protected]> --------- Signed-off-by: piyush-shukla03_infosys <[email protected]> Co-authored-by: piyush-shukla03_infosys <[email protected]>
mosip · Aug 8, 2024 · a2806be · a2806be
1 parent 24aaa25
commit a2806be
Show file tree

Hide file tree

Showing 17 changed files with 510 additions and 476 deletions.
diff --git a/android/app/src/main/java/io/mosip/registration_client/api_services/RegistrationApi.java b/android/app/src/main/java/io/mosip/registration_client/api_services/RegistrationApi.java
@@ -60,7 +60,7 @@ public void startRegistration(@NonNull List<String> languages, @NonNull String f
     }
 
     @Override
-    public void evaluateMVELVisible(@NonNull String fieldData, @NonNull String expression, @NonNull RegistrationDataPigeon.Result<Boolean> result) {
+    public void evaluateMVELVisible(@NonNull String fieldData, @NonNull RegistrationDataPigeon.Result<Boolean> result) {
         try {
             FieldSpecDto fieldSpecDto = JsonUtils.jsonStringToJavaObject(fieldData, new TypeReference<FieldSpecDto>() {
             });
@@ -75,7 +75,7 @@ public void evaluateMVELVisible(@NonNull String fieldData, @NonNull String expre
     }
 
     @Override
-    public void evaluateMVELRequired(@NonNull String fieldData, @NonNull String expression, @NonNull RegistrationDataPigeon.Result<Boolean> result) {
+    public void evaluateMVELRequired(@NonNull String fieldData, @NonNull RegistrationDataPigeon.Result<Boolean> result) {
         try {
             FieldSpecDto fieldSpecDto = JsonUtils.jsonStringToJavaObject(fieldData, new TypeReference<FieldSpecDto>() {
             });

diff --git a/lib/platform_android/registration_service_impl.dart b/lib/platform_android/registration_service_impl.dart
@@ -12,11 +12,12 @@ import 'package:registration_client/platform_spi/registration_service.dart';
 
 class RegistrationServiceImpl implements RegistrationService {
   @override
-  Future<String> startRegistration(List<String> langauages, String flowType, String process) async {
+  Future<String> startRegistration(
+      List<String> langauages, String flowType, String process) async {
     String registrationStartResponse = '';
     try {
-      registrationStartResponse =
-          await RegistrationDataApi().startRegistration(langauages, flowType, process);
+      registrationStartResponse = await RegistrationDataApi()
+          .startRegistration(langauages, flowType, process);
     } on PlatformException {
       registrationStartResponse = "Something went wrong!";
       debugPrint('RegApi call failed');
@@ -29,11 +30,10 @@ class RegistrationServiceImpl implements RegistrationService {
   }
 
   @override
-  Future<bool> evaluateMVELVisible(String fieldData, String expression) async {
+  Future<bool> evaluateMVELVisible(String fieldData) async {
     bool isMvelValid = false;
     try {
-      isMvelValid =
-          await RegistrationDataApi().evaluateMVELVisible(fieldData, expression);
+      isMvelValid = await RegistrationDataApi().evaluateMVELVisible(fieldData);
     } on PlatformException {
       debugPrint('RegApi mvel visible call failed');
     } catch (e) {
@@ -43,11 +43,10 @@ class RegistrationServiceImpl implements RegistrationService {
   }
 
   @override
-  Future<bool> evaluateMVELRequired(String fieldData, String expression) async {
+  Future<bool> evaluateMVELRequired(String fieldData) async {
     bool isMvelValid = false;
     try {
-      isMvelValid =
-          await RegistrationDataApi().evaluateMVELRequired(fieldData, expression);
+      isMvelValid = await RegistrationDataApi().evaluateMVELRequired(fieldData);
     } on PlatformException {
       debugPrint('RegApi mvel call failed');
     } catch (e) {
@@ -57,11 +56,12 @@ class RegistrationServiceImpl implements RegistrationService {
   }
 
   @override
-  Future<String> getPreviewTemplate(bool isPreview, Map<String, String> templateValues) async {
+  Future<String> getPreviewTemplate(
+      bool isPreview, Map<String, String> templateValues) async {
     String previewTemplate = '';
     try {
-      previewTemplate =
-          await RegistrationDataApi().getPreviewTemplate(isPreview,templateValues);
+      previewTemplate = await RegistrationDataApi()
+          .getPreviewTemplate(isPreview, templateValues);
     } on PlatformException {
       debugPrint('Registration API template call failed');
     } catch (e) {
@@ -72,7 +72,8 @@ class RegistrationServiceImpl implements RegistrationService {
   }
 
   @override
-  Future<RegistrationSubmitResponse> submitRegistrationDto(String makerName) async {
+  Future<RegistrationSubmitResponse> submitRegistrationDto(
+      String makerName) async {
     late RegistrationSubmitResponse registrationSubmitResponse;
     try {
       registrationSubmitResponse =

diff --git a/lib/platform_spi/registration_service.dart b/lib/platform_spi/registration_service.dart
@@ -9,10 +9,12 @@ import 'package:registration_client/pigeon/registration_data_pigeon.dart';
 import 'package:registration_client/platform_android/registration_service_impl.dart';
 
 abstract class RegistrationService {
-  Future<String> startRegistration(List<String> languages, String flopwType, String process);
-  Future<bool> evaluateMVELVisible(String fieldData, String expression);
-  Future<bool> evaluateMVELRequired(String fieldData, String expression);
-  Future<String> getPreviewTemplate(bool isPreview,Map<String,String> templateValues);
+  Future<String> startRegistration(
+      List<String> languages, String flopwType, String process);
+  Future<bool> evaluateMVELVisible(String fieldData);
+  Future<bool> evaluateMVELRequired(String fieldData);
+  Future<String> getPreviewTemplate(
+      bool isPreview, Map<String, String> templateValues);
   Future<RegistrationSubmitResponse> submitRegistrationDto(String makerName);
 
   factory RegistrationService() => getRegistrationServiceImpl();

diff --git a/lib/provider/global_provider.dart b/lib/provider/global_provider.dart
@@ -43,16 +43,15 @@ class GlobalProvider with ChangeNotifier {
   final formKey = GlobalKey<FormState>();
   final updateFieldKey = GlobalKey<FormState>();
   String _updateUINNumber = "";
-  String _onboardingProcessName="";
+  String _onboardingProcessName = "";
   bool _isPageChanged = false;
   String get updateUINNumber => _updateUINNumber;
   String get onboardingProcessName => _onboardingProcessName;
   bool get isPageChanged => _isPageChanged;
   bool _preRegControllerRefresh = false;
   bool get preRegControllerRefresh => _preRegControllerRefresh;
 
-
-  set isPageChanged(bool value){
+  set isPageChanged(bool value) {
     _isPageChanged = value;
     notifyListeners();
   }
@@ -322,7 +321,7 @@ class GlobalProvider with ChangeNotifier {
     notifyListeners();
   }
 
-  setPreRegistrationId(String value){
+  setPreRegistrationId(String value) {
     _preRegId = value;
     notifyListeners();
   }
@@ -444,9 +443,9 @@ class GlobalProvider with ChangeNotifier {
     String x = '';
     for (var i in chosenLang) {
       String code = languageToCodeMapper[i]!;
-        if(label[code] != null) {
-          x = "$x${label[code] ?? ""}/ ";
-        }
+      if (label[code] != null) {
+        x = "$x${label[code] ?? ""}/ ";
+      }
     }
     return x.isEmpty ? x : x.substring(0, x.length - 2);
   }
@@ -797,7 +796,7 @@ class GlobalProvider with ChangeNotifier {
   }
 
   removeSelectedUpdateFieldKey(String key) {
-      _selectedUpdateFields.remove(key);
+    _selectedUpdateFields.remove(key);
     notifyListeners();
   }
 

diff --git a/lib/provider/registration_task_provider.dart b/lib/provider/registration_task_provider.dart
@@ -117,13 +117,12 @@ class RegistrationTaskProvider with ChangeNotifier {
     notifyListeners();
   }
 
-  evaluateMVELVisible(String fieldData, String expression) async {
-    return await registrationService.evaluateMVELVisible(fieldData, expression);
+  evaluateMVELVisible(String fieldData) async {
+    return await registrationService.evaluateMVELVisible(fieldData);
   }
 
-  evaluateMVELRequired(String fieldData, String expression) async {
-    return await registrationService.evaluateMVELRequired(
-        fieldData, expression);
+  evaluateMVELRequired(String fieldData) async {
+    return await registrationService.evaluateMVELRequired(fieldData);
   }
 
   setPreviewTemplate(String value) {

diff --git a/lib/ui/machine_keys.dart b/lib/ui/machine_keys.dart
@@ -6,7 +6,6 @@
 */
 
 import 'dart:convert';
-import 'dart:developer';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -147,7 +146,6 @@ class _MachineKeysState extends State<MachineKeys> {
       onTap: () {
         Clipboard.setData(ClipboardData(text: machineDetails)).then((value) {
           showInSnackBar(appLocalizations.copy_message);
-          log("machine details: $machineDetails");
         });
       },
       child: Container(

diff --git a/lib/ui/onboard/home_page.dart b/lib/ui/onboard/home_page.dart
@@ -8,7 +8,6 @@
 import 'dart:developer';
 
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:intl/intl.dart';

diff --git a/lib/ui/process_ui/new_process.dart b/lib/ui/process_ui/new_process.dart
@@ -25,8 +25,6 @@ import 'package:registration_client/provider/connectivity_provider.dart';
 import 'package:registration_client/provider/global_provider.dart';
 import 'package:registration_client/provider/registration_task_provider.dart';
 
-import 'package:registration_client/ui/common/tablet_header.dart';
-import 'package:registration_client/ui/common/tablet_navbar.dart';
 import 'package:registration_client/ui/post_registration/acknowledgement_page.dart';
 
 import 'package:registration_client/ui/post_registration/preview_page.dart';
@@ -205,20 +203,20 @@ class _NewProcessState extends State<NewProcess> with WidgetsBindingObserver {
     await globalProvider.getAudit("REG-EVT-003", "REG-MOD-103");
   }
 
-  setScrollToTop(){
-      scrollController.animateTo(
-        scrollController.position.minScrollExtent,
-        duration: const Duration(milliseconds: 500),
-        curve: Curves.easeOut,
-      );
-      globalProvider.isPageChanged = false;
+  setScrollToTop() {
+    scrollController.animateTo(
+      scrollController.position.minScrollExtent,
+      duration: const Duration(milliseconds: 500),
+      curve: Curves.easeOut,
+    );
+    globalProvider.isPageChanged = false;
   }
 
   bool continueButton = false;
   @override
   Widget build(BuildContext context) {
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-      if(globalProvider.isPageChanged){
+      if (globalProvider.isPageChanged) {
         setScrollToTop();
       }
     });
@@ -235,17 +233,15 @@ class _NewProcessState extends State<NewProcess> with WidgetsBindingObserver {
     final Process newProcess = arguments["process"];
     int size = newProcess.screens!.length;
 
-    evaluateMVELVisible(
-        String fieldData, String? engine, String? expression, Field e) async {
-      bool visible = await registrationTaskProvider.evaluateMVELVisible(
-          fieldData, expression!);
+    evaluateMVELVisible(String fieldData) async {
+      bool visible =
+          await registrationTaskProvider.evaluateMVELVisible(fieldData);
       return visible;
     }
 
-    evaluateMVELRequired(
-        String fieldData, String? engine, String? expression, Field e) async {
-      bool required = await registrationTaskProvider.evaluateMVELRequired(
-          fieldData, expression!);
+    evaluateMVELRequired(String fieldData) async {
+      bool required =
+          await registrationTaskProvider.evaluateMVELRequired(fieldData);
       return required;
     }
 
@@ -416,15 +412,9 @@ class _NewProcessState extends State<NewProcess> with WidgetsBindingObserver {
           if (screen.fields!.elementAt(i)!.requiredOn != null &&
               screen.fields!.elementAt(i)!.requiredOn!.isNotEmpty) {
             bool visible = await evaluateMVELVisible(
-                jsonEncode(screen.fields!.elementAt(i)!.toJson()),
-                screen.fields!.elementAt(i)!.requiredOn?[0]?.engine,
-                screen.fields!.elementAt(i)!.requiredOn?[0]?.expr,
-                screen.fields!.elementAt(i)!);
+                jsonEncode(screen.fields!.elementAt(i)!.toJson()));
             bool required = await evaluateMVELRequired(
-                jsonEncode(screen.fields!.elementAt(i)!.toJson()),
-                screen.fields!.elementAt(i)!.requiredOn?[0]?.engine,
-                screen.fields!.elementAt(i)!.requiredOn?[0]?.expr,
-                screen.fields!.elementAt(i)!);
+                jsonEncode(screen.fields!.elementAt(i)!.toJson()));
             if (visible && required) {
               if (screen.fields!.elementAt(i)!.inputRequired!) {
                 if (!(globalProvider.fieldInputValue
@@ -581,10 +571,11 @@ class _NewProcessState extends State<NewProcess> with WidgetsBindingObserver {
     }
 
     customValidation(globalProvider.newProcessTabIndex).then((value) {
-      continueButton = value &&
-          globalProvider.formKey.currentState != null &&
-          globalProvider.formKey.currentState!.validate();
-
+      setState(() {
+        continueButton = value &&
+            globalProvider.formKey.currentState != null &&
+            globalProvider.formKey.currentState!.validate();
+      });
       if (globalProvider.newProcessTabIndex >= size) {
         continueButton = true;
       }

diff --git a/lib/ui/process_ui/update_process.dart b/lib/ui/process_ui/update_process.dart
@@ -25,8 +25,6 @@ import 'package:registration_client/provider/connectivity_provider.dart';
 import 'package:registration_client/provider/global_provider.dart';
 import 'package:registration_client/provider/registration_task_provider.dart';
 
-import 'package:registration_client/ui/common/tablet_header.dart';
-import 'package:registration_client/ui/common/tablet_navbar.dart';
 import 'package:registration_client/ui/post_registration/acknowledgement_page.dart';
 
 import 'package:registration_client/ui/post_registration/preview_page.dart';

diff --git a/lib/ui/process_ui/widgets/age_date_control.dart b/lib/ui/process_ui/widgets/age_date_control.dart
@@ -5,8 +5,6 @@
  *
 */
 
-import 'dart:math';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
@@ -46,8 +44,8 @@ class _AgeDateControlState extends State<AgeDateControl> {
       globalProvider = Provider.of<GlobalProvider>(context, listen: false);
       registrationTaskProvider =
           Provider.of<RegistrationTaskProvider>(context, listen: false);
-      _getSavedDate();
     });
+    _getSavedDate();
     super.initState();
   }