Added few changes and server base url to qa-trinity

Signed-off-by: Piyush7034 <[email protected]>
mosip · Nov 9, 2023 · 644d2bd · 644d2bd
1 parent 269438a
commit 644d2bd
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -39,7 +39,7 @@ ext {
     clientmanagerLibVersionCode = 1
     clientmanagerLibVersionName = "\"1.0.0\""
 
-    serverBaseURL = "\"https://api-internal.qa-triad.mosip.net/\""
+    serverBaseURL = "\"https://api-internal.qa-trinity.mosip.net/\""
     serverHealthCheckPath = "\"v1/syncdata/actuator/health\""
     serverActuatorInfoPath = "\"v1/syncdata/actuator/info\""
 }

diff --git a/lib/ui/process_ui/widgets/language_selector.dart b/lib/ui/process_ui/widgets/language_selector.dart
@@ -40,15 +40,23 @@ class _LanguageSelectorState extends State<LanguageSelector> {
     Navigator.of(context).pop();
   }
 
+  _getRegistrationLanguageList() {
+    return context.read<GlobalProvider>().chosenLang.map((e) {
+      return context.read<GlobalProvider>().langToCode(e) as String;
+    }).toList();
+  }
+
+  _startRegistration(List<String> langList) async {
+    await context.read<RegistrationTaskProvider>().startRegistration(langList);
+  }
+
   _navigateToConsentPage() async {
     context.read<GlobalProvider>().getThresholdValues();
     context.read<GlobalProvider>().fieldDisplayValues = {};
-    context.read<GlobalProvider>().fieldValues(widget.newProcess);
+    await context.read<GlobalProvider>().fieldValues(widget.newProcess);
 
-    List<String> langList = context.read<GlobalProvider>().chosenLang.map((e) {
-      return context.read<GlobalProvider>().langToCode(e) as String;
-    }).toList();
-    await context.read<RegistrationTaskProvider>().startRegistration(langList);
+    List<String> langList = _getRegistrationLanguageList();
+    await _startRegistration(langList);
     String registrationStartError = _getRegistrationError();
     _navigateBack();
     if (registrationStartError.isEmpty) {

diff --git a/lib/ui/process_ui/widgets/new_process_screen_content.dart b/lib/ui/process_ui/widgets/new_process_screen_content.dart
@@ -51,7 +51,7 @@ class _NewProcessScreenContentState extends State<NewProcessScreenContent> {
     switch (e.controlType) {
       case "checkbox":
         if (e.subType == "gender") {
-          return ButtonControl(field: e);
+          return RadioButtonControl(field: e);
         }
         return CheckboxControl(field: e);
       case "html":

diff --git a/lib/ui/process_ui/widgets/textbox_control.dart b/lib/ui/process_ui/widgets/textbox_control.dart
@@ -117,7 +117,11 @@ class _TextBoxControlState extends State<TextBoxControl> {
                   },
                   validator: (value) {
                     if (!widget.e.required! && widget.e.requiredOn!.isEmpty) {
-                      return null;
+                      if (value == null || value.isEmpty) {
+                        return null;
+                      } else if (!widget.validation.hasMatch(value)) {
+                        return 'Invalid input';
+                      }
                     }
                     if (value == null || value.isEmpty) {
                       return 'Please enter a value';