register issues

lib/pages/login/login.dart

@@ -8,6 +8,7 @@ import 'package:diplomaticquarterapp/locator.dart';
 import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart';
 import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart';
 import 'package:diplomaticquarterapp/models/Authentication/check_paitent_authentication_req.dart';
+import 'package:diplomaticquarterapp/models/Authentication/checkpatient_for_registration.dart';
 import 'package:diplomaticquarterapp/pages/landing/landing_page.dart';
 import 'package:diplomaticquarterapp/pages/login/confirm-login.dart';
 import 'package:diplomaticquarterapp/pages/login/login-type.dart';
@@ -39,7 +40,7 @@ class _Login extends State<Login> {
   final util = Utils();
   final nationalIDorFile = TextEditingController();
   final mobileNumberController = TextEditingController();
-  final int loginType = LoginType.loginType;
+  int loginType = LoginType.loginType;
   String mobileNo;
   String countryCode = '966';
   bool isButtonDisabled = true;
@@ -61,10 +62,12 @@ class _Login extends State<Login> {
 //    getDeviceToken();
     super.initState();
 
-    if (BASE_URL.contains("uat.")) {
-      nationalIDorFile.text = "2001273";
-      mobileNumberController.text = mobileNo = "0555416043";
-    }/* else {
+    // if (BASE_URL.contains("uat.")) {
+    //   nationalIDorFile.text = "2001273";
+    //   mobileNumberController.text = mobileNo = "0555416043";
+    // }
+    getRegisterData();
+    /* else {
       nationalIDorFile.text = "3376044";
       mobileNumberController.text = mobileNo = "0555416575";
     }*/
@@ -107,7 +110,11 @@ class _Login extends State<Login> {
                   style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.64, height: 23 / 16),
                 ),
                 SizedBox(height: 20),
-                PhoneNumberSelectorWidget(onNumberChange: (value) => {mobileNo = value, validateForm()}, onCountryChange: (value) => countryCode = value),
+                PhoneNumberSelectorWidget(
+                  onNumberChange: (value) => {mobileNo = value, validateForm()},
+                  onCountryChange: (value) => countryCode = value,
+                  mobileNo: this.mobileNo,
+                ),
                 SizedBox(height: 12),
                 Directionality(
                     textDirection: TextDirection.ltr,
@@ -375,9 +382,16 @@ class _Login extends State<Login> {
     projectViewModel.platformBridge().registerHmgGeofences();
   }
 
-// showLoader(bool isTrue) {
-//   setState(() {
-//     isLoading = isTrue;
-//   });
-// }
+  getRegisterData() async {
+    var registerData = await sharedPref.getObject(REGISTER_DATA_FOR_LOGIIN);
+
+    if (registerData != null) {
+      setState(() {
+        this.nationalIDorFile.text = registerData['PatientIdentificationID'].toString();
+        this.isButtonDisabled = false;
+        this.loginType = 1;
+        this.mobileNo = registerData['PatientMobileNumber'].toString();
+      });
+    }
+  }
 }

lib/pages/login/register.dart

@@ -5,6 +5,7 @@ import 'package:diplomaticquarterapp/models/Authentication/check_user_status_req
 import 'package:diplomaticquarterapp/models/Authentication/checkpatient_for_registration.dart';
 import 'package:diplomaticquarterapp/pages/login/confirm-login.dart';
 import 'package:diplomaticquarterapp/pages/login/login-type.dart';
+import 'package:diplomaticquarterapp/pages/login/login.dart';
 import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 import 'package:diplomaticquarterapp/uitl/app_toast.dart';
@@ -331,7 +332,9 @@ class _Register extends State<Register> {
             okText: TranslationBase.of(context).ok,
             okFunction: () {
               AlertDialogBox.closeAlertDialog(context);
-              Navigator.of(context).pop();
+
+              sharedPref.setObject(REGISTER_DATA_FOR_LOGIIN, nRequest);
+              Navigator.of(context).push(FadePage(page: Login()));
             }).showAlertDialog(context);
       } else {
         nRequest['forRegister'] = true;

lib/widgets/mobile-no/mobile_no.dart

@@ -11,11 +11,8 @@ import '../../Constants.dart';
 class PhoneNumberSelectorWidget extends StatefulWidget {
   final Function onNumberChange;
   final Function onCountryChange;
-  PhoneNumberSelectorWidget({
-    Key key,
-    this.onNumberChange,
-    this.onCountryChange,
-  }) : super(key: key);
+  final String mobileNo;
+  PhoneNumberSelectorWidget({Key key, this.onNumberChange, this.onCountryChange, this.mobileNo}) : super(key: key);
 
   @override
   _PhoneNumberSelectorWidgetState createState() {
@@ -31,6 +28,7 @@ class _PhoneNumberSelectorWidgetState extends State<PhoneNumberSelectorWidget> {
   @override
   void initState() {
     for (var element in countriesData) counties.add(Countries.fromJson(element));
+
     super.initState();
   }
 
@@ -53,7 +51,7 @@ class _PhoneNumberSelectorWidgetState extends State<PhoneNumberSelectorWidget> {
       children: [
         inputWidget(TranslationBase.of(context).country, countryName, isEnable: false, hasSelection: true),
         SizedBox(height: 12),
-        Directionality(textDirection: TextDirection.ltr, child: inputWidget(TranslationBase.of(context).phoneNumber, "5xxxxxxxx", prefix: countryCode)),
+        Directionality(textDirection: TextDirection.ltr, child: inputWidget(TranslationBase.of(context).phoneNumber, widget.mobileNo ?? "5xxxxxxxx", prefix: countryCode)),
       ],
     );
   }
@@ -252,7 +250,8 @@ class _MobileNo extends State<MobileNo> {
               Expanded(
                 flex: 4,
                 child: Container(
-                  margin: widget.margin != null ? EdgeInsets.all(widget.margin) : EdgeInsets.only(top: widget.marginTop, right: widget.marginRight, bottom: widget.marginBottom, left: widget.marginLeft),
+                  margin:
+                      widget.margin != null ? EdgeInsets.all(widget.margin) : EdgeInsets.only(top: widget.marginTop, right: widget.marginRight, bottom: widget.marginBottom, left: widget.marginLeft),
                   child: TextField(
                     controller: widget.controller,
                     keyboardType: TextInputType.number,