Merge branch 'hussam' into 'development'

Fixing Clinic name in app reopening

See merge request Cloud_Solution/doctor_app_flutter!154

lib/providers/auth_provider.dart

@@ -1,6 +1,7 @@
 import 'package:doctor_app_flutter/client/base_app_client.dart';
 import 'package:doctor_app_flutter/models/doctor/clinic_model.dart';
 import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
+import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
 import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:doctor_app_flutter/config/config.dart';
@@ -14,6 +15,8 @@ class AuthProvider with ChangeNotifier {
   String selectedClinicName;
   bool isLogin = false;
   bool isLoading = true;
+  DoctorProfileModel doctorProfile;
+
   AuthProvider() {
     getUserAuthentication();
   }
@@ -21,6 +24,7 @@ class AuthProvider with ChangeNotifier {
   void getUserAuthentication() async {
     Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
     if (profile != null) {
+      doctorProfile = new DoctorProfileModel.fromJson(profile);
       isLoading = false;
       isLogin = true;
     } else {
@@ -117,7 +121,7 @@ class AuthProvider with ChangeNotifier {
         localRes = response;
         selectedClinicName =
             ClinicModel.fromJson(response['List_DoctorsClinic'][0]).clinicName;
-        notifyListeners();
+
         response['List_DoctorsClinic'].forEach((v) {
           doctorsClinicList.add(new ClinicModel.fromJson(v));
         });

lib/screens/dashboard_screen.dart

@@ -55,8 +55,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
   bool isLoading = false;
   ProjectProvider projectsProvider;
   var _isInit = true;
+  DoctorProfileModel profile;
 
-  void didChangeDependencies() {
+  void didChangeDependencies() async {
     super.didChangeDependencies();
     if (_isInit) {
       projectsProvider = Provider.of<ProjectProvider>(context);
@@ -76,6 +77,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
     authProvider = Provider.of(context);
     projectsProvider = Provider.of(context);
     FocusScopeNode currentFocus = FocusScope.of(context);
+
     if (!currentFocus.hasPrimaryFocus) {
       currentFocus.unfocus();
     }
@@ -101,7 +103,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                           child: AppText(
                             authProvider.selectedClinicName != null
                                 ? authProvider.selectedClinicName
-                                : '',
+                                : authProvider.doctorProfile.clinicDescription,
                             fontWeight: FontWeight.bold,
                             fontSize: SizeConfig.textMultiplier * 2.5,
                           ),

lib/widgets/auth/verfiy_account.dart

@@ -42,6 +42,10 @@ class _VerifyAccountState extends State<VerifyAccount> {
   AuthProvider authProv;
   bool _isInit = true;
   var model;
+  TextEditingController digit1 = TextEditingController(text: "");
+  TextEditingController digit2 = TextEditingController(text: "");
+  TextEditingController digit3 = TextEditingController(text: "");
+  TextEditingController digit4 = TextEditingController(text: "");
 
   @override
   void initState() {
@@ -103,6 +107,7 @@ class _VerifyAccountState extends State<VerifyAccount> {
                                       style: buildTextStyle(),
                                       autofocus: true,
                                       maxLength: 1,
+                                      controller: digit1,
                                       textAlign: TextAlign.center,
                                       keyboardType: TextInputType.number,
                                       decoration: buildInputDecoration(context),
@@ -126,6 +131,7 @@ class _VerifyAccountState extends State<VerifyAccount> {
                                     width: SizeConfig.realScreenWidth * 0.20,
                                     child: TextFormField(
                                         focusNode: focusD2,
+                                        controller: digit2,
                                         textInputAction: TextInputAction.next,
                                         maxLength: 1,
                                         textAlign: TextAlign.center,
@@ -153,6 +159,7 @@ class _VerifyAccountState extends State<VerifyAccount> {
                                       width: SizeConfig.realScreenWidth * 0.20,
                                       child: TextFormField(
                                           focusNode: focusD3,
+                                          controller: digit3,
                                           textInputAction: TextInputAction.next,
                                           maxLength: 1,
                                           textAlign: TextAlign.center,
@@ -179,6 +186,7 @@ class _VerifyAccountState extends State<VerifyAccount> {
                                       width: SizeConfig.realScreenWidth * 0.20,
                                       child: TextFormField(
                                           focusNode: focusD4,
+                                          controller: digit4,
                                           maxLength: 1,
                                           textAlign: TextAlign.center,
                                           style: buildTextStyle(),
@@ -246,6 +254,7 @@ class _VerifyAccountState extends State<VerifyAccount> {
     if (value.isEmpty) {
       return 'Please enter your Password';
     }
+
     return null;
   }
 
@@ -334,8 +343,9 @@ class _VerifyAccountState extends State<VerifyAccount> {
           verifyAccountFormValue['digit2'] +
           verifyAccountFormValue['digit3'] +
           verifyAccountFormValue['digit4'];
-      print(activationCode);
+
       int projectID = await sharedPref.getInt(PROJECT_ID);
+
       Map<String, dynamic> model = {
         "activationCode": activationCode,
         "DoctorID": _loggedUser['DoctorID'],
@@ -353,7 +363,6 @@ class _VerifyAccountState extends State<VerifyAccount> {
       };
 
       authProv.memberCheckActivationCodeNew(model).then((res) {
-        // changeLoadingStata(false);
         if (res['MessageStatus'] == 1) {
           sharedPref.setString(TOKEN, res['AuthenticationTokenID']);
           if (res['List_DoctorProfile'] != null) {