Merge branch 'development' into 'medical-file'

# Conflicts:
#   lib/landing_page.dart

android/app/build.gradle

@@ -44,6 +44,7 @@ android {
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+         multiDexEnabled true
     }
 
     buildTypes {
@@ -72,9 +73,10 @@ dependencies {
     implementation 'com.opentok.android:opentok-android-sdk:2.16.5'
     //permissions
     implementation 'pub.devrel:easypermissions:0.4.0'
-
+implementation 'com.google.firebase:firebase-core:9.6.1'
     //retrofit
     implementation 'com.squareup.retrofit2:retrofit:2.6.2'
     implementation 'com.squareup.retrofit2:converter-gson:2.6.2'
     implementation 'com.squareup.okhttp3:logging-interceptor:3.14.1'
+    apply plugin: 'com.google.gms.google-services'
 }

android/app/google-services.json

@@ -0,0 +1,39 @@
+{
+  "project_info": {
+    "project_number": "1008895414777",
+    "project_id": "doctorapp-9f172",
+    "storage_bucket": "doctorapp-9f172.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:1008895414777:android:d00fe21d6955c21b1f6d28",
+        "android_client_info": {
+          "package_name": "com.example.doctor_app_flutter"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "1008895414777-3mg88j5ocs5r1au7rf4sh3f4pgsri2f2.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCNncEIj8ehVUSxV89rx0x1NaWp8t1YVkw"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "1008895414777-3mg88j5ocs5r1au7rf4sh3f4pgsri2f2.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/build.gradle

@@ -8,6 +8,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.google.gms:google-services:4.3.2'
     }
 }
 

android/google-services.json

@@ -0,0 +1,39 @@
+{
+  "project_info": {
+    "project_number": "1008895414777",
+    "project_id": "doctorapp-9f172",
+    "storage_bucket": "doctorapp-9f172.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:1008895414777:android:d00fe21d6955c21b1f6d28",
+        "android_client_info": {
+          "package_name": "com.example.doctor_app_flutter"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "1008895414777-3mg88j5ocs5r1au7rf4sh3f4pgsri2f2.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCNncEIj8ehVUSxV89rx0x1NaWp8t1YVkw"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "1008895414777-3mg88j5ocs5r1au7rf4sh3f4pgsri2f2.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/gradle.properties

@@ -1,4 +1,5 @@
-org.gradle.jvmargs=-Xmx1536M
+
 android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
+org.gradle.jvmargs=-Xmx4608m

lib/client/base_app_client.dart

@@ -71,9 +71,14 @@ class BaseAppClient {
       body['SessionID'] = SESSION_ID;
       body['IsLoginForDoctorApp'] = IS_LOGIN_FOR_DOCTOR_APP;
       body['PatientOutSA'] = 0; // PATIENT_OUT_SA;
-      body['VidaAuthTokenID'] = await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
-      body['VidaRefreshTokenID'] =
-          await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
+      if (body['VidaAuthTokenID'] == null) {
+        body['VidaAuthTokenID'] =
+            await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
+      }
+      if (body['VidaRefreshTokenID'] == null) {
+        body['VidaRefreshTokenID'] =
+            await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
+      }
 
       print("URL : $url");
       print("Body : ${json.encode(body)}");

lib/config/config.dart

@@ -71,6 +71,10 @@ const CREATE_REFERRAL_PATIENT =
 const RESPONSE_PENDING_REFERRAL_PATIENT =
     'Services/DoctorApplication.svc/REST/CreateReferral';
 
+const GET_PATIENT_REFERRAL = 'Services/DoctorApplication.svc/REST/GetRefferal';
+
+const POST_UCAF = 'Services/DoctorApplication.svc/REST/PostUCAF';
+
 const GET_DOCTOR_WORKING_HOURS_TABLE =
     'Services/Doctors.svc/REST/GetDoctorWorkingHoursTable';
 
@@ -78,9 +82,13 @@ const GET_PATIENT_LAB_RESULTS =
     'Services/DoctorApplication.svc/REST/GetPatientLabResults';
 const LOGIN_URL = 'Services/Sentry.svc/REST/MemberLogIN_New';
 const INSERT_DEVICE_IMEI =
-    'Services/Sentry.svc/REST/DoctorApplication_INSERTDeviceIMEI';
+    'Services/DoctorApplication.svc/REST/DoctorApp_InsertOrUpdateDeviceDetails';
+// 'Services/Sentry.svc/REST/DoctorApplication_INSERTDeviceIMEI';
+// const SELECT_DEVICE_IMEI =
+//     'Services/Sentry.svc/REST/DoctorApplication_SELECTDeviceIMEIbyIMEI';
+
 const SELECT_DEVICE_IMEI =
-    'Services/Sentry.svc/REST/DoctorApplication_SELECTDeviceIMEIbyIMEI';
+    'Services/DoctorApplication.svc/REST/DoctorApp_GetDeviceDetailsByIMEI';
 
 const SEND_ACTIVATION_CODE_BY_OTP_NOTIFICATION_TYPE =
     'Services/Sentry.svc/REST/DoctorApplication_SendActivationCodebyOTPNotificationType';
@@ -88,6 +96,8 @@ const SEND_ACTIVATION_CODE_BY_OTP_NOTIFICATION_TYPE =
 const SEND_ACTIVATION_CODE_FOR_DOCTOR_APP =
     'Services/DoctorApplication.svc/REST/SendActivationCodeForDoctorApp';
 
+const SEND_ACTIVATION_CODE_FOR_VERIFICATION_SCREEN =
+    'Services/DoctorApplication.svc/REST/SendVerificationCode';
 const MEMBER_CHECK_ACTIVATION_CODE_NEW =
     'Services/Sentry.svc/REST/MemberCheckActivationCode_New';
 
@@ -133,6 +143,9 @@ const GET_PATIENT_ARRIVAL_LIST =
 const GET_ALLERGIES = 'Services/DoctorApplication.svc/REST/GetAllergies';
 const GET_MASTER_LOOKUP_LIST =
     'Services/DoctorApplication.svc/REST/GetMasterLookUpList';
+
+const POST_EPISODE = 'Services/DoctorApplication.svc/REST/PostEpisode';
+
 const POST_ALLERGY = 'Services/DoctorApplication.svc/REST/PostAllergies';
 const POST_HISTORY = 'Services/DoctorApplication.svc/REST/PostHistory';
 const POST_CHIEF_COMPLAINT =
@@ -173,7 +186,8 @@ const UPDATE_PROCEDURE = 'Services/DoctorApplication.svc/REST/PatchProcedure';
 const UPDATE_PRESCRIPTION =
     'Services/DoctorApplication.svc/REST/PatchPrescription';
 const SEARCH_DRUG = 'Services/DoctorApplication.svc/REST/GetMedicationList';
-
+const DRUG_TO_DRUG =
+    'Services/DoctorApplication.svc/REST/DrugToDrugInteraction';
 const GET_MEDICAL_FILE = 'Services/DoctorApplication.svc/REST/GetMedicalFile';
 
 var selectedPatientType = 1;
@@ -222,6 +236,8 @@ var SERVICES_PATIANT_HEADER_AR = [
 //******************
 
 // Colors ////// by : ibrahim
+
+var DEVICE_TOKEN = "";
 const PRIMARY_COLOR = 0xff515B5D;
 
 const TRANSACTION_NO = 0;

lib/config/localized_values.dart

@@ -295,7 +295,10 @@ const Map<String, Map<String, String>> localizedValues = {
   },
   'clinicSelect': {'en': "Select Clinic", 'ar': 'اختار عيادة'},
   'doctorSelect': {'en': "Select Doctor", 'ar': 'اختار طبيب'},
-  "empty-message": {"en": "Please enter message", "ar": "يرجى ادخال الموضوع"},
+  "empty-message": {
+    "en": "Please enter this field",
+    "ar": "يرجى ادخال هذا الحقل"
+  },
   'no-sickleve-applied': {
     'en': "No sick leave applied",
     'ar': 'لم تطبق إجازة مرضية'
@@ -536,9 +539,52 @@ const Map<String, Map<String, String>> localizedValues = {
     'en': "There is no Chief Complaint",
     'ar': "ليس هناك شكوى رئيس"
   },
-  'addAssessment': {'en': "Add ASSESSMENT", 'ar':"أضف التقييم" },
-  'assessment': {'en': "ASSESSMENT", 'ar':" التقييم" },
-  'physicalSystemExamination': {'en': "Physical/System Examination", 'ar':" الفحص البدني / النظام" },
-  'searchExamination': {'en': "Search Examination", 'ar':"فحص البحث" },
-  'addExamination': {'en': "Add Examination", 'ar':"اضافه" },
+  "more-verify": {
+    "en": "More Verification Options",
+    "ar": "المزيد من خيارات التحقق"
+  },
+  "welcome-back": {"en": "Welcome back!", "ar": "مرحبا بعودتك!"},
+  "account-info": {
+    "en": "Would you like to login with current username?",
+    "ar": "هل ترغب في تسجيل الدخول باسم المستخدم الحالي؟"
+  },
+  "another-acc": {"en": "Use Another Account", "ar": "استخدم حسابا آخر"},
+  "verify-login-with": {
+    "en": "Please choose one of the following options to verify",
+    "ar": "الرجاء اختيار احدى الخيارات التالية للتحقق من البيانات"
+  },
+  "register-user": {"en": "Register", "ar": "تسجيل"},
+  "verify-with-fingerprint": {"en": "Fingerprint", "ar": "بصمة"},
+  "verify-with-faceid": {"en": "Face ID", "ar": "معرف الوجه"},
+  "verify-with-sms": {"en": "SMS", "ar": "الرسائل القصيرة"},
+  "verify-with-whatsapp": {"en": "Whatsapp", "ar": " الواتس اب"},
+  "last-login": {"en": "LAST LOGIN AT:", "ar": "آخر تسجيل دخول"},
+  "last-login-with": {"en": "VERIFICATION TYPE:", "ar": "نوع التحقق:"},
+  "verify-fingerprint": {
+    "en":
+        "To activate the fingerprint login service, please verify data by using one of the following options.",
+    "ar":
+        "لتفعيل خدمة الدخول بالبصمة، يرجى اختيار احدى القنوات التالية للتحقق من البيانات"
+  },
+  "verification_message": {
+    "en": "Please enter the Verification Code sent to",
+    "ar": "الرجاء ادخال رمز التحقق الذي تم إرساله إلى"
+  },
+  "validation_message": {
+    "en": "The verification code expires in",
+    "ar": "تنتهي صلاحية رمز التحقق خلال"
+  },
+  'addAssessment': {'en': "Add ASSESSMENT", 'ar': "أضف التقييم"},
+  'assessment': {'en': "ASSESSMENT", 'ar': " التقييم"},
+  'physicalSystemExamination': {
+    'en': "Physical/System Examination",
+    'ar': " الفحص البدني / النظام"
+  },
+  'searchExamination': {'en': "Search Examination", 'ar': "فحص البحث"},
+  'addExamination': {'en': "Add Examination", 'ar': "اضافه"},
+  'doc': {'en': "Doc :", 'ar': " د: "},
+  'patientNoDetailErrMsg': {
+    'en': "There is no detail for this patient",
+    'ar': "لا توجد تفاصيل لهذا المريض"
+  },
 };

lib/config/shared_pref_kay.dart

@@ -10,3 +10,5 @@ final DOCTOR_PROFILE = 'doctorProfile';
 final LIVE_CARE_PATIENT = 'livecare-patient-profile';
 final LOGGED_IN_USER = 'loggedUser';
 final DASHBOARD_DATA = 'dashboard-data';
+final OTP_TYPE = 'otp-type';
+final LAST_LOGIN_USER = 'last-login-user';

lib/core/model/imei_details.dart

@@ -0,0 +1,124 @@
+class GetIMEIDetailsModel {
+  int iD;
+  String iMEI;
+  int logInTypeID;
+  bool outSA;
+  String mobile;
+  Null identificationNo;
+  int doctorID;
+  String doctorName;
+  String doctorNameN;
+  int clinicID;
+  String clinicDescription;
+  Null clinicDescriptionN;
+  int projectID;
+  String projectName;
+  String genderDescription;
+  Null genderDescriptionN;
+  String titleDescription;
+  Null titleDescriptionN;
+  Null zipCode;
+  String createdOn;
+  Null createdBy;
+  String editedOn;
+  int editedBy;
+  bool biometricEnabled;
+  Null preferredLanguage;
+  bool isActive;
+  String vidaAuthTokenID;
+  String vidaRefreshTokenID;
+
+  GetIMEIDetailsModel(
+      {this.iD,
+      this.iMEI,
+      this.logInTypeID,
+      this.outSA,
+      this.mobile,
+      this.identificationNo,
+      this.doctorID,
+      this.doctorName,
+      this.doctorNameN,
+      this.clinicID,
+      this.clinicDescription,
+      this.clinicDescriptionN,
+      this.projectID,
+      this.projectName,
+      this.genderDescription,
+      this.genderDescriptionN,
+      this.titleDescription,
+      this.titleDescriptionN,
+      this.zipCode,
+      this.createdOn,
+      this.createdBy,
+      this.editedOn,
+      this.editedBy,
+      this.biometricEnabled,
+      this.preferredLanguage,
+      this.isActive,
+      this.vidaAuthTokenID,
+      this.vidaRefreshTokenID});
+
+  GetIMEIDetailsModel.fromJson(Map<String, dynamic> json) {
+    iD = json['ID'];
+    iMEI = json['IMEI'];
+    logInTypeID = json['LogInTypeID'];
+    outSA = json['OutSA'];
+    mobile = json['Mobile'];
+    identificationNo = json['IdentificationNo'];
+    doctorID = json['DoctorID'];
+    doctorName = json['DoctorName'];
+    doctorNameN = json['DoctorNameN'];
+    clinicID = json['ClinicID'];
+    clinicDescription = json['ClinicDescription'];
+    clinicDescriptionN = json['ClinicDescriptionN'];
+    projectID = json['ProjectID'];
+    projectName = json['ProjectName'];
+    genderDescription = json['Gender_Description'];
+    genderDescriptionN = json['Gender_DescriptionN'];
+    titleDescription = json['Title_Description'];
+    titleDescriptionN = json['Title_DescriptionN'];
+    zipCode = json['ZipCode'];
+    createdOn = json['CreatedOn'];
+    createdBy = json['CreatedBy'];
+    editedOn = json['EditedOn'];
+    editedBy = json['EditedBy'];
+    biometricEnabled = json['BiometricEnabled'];
+    preferredLanguage = json['PreferredLanguage'];
+    isActive = json['IsActive'];
+    vidaAuthTokenID = json['VidaAuthTokenID'];
+    vidaRefreshTokenID = json['VidaRefreshTokenID'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['ID'] = this.iD;
+    data['IMEI'] = this.iMEI;
+    data['LogInTypeID'] = this.logInTypeID;
+    data['OutSA'] = this.outSA;
+    data['Mobile'] = this.mobile;
+    data['IdentificationNo'] = this.identificationNo;
+    data['DoctorID'] = this.doctorID;
+    data['DoctorName'] = this.doctorName;
+    data['DoctorNameN'] = this.doctorNameN;
+    data['ClinicID'] = this.clinicID;
+    data['ClinicDescription'] = this.clinicDescription;
+    data['ClinicDescriptionN'] = this.clinicDescriptionN;
+    data['ProjectID'] = this.projectID;
+    data['ProjectName'] = this.projectName;
+    data['Gender_Description'] = this.genderDescription;
+    data['Gender_DescriptionN'] = this.genderDescriptionN;
+    data['Title_Description'] = this.titleDescription;
+    data['Title_DescriptionN'] = this.titleDescriptionN;
+    data['ZipCode'] = this.zipCode;
+    data['CreatedOn'] = this.createdOn;
+    data['CreatedBy'] = this.createdBy;
+    data['EditedOn'] = this.editedOn;
+    data['EditedBy'] = this.editedBy;
+    data['BiometricEnabled'] = this.biometricEnabled;
+    data['PreferredLanguage'] = this.preferredLanguage;
+    data['IsActive'] = this.isActive;
+    data['VidaAuthTokenID'] = this.vidaAuthTokenID;
+    data['VidaRefreshTokenID'] = this.vidaRefreshTokenID;
+    return data;
+  }
+}

lib/core/model/insert_imei_model.dart

@@ -0,0 +1,140 @@
+class InsertIMEIDetailsModel {
+  String iMEI;
+  int logInTypeID;
+  Null outSA;
+  Null mobile;
+  Null identificationNo;
+  int doctorID;
+  String doctorName;
+  String doctorNameN;
+  int clinicID;
+  String clinicDescription;
+  Null clinicDescriptionN;
+  String projectName;
+  String genderDescription;
+  Null genderDescriptionN;
+  String titleDescription;
+  Null titleDescriptionN;
+  bool bioMetricEnabled;
+  Null preferredLanguage;
+  bool isActive;
+  int editedBy;
+  int projectID;
+  String tokenID;
+  int languageID;
+  String stamp;
+  String iPAdress;
+  double versionID;
+  int channel;
+  String sessionID;
+  bool isLoginForDoctorApp;
+  int patientOutSA;
+  String vidaAuthTokenID;
+  String vidaRefreshTokenID;
+
+  InsertIMEIDetailsModel(
+      {this.iMEI,
+      this.logInTypeID,
+      this.outSA,
+      this.mobile,
+      this.identificationNo,
+      this.doctorID,
+      this.doctorName,
+      this.doctorNameN,
+      this.clinicID,
+      this.clinicDescription,
+      this.clinicDescriptionN,
+      this.projectName,
+      this.genderDescription,
+      this.genderDescriptionN,
+      this.titleDescription,
+      this.titleDescriptionN,
+      this.bioMetricEnabled,
+      this.preferredLanguage,
+      this.isActive,
+      this.editedBy,
+      this.projectID,
+      this.tokenID,
+      this.languageID,
+      this.stamp,
+      this.iPAdress,
+      this.versionID,
+      this.channel,
+      this.sessionID,
+      this.isLoginForDoctorApp,
+      this.patientOutSA,
+      this.vidaAuthTokenID,
+      this.vidaRefreshTokenID});
+
+  InsertIMEIDetailsModel.fromJson(Map<String, dynamic> json) {
+    iMEI = json['IMEI'];
+    logInTypeID = json['LogInTypeID'];
+    outSA = json['OutSA'];
+    mobile = json['Mobile'];
+    identificationNo = json['IdentificationNo'];
+    doctorID = json['DoctorID'];
+    doctorName = json['DoctorName'];
+    doctorNameN = json['DoctorNameN'];
+    clinicID = json['ClinicID'];
+    clinicDescription = json['ClinicDescription'];
+    clinicDescriptionN = json['ClinicDescriptionN'];
+    projectName = json['ProjectName'];
+    genderDescription = json['GenderDescription'];
+    genderDescriptionN = json['GenderDescriptionN'];
+    titleDescription = json['TitleDescription'];
+    titleDescriptionN = json['Title_DescriptionN'];
+    bioMetricEnabled = json['BioMetricEnabled'];
+    preferredLanguage = json['PreferredLanguage'];
+    isActive = json['IsActive'];
+    editedBy = json['EditedBy'];
+    projectID = json['ProjectID'];
+    tokenID = json['TokenID'];
+    languageID = json['LanguageID'];
+    stamp = json['stamp'];
+    iPAdress = json['IPAdress'];
+    versionID = json['VersionID'];
+    channel = json['Channel'];
+    sessionID = json['SessionID'];
+    isLoginForDoctorApp = json['IsLoginForDoctorApp'];
+    patientOutSA = json['PatientOutSA'];
+    vidaAuthTokenID = json['VidaAuthTokenID'];
+    vidaRefreshTokenID = json['VidaRefreshTokenID'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['IMEI'] = this.iMEI;
+    data['LogInTypeID'] = this.logInTypeID;
+    data['OutSA'] = this.outSA;
+    data['Mobile'] = this.mobile;
+    data['IdentificationNo'] = this.identificationNo;
+    data['DoctorID'] = this.doctorID;
+    data['DoctorName'] = this.doctorName;
+    data['DoctorNameN'] = this.doctorNameN;
+    data['ClinicID'] = this.clinicID;
+    data['ClinicDescription'] = this.clinicDescription;
+    data['ClinicDescriptionN'] = this.clinicDescriptionN;
+    data['ProjectName'] = this.projectName;
+    data['GenderDescription'] = this.genderDescription;
+    data['GenderDescriptionN'] = this.genderDescriptionN;
+    data['TitleDescription'] = this.titleDescription;
+    data['Title_DescriptionN'] = this.titleDescriptionN;
+    data['BioMetricEnabled'] = this.bioMetricEnabled;
+    data['PreferredLanguage'] = this.preferredLanguage;
+    data['IsActive'] = this.isActive;
+    data['EditedBy'] = this.editedBy;
+    data['ProjectID'] = this.projectID;
+    data['TokenID'] = this.tokenID;
+    data['LanguageID'] = this.languageID;
+    data['stamp'] = this.stamp;
+    data['IPAdress'] = this.iPAdress;
+    data['VersionID'] = this.versionID;
+    data['Channel'] = this.channel;
+    data['SessionID'] = this.sessionID;
+    data['IsLoginForDoctorApp'] = this.isLoginForDoctorApp;
+    data['PatientOutSA'] = this.patientOutSA;
+    data['VidaAuthTokenID'] = this.vidaAuthTokenID;
+    data['VidaRefreshTokenID'] = this.vidaRefreshTokenID;
+    return data;
+  }
+}

lib/core/service/SOAP_service.dart

@@ -11,6 +11,7 @@ import 'package:doctor_app_flutter/models/SOAP/GetHistoryReqModel.dart';
 import 'package:doctor_app_flutter/models/SOAP/GetHistoryResModel.dart';
 import 'package:doctor_app_flutter/models/SOAP/GetPhysicalExamListResModel.dart';
 import 'package:doctor_app_flutter/models/SOAP/GetPhysicalExamReqModel.dart';
+import 'package:doctor_app_flutter/models/SOAP/PostEpisodeReqModel.dart';
 import 'package:doctor_app_flutter/models/SOAP/get_Allergies_request_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/post_allergy_request_model.dart';
@@ -31,6 +32,7 @@ class SOAPService extends LookupService {
   List<GetGetProgressNoteResModel> patientProgressNoteList  = [];
   List<GetAssessmentResModel> patientAssessmentList  = [];
 
+  int episodeID;
   Future getAllergies(GetAllergiesRequestModel getAllergiesRequestModel) async {
     await baseAppClient.post(
       GET_ALLERGIES,
@@ -48,6 +50,20 @@ class SOAPService extends LookupService {
     );
   }
 
+  Future postEpisode(PostEpisodeReqModel postEpisodeReqModel) async {
+    hasError = false;
+
+    await baseAppClient.post(POST_EPISODE,
+        onSuccess: (dynamic response, int statusCode) {
+
+          print("Success");
+          episodeID = response['EpisodeID'];
+        }, onFailure: (String error, int statusCode) {
+          hasError = true;
+          super.error = error;
+        }, body: postEpisodeReqModel.toJson());
+  }
+
   Future postAllergy(PostAllergyRequestModel postAllergyRequestModel) async {
     hasError = false;
 

lib/core/service/auth_service.dart

@@ -0,0 +1,29 @@
+import 'package:doctor_app_flutter/config/config.dart';
+import 'package:doctor_app_flutter/core/model/imei_details.dart';
+import 'package:doctor_app_flutter/core/service/base/base_service.dart';
+import 'package:doctor_app_flutter/models/dashboard/dashboard_model.dart';
+
+class AuthService extends BaseService {
+  List<GetIMEIDetailsModel> _imeiDetails = [];
+  List<GetIMEIDetailsModel> get dashboardItemsList => _imeiDetails;
+
+  Future selectDeviceImei(imei) async {
+    try {
+      // dynamic localRes;
+      await baseAppClient.post(SELECT_DEVICE_IMEI,
+          onSuccess: (dynamic response, int statusCode) {
+        _imeiDetails = [];
+        response['List_DoctorDeviceDetails'].forEach((v) {
+          _imeiDetails.add(GetIMEIDetailsModel.fromJson(v));
+        });
+      }, onFailure: (String error, int statusCode) {
+        hasError = true;
+        super.error = error;
+      }, body: {"IMEI": imei, "TokenID": "@dm!n"});
+      //return Future.value(localRes);
+    } catch (error) {
+      hasError = true;
+      super.error = error;
+    }
+  }
+}

lib/core/service/base/base_service.dart

@@ -1,4 +1,5 @@
 import 'package:doctor_app_flutter/client/base_app_client.dart';
+import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
 import 'package:doctor_app_flutter/config/config.dart';
 import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
@@ -12,7 +13,7 @@ class BaseService {
   DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
   DoctorProfileModel doctorProfile;
 
-  List<PatientArrivalEntity> patientArrivalList = [];
+  List<PatiantInformtion> patientArrivalList = [];
 
 //TODO add the user login model when we need it
   Future<DoctorProfileModel> getDoctorProfile() async {
@@ -50,7 +51,7 @@ class BaseService {
         patientArrivalList.clear();
 
         response['patientArrivalList']['entityList'].forEach((v) {
-          PatientArrivalEntity item = PatientArrivalEntity.fromJson(v);
+          PatiantInformtion item = PatiantInformtion.fromJson(v);
           patientArrivalList.add(item);
         });
       },

lib/core/service/medicine_service.dart

@@ -14,7 +14,6 @@ class MedicineService extends BaseService {
       PharmaciesItemsRequestModel();
   PharmaciesListRequestModel _listRequestModel = PharmaciesListRequestModel();
 
-
   Future getMedicineItem(String itemName) async {
     _itemsRequestModel.pHRItemName = itemName;
     await baseAppClient.post(

lib/core/service/patient-doctor-referral-service.dart

@@ -18,6 +18,7 @@ class PatientReferralService extends LookupService {
   List<dynamic> doctorsList = [];
   List<MyReferredPatientModel> listMyReferredPatientModel = [];
   List<PendingReferral> pendingReferralList = [];
+  List<PendingReferral> patientReferralList = [];
   String setupID = "0";
 
   Future getProjectsList() async {
@@ -163,6 +164,33 @@ class PatientReferralService extends LookupService {
     );
   }
 
+  Future getPatientReferral(PatiantInformtion patient) async {
+    hasError = false;
+    Map<String, dynamic> body = Map();
+    body['PatientMRN'] = patient.patientMRN;
+    body['AppointmentNo'] = patient.appointmentNo;
+
+    await baseAppClient.post(
+      GET_PATIENT_REFERRAL,
+      onSuccess: (dynamic response, int statusCode) {
+        patientReferralList.clear();
+
+        response['ReferralList']['entityList'].forEach((v) {
+          PendingReferral item = PendingReferral.fromJson(v);
+          item.isReferralDoctorSameBranch =
+              item.targetProjectId == item.sourceProjectId;
+          patientReferralList.add(item);
+        });
+      },
+      onFailure: (String error, int statusCode) {
+        patientReferralList.clear();
+        hasError = true;
+        super.error = error;
+      },
+      body: body,
+    );
+  }
+
   Future responseReferral(PendingReferral pendingReferral, bool isAccepted) async {
     hasError = false;
     DoctorProfileModel doctorProfile = await getDoctorProfile();
@@ -221,6 +249,7 @@ class PatientReferralService extends LookupService {
       CREATE_REFERRAL_PATIENT,
       onSuccess: (dynamic response, int statusCode) {
         print(response.toString());
+        print("create referral status code = ${statusCode}");
       },
       onFailure: (String error, int statusCode) {
         hasError = true;

lib/core/service/patient-vital-signs-service.dart

@@ -5,8 +5,7 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-data.dart';
 import 'package:doctor_app_flutter/models/patient/vital_sign/vital_sign_res_model.dart';
 
-class VitalSignsService extends BaseService{
-
+class VitalSignsService extends BaseService {
   List<VitalSignResModel> patientVitalSignList = [];
   List<VitalSignResModel> patientVitalSignOrderdSubList = [];
   VitalSignData patientVitalSigns;
@@ -15,16 +14,17 @@ class VitalSignsService extends BaseService{
     patientVitalSigns = null;
     hasError = false;
     Map<String, dynamic> body = Map();
-    body['PatientMRN'] = patient.patientMRN;
-    body['AppointmentNo'] = patient.appointmentNo;
-    body['EpisodeID'] = patient.episodeNo;
-
+    body['PatientMRN'] = 2954208; //patient.patientMRN;
+    body['AppointmentNo'] = "2016055308"; //patient.appointmentNo;
+    body['EpisodeID'] = 210011002; //patient.episodeNo;
     await baseAppClient.post(
       GET_PATIENT_VITAL_SIGN_DATA,
       onSuccess: (dynamic response, int statusCode) {
-        if(response['VitalSignsList'] != null){
-          if(response['VitalSignsList']['entityList'] != null && (response['VitalSignsList']['entityList'] as List).length > 0){
-            patientVitalSigns = VitalSignData.fromJson(response['VitalSignsList']['entityList'][0]);
+        if (response['VitalSignsList'] != null) {
+          if (response['VitalSignsList']['entityList'] != null &&
+              (response['VitalSignsList']['entityList'] as List).length > 0) {
+            patientVitalSigns = VitalSignData.fromJson(
+                response['VitalSignsList']['entityList'][0]);
           }
         }
       },
@@ -35,4 +35,4 @@ class VitalSignsService extends BaseService{
       body: body,
     );
   }
-}
+}

lib/core/service/prescription_service.dart

@@ -5,6 +5,9 @@ import 'package:doctor_app_flutter/core/model/post_prescrition_req_model.dart';
 import 'package:doctor_app_flutter/core/model/search_drug_model.dart';
 import 'package:doctor_app_flutter/core/model/search_drug_request_model.dart';
 import 'package:doctor_app_flutter/core/service/base/base_service.dart';
+import 'package:doctor_app_flutter/models/SOAP/GetAllergiesResModel.dart';
+import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
+import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-data.dart';
 
 class PrescriptionService extends BaseService {
   List<PrescriptionModel> _prescriptionList = List();
@@ -13,12 +16,16 @@ class PrescriptionService extends BaseService {
   List<SearchDrugModel> get drugsList => _drugsList;
   List<dynamic> doctorsList = [];
   List<dynamic> specialityList = [];
+  List<dynamic> drugToDrug = [];
 
   PrescriptionReqModel _prescriptionReqModel = PrescriptionReqModel();
   SearchDrugRequestModel _drugRequestModel = SearchDrugRequestModel(
+    //search: ["Acetaminophen"],
+    // vidaAuthTokenID:
+    // "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMDAyIiwianRpIjoiY2QwOWU3MTEtZDEwYy00NjZhLWEwNDctMjc4MDBmNmRkMTYxIiwiZW1haWwiOiIiLCJpZCI6IjEwMDIiLCJOYW1lIjoiVEVNUCAtIERPQ1RPUiIsIkVtcGxveWVlSWQiOiI0NzA5IiwiRmFjaWxpdHlHcm91cElkIjoiMDEwMjY2IiwiRmFjaWxpdHlJZCI6IjE1IiwiUGhhcmFtY3lGYWNpbGl0eUlkIjoiNTUiLCJJU19QSEFSTUFDWV9DT05ORUNURUQiOiJUcnVlIiwiRG9jdG9ySWQiOiI0NzA5IiwiU0VTU0lPTklEIjoiMjE1OTYyMDMiLCJDbGluaWNJZCI6IjEiLCJyb2xlIjpbIkhFQUQgTlVSU0VTIiwiRE9DVE9SUyIsIkhFQUQgRE9DVE9SUyIsIkFETUlOSVNUUkFUT1JTIiwiUkVDRVBUSU9OSVNUIiwiRVIgTlVSU0UiLCJJVkYgUkVDRVBUSU9OSVNUIiwiRVIgUkVDRVBUSU9OSVNUIiwiUEhBUk1BQ1kgQUNDT1VOVCBTVEFGRiIsIlBIQVJNQUNZIE5VUlNFIiwiSU5QQVRJRU5UIFBIQVJNQUNJU1QiLCJBRE1JU1NJT04gU1RBRkYiLCJBUFBST1ZBTCBTVEFGRiIsIklWRiBET0NUT1IiLCJJVkYgTlVSU0UiLCJJVkYgQ09PUkRJTkFUT1IiLCJJVkYgTEFCIFNUQUZGIiwiQ09OU0VOVCAiLCJNRURJQ0FMIFJFUE9SVCAtIFNJQ0sgTEVBVkUgTUFOQUdFUiJdLCJuYmYiOjE2MDkyNjQ2MTQsImV4cCI6MTYxMDEyODYxNCwiaWF0IjoxNjA5MjY0NjE0fQ.xCJ0jGtSFf36G8uZpdmHVoLfXDyP6e9mBpuOPSlzuio",
     search: ["Amoxicillin"],
-    vidaAuthTokenID:
-        "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMDAyIiwianRpIjoiY2QwOWU3MTEtZDEwYy00NjZhLWEwNDctMjc4MDBmNmRkMTYxIiwiZW1haWwiOiIiLCJpZCI6IjEwMDIiLCJOYW1lIjoiVEVNUCAtIERPQ1RPUiIsIkVtcGxveWVlSWQiOiI0NzA5IiwiRmFjaWxpdHlHcm91cElkIjoiMDEwMjY2IiwiRmFjaWxpdHlJZCI6IjE1IiwiUGhhcmFtY3lGYWNpbGl0eUlkIjoiNTUiLCJJU19QSEFSTUFDWV9DT05ORUNURUQiOiJUcnVlIiwiRG9jdG9ySWQiOiI0NzA5IiwiU0VTU0lPTklEIjoiMjE1OTYyMDMiLCJDbGluaWNJZCI6IjEiLCJyb2xlIjpbIkhFQUQgTlVSU0VTIiwiRE9DVE9SUyIsIkhFQUQgRE9DVE9SUyIsIkFETUlOSVNUUkFUT1JTIiwiUkVDRVBUSU9OSVNUIiwiRVIgTlVSU0UiLCJJVkYgUkVDRVBUSU9OSVNUIiwiRVIgUkVDRVBUSU9OSVNUIiwiUEhBUk1BQ1kgQUNDT1VOVCBTVEFGRiIsIlBIQVJNQUNZIE5VUlNFIiwiSU5QQVRJRU5UIFBIQVJNQUNJU1QiLCJBRE1JU1NJT04gU1RBRkYiLCJBUFBST1ZBTCBTVEFGRiIsIklWRiBET0NUT1IiLCJJVkYgTlVSU0UiLCJJVkYgQ09PUkRJTkFUT1IiLCJJVkYgTEFCIFNUQUZGIiwiQ09OU0VOVCAiLCJNRURJQ0FMIFJFUE9SVCAtIFNJQ0sgTEVBVkUgTUFOQUdFUiJdLCJuYmYiOjE2MDkyNjQ2MTQsImV4cCI6MTYxMDEyODYxNCwiaWF0IjoxNjA5MjY0NjE0fQ.xCJ0jGtSFf36G8uZpdmHVoLfXDyP6e9mBpuOPSlzuio",
+    //vidaAuthTokenID:
+    // "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMDAyIiwianRpIjoiY2QwOWU3MTEtZDEwYy00NjZhLWEwNDctMjc4MDBmNmRkMTYxIiwiZW1haWwiOiIiLCJpZCI6IjEwMDIiLCJOYW1lIjoiVEVNUCAtIERPQ1RPUiIsIkVtcGxveWVlSWQiOiI0NzA5IiwiRmFjaWxpdHlHcm91cElkIjoiMDEwMjY2IiwiRmFjaWxpdHlJZCI6IjE1IiwiUGhhcmFtY3lGYWNpbGl0eUlkIjoiNTUiLCJJU19QSEFSTUFDWV9DT05ORUNURUQiOiJUcnVlIiwiRG9jdG9ySWQiOiI0NzA5IiwiU0VTU0lPTklEIjoiMjE1OTYyMDMiLCJDbGluaWNJZCI6IjEiLCJyb2xlIjpbIkhFQUQgTlVSU0VTIiwiRE9DVE9SUyIsIkhFQUQgRE9DVE9SUyIsIkFETUlOSVNUUkFUT1JTIiwiUkVDRVBUSU9OSVNUIiwiRVIgTlVSU0UiLCJJVkYgUkVDRVBUSU9OSVNUIiwiRVIgUkVDRVBUSU9OSVNUIiwiUEhBUk1BQ1kgQUNDT1VOVCBTVEFGRiIsIlBIQVJNQUNZIE5VUlNFIiwiSU5QQVRJRU5UIFBIQVJNQUNJU1QiLCJBRE1JU1NJT04gU1RBRkYiLCJBUFBST1ZBTCBTVEFGRiIsIklWRiBET0NUT1IiLCJJVkYgTlVSU0UiLCJJVkYgQ09PUkRJTkFUT1IiLCJJVkYgTEFCIFNUQUZGIiwiQ09OU0VOVCAiLCJNRURJQ0FMIFJFUE9SVCAtIFNJQ0sgTEVBVkUgTUFOQUdFUiJdLCJuYmYiOjE2MDkyNjQ2MTQsImV4cCI6MTYxMDEyODYxNCwiaWF0IjoxNjA5MjY0NjE0fQ.xCJ0jGtSFf36G8uZpdmHVoLfXDyP6e9mBpuOPSlzuio",
   );
 
   PostPrescriptionReqModel _postPrescriptionReqModel =
@@ -84,4 +91,18 @@ class PrescriptionService extends BaseService {
       body: updatePrescriptionReqModel.toJson(),
     );
   }
+
+  Future getDrugToDrug(
+      VitalSignData vital, List<GetAllergiesResModel> allergy) async {
+    hasError = false;
+    var request = {};
+    await baseAppClient.post(DRUG_TO_DRUG,
+        onSuccess: (dynamic response, int statusCode) {
+      drugToDrug = [];
+      //drugToDrug = //response['MedicationList']['entityList'];
+    }, onFailure: (String error, int statusCode) {
+      hasError = true;
+      super.error = error;
+    }, body: _drugRequestModel.toJson());
+  }
 }

lib/core/viewModel/SOAP_view_model.dart

@@ -13,6 +13,7 @@ import 'package:doctor_app_flutter/models/SOAP/GetHistoryReqModel.dart';
 import 'package:doctor_app_flutter/models/SOAP/GetHistoryResModel.dart';
 import 'package:doctor_app_flutter/models/SOAP/GetPhysicalExamListResModel.dart';
 import 'package:doctor_app_flutter/models/SOAP/GetPhysicalExamReqModel.dart';
+import 'package:doctor_app_flutter/models/SOAP/PostEpisodeReqModel.dart';
 import 'package:doctor_app_flutter/models/SOAP/get_Allergies_request_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
 import 'package:doctor_app_flutter/models/SOAP/post_allergy_request_model.dart';
@@ -78,6 +79,8 @@ class SOAPViewModel extends BaseViewModel {
 
   List<GetAssessmentResModel> get patientAssessmentList =>
       _SOAPService.patientAssessmentList;
+  int get episodeID =>
+      _SOAPService.episodeID;
 
   Future getAllergies(GetAllergiesRequestModel getAllergiesRequestModel) async {
     setState(ViewState.Busy);
@@ -99,6 +102,17 @@ class SOAPViewModel extends BaseViewModel {
       setState(ViewState.Idle);
   }
 
+
+  Future postEpisode(PostEpisodeReqModel postEpisodeReqModel) async {
+    setState(ViewState.BusyLocal);
+    await _SOAPService.postEpisode(postEpisodeReqModel);
+    if (_SOAPService.hasError) {
+      error = _SOAPService.error;
+      setState(ViewState.ErrorLocal);
+    } else
+      setState(ViewState.Idle);
+  }
+
   Future postAllergy(PostAllergyRequestModel postAllergyRequestModel) async {
     setState(ViewState.BusyLocal);
     await _SOAPService.postAllergy(postAllergyRequestModel);
@@ -222,6 +236,7 @@ class SOAPViewModel extends BaseViewModel {
 
 
   Future getPatientAllergy(GeneralGetReqForSOAP generalGetReqForSOAP) async {
+
     setState(ViewState.Busy);
     await _SOAPService.getPatientAllergy(generalGetReqForSOAP);
     if (_SOAPService.hasError) {
@@ -231,6 +246,14 @@ class SOAPViewModel extends BaseViewModel {
       setState(ViewState.Idle);
   }
 
+  String getAllergicNames(){
+    String allergiesString='';
+    patientAllergiesList.forEach((element) {
+      allergiesString += element.allergyDiseaseName+' , ';
+    });
+    return allergiesString;
+  }
+
   Future getPatientHistories(GetHistoryReqModel getHistoryReqModel, {bool isFirst =  false}) async {
     setState(ViewState.Busy);
     await _SOAPService.getPatientHistories(getHistoryReqModel, isFirst: isFirst);

lib/core/viewModel/auth_view_model.dart

@@ -1,6 +1,13 @@
 import 'package:doctor_app_flutter/client/base_app_client.dart';
+import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/model/imei_details.dart';
+import 'package:doctor_app_flutter/core/model/insert_imei_model.dart';
+import 'package:doctor_app_flutter/core/service/auth_service.dart';
+import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart';
+import 'package:doctor_app_flutter/locator.dart';
 import 'package:doctor_app_flutter/models/auth/activation_Code_req_model.dart';
 import 'package:doctor_app_flutter/models/auth/check_activation_code_request_model.dart';
+import 'package:doctor_app_flutter/models/auth/send_activation_code_model2.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';
@@ -12,8 +19,9 @@ import '../../models/doctor/user_model.dart';
 DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
 enum APP_STATUS { LOADING, UNAUTHENTICATED, AUTHENTICATED }
 
-class AuthViewModel with ChangeNotifier {
+class AuthViewModel extends BaseViewModel {
   List<ClinicModel> doctorsClinicList = [];
+
   String selectedClinicName;
   bool isLogin = false;
   bool isLoading = true;
@@ -71,35 +79,31 @@ class AuthViewModel with ChangeNotifier {
     }
   }
 
-  Future<dynamic> insertDeviceImei(imei) async {
+  Future insertDeviceImei(request) async {
+    var loggedIn = await sharedPref.getObj(LOGGED_IN_USER);
+
+    request['IMEI'] = DEVICE_TOKEN;
+    request['LogInTypeID'] = await sharedPref.getInt(OTP_TYPE);
+    request['BioMetricEnabled'] = true;
+    request['MobileNo'] = loggedIn['MobileNumber'];
+    InsertIMEIDetailsModel nRequest = InsertIMEIDetailsModel.fromJson(request);
+    nRequest.genderDescription = request['Gender_Description'];
+    nRequest.genderDescriptionN = request['Gender_DescriptionN'];
+    nRequest.genderDescriptionN = request['Gender_DescriptionN'];
+    nRequest.titleDescription = request['Title_Description'];
+    nRequest.titleDescriptionN = request['Title_DescriptionN'];
+    nRequest.projectID = await sharedPref.getInt(PROJECT_ID);
+    nRequest.vidaAuthTokenID = await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
+    nRequest.vidaRefreshTokenID =
+        await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
     try {
-      dynamic localRes;
-
+      var localRes;
       await baseAppClient.post(INSERT_DEVICE_IMEI,
           onSuccess: (dynamic response, int statusCode) {
         localRes = response;
-      }, onFailure: (String error, int statusCode) {
-        throw error;
-      }, body: imei);
-      return Future.value(localRes);
-    } catch (error) {
-      print(error);
-      throw error;
-    }
-  }
-
-  Future<dynamic> selectDeviceImei(imei) async {
-    try {
-      dynamic localRes;
-      await baseAppClient.post(SELECT_DEVICE_IMEI,
-          onSuccess: (dynamic response, int statusCode) {
-        localRes = response;
-      }, onFailure: (String error, int statusCode) {
-        throw error;
-      }, body: imei);
+      }, onFailure: (String error, int statusCode) {}, body: nRequest.toJson());
       return Future.value(localRes);
     } catch (error) {
-      print(error);
       throw error;
     }
   }
@@ -120,7 +124,8 @@ class AuthViewModel with ChangeNotifier {
     }
   }
 
-  Future sendActivationCodeForDoctorApp(ActivationCodeModel activationCodeModel) async {
+  Future sendActivationCodeForDoctorApp(
+      ActivationCodeModel activationCodeModel) async {
     try {
       var localRes;
       await baseAppClient.post(SEND_ACTIVATION_CODE_FOR_DOCTOR_APP,
@@ -158,22 +163,22 @@ class AuthViewModel with ChangeNotifier {
     }
   }
 
-
-  Future<dynamic> checkActivationCodeForDoctorApp(CheckActivationCodeRequestModel checkActivationCodeRequestModel) async {
+  Future<dynamic> checkActivationCodeForDoctorApp(
+      CheckActivationCodeRequestModel checkActivationCodeRequestModel) async {
     try {
       dynamic localRes;
       await baseAppClient.post(CHECK_ACTIVATION_CODE_FOR_DOCTOR_APP,
           onSuccess: (dynamic response, int statusCode) {
-            localRes = response;
-            selectedClinicName =
-                ClinicModel.fromJson(response['List_DoctorsClinic'][0]).clinicName;
-
-            response['List_DoctorsClinic'].forEach((v) {
-              doctorsClinicList.add(new ClinicModel.fromJson(v));
-            });
-          }, onFailure: (String error, int statusCode) {
-            throw error;
-          }, body: checkActivationCodeRequestModel.toJson());
+        localRes = response;
+        selectedClinicName =
+            ClinicModel.fromJson(response['List_DoctorsClinic'][0]).clinicName;
+
+        response['List_DoctorsClinic'].forEach((v) {
+          doctorsClinicList.add(new ClinicModel.fromJson(v));
+        });
+      }, onFailure: (String error, int statusCode) {
+        throw error;
+      }, body: checkActivationCodeRequestModel.toJson());
       return Future.value(localRes);
     } catch (error) {
       print(error);
@@ -208,4 +213,21 @@ class AuthViewModel with ChangeNotifier {
       throw error;
     }
   }
+
+  Future sendActivationCodeVerificationScreen(
+      ActivationCodeModel2 activationCodeModel) async {
+    try {
+      var localRes;
+      await baseAppClient.post(SEND_ACTIVATION_CODE_FOR_VERIFICATION_SCREEN,
+          onSuccess: (dynamic response, int statusCode) {
+        localRes = response;
+      }, onFailure: (String error, int statusCode) {
+        throw error;
+      }, body: activationCodeModel.toJson());
+      return Future.value(localRes);
+    } catch (error) {
+      print(error);
+      throw error;
+    }
+  }
 }

lib/core/viewModel/imei_view_model.dart

@@ -0,0 +1,21 @@
+import 'package:doctor_app_flutter/client/base_app_client.dart';
+import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/model/imei_details.dart';
+import 'package:doctor_app_flutter/core/service/auth_service.dart';
+import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart';
+import 'package:doctor_app_flutter/locator.dart';
+
+class IMEIViewModel extends BaseViewModel {
+  AuthService _authService = locator<AuthService>();
+  List<GetIMEIDetailsModel> get imeiDetails => _authService.dashboardItemsList;
+
+  Future selectDeviceImei(imei) async {
+    setState(ViewState.Busy);
+    await _authService.selectDeviceImei(imei);
+    if (_authService.hasError) {
+      error = _authService.error;
+      setState(ViewState.Error);
+    } else
+      setState(ViewState.Idle);
+  }
+}

lib/core/viewModel/patient-referral-viewmodel.dart

@@ -27,9 +27,27 @@ class PatientReferralViewModel extends BaseViewModel {
   List<PendingReferral> get pendingReferral =>
       _referralPatientService.pendingReferralList;
 
-  List<PatientArrivalEntity> get patientArrivalList =>
+  List<PendingReferral> get patientReferral =>
+      _referralPatientService.patientReferralList;
+
+  List<PatiantInformtion> get patientArrivalList =>
       _referralPatientService.patientArrivalList;
 
+  Future getPatientReferral(PatiantInformtion patient) async {
+    setState(ViewState.Busy);
+    await _referralPatientService.getPatientReferral(patient);
+    if (_referralPatientService.hasError) {
+      error = _referralPatientService.error;
+      setState(ViewState.Error);
+    } else {
+      if(patientReferral.length == 0){
+       await getMasterLookup(MasterKeysService.physiotherapyGoals);
+      } else {
+        setState(ViewState.Idle);
+      }
+    }
+  }
+
   Future getMasterLookup(MasterKeysService masterKeys) async {
     setState(ViewState.Busy);
     await _referralPatientService.getMasterLookup(masterKeys);
@@ -37,7 +55,7 @@ class PatientReferralViewModel extends BaseViewModel {
       error = _referralPatientService.error;
       setState(ViewState.Error);
     } else
-    await getBranches();
+      await getBranches();
   }
 
   Future getBranches() async {

lib/core/viewModel/patient-vital-sign-viewmodel.dart

@@ -11,9 +11,6 @@ import '../../locator.dart';
 class VitalSignsViewModel extends BaseViewModel {
   VitalSignsService _vitalSignService = locator<VitalSignsService>();
 
-  List<PatientArrivalEntity> get patientArrivalList =>
-      _vitalSignService.patientArrivalList;
-
   VitalSignData get patientVitalSigns => _vitalSignService.patientVitalSigns;
 
   Future getPatientVitalSign(PatiantInformtion patient) async {

lib/core/viewModel/prescription_view_model.dart

@@ -5,6 +5,9 @@ import 'package:doctor_app_flutter/core/model/search_drug_model.dart';
 import 'package:doctor_app_flutter/core/service/prescription_service.dart';
 import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart';
 import 'package:doctor_app_flutter/locator.dart';
+import 'package:doctor_app_flutter/models/SOAP/GetAllergiesResModel.dart';
+import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart';
+import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-data.dart';
 
 class PrescriptionViewModel extends BaseViewModel {
   bool hasError = false;
@@ -67,4 +70,16 @@ class PrescriptionViewModel extends BaseViewModel {
     } else
       setState(ViewState.Idle);
   }
+
+  Future getDrugToDrug(
+      VitalSignData vital, List<GetAllergiesResModel> allergy) async {
+    hasError = false;
+    setState(ViewState.Busy);
+    await _prescriptionService.getDrugToDrug(vital, allergy);
+    if (_prescriptionService.hasError) {
+      error = _prescriptionService.error;
+      setState(ViewState.ErrorLocal);
+    } else
+      setState(ViewState.Idle);
+  }
 }

lib/core/viewModel/project_view_model.dart

@@ -24,6 +24,7 @@ class ProjectViewModel with ChangeNotifier {
   List<ClinicModel> doctorClinicsList = [];
   bool isLoading = false;
   bool isError = false;
+  bool isLogin = false;
   String error = '';
   BaseAppClient baseAppClient = BaseAppClient();
 
@@ -56,7 +57,9 @@ class ProjectViewModel with ChangeNotifier {
     currentLanguage = await sharedPref.getString(APP_Language);
     _appLocale = Locale(currentLanguage ?? 'en');
     _isArabic = currentLanguage != null
-        ? currentLanguage == 'ar' ? true : false
+        ? currentLanguage == 'ar'
+            ? true
+            : false
         : false;
     notifyListeners();
   }
@@ -69,7 +72,7 @@ class ProjectViewModel with ChangeNotifier {
       sharedPref.setString(APP_Language, 'ar');
     } else if (lan != "ar" && currentLanguage != lan) {
       _appLocale = Locale("en");
-      _isArabic   = false;
+      _isArabic = false;
       currentLanguage = 'en';
       sharedPref.setString(APP_Language, 'en');
     }

lib/landing_page.dart

@@ -64,10 +64,9 @@ class _LandingPageState extends State<LandingPage> {
           ShowCaseWidget(
             builder: Builder(builder: (context) => DashboardScreen()),
           ),
-          MessagesScreen(),
+          // MessagesScreen(),
           MyScheduleScreen(),
-          //NewPrescriptionScreen(),
-          ServicesScreen()
+          // ServicesScreen()
         ],
       ),
       bottomNavigationBar: BottomNavBar(changeIndex: _changeCurrentTab),

lib/locator.dart

@@ -1,10 +1,13 @@
+import 'package:doctor_app_flutter/core/service/auth_service.dart';
 import 'package:doctor_app_flutter/core/service/dasboard_service.dart';
 import 'package:doctor_app_flutter/core/service/medical_file_service.dart';
 import 'package:doctor_app_flutter/core/service/patient_service.dart';
 import 'package:doctor_app_flutter/core/service/prescription_service.dart';
 import 'package:doctor_app_flutter/core/service/procedure_service.dart';
 import 'package:doctor_app_flutter/core/service/sickleave_service.dart';
+import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart';
+import 'package:doctor_app_flutter/core/viewModel/imei_view_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/medical_file_view_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/prescription_view_model.dart';
@@ -54,9 +57,11 @@ void setupLocator() {
   locator.registerLazySingleton(() => MedicalFileService());
   locator.registerLazySingleton(() => AdmissionRequestService());
   locator.registerLazySingleton(() => UcafService());
+  locator.registerLazySingleton(() => AuthService());
 
   /// View Model
   locator.registerFactory(() => DoctorReplayViewModel());
+  locator.registerFactory(() => IMEIViewModel());
   locator.registerFactory(() => ScheduleViewModel());
   locator.registerFactory(() => ReferralPatientViewModel());
   locator.registerFactory(() => ReferredPatientViewModel());

lib/main.dart

@@ -41,32 +41,31 @@ class MyApp extends StatelessWidget {
               ),
             ],
             child: Consumer<ProjectViewModel>(
-              builder: (context,projectProvider,child) => MaterialApp(
-                showSemanticsDebugger: false,
-                title: 'Flutter Demo',
-                locale: projectProvider.appLocal,
-                localizationsDelegates: [
-                  TranslationBaseDelegate(),
-                  GlobalMaterialLocalizations.delegate,
-                  GlobalWidgetsLocalizations.delegate,
-                ],
-                supportedLocales: [
-                  const Locale('ar', ''), // Arabic
-                  const Locale('en', ''), // English
-                ],
-                theme: ThemeData(
-                  primarySwatch: Colors.grey,
-                  primaryColor: Colors.grey,
-                  buttonColor: HexColor('#B8382C'),
-                  fontFamily: 'WorkSans',
-                  dividerColor: Colors.grey[350],
-                  backgroundColor:  Color.fromRGBO(255,255,255, 1),
-                ),
-                initialRoute: INIT_ROUTE,
-                routes: routes,
-                debugShowCheckedModeBanner: false,
-              )
-            ),
+                builder: (context, projectProvider, child) => MaterialApp(
+                      showSemanticsDebugger: false,
+                      title: 'Flutter Demo',
+                      locale: projectProvider.appLocal,
+                      localizationsDelegates: [
+                        TranslationBaseDelegate(),
+                        GlobalMaterialLocalizations.delegate,
+                        GlobalWidgetsLocalizations.delegate,
+                      ],
+                      supportedLocales: [
+                        const Locale('ar', ''), // Arabic
+                        const Locale('en', ''), // English
+                      ],
+                      theme: ThemeData(
+                        primarySwatch: Colors.grey,
+                        primaryColor: Colors.grey,
+                        buttonColor: HexColor('#B8382C'),
+                        fontFamily: 'WorkSans',
+                        dividerColor: Colors.grey[350],
+                        backgroundColor: Color.fromRGBO(255, 255, 255, 1),
+                      ),
+                      initialRoute: INIT_ROUTE,
+                      routes: routes,
+                      debugShowCheckedModeBanner: false,
+                    )),
           );
         });
       },

lib/models/SOAP/PostEpisodeReqModel.dart

@@ -0,0 +1,28 @@
+class PostEpisodeReqModel {
+  int appointmentNo;
+  int patientMRN;
+  int doctorID;
+  String vidaAuthTokenID;
+
+  PostEpisodeReqModel(
+      {this.appointmentNo,
+        this.patientMRN,
+        this.doctorID,
+        this.vidaAuthTokenID});
+
+  PostEpisodeReqModel.fromJson(Map<String, dynamic> json) {
+    appointmentNo = json['AppointmentNo'];
+    patientMRN = json['PatientMRN'];
+    doctorID = json['DoctorID'];
+    vidaAuthTokenID = json['VidaAuthTokenID'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['AppointmentNo'] = this.appointmentNo;
+    data['PatientMRN'] = this.patientMRN;
+    data['DoctorID'] = this.doctorID;
+    data['VidaAuthTokenID'] = this.vidaAuthTokenID;
+    return data;
+  }
+}

lib/models/auth/activation_Code_req_model.dart

@@ -8,17 +8,18 @@ class ActivationCodeModel {
   String password;
   int facilityId;
   String generalid;
-
+  String otpSendType;
   ActivationCodeModel(
       {this.mobileNumber,
-        this.zipCode,
-        this.channel,
-        this.languageID,
-        this.versionID,
-        this.memberID,
-        this.password,
-        this.facilityId,
-        this.generalid});
+      this.zipCode,
+      this.channel,
+      this.languageID,
+      this.versionID,
+      this.memberID,
+      this.password,
+      this.facilityId,
+      this.otpSendType,
+      this.generalid});
 
   ActivationCodeModel.fromJson(Map<String, dynamic> json) {
     mobileNumber = json['MobileNumber'];
@@ -29,6 +30,7 @@ class ActivationCodeModel {
     memberID = json['MemberID'];
     password = json['Password'];
     facilityId = json['facilityId'];
+    otpSendType = json['OTP_SendType'];
     generalid = json['generalid'];
   }
 
@@ -42,6 +44,7 @@ class ActivationCodeModel {
     data['MemberID'] = this.memberID;
     data['Password'] = this.password;
     data['facilityId'] = this.facilityId;
+    data['OTP_SendType'] = otpSendType;
     data['generalid'] = this.generalid;
     return data;
   }

lib/models/auth/check_activation_code_request_model.dart

@@ -12,21 +12,22 @@ class CheckActivationCodeRequestModel {
   String activationCode;
   String vidaAuthTokenID;
   String vidaRefreshTokenID;
-
+  int oTPSendType;
   CheckActivationCodeRequestModel(
       {this.mobileNumber,
-        this.zipCode,
-        this.doctorID,
-        this.iPAdress,
-        this.channel,
-        this.languageID,
-        this.projectID,
-        this.versionID,
-        this.generalid,
-        this.logInTokenID,
-        this.activationCode,
-        this.vidaAuthTokenID,
-        this.vidaRefreshTokenID});
+      this.zipCode,
+      this.doctorID,
+      this.iPAdress,
+      this.channel,
+      this.languageID,
+      this.projectID,
+      this.versionID,
+      this.generalid,
+      this.logInTokenID,
+      this.activationCode,
+      this.vidaAuthTokenID,
+      this.vidaRefreshTokenID,
+      this.oTPSendType});
 
   CheckActivationCodeRequestModel.fromJson(Map<String, dynamic> json) {
     mobileNumber = json['MobileNumber'];
@@ -42,6 +43,7 @@ class CheckActivationCodeRequestModel {
     activationCode = json['activationCode'];
     vidaAuthTokenID = json['VidaAuthTokenID'];
     vidaRefreshTokenID = json['VidaRefreshTokenID'];
+    oTPSendType = json['OTP_SendType'];
   }
 
   Map<String, dynamic> toJson() {
@@ -59,6 +61,7 @@ class CheckActivationCodeRequestModel {
     data['activationCode'] = this.activationCode;
     data['VidaAuthTokenID'] = this.vidaAuthTokenID;
     data['VidaRefreshTokenID'] = this.vidaRefreshTokenID;
+    data['OTP_SendType'] = this.oTPSendType;
     return data;
   }
 }

lib/models/auth/send_activation_code_model2.dart

@@ -0,0 +1,60 @@
+class ActivationCodeModel2 {
+  int oTPSendType;
+  String mobileNumber;
+  String zipCode;
+  int channel;
+  int languageID;
+  double versionID;
+  int memberID;
+  int facilityId;
+  String generalid;
+  int isMobileFingerPrint;
+  String vidaAuthTokenID;
+  String vidaRefreshTokenID;
+
+  ActivationCodeModel2(
+      {this.oTPSendType,
+      this.mobileNumber,
+      this.zipCode,
+      this.channel,
+      this.languageID,
+      this.versionID,
+      this.memberID,
+      this.facilityId,
+      this.generalid,
+      this.isMobileFingerPrint,
+      this.vidaAuthTokenID,
+      this.vidaRefreshTokenID});
+
+  ActivationCodeModel2.fromJson(Map<String, dynamic> json) {
+    oTPSendType = json['OTP_SendType'];
+    mobileNumber = json['MobileNumber'];
+    zipCode = json['ZipCode'];
+    channel = json['Channel'];
+    languageID = json['LanguageID'];
+    versionID = json['VersionID'];
+    memberID = json['MemberID'];
+    facilityId = json['facilityId'];
+    generalid = json['generalid'];
+    isMobileFingerPrint = json['IsMobileFingerPrint'];
+    vidaAuthTokenID = json['VidaAuthTokenID'];
+    vidaRefreshTokenID = json['VidaRefreshTokenID'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['OTP_SendType'] = this.oTPSendType;
+    data['MobileNumber'] = this.mobileNumber;
+    data['ZipCode'] = this.zipCode;
+    data['Channel'] = this.channel;
+    data['LanguageID'] = this.languageID;
+    data['VersionID'] = this.versionID;
+    data['MemberID'] = this.memberID;
+    data['facilityId'] = this.facilityId;
+    data['generalid'] = this.generalid;
+    data['IsMobileFingerPrint'] = this.isMobileFingerPrint;
+    data['VidaAuthTokenID'] = this.vidaAuthTokenID;
+    data['VidaRefreshTokenID'] = this.vidaRefreshTokenID;
+    return data;
+  }
+}

lib/screens/auth/login_screen.dart

@@ -1,7 +1,17 @@
 import 'dart:async';
+import 'dart:io';
 
 import 'package:doctor_app_flutter/config/config.dart';
+import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
+import 'package:doctor_app_flutter/core/service/auth_service.dart';
+import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart';
+import 'package:doctor_app_flutter/core/viewModel/imei_view_model.dart';
+import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
+import 'package:doctor_app_flutter/screens/auth/verification_methods_screen.dart';
+import 'package:doctor_app_flutter/screens/base/base_view.dart';
+import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../../lookups/auth_lookup.dart';
@@ -23,21 +33,48 @@ class _LoginsreenState extends State<Loginsreen> {
   Future<SharedPreferences> _prefs = SharedPreferences.getInstance();
 
   String platformImei;
-  Future<String> platformImeiFuture;
-
-  bool _isLoading = false;
-
-  Future<void> getSharedPref() async {
-    sharedPref.getString('platformImei').then((imei) {
-      platformImei = imei;
-    });
-  }
-
+  // Future<String> platformImeiFuture;
+  final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
+  bool _isLoading = true;
+  ProjectViewModel projectViewModel;
+  AuthService authService = AuthService();
   @override
   void initState() {
     super.initState();
-    platformImeiFuture = _prefs.then((SharedPreferences prefs) {
-      return (prefs.getString('platformImei'));
+
+    _firebaseMessaging.setAutoInitEnabled(true);
+    if (Platform.isIOS) {
+      _firebaseMessaging.requestNotificationPermissions();
+    }
+
+    _firebaseMessaging.getToken().then((String token) async {
+      if (DEVICE_TOKEN == "" && projectViewModel.isLogin == false) {
+        DEVICE_TOKEN = token;
+        changeLoadingStata(true);
+        authService.selectDeviceImei(DEVICE_TOKEN).then((value) {
+          print(authService.dashboardItemsList);
+
+          if (authService.dashboardItemsList.length > 0) {
+            sharedPref.setObj(
+                LAST_LOGIN_USER, authService.dashboardItemsList[0]);
+            Navigator.of(context).pushReplacement(MaterialPageRoute(
+                builder: (BuildContext context) => VerificationMethodsScreen(
+                      password: null,
+                    )));
+          } else {
+            changeLoadingStata(false);
+          }
+          //changeLoadingStata(false);
+        });
+      } else {
+        changeLoadingStata(false);
+      }
+
+      // else if (projectViewModel.isLogin) {
+      //   getNotificationCount(token);
+      // }
+    }).catchError((err) {
+      print(err);
     });
   }
 
@@ -56,54 +93,46 @@ class _LoginsreenState extends State<Loginsreen> {
 
   @override
   Widget build(BuildContext context) {
-    getSharedPref();
-    return AppScaffold(
-      isLoading: _isLoading,
-      isShowAppBar: false,
-      body: SafeArea(
-        child: ListView(children: <Widget>[
-          FutureBuilder(
-              future: platformImeiFuture,
-              builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
-                switch (snapshot.connectionState) {
-                  case ConnectionState.waiting:
-                    return DrAppCircularProgressIndeicator();
-                  default:
-                    if (snapshot.hasError) {
-                      return Text('Error: ${snapshot.error}');
-                    } else {
-                      return Container(
-                          margin: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 30),
-                          alignment: Alignment.topLeft,
-                          child: Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: <Widget>[
-                                (platformImei == null)
-                                    ? Column(
-                                        crossAxisAlignment:
-                                            CrossAxisAlignment.start,
-                                        children: <Widget>[
-                                          AuthHeader(loginType.knownUser),
-                                          LoginForm(
-                                            changeLoadingStata:
-                                                changeLoadingStata,
-                                          ),
-                                        ],
-                                      )
-                                    : Column(
-                                        crossAxisAlignment:
-                                            CrossAxisAlignment.start,
-                                        children: <Widget>[
-                                          AuthHeader(loginType.unknownUser),
-                                          KnownUserLogin(),
-                                        ],
+    projectViewModel = Provider.of<ProjectViewModel>(context);
+
+    return BaseView<IMEIViewModel>(
+        onModelReady: (model) => {},
+        builder: (_, model, w) => AppScaffold(
+              baseViewModel: model,
+              isShowAppBar: false,
+              body: SafeArea(
+                child: (_isLoading == false)
+                    ? ListView(children: <Widget>[
+                        Container(
+                            margin:
+                                EdgeInsetsDirectional.fromSTEB(30, 0, 30, 30),
+                            alignment: Alignment.topLeft,
+                            child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: <Widget>[
+                                  Column(
+                                    crossAxisAlignment:
+                                        CrossAxisAlignment.start,
+                                    children: <Widget>[
+                                      AuthHeader(loginType.knownUser),
+                                      LoginForm(
+                                        changeLoadingStata: changeLoadingStata,
                                       ),
-                              ]));
-                    }
-                }
-              }),
-        ]),
-      ),
-    );
+                                    ],
+                                  )
+
+                                  // : Column(
+                                  //     crossAxisAlignment:
+                                  //         CrossAxisAlignment.start,
+                                  //     children: <Widget>[
+                                  //       AuthHeader(loginType.unknownUser),
+                                  //       KnownUserLogin(),
+                                  //     ],
+                                  //   ),
+                                ]))
+                      ])
+                    : Center(child: CircularProgressIndicator()),
+              ),
+            ));
   }
 }

lib/screens/auth/verification_methods_screen.dart

@@ -42,7 +42,7 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
   Widget build(BuildContext context) {
     return AppScaffold(
         isLoading: _isLoading,
-         isShowAppBar: false,
+        isShowAppBar: false,
         body: ListView(children: <Widget>[
           Container(
             margin: EdgeInsetsDirectional.fromSTEB(30, 0, 30, 0),

lib/screens/dashboard_screen.dart

@@ -1,3 +1,4 @@
+import 'package:doctor_app_flutter/config/config.dart';
 import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
 import 'package:doctor_app_flutter/config/size_config.dart';
 import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart';
@@ -9,14 +10,17 @@ import 'package:doctor_app_flutter/models/doctor/profile_req_Model.dart';
 import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/hospital_view_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
+import 'package:doctor_app_flutter/models/patient/patient_model.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
 import 'package:doctor_app_flutter/screens/patients/profile/referral/my-referral-patient-screen.dart';
 import 'package:doctor_app_flutter/screens/reschedule-leaves/add-rescheduleleave.dart';
+import 'package:doctor_app_flutter/util/date-utils.dart';
 import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
 import 'package:doctor_app_flutter/util/helpers.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:doctor_app_flutter/widgets/patients/profile/profile-welcome-widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
+import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:hexcolor/hexcolor.dart';
@@ -45,6 +49,7 @@ class DashboardScreen extends StatefulWidget {
 }
 
 class _DashboardScreenState extends State<DashboardScreen> {
+  final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
   HospitalViewModel hospitalProvider;
   AuthViewModel authProvider;
   bool isLoading = false;
@@ -58,6 +63,18 @@ class _DashboardScreenState extends State<DashboardScreen> {
     if (_isInit) {
       projectsProvider = Provider.of<ProjectViewModel>(context);
       projectsProvider.getDoctorClinicsList();
+
+      _firebaseMessaging.setAutoInitEnabled(true);
+      _firebaseMessaging.getToken().then((String token) async {
+        if (token != '') {
+          DEVICE_TOKEN = token;
+          var request = await sharedPref.getObj(DOCTOR_PROFILE);
+          authProvider.insertDeviceImei(request).then((value) {
+            print(value['ReturnValue']);
+            changeIsLoading(false);
+          });
+        }
+      });
     }
     _isInit = false;
   }
@@ -77,6 +94,27 @@ class _DashboardScreenState extends State<DashboardScreen> {
     if (!currentFocus.hasPrimaryFocus) {
       currentFocus.unfocus();
     }
+
+    var _patientSearchFormValues = PatientModel(
+        FirstName: "0",
+        MiddleName: "0",
+        LastName: "0",
+        PatientMobileNumber: "0",
+        PatientIdentificationID: "0",
+        PatientID: 0,
+        From: DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd')
+            .toString(),
+        To: DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd')
+            .toString(),
+        LanguageID: 2,
+        stamp: "2020-03-02T13:56:39.170Z",
+        IPAdress: "11.11.11.11",
+        VersionID: 1.2,
+        Channel: 9,
+        TokenID: "2Fi7HoIHB0eDyekVa6tCJg==",
+        SessionID: "5G0yXn0Jnq",
+        IsLoginForDoctorApp: true,
+        PatientOutSA: false);
     return BaseView<DashboardViewModel>(
       onModelReady: (model) => model.getDashboard(),
       builder: (_, model, w) => AppScaffold(
@@ -649,7 +687,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                       AppText(
                                         model.dashboardItemsList.length > 0
                                             ? getPatientCount(
-                                                model.dashboardItemsList[7])
+                                                model.dashboardItemsList[5])
                                             : "",
                                         fontSize: SizeConfig.textMultiplier * 6,
                                         color: Colors.white,
@@ -693,7 +731,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                         color: Colors.white,
                                       ),
                                       AppText(
-                                        TranslationBase.of(context).radiology,
+                                        TranslationBase.of(context).clinic,
                                         color: Colors.white,
                                       )
                                     ],
@@ -957,6 +995,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
                         height: 20,
                       ),
                       Row(
+                        // mainAxisAlignment: MainAxisAlignment.spaceAround,
+                        crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
                           DashboardItem(
                             child: Column(
@@ -984,6 +1024,33 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                 ),
                               );
                             },
+                          ),
+                          SizedBox(
+                            width: 8,
+                          ),
+                          DashboardItem(
+                            child: Column(
+                              mainAxisAlignment: MainAxisAlignment.spaceAround,
+                              children: <Widget>[
+                                Icon(
+                                  DoctorApp.patient,
+                                  size: 50,
+                                ),
+                                AppText(
+                                  TranslationBase.of(context).arrived,
+                                  color: Colors.black,
+                                  textAlign: TextAlign.center,
+                                )
+                              ],
+                            ),
+                            hasBorder: true,
+                            onTap: () {
+                              Navigator.of(context)
+                                  .pushNamed(PATIENTS, arguments: {
+                                "patientSearchForm": _patientSearchFormValues,
+                                "selectedType": "7"
+                              });
+                            },
                           )
                         ],
                       ),

lib/screens/patients/patient_search_screen.dart

@@ -68,21 +68,9 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
 
 
     try {
-
-     /* Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
-      DoctorProfileModel doctorProfile =
-          new DoctorProfileModel.fromJson(profile)*/;
       if (_formKey.currentState.validate()) {
         _formKey.currentState.save();
 
-       /* sharedPref.setString(SLECTED_PATIENT_TYPE, _selectedType);
-        String token = await sharedPref.getString(TOKEN);
-
-        _patientSearchFormValues.TokenID = token;
-        _patientSearchFormValues.ProjectID = doctorProfile.projectID; //15
-        _patientSearchFormValues.DoctorID = doctorProfile.doctorID;
-        _patientSearchFormValues.ClinicID = doctorProfile.clinicID;*/
-
         if ((_patientSearchFormValues.From == "0" ||
                 _patientSearchFormValues.To == "0") &&
             _selectedType == "7") {

lib/screens/patients/patients_screen.dart

@@ -274,7 +274,8 @@ class _PatientsScreenState extends State<PatientsScreen> {
             .then((res) {
           setState(() {
             _isLoading = false;
-            if (res['MessageStatus'] == 1) {
+
+            if (res != null && res['MessageStatus'] == 1) {
               if (val2 == 7) {
                 if (res[SERVICES_PATIANT2[val2]] == null) {
                   _isError = true;
@@ -282,6 +283,9 @@ class _PatientsScreenState extends State<PatientsScreen> {
                   this.error = error.toString();
                 } else {
                   var localList = [];
+                  if(res["patientArrivalList"]["entityList"] == null){
+                    res["patientArrivalList"]["entityList"] = [];
+                  }
                   res["patientArrivalList"]["entityList"].forEach((v) {
                     Map<String, dynamic> mergedPatient = {
                       ...v,
@@ -289,7 +293,6 @@ class _PatientsScreenState extends State<PatientsScreen> {
                     };
                     localList.add(mergedPatient);
                   });
-                  print(localList.toString());
                   lItems = localList;
                 }
               } else {
@@ -301,7 +304,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
               _isError = false;
             } else {
               _isError = true;
-              error = res['ErrorEndUserMessage'] ?? res['ErrorMessage'];
+              error =  model.error; //res['ErrorEndUserMessage'] ?? res['ErrorMessage'];
             }
           });
         }).catchError((error) {

lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart

@@ -72,11 +72,11 @@ class _UcafDetailScreenState extends State<UcafDetailScreen> {
                   ),
                   Container(
                     margin:
-                    EdgeInsets.symmetric(vertical: 16, horizontal: 16),
+                    EdgeInsets.symmetric(vertical: 8, horizontal: 16),
                     child: BorderedButton(
                       TranslationBase.of(context).save,
                       hasBorder: true,
-                      vPadding: 16,
+                      vPadding: 8,
                       hPadding: 8,
                       borderColor: HexColor("#B8382B"),
                       backgroundColor: HexColor("#B8382B"),
@@ -87,11 +87,11 @@ class _UcafDetailScreenState extends State<UcafDetailScreen> {
                   ),
                   Container(
                     margin:
-                    EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 16),
+                    EdgeInsets.only(left: 16, right: 16, top: 0.0, bottom: 8),
                     child: BorderedButton(
                       TranslationBase.of(context).cancel,
                       hasBorder: true,
-                      vPadding: 16,
+                      vPadding: 8,
                       hPadding: 8,
                       borderColor: Colors.white,
                       backgroundColor: Colors.white,

lib/screens/patients/profile/referral/my-referral-detail-screen.dart

@@ -12,6 +12,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/borderedButton.dart';
 import 'package:flutter/material.dart';
+import 'package:hexcolor/hexcolor.dart';
 import 'package:provider/provider.dart';
 
 import '../../../../routes.dart';
@@ -39,7 +40,7 @@ class MyReferralDetailScreen extends StatelessWidget {
       builder: (_, model, w) => AppScaffold(
         baseViewModel: model,
         appBarTitle: TranslationBase.of(context).referPatient,
-        body: Column(
+        body: model.patientArrivalList != null ? Column(
           children: [
             Expanded(
               child: SingleChildScrollView(
@@ -110,7 +111,7 @@ class MyReferralDetailScreen extends StatelessWidget {
                                 icon: 'lab.png'),
                             PatientProfileButton(
                                 key: key,
-                                // patient: patient,
+                                patient: model.patientArrivalList[0],
                                 route: PATIENT_VITAL_SIGN,
                                 nameLine1: TranslationBase.of(context).vital,
                                 nameLine2: TranslationBase.of(context).signs,
@@ -160,6 +161,15 @@ class MyReferralDetailScreen extends StatelessWidget {
               ),
             ),
           ],
+        ) : Container(
+          child: Center(
+            child: AppText(
+              TranslationBase.of(context).patientNoDetailErrMsg,
+              color: HexColor("#B8382B"),
+              fontWeight: FontWeight.bold,
+              fontSize: 16,
+            ),
+          ),
         ),
       ),
     );

lib/screens/patients/profile/referral/refer-patient-screen.dart

@@ -8,6 +8,7 @@ import 'package:doctor_app_flutter/screens/base/base_view.dart';
 import 'package:doctor_app_flutter/util/date-utils.dart';
 import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
+import 'package:doctor_app_flutter/widgets/patients/patient-referral-item-widget.dart';
 import 'package:doctor_app_flutter/widgets/patients/profile/patient-page-header-widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_loader_widget.dart';
@@ -40,11 +41,7 @@ class _PatientMakeReferralScreenState extends State<PatientMakeReferralScreen> {
   @override
   void initState() {
     super.initState();
-    referToList = List();
-    dynamic sameBranch = {"id": 1, "name": "Same Branch"};
-    dynamic otherBranch = {"id": 2, "name": "Other Branch"};
-    referToList.add(sameBranch);
-    referToList.add(otherBranch);
+
     appointmentDate = DateTime.now();
   }
 
@@ -53,11 +50,22 @@ class _PatientMakeReferralScreenState extends State<PatientMakeReferralScreen> {
     final routeArgs = ModalRoute.of(context).settings.arguments as Map;
     patient = routeArgs['patient'];
 
+    referToList = List();
+    dynamic sameBranch = {
+      "id": 1,
+      "name": TranslationBase.of(context).sameBranch
+    };
+    dynamic otherBranch = {
+      "id": 2,
+      "name": TranslationBase.of(context).otherBranch
+    };
+    referToList.add(sameBranch);
+    referToList.add(otherBranch);
+
     final screenSize = MediaQuery.of(context).size;
 
     return BaseView<PatientReferralViewModel>(
-      onModelReady: (model) =>
-          model.getMasterLookup(MasterKeysService.physiotherapyGoals),
+      onModelReady: (model) => model.getPatientReferral(patient),
       builder: (_, model, w) => AppScaffold(
         baseViewModel: model,
         appBarTitle: TranslationBase.of(context).referPatient,
@@ -84,279 +92,50 @@ class _PatientMakeReferralScreenState extends State<PatientMakeReferralScreen> {
                       indent: 0,
                       endIndent: 0,
                     ),
-                    Container(
-                      margin:
-                          EdgeInsets.symmetric(vertical: 16, horizontal: 16),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          SizedBox(
-                            height: 16,
-                          ),
-                          AppText(
-                            TranslationBase.of(context).referPatient,
-                            fontWeight: FontWeight.bold,
-                            fontSize: 16,
-                          ),
-                          SizedBox(
-                            height: 16,
-                          ),
-                          Container(
-                            height: screenSize.height * 0.070,
-                            child: InkWell(
-                              onTap: referToList != null
-                                  ? () {
-                                      ListSelectDialog dialog =
-                                          ListSelectDialog(
-                                        list: referToList,
-                                        attributeName: 'name',
-                                        attributeValueId: 'id',
-                                        okText: TranslationBase.of(context).ok,
-                                        okFunction: (selectedValue) {
-                                          setState(() {
-                                            _referTo = selectedValue;
-                                            _selectedBranch = null;
-                                            _selectedClinic = null;
-                                            _selectedDoctor = null;
-                                            model
-                                                .getDoctorBranch()
-                                                .then((value) {
-                                              _selectedBranch = value;
-                                              if (_referTo['id'] == 1) {
-                                                model.getClinics(
-                                                    _selectedBranch['ID']);
-                                              }
-                                            });
-                                          });
-                                        },
-                                      );
-                                      showDialog(
-                                        barrierDismissible: false,
-                                        context: context,
-                                        builder: (BuildContext context) {
-                                          return dialog;
-                                        },
-                                      );
-                                    }
-                                  : null,
-                              child: TextField(
-                                decoration: textFieldSelectorDecoration(
-                                    TranslationBase.of(context).referTo,
-                                    _referTo != null ? _referTo['name'] : null,
-                                    true),
-                                enabled: false,
-                              ),
-                            ),
-                          ),
-                          SizedBox(
-                            height: 10,
-                          ),
-                          Container(
-                            height: screenSize.height * 0.070,
-                            child: InkWell(
-                              onTap: model.branchesList != null &&
-                                      model.branchesList.length > 0 &&
-                                      _referTo != null &&
-                                      _referTo['id'] == 2
-                                  ? () {
-                                      ListSelectDialog dialog =
-                                          ListSelectDialog(
-                                        list: model.branchesList,
-                                        attributeName: 'Desciption',
-                                        attributeValueId: 'ID',
-                                        okText: TranslationBase.of(context).ok,
-                                        okFunction: (selectedValue) {
-                                          setState(() {
-                                            _selectedBranch = selectedValue;
-                                            _selectedClinic = null;
-                                            _selectedDoctor = null;
-                                            model.getClinics(
-                                                _selectedBranch['ID']);
-                                          });
-                                        },
-                                      );
-                                      showDialog(
-                                        barrierDismissible: false,
-                                        context: context,
-                                        builder: (BuildContext context) {
-                                          return dialog;
-                                        },
-                                      );
-                                    }
-                                  : null,
-                              child: TextField(
-                                decoration: textFieldSelectorDecoration(
-                                    TranslationBase.of(context).branch,
-                                    _selectedBranch != null
-                                        ? _selectedBranch['Desciption']
-                                        : null,
-                                    true),
-                                enabled: false,
-                              ),
-                            ),
-                          ),
-                          SizedBox(
-                            height: 10,
-                          ),
-                          Container(
-                            height: screenSize.height * 0.070,
-                            child: InkWell(
-                              onTap: _selectedBranch != null &&
-                                      model.clinicsList != null &&
-                                      model.clinicsList.length > 0
-                                  ? () {
-                                      ListSelectDialog dialog =
-                                          ListSelectDialog(
-                                        list: model.clinicsList,
-                                        attributeName: 'ClinicDescription',
-                                        attributeValueId: 'ClinicID',
-                                        okText: TranslationBase.of(context).ok,
-                                        okFunction: (selectedValue) {
-                                          setState(() {
-                                            _selectedDoctor = null;
-                                            _selectedClinic = selectedValue;
-                                            model.getClinicDoctors(
-                                                _selectedClinic['ClinicID']
-                                                    .toString());
-                                          });
-                                        },
-                                      );
-                                      showDialog(
-                                        barrierDismissible: false,
-                                        context: context,
-                                        builder: (BuildContext context) {
-                                          return dialog;
-                                        },
-                                      );
-                                    }
-                                  : null,
-                              child: TextField(
-                                decoration: textFieldSelectorDecoration(
-                                    TranslationBase.of(context).clinic,
-                                    _selectedClinic != null
-                                        ? _selectedClinic['ClinicDescription']
-                                        : null,
-                                    true),
-                                enabled: false,
-                              ),
-                            ),
-                          ),
-                          SizedBox(
-                            height: 10,
-                          ),
-                          Container(
-                            height: screenSize.height * 0.070,
-                            child: InkWell(
-                              onTap: _selectedClinic != null &&
-                                      model.doctorsList != null &&
-                                      model.doctorsList.length > 0
-                                  ? () {
-                                      ListSelectDialog dialog =
-                                          ListSelectDialog(
-                                        list: model.doctorsList,
-                                        attributeName: 'DoctorName',
-                                        attributeValueId: 'DoctorID',
-                                        okText: TranslationBase.of(context).ok,
-                                        okFunction: (selectedValue) {
-                                          setState(() {
-                                            _selectedDoctor = selectedValue;
-                                          });
-                                        },
-                                      );
-                                      showDialog(
-                                        barrierDismissible: false,
-                                        context: context,
-                                        builder: (BuildContext context) {
-                                          return dialog;
-                                        },
-                                      );
-                                    }
-                                  : null,
-                              child: TextField(
-                                decoration: textFieldSelectorDecoration(
-                                    TranslationBase.of(context).doctor,
-                                    _selectedDoctor != null
-                                        ? _selectedDoctor['DoctorName']
-                                        : null,
-                                    true),
-                                enabled: false,
-                              ),
-                            ),
-                          ),
-                          SizedBox(
-                            height: 10,
-                          ),
-                          Container(
-                            height: screenSize.height * 0.070,
-                            child: InkWell(
-                              onTap: () => _selectDate(context, model),
-                              child: TextField(
-                                decoration: textFieldSelectorDecoration(
-                                    TranslationBase.of(context)
-                                        .chooseAppointment,
-                                    appointmentDate != null
-                                        ? "${DateUtils.convertDateToFormat(appointmentDate, "yyyy-MM-dd")}"
-                                        : null,
-                                    true,
-                                    suffixIcon: Icon(
-                                      Icons.calendar_today,
-                                      color: Colors.black,
-                                    )),
-                                enabled: false,
-                              ),
-                            ),
-                          ),
-                          SizedBox(
-                            height: 10,
-                          ),
-                          Container(
-                              child: TextField(
-                            decoration: textFieldSelectorDecoration(
-                                TranslationBase.of(context).remarks,
-                                null,
-                                false),
-                            enabled: true,
-                            controller: _remarksController,
-                            inputFormatters: [
-                              FilteringTextInputFormatter.allow(
-                                  RegExp(ONLY_LETTERS))
-                            ],
-                            keyboardType: TextInputType.text,
-                            minLines: 4,
-                            maxLines: 6,
-                          )),
-                        ],
-                      ),
+                    model.patientReferral.length == 0
+                        ? ReferralForm(model, screenSize)
+                        : PatientReferralItemWidget(
+                      patientName: model.patientReferral[0].patientName,
+                        referralStatus: "${model.patientReferral[0].referralStatus}",
+                        isReferredTo: true,
+                      isSameBranch: model.patientReferral[0]
+                          .isReferralDoctorSameBranch,
+                      referralDoctorName:
+                      model.patientReferral[0].referredByDoctorInfo,
+                      clinicDescription: null,
+                      remark:
+                      model.patientReferral[0].remarksFromSource
                     ),
                   ],
                 ),
-                Container(
-                  margin: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-                  child: AppButton(
-                    title: TranslationBase.of(context).refer,
-                    color: HexColor("#B8382B"),
-                    onPressed: () {
-                      if (appointmentDate == null ||
-                          _selectedBranch == null ||
-                          _selectedClinic == null ||
-                          _selectedDoctor == null ||
-                          _remarksController.text == null) return;
-                      model
-                          .makeReferral(
-                              patient,
-                              appointmentDate.toIso8601String(),
-                              _selectedBranch['ID'],
-                              _selectedClinic['ClinicID'],
-                              _selectedDoctor['DoctorID'],
-                              _remarksController.text)
-                          .then((_) {
-                        DrAppToastMsg.showSuccesToast(
-                            TranslationBase.of(context).referralSuccessMsg);
-                        Navigator.pop(context);
-                      });
-                    },
-                  ),
-                )
+                if (model.patientReferral.length == 0)
+                  Container(
+                    margin: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                    child: AppButton(
+                      title: TranslationBase.of(context).refer,
+                      color: HexColor("#B8382B"),
+                      onPressed: () {
+                        if (appointmentDate == null ||
+                            _selectedBranch == null ||
+                            _selectedClinic == null ||
+                            _selectedDoctor == null ||
+                            _remarksController.text == null) return;
+                        model
+                            .makeReferral(
+                                patient,
+                                appointmentDate.toIso8601String(),
+                                _selectedBranch['ID'],
+                                _selectedClinic['ClinicID'],
+                                _selectedDoctor['DoctorID'],
+                                _remarksController.text)
+                            .then((_) {
+                          DrAppToastMsg.showSuccesToast(
+                              TranslationBase.of(context).referralSuccessMsg);
+                          Navigator.pop(context);
+                        });
+                      },
+                    ),
+                  )
               ],
             ),
           ),
@@ -365,6 +144,239 @@ class _PatientMakeReferralScreenState extends State<PatientMakeReferralScreen> {
     );
   }
 
+  Widget ReferralForm(PatientReferralViewModel model, Size screenSize) {
+    return Container(
+      margin: EdgeInsets.symmetric(vertical: 16, horizontal: 16),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          SizedBox(
+            height: 16,
+          ),
+          AppText(
+            TranslationBase.of(context).referPatient,
+            fontWeight: FontWeight.bold,
+            fontSize: 16,
+          ),
+          SizedBox(
+            height: 16,
+          ),
+          Container(
+            height: screenSize.height * 0.070,
+            child: InkWell(
+              onTap: referToList != null
+                  ? () {
+                      ListSelectDialog dialog = ListSelectDialog(
+                        list: referToList,
+                        attributeName: 'name',
+                        attributeValueId: 'id',
+                        okText: TranslationBase.of(context).ok,
+                        okFunction: (selectedValue) {
+                          setState(() {
+                            _referTo = selectedValue;
+                            _selectedBranch = null;
+                            _selectedClinic = null;
+                            _selectedDoctor = null;
+                            model.getDoctorBranch().then((value) {
+                              _selectedBranch = value;
+                              if (_referTo['id'] == 1) {
+                                model.getClinics(_selectedBranch['ID']);
+                              }
+                            });
+                          });
+                        },
+                      );
+                      showDialog(
+                        barrierDismissible: false,
+                        context: context,
+                        builder: (BuildContext context) {
+                          return dialog;
+                        },
+                      );
+                    }
+                  : null,
+              child: TextField(
+                decoration: textFieldSelectorDecoration(
+                    TranslationBase.of(context).referTo,
+                    _referTo != null ? _referTo['name'] : null,
+                    true),
+                enabled: false,
+              ),
+            ),
+          ),
+          SizedBox(
+            height: 10,
+          ),
+          Container(
+            height: screenSize.height * 0.070,
+            child: InkWell(
+              onTap: model.branchesList != null &&
+                      model.branchesList.length > 0 &&
+                      _referTo != null &&
+                      _referTo['id'] == 2
+                  ? () {
+                      ListSelectDialog dialog = ListSelectDialog(
+                        list: model.branchesList,
+                        attributeName: 'Desciption',
+                        attributeValueId: 'ID',
+                        okText: TranslationBase.of(context).ok,
+                        okFunction: (selectedValue) {
+                          setState(() {
+                            _selectedBranch = selectedValue;
+                            _selectedClinic = null;
+                            _selectedDoctor = null;
+                            model.getClinics(_selectedBranch['ID']);
+                          });
+                        },
+                      );
+                      showDialog(
+                        barrierDismissible: false,
+                        context: context,
+                        builder: (BuildContext context) {
+                          return dialog;
+                        },
+                      );
+                    }
+                  : null,
+              child: TextField(
+                decoration: textFieldSelectorDecoration(
+                    TranslationBase.of(context).branch,
+                    _selectedBranch != null
+                        ? _selectedBranch['Desciption']
+                        : null,
+                    true),
+                enabled: false,
+              ),
+            ),
+          ),
+          SizedBox(
+            height: 10,
+          ),
+          Container(
+            height: screenSize.height * 0.070,
+            child: InkWell(
+              onTap: _selectedBranch != null &&
+                      model.clinicsList != null &&
+                      model.clinicsList.length > 0
+                  ? () {
+                      ListSelectDialog dialog = ListSelectDialog(
+                        list: model.clinicsList,
+                        attributeName: 'ClinicDescription',
+                        attributeValueId: 'ClinicID',
+                        okText: TranslationBase.of(context).ok,
+                        okFunction: (selectedValue) {
+                          setState(() {
+                            _selectedDoctor = null;
+                            _selectedClinic = selectedValue;
+                            model.getClinicDoctors(
+                                _selectedClinic['ClinicID'].toString());
+                          });
+                        },
+                      );
+                      showDialog(
+                        barrierDismissible: false,
+                        context: context,
+                        builder: (BuildContext context) {
+                          return dialog;
+                        },
+                      );
+                    }
+                  : null,
+              child: TextField(
+                decoration: textFieldSelectorDecoration(
+                    TranslationBase.of(context).clinic,
+                    _selectedClinic != null
+                        ? _selectedClinic['ClinicDescription']
+                        : null,
+                    true),
+                enabled: false,
+              ),
+            ),
+          ),
+          SizedBox(
+            height: 10,
+          ),
+          Container(
+            height: screenSize.height * 0.070,
+            child: InkWell(
+              onTap: _selectedClinic != null &&
+                      model.doctorsList != null &&
+                      model.doctorsList.length > 0
+                  ? () {
+                      ListSelectDialog dialog = ListSelectDialog(
+                        list: model.doctorsList,
+                        attributeName: 'DoctorName',
+                        attributeValueId: 'DoctorID',
+                        okText: TranslationBase.of(context).ok,
+                        okFunction: (selectedValue) {
+                          setState(() {
+                            _selectedDoctor = selectedValue;
+                          });
+                        },
+                      );
+                      showDialog(
+                        barrierDismissible: false,
+                        context: context,
+                        builder: (BuildContext context) {
+                          return dialog;
+                        },
+                      );
+                    }
+                  : null,
+              child: TextField(
+                decoration: textFieldSelectorDecoration(
+                    TranslationBase.of(context).doctor,
+                    _selectedDoctor != null
+                        ? _selectedDoctor['DoctorName']
+                        : null,
+                    true),
+                enabled: false,
+              ),
+            ),
+          ),
+          SizedBox(
+            height: 10,
+          ),
+          Container(
+            height: screenSize.height * 0.070,
+            child: InkWell(
+              onTap: () => _selectDate(context, model),
+              child: TextField(
+                decoration: textFieldSelectorDecoration(
+                    TranslationBase.of(context).chooseAppointment,
+                    appointmentDate != null
+                        ? "${DateUtils.convertDateToFormat(appointmentDate, "yyyy-MM-dd")}"
+                        : null,
+                    true,
+                    suffixIcon: Icon(
+                      Icons.calendar_today,
+                      color: Colors.black,
+                    )),
+                enabled: false,
+              ),
+            ),
+          ),
+          SizedBox(
+            height: 10,
+          ),
+          Container(
+              child: TextField(
+            decoration: textFieldSelectorDecoration(
+                TranslationBase.of(context).remarks, null, false),
+            enabled: true,
+            controller: _remarksController,
+            inputFormatters: [
+              FilteringTextInputFormatter.allow(RegExp(ONLY_LETTERS))
+            ],
+            keyboardType: TextInputType.text,
+            minLines: 4,
+            maxLines: 6,
+          )),
+        ],
+      ),
+    );
+  }
+
   _selectDate(BuildContext context, PatientReferralViewModel model) async {
     // https://medium.com/flutter-community/a-deep-dive-into-datepicker-in-flutter-37e84f7d8d6c   good reference
     // https://stackoverflow.com/a/63147062/6246772  to customize a date picker

lib/screens/prescription/add_prescription_form.dart

@@ -7,6 +7,7 @@ import 'package:doctor_app_flutter/core/viewModel/prescription_view_model.dart';
 import 'package:doctor_app_flutter/models/livecare/transfer_to_admin.dart';
 import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
+import 'package:doctor_app_flutter/screens/prescription/drugtodrug.dart';
 import 'package:doctor_app_flutter/screens/prescription/prescription_screen.dart';
 import 'package:doctor_app_flutter/screens/prescription/prescription_warnings.dart';
 import 'package:doctor_app_flutter/util/date-utils.dart';
@@ -693,7 +694,8 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
                                             .addMedication,
                                         onPressed: () {
                                           formKey.currentState.save();
-
+                                          // Navigator.pop(context);
+                                          // openDrugToDrug();
                                           if (strength == null ||
                                               route == null ||
                                               frequency == null ||
@@ -708,26 +710,8 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
                                           }
 
                                           if (formKey.currentState.validate()) {
-                                            postProcedure(
-                                                patient: widget.patient,
-                                                doseTimeIn:
-                                                    doseTime['id'].toString(),
-                                                model: widget.model,
-                                                duration:
-                                                    duration['id'].toString(),
-                                                frequency:
-                                                    frequency['id'].toString(),
-                                                route: route['id'].toString(),
-                                                drugId: selectedDrug['ItemId']
-                                                    .toString(),
-                                                strength:
-                                                    strength['id'].toString(),
-                                                indication:
-                                                    indicationController.text,
-                                                instruction:
-                                                    instructionController.text,
-                                                doseTime: selectedDate);
                                             Navigator.pop(context);
+                                            openDrugToDrug();
                                           }
                                           {
                                             // Navigator.push(
@@ -804,4 +788,44 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
       ),
     );
   }
+
+  openDrugToDrug() {
+    showModalBottomSheet(
+        context: context,
+        builder: (context) {
+          return Container(
+            height: SizeConfig.realScreenHeight * .5,
+            width: SizeConfig.realScreenWidth,
+            child: SingleChildScrollView(
+                child: Column(
+              // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                DrugToDrug(widget.patient),
+                Container(
+                    margin: EdgeInsets.all(SizeConfig.widthMultiplier * 2),
+                    child: AppButton(
+                      title: TranslationBase.of(context).addMedication,
+                      onPressed: () {
+                        postProcedure(
+                            patient: widget.patient,
+                            doseTimeIn: doseTime['id'].toString(),
+                            model: widget.model,
+                            duration: duration['id'].toString(),
+                            frequency: frequency['id'].toString(),
+                            route: route['id'].toString(),
+                            drugId: selectedDrug['ItemId'].toString(),
+                            strength: strength['id'].toString(),
+                            indication: indicationController.text,
+                            instruction: instructionController.text,
+                            doseTime: selectedDate);
+                      },
+                    ))
+              ],
+            )),
+
+            //],
+            //)
+          );
+        });
+  }
 }

lib/screens/prescription/drugtodrug.dart

@@ -0,0 +1,89 @@
+import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
+import 'package:doctor_app_flutter/config/size_config.dart';
+import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
+import 'package:doctor_app_flutter/core/viewModel/patient-vital-sign-viewmodel.dart';
+import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart';
+import 'package:doctor_app_flutter/core/viewModel/prescription_view_model.dart';
+import 'package:doctor_app_flutter/models/SOAP/GeneralGetReqForSOAP.dart';
+import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
+import 'package:doctor_app_flutter/models/patient/vital_sign/vital_sign_req_model.dart';
+import 'package:doctor_app_flutter/screens/base/base_view.dart';
+import 'package:doctor_app_flutter/screens/medicine/medicine_search_screen.dart';
+import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
+import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
+import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
+import 'package:flutter/material.dart';
+
+class DrugToDrug extends StatefulWidget {
+  final PatiantInformtion patient;
+  DrugToDrug(this.patient);
+  @override
+  _DrugToDrug createState() => _DrugToDrug();
+}
+
+class _DrugToDrug extends State<DrugToDrug> {
+  int typeID = 1;
+  List<Map<dynamic, dynamic>> expandableList = [
+    {'name': 'CRITICAL'},
+    {'name': 'HIGH'},
+    {'name': 'MODERATE'},
+    {'name': 'LOW'},
+    {'name': 'INFO'},
+  ];
+
+  @override
+  void initState() {
+    getTypeID();
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    GeneralGetReqForSOAP generalGetReqForSOAP = GeneralGetReqForSOAP(
+        patientMRN: 2954208, //widget.patient.patientMRN,
+        episodeId: 210011002, //widget.patient.episodeNo,
+        appointmentNo: 2016055308, //widget.patient.appointmentNo,
+        doctorID: '',
+        editedBy: '');
+
+    return BaseView<VitalSignsViewModel>(
+        onModelReady: (model) => model.getPatientVitalSign(widget.patient),
+        builder: (BuildContext context, model, Widget child) {
+          return BaseView<SOAPViewModel>(
+              onModelReady: (model2) =>
+                  model2.getPatientAllergy(generalGetReqForSOAP),
+              builder: (BuildContext context, model2, Widget child) {
+                return BaseView<PrescriptionViewModel>(
+                    onModelReady: (model3) => model3.getDrugToDrug(
+                        model.patientVitalSigns, model2.patientAllergiesList),
+                    builder: (BuildContext context,
+                            PrescriptionViewModel model3, Widget child) =>
+                        NetworkBaseView(
+                            baseViewModel: model3,
+                            child: Container(
+                                height: SizeConfig.realScreenHeight * .45,
+                                child: new ListView.builder(
+                                    itemCount: expandableList.length,
+                                    itemBuilder: (context, i) {
+                                      return new ExpansionTile(
+                                        title: new Text(
+                                          expandableList[i]['name'],
+                                          style: new TextStyle(
+                                              fontSize: 20.0,
+                                              fontWeight: FontWeight.bold,
+                                              fontStyle: FontStyle.italic),
+                                        ),
+                                        children: <Widget>[Text('Hi')],
+                                      );
+                                    }))));
+              });
+        });
+  }
+
+  getTypeID() async {
+    var type = await sharedPref.getString(SLECTED_PATIENT_TYPE) == '0' ? 2 : 1;
+    setState(() {
+      typeID = type;
+    });
+  }
+}

lib/screens/reschedule-leaves/reschedule_leave.dart

@@ -792,7 +792,7 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
         "doctorId": this.profile['DoctorID'],
         "dateTimeFrom": fromDate,
         "dateTimeTo": toDate,
-        "date": df.format(DateTime.now()),
+        "date": offTime == '1' ? fromDate : df.format(DateTime.now()),
         "reasonId": reason == null ? model.allOffTime[0]['code'] : reason,
         "coveringDoctorId":
             doctorID == null ? model.coveringDoctors[0]['doctorID'] : doctorID,
@@ -846,7 +846,7 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
         "doctorId": this.profile['DoctorID'],
         "dateTimeFrom": fromDate,
         "dateTimeTo": toDate,
-        "date": df.format(DateTime.now()),
+        "date": offTime == '1' ? fromDate : df.format(DateTime.now()),
         "reasonId": reason == null ? model.allOffTime[0]['code'] : reason,
         "coveringDoctorId":
             doctorID == null ? model.coveringDoctors[0]['doctorID'] : doctorID,

lib/util/helpers.dart

@@ -346,15 +346,17 @@ class Helpers {
   }
 
   logout() async {
+    DEVICE_TOKEN = "";
     String lang = await sharedPref.getString(APP_Language);
     await clearSharedPref();
     sharedPref.setString(APP_Language, lang);
     Navigator.of(AppGlobal.CONTEX).pushReplacementNamed(LOGIN);
+
     // TODO Fix it
     // Navigator.of(AppGlobal.CONTEX).popUntil((ModalRoute.withName(LOGIN)));
   }
 
-   String parseHtmlString(String htmlString) {
+  String parseHtmlString(String htmlString) {
     final document = parse(htmlString);
     final String parsedString = parse(document.body.text).documentElement.text;
 
@@ -380,11 +382,11 @@ class Helpers {
       hintText: selectedText != null ? selectedText : hintText,
       suffixIcon: isDropDown
           ? suffixIcon != null
-          ? suffixIcon
-          : Icon(
-        Icons.arrow_drop_down,
-        color: dropDownColor != null ? dropDownColor : Colors.black,
-      )
+              ? suffixIcon
+              : Icon(
+                  Icons.arrow_drop_down,
+                  color: dropDownColor != null ? dropDownColor : Colors.black,
+                )
           : null,
       hintStyle: TextStyle(
         fontSize: 14,
@@ -394,7 +396,8 @@ class Helpers {
   }
 
   static BoxDecoration containerBorderDecoration(
-      Color containerColor, Color borderColor, {double borderWidth = -1}) {
+      Color containerColor, Color borderColor,
+      {double borderWidth = -1}) {
     return BoxDecoration(
       color: containerColor,
       shape: BoxShape.rectangle,

lib/util/translations_delegate_base.dart

@@ -544,20 +544,74 @@ class TranslationBase {
       localizedValues['referralEmptyMsg'][locale.languageCode];
   String get referralSuccessMsg =>
       localizedValues['referralSuccessMsg'][locale.languageCode];
-  String get diagnoseType => localizedValues['diagnoseType'][locale.languageCode];
+  String get diagnoseType =>
+      localizedValues['diagnoseType'][locale.languageCode];
   String get condition => localizedValues['condition'][locale.languageCode];
   String get id => localizedValues['id'][locale.languageCode];
   String get quantity => localizedValues['quantity'][locale.languageCode];
   String get codeNo => localizedValues['codeNo'][locale.languageCode];
   String get covered => localizedValues['covered'][locale.languageCode];
-  String get approvalRequired => localizedValues['approvalRequired'][locale.languageCode];
-  String get uncoveredByDoctor => localizedValues['uncoveredByDoctor'][locale.languageCode];
-  String get addAssessment => localizedValues['addAssessment'][locale.languageCode];
+  String get approvalRequired =>
+      localizedValues['approvalRequired'][locale.languageCode];
+  String get uncoveredByDoctor =>
+      localizedValues['uncoveredByDoctor'][locale.languageCode];
+  String get chiefComplaintEmptyMsg =>
+      localizedValues['chiefComplaintEmptyMsg'][locale.languageCode];
+
+  String get moreVerification =>
+      localizedValues['more-verify'][locale.languageCode];
+
+  String get welcomeBack =>
+      localizedValues['welcome-back'][locale.languageCode];
+
+  String get accountInfo =>
+      localizedValues['account-info'][locale.languageCode];
+
+  String get useAnotherAccount =>
+      localizedValues['another-acc'][locale.languageCode];
+
+  String get verifyLoginWith =>
+      localizedValues['verify-login-with'][locale.languageCode];
+
+  String get register => localizedValues['register-user'][locale.languageCode];
+
+  String get verifyFingerprint =>
+      localizedValues['verify-with-fingerprint'][locale.languageCode];
+
+  String get verifyFaceID =>
+      localizedValues['verify-with-faceid'][locale.languageCode];
+
+  String get verifySMS =>
+      localizedValues['verify-with-sms'][locale.languageCode];
+
+  String get verifyWhatsApp =>
+      localizedValues['verify-with-whatsapp'][locale.languageCode];
+
+  String get lastLoginAt => localizedValues['last-login'][locale.languageCode];
+
+  String get lastLoginWith =>
+      localizedValues['last-login-with'][locale.languageCode];
+
+  String get verifyFingerprint2 =>
+      localizedValues['verify-fingerprint'][locale.languageCode];
+  String get verificationMessage =>
+      localizedValues['verification_message'][locale.languageCode];
+  String get validationMessage =>
+      localizedValues['validation_message'][locale.languageCode];
+
+  String get addAssessment =>
+      localizedValues['addAssessment'][locale.languageCode];
   String get assessment => localizedValues['assessment'][locale.languageCode];
-  String get chiefComplaintEmptyMsg => localizedValues['chiefComplaintEmptyMsg'][locale.languageCode];
-  String get physicalSystemExamination => localizedValues['physicalSystemExamination'][locale.languageCode];
-  String get searchExamination => localizedValues['searchExamination'][locale.languageCode];
-  String get addExamination => localizedValues['addExamination'][locale.languageCode];
+
+  String get physicalSystemExamination =>
+      localizedValues['physicalSystemExamination'][locale.languageCode];
+  String get searchExamination =>
+      localizedValues['searchExamination'][locale.languageCode];
+  String get addExamination =>
+      localizedValues['addExamination'][locale.languageCode];
+  String get doc => localizedValues['doc'][locale.languageCode];
+  String get patientNoDetailErrMsg =>
+      localizedValues['patientNoDetailErrMsg'][locale.languageCode];
 }
 
 class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

lib/widgets/auth/known_user_login.dart

@@ -70,8 +70,8 @@ class _KnownUserLoginState extends State<KnownUserLogin> {
   @override
   Widget build(BuildContext context) {
     AuthViewModel authProv = Provider.of<AuthViewModel>(context);
-    var imeiModel = {'IMEI': _platformImei};
-    _loginTypeFuture = authProv.selectDeviceImei(imeiModel);
+    // var imeiModel = {'IMEI': _platformImei};
+    // _loginTypeFuture = authProv.selectDeviceImei(imeiModel);
     return FutureBuilder(
         future: Future.wait([_loggedUserFuture, _loginTypeFuture]),
         builder: (BuildContext context, AsyncSnapshot snapshot) {

lib/widgets/auth/login_form.dart

@@ -224,26 +224,29 @@ class _LoginFormState extends State<LoginForm> {
   }
 
   login(context, AuthViewModel authProv, Function changeLoadingStata) {
-    FocusScopeNode currentFocus = FocusScope.of(context);
-    changeLoadingStata(true);
+    showLoading();
     if (loginFormKey.currentState.validate()) {
       loginFormKey.currentState.save();
       sharedPref.setInt(PROJECT_ID, userInfo.projectID);
       authProv.login(userInfo).then((res) {
-        changeLoadingStata(false);
-
+        //changeLoadingStata(false);
+        hideLoading();
         if (res['MessageStatus'] == 1) {
           // insertDeviceImei(res, authProv);
           saveObjToString(LOGGED_IN_USER, res);
+          sharedPref.remove(LAST_LOGIN_USER);
           sharedPref.setString(TOKEN, res['LogInTokenID']);
           print("token" + res['LogInTokenID']);
-          Navigator.of(context).pushReplacement(MaterialPageRoute(builder: (BuildContext context) => VerificationMethodsScreen(password: userInfo.password,)));
+          Navigator.of(context).pushReplacement(MaterialPageRoute(
+              builder: (BuildContext context) => VerificationMethodsScreen(
+                    password: userInfo.password,
+                  )));
         } else {
           // handel error
           helpers.showErrorToast(res['ErrorEndUserMessage']);
         }
       }).catchError((err) {
-        print('$err');
+        hideLoading();
         changeLoadingStata(false);
         helpers.showErrorToast(err);
       });
@@ -273,7 +276,11 @@ class _LoginFormState extends State<LoginForm> {
         if (res['MessageStatus'] == 1) {
           setSharedPref('platformImei', _platformImei);
           saveObjToString(LOGGED_IN_USER, preRes);
-          Navigator.of(context).pushReplacement(MaterialPageRoute(builder: (BuildContext context) => VerificationMethodsScreen(password: userInfo.password,)));
+
+          Navigator.of(context).pushReplacement(MaterialPageRoute(
+              builder: (BuildContext context) => VerificationMethodsScreen(
+                    password: userInfo.password,
+                  )));
 
           // save imei on shared preferance
         } else {
@@ -350,4 +357,18 @@ class _LoginFormState extends State<LoginForm> {
 
     primaryFocus.unfocus();
   }
+
+  showLoading() {
+    showDialog(
+        context: context,
+        builder: (BuildContext context) {
+          return Center(
+            child: CircularProgressIndicator(),
+          );
+        });
+  }
+
+  hideLoading() {
+    Navigator.pop(context);
+  }
 }

lib/widgets/auth/verification_methods.dart

@@ -1,11 +1,23 @@
 import 'dart:io' show Platform;
 
 import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
+import 'package:doctor_app_flutter/core/model/imei_details.dart';
+import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
 import 'package:doctor_app_flutter/models/auth/activation_Code_req_model.dart';
-import 'package:doctor_app_flutter/screens/auth/verification_methods_screen.dart';
+import 'package:doctor_app_flutter/models/auth/check_activation_code_request_model.dart';
+import 'package:doctor_app_flutter/models/auth/send_activation_code_model2.dart';
+import 'package:doctor_app_flutter/models/doctor/clinic_model.dart';
+import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
+import 'package:doctor_app_flutter/models/doctor/profile_req_Model.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
+import 'package:doctor_app_flutter/widgets/otp/sms-popup.dart';
+import 'package:doctor_app_flutter/widgets/shared/app_button.dart';
+import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
+import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
 import 'package:flutter/material.dart';
-import 'package:hexcolor/hexcolor.dart';
+import 'package:flutter/services.dart';
+import 'package:intl/intl.dart';
+import 'package:local_auth/local_auth.dart';
 import 'package:provider/provider.dart';
 
 import '../../config/size_config.dart';
@@ -40,6 +52,17 @@ class _VerificationMethodsState extends State<VerificationMethods> {
   Future _loggedUserFuture;
   var _loggedUser;
   var verificationMethod;
+  GetIMEIDetailsModel user;
+  final LocalAuthentication auth = LocalAuthentication();
+  var _availableBiometrics;
+  ProjectViewModel projectsProvider;
+  var isMoreOption = false;
+  var onlySMSBox = false;
+  static BuildContext _context;
+  var loginTokenID;
+
+  bool authenticated;
+
   @override
   void initState() {
     super.initState();
@@ -50,6 +73,13 @@ class _VerificationMethodsState extends State<VerificationMethods> {
     sharedPref.getObj(LOGGED_IN_USER).then((userInfo) {
       _loggedUser = userInfo;
     });
+    sharedPref.getObj(LAST_LOGIN_USER).then((lastLogin) {
+      if (lastLogin != null) {
+        user = GetIMEIDetailsModel.fromJson(lastLogin);
+      }
+    });
+
+    print(user);
   }
 
   @override
@@ -63,6 +93,7 @@ class _VerificationMethodsState extends State<VerificationMethods> {
   @override
   Widget build(BuildContext context) {
     AuthViewModel authProv = Provider.of<AuthViewModel>(context);
+    projectsProvider = Provider.of<ProjectViewModel>(context);
     return FutureBuilder(
         future: Future.wait([_loggedUserFuture]),
         builder: (BuildContext context, AsyncSnapshot snapshot) {
@@ -75,66 +106,205 @@ class _VerificationMethodsState extends State<VerificationMethods> {
                 return Text('Error: ${snapshot.error}');
               } else {
                 return Container(
-                  width: SizeConfig.realScreenWidth * 0.80,
+                  width: SizeConfig.realScreenWidth,
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: <Widget>[
-                      Text(
-                        hideSilentMethods()
-                            ? TranslationBase.of(context).firstStep
-                            : TranslationBase.of(context).pleaseChoose,
-                        style: TextStyle(
-                          fontSize: 3.5 * SizeConfig.textMultiplier,
-                        ),
-                      ),
-                      SizedBox(
-                        height: 20,
-                      ),
                       Container(
-                        height: SizeConfig.realScreenHeight * 0.6,
-                        child: CustomScrollView(
-                          primary: false,
-                          slivers: <Widget>[
-                            SliverPadding(
-                              padding: const EdgeInsets.all(0),
-                              sliver: SliverGrid.count(
-                                // childAspectRatio: 0.7,
-                                crossAxisSpacing: 0,
-                                mainAxisSpacing: 5,
-                                crossAxisCount: 2,
-                                children: <Widget>[
-                                  Visibility(
-                                    visible: hideSilentMethods() ? false : true,
-                                    child: buildFingerprintMethod(
-                                        context, authProv),
-                                    replacement:
-                                        buildWhatsAppMethod(context, authProv),
-                                  ),
-                                  Visibility(
-                                    visible: hideSilentMethods() ? false : true,
-                                    child: buildFaceIDMethod(context, authProv),
-                                    replacement:
-                                        buildSMSMethod(context, authProv),
-                                  ),
-                                  Visibility(
-                                      visible:
-                                          hideSilentMethods() ? false : true,
-                                      child: buildWhatsAppMethod(
-                                          context, authProv)),
-                                  Visibility(
-                                    visible: hideSilentMethods() ? false : true,
-                                    child: buildSMSMethod(context, authProv),
-                                  ),
-                                ],
-                              ),
-                            ),
-                          ],
-                        ),
-                        // height: 500,
-                      ),
-                      SizedBox(
-                          // height:  20,
-                          )
+                          height: SizeConfig.realScreenHeight * 0.6,
+                          child: Column(
+                            children: <Widget>[
+                              user != null && isMoreOption == false
+                                  ? Column(
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.spaceEvenly,
+                                      crossAxisAlignment:
+                                          CrossAxisAlignment.start,
+                                      children: <Widget>[
+                                        AppText(
+                                          TranslationBase.of(context)
+                                                  .welcomeBack +
+                                              ' ' +
+                                              user.doctorName,
+                                          fontSize:
+                                              SizeConfig.textMultiplier * 3.5,
+                                        ),
+                                        SizedBox(
+                                          height: 20,
+                                        ),
+                                        AppText(
+                                          TranslationBase.of(context)
+                                              .accountInfo,
+                                          fontSize:
+                                              SizeConfig.textMultiplier * 2.5,
+                                        ),
+                                        SizedBox(
+                                          height: 20,
+                                        ),
+                                        Card(
+                                            color: Colors.grey[300],
+                                            child: Row(
+                                              children: <Widget>[
+                                                Flexible(
+                                                    child: ListTile(
+                                                  title: Text(
+                                                    TranslationBase.of(context)
+                                                        .lastLoginAt,
+                                                    textAlign: TextAlign.center,
+                                                    overflow:
+                                                        TextOverflow.ellipsis,
+                                                  ),
+                                                  subtitle: Text(
+                                                      // user. != null
+                                                      //     ? formatDate(Helpers
+                                                      //         .convertStringToDate(
+                                                      //             user
+                                                      //                 .))
+                                                      //     : user !=
+                                                      //             null
+                                                      //         ? formatDate(Helpers
+                                                      //             .convertStringToDate(user
+                                                      //                 .createdOn))
+                                                      //:
+                                                      '--',
+                                                      overflow:
+                                                          TextOverflow.ellipsis,
+                                                      textAlign:
+                                                          TextAlign.center),
+                                                )),
+                                                Flexible(
+                                                    child: ListTile(
+                                                  title: Text(
+                                                      TranslationBase.of(
+                                                              context)
+                                                          .lastLoginWith,
+                                                      overflow:
+                                                          TextOverflow.ellipsis,
+                                                      textAlign:
+                                                          TextAlign.center),
+                                                  subtitle: Text(
+                                                      getType(user.logInTypeID,
+                                                          context),
+                                                      overflow:
+                                                          TextOverflow.ellipsis,
+                                                      textAlign:
+                                                          TextAlign.center),
+                                                ))
+                                              ],
+                                            )),
+                                      ],
+                                    )
+                                  : Column(
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.spaceEvenly,
+                                      crossAxisAlignment:
+                                          CrossAxisAlignment.start,
+                                      children: <Widget>[
+                                          this.onlySMSBox == false
+                                              ? AppText(
+                                                  TranslationBase.of(context)
+                                                      .verifyLoginWith,
+                                                  fontSize: SizeConfig
+                                                          .textMultiplier *
+                                                      3.5,
+                                                  textAlign: TextAlign.left,
+                                                )
+                                              : AppText(
+                                                  TranslationBase.of(context)
+                                                      .verifyFingerprint2,
+                                                  fontSize: SizeConfig
+                                                          .textMultiplier *
+                                                      2.5,
+                                                  textAlign: TextAlign.start,
+                                                ),
+                                        ]),
+                              user != null && isMoreOption == false
+                                  ? Column(
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.start,
+                                      crossAxisAlignment:
+                                          CrossAxisAlignment.start,
+                                      children: <Widget>[
+                                          Row(
+                                              mainAxisAlignment:
+                                                  MainAxisAlignment.center,
+                                              children: <Widget>[
+                                                Expanded(
+                                                    child: InkWell(
+                                                        onTap: () => {
+                                                              authenticateUser(
+                                                                  3,
+                                                                  BiometricType
+                                                                      .face
+                                                                      .index,
+                                                                  authProv)
+                                                            },
+                                                        child: getButton(
+                                                            user.logInTypeID,
+                                                            authProv))),
+                                                Expanded(
+                                                    child:
+                                                        getButton(5, authProv))
+                                              ])
+                                        ])
+                                  : Column(
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.start,
+                                      crossAxisAlignment:
+                                          CrossAxisAlignment.start,
+                                      children: <Widget>[
+                                          onlySMSBox == false
+                                              ? Row(
+                                                  mainAxisAlignment:
+                                                      MainAxisAlignment.center,
+                                                  children: <Widget>[
+                                                    Expanded(
+                                                        child: getButton(
+                                                            3, authProv)),
+                                                    Expanded(
+                                                        child: getButton(
+                                                            2, authProv))
+                                                  ],
+                                                )
+                                              : SizedBox(),
+                                          Row(
+                                            mainAxisAlignment:
+                                                MainAxisAlignment.center,
+                                            children: <Widget>[
+                                              Expanded(
+                                                  child:
+                                                      getButton(1, authProv)),
+                                              Expanded(
+                                                  child: getButton(4, authProv))
+                                            ],
+                                          ),
+                                        ]),
+                              Expanded(
+                                flex: 1,
+                                child: Column(
+                                  mainAxisAlignment: MainAxisAlignment.end,
+                                  children: <Widget>[
+                                    user != null
+                                        ? Row(
+                                            children: <Widget>[
+                                              Expanded(
+                                                  child: Button(
+                                                title:
+                                                    TranslationBase.of(context)
+                                                        .useAnotherAccount,
+                                                onTap: () {
+                                                  Navigator.of(context)
+                                                      .pushNamed(LOGIN);
+                                                },
+                                              )),
+                                            ],
+                                          )
+                                        : SizedBox(),
+                                  ],
+                                ),
+                              )
+                            ],
+                          ))
                     ],
                   ),
                 );
@@ -143,119 +313,6 @@ class _VerificationMethodsState extends State<VerificationMethods> {
         });
   }
 
-  /*
- *@author: Elham Rababah
- *@Date:28/5/2020
- *@param: BuildContext context, AuthProvider authProv
- *@return: Center widget
- *@desc:   buildSMSMethod Methods widget
- */
-  Center buildSMSMethod(BuildContext context, AuthViewModel authProv) {
-    return buildVerificationMethod(
-        context,
-        'assets/images/verification_sms_icon.png',
-        TranslationBase.of(context).sms, () {
-      sendActivationCodeByOtpNotificationType(1, authProv);
-    });
-  }
-
-  /*
- *@author: Elham Rababah
- *@Date:28/5/2020
- *@param: BuildContext context, AuthProvider authProv
- *@return: Center widget
- *@desc:   build WhatsApp  Methods widget
- */
-  Center buildWhatsAppMethod(BuildContext context, AuthViewModel authProv) {
-    return buildVerificationMethod(
-        context,
-        'assets/images/verification_whatsapp_icon.png',
-        TranslationBase.of(context).whatsApp, () {
-      sendActivationCodeByOtpNotificationType(2, authProv);
-    });
-  }
-
-/*
- *@author: Elham Rababah
- *@Date:28/5/2020
- *@param: BuildContext context, AuthProvider authProv
- *@return: Center widget
- *@desc:   build FaceID Methods widget
- */
-  Center buildFaceIDMethod(BuildContext context, AuthViewModel authProv) {
-    return buildVerificationMethod(
-        context,
-        'assets/images/verification_faceid_icon.png',
-        TranslationBase.of(context).faceId, () {
-      sendActivationCodeByOtpNotificationType(3, authProv);
-    });
-  }
-
-/*
- *@author: Elham Rababah
- *@Date:28/5/2020
- *@param: BuildContext context, AuthProvider authProv
- *@return: Center widget
- *@desc:   build Fingerprint Methods widget
- */
-  Center buildFingerprintMethod(BuildContext context, AuthViewModel authProv) {
-    return buildVerificationMethod(
-        context,
-        'assets/images/verification_fingerprint_icon.png',
-        TranslationBase.of(context).fingerprint, () {
-      sendActivationCodeByOtpNotificationType(4, authProv);
-    });
-  }
-
-  /*
- *@author: Elham Rababah
- *@Date:28/5/2020
- *@param: BuildContext context, AuthProvider authProv
- *@return: Center widget
- *@desc:   build Verification Methods widget
- */
-  Center buildVerificationMethod(context, url, dec, Function fun) {
-    return Center(
-      child: InkWell(
-        onTap: fun,
-        child: Container(
-          // height: SizeConfig.heightMultiplier *2,
-          height: SizeConfig.heightMultiplier * 19,
-          width: SizeConfig.widthMultiplier * 37,
-
-          padding: EdgeInsets.all(10),
-          decoration: BoxDecoration(
-              border: Border.all(
-                  width: 1,
-                  color: HexColor(
-                      '#CCCCCC') //                   <--- border width here
-                  ),
-              borderRadius: BorderRadius.all(Radius.circular(10))),
-          child: Column(
-            children: <Widget>[
-              Container(
-                margin: EdgeInsetsDirectional.only(
-                    top: SizeConfig.heightMultiplier * 0.5),
-                child: Image.asset(
-                  url,
-                  height: SizeConfig.heightMultiplier * 10,
-                  fit: BoxFit.cover,
-                ),
-              ),
-              SizedBox(
-                height: 10,
-              ),
-              Text(
-                dec,
-                style: TextStyle(fontSize: SizeConfig.textMultiplier * 2),
-              )
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
   bool hideSilentMethods() {
     return verificationMethod == 4 || verificationMethod == 3 ? true : false;
   }
@@ -267,64 +324,518 @@ class _VerificationMethodsState extends State<VerificationMethods> {
  *@return:
  *@desc:   send Activation Code By Otp Notification Type
  */
-  sendActivationCodeByOtpNotificationType(oTPSendType, AuthViewModel authProv) async {
+  sendActivationCodeByOtpNotificationType(
+      oTPSendType, AuthViewModel authProv) async {
     // TODO : build enum for verfication method
     if (oTPSendType == 1 || oTPSendType == 2) {
       widget.changeLoadingStata(true);
       int projectID = await sharedPref.getInt(PROJECT_ID);
       ActivationCodeModel activationCodeModel = ActivationCodeModel(
           facilityId: projectID,
-          generalid: "Cs2020@2016\$2958",
           memberID: _loggedUser['List_MemberInformation'][0]['MemberID'],
           zipCode: _loggedUser['ZipCode'],
           mobileNumber: _loggedUser['MobileNumber'],
-
+          otpSendType: oTPSendType.toString(),
           password: widget.password);
 
-      Map<String, dynamic> model = {
-
-        "OTP_SendType": oTPSendType
-      };
-
       try {
         authProv
             .sendActivationCodeForDoctorApp(activationCodeModel)
             .then((res) {
-            widget.changeLoadingStata(false);
-
-            if (res['MessageStatus'] == 1) {
-              print("VerificationCode : "+ res["VerificationCode"]);
-              sharedPref.setString(VIDA_AUTH_TOKEN_ID, res["VidaAuthTokenID"]);
-              sharedPref.setString(VIDA_REFRESH_TOKEN_ID, res["VidaRefreshTokenID"]);
-              sharedPref.setString(LOGIN_TOKEN_ID, res["LogInTokenID"]);
-              Navigator.of(context).pushReplacementNamed(VERIFY_ACCOUNT,
-                  arguments: {'model': model});
-            } else {
-              print(res['ErrorEndUserMessage']);
-              helpers.showErrorToast(res['ErrorEndUserMessage']);
-            }
-        })
-            .catchError((err) {
+          widget.changeLoadingStata(false);
+
+          if (res['MessageStatus'] == 1) {
+            print("VerificationCode : " + res["VerificationCode"]);
+            sharedPref.setString(VIDA_AUTH_TOKEN_ID, res["VidaAuthTokenID"]);
+            sharedPref.setString(
+                VIDA_REFRESH_TOKEN_ID, res["VidaRefreshTokenID"]);
+            sharedPref.setString(LOGIN_TOKEN_ID, res["LogInTokenID"]);
+            this.startSMSService(oTPSendType, authProv);
+          } else {
+            print(res['ErrorEndUserMessage']);
+            helpers.showErrorToast(res['ErrorEndUserMessage']);
+          }
+        }).catchError((err) {
           print('$err');
           widget.changeLoadingStata(false);
 
           helpers.showErrorToast();
         });
       } catch (e) {}
+    } else {
+      // TODO route to this page with parameters to inicate we should present 2 option
+      if (Platform.isAndroid && oTPSendType == 3) {
+        helpers.showErrorToast('Your device not support this feature');
+      } else {
+        // Navigator.of(context).push(MaterialPageRoute(
+        //     builder: (BuildContext context) =>
+        //         VerificationMethodsScreen(password: widget.password,)));
+
+        // Navigator.of(context).pushNamed(VERIFICATION_METHODS,
+        //     arguments: {'verificationMethod': oTPSendType});
+      }
+    }
+  }
+
+  sendActivationCodeVerificationScreen(
+      oTPSendType, AuthViewModel authProv) async {
+    // TODO : build enum for verfication method
+    if (oTPSendType == 1 || oTPSendType == 2) {
+      widget.changeLoadingStata(true);
+      ActivationCodeModel2 activationCodeModel = ActivationCodeModel2(
+          facilityId: user.projectID,
+          memberID: user.doctorID,
+          zipCode: user.outSA == true ? '971' : '966',
+          mobileNumber: user.mobile,
+          oTPSendType: oTPSendType,
+          isMobileFingerPrint: 1,
+          vidaAuthTokenID: user.vidaAuthTokenID,
+          vidaRefreshTokenID: user.vidaRefreshTokenID);
 
+      try {
+        authProv
+            .sendActivationCodeVerificationScreen(activationCodeModel)
+            .then((res) {
+          widget.changeLoadingStata(false);
+
+          if (res['MessageStatus'] == 1) {
+            print("VerificationCode : " + res["VerificationCode"]);
+            sharedPref.setString(VIDA_AUTH_TOKEN_ID, res["VidaAuthTokenID"]);
+            sharedPref.setString(
+                VIDA_REFRESH_TOKEN_ID, res["VidaRefreshTokenID"]);
+            sharedPref.setString(LOGIN_TOKEN_ID, res["LogInTokenID"]);
+            this.startSMSService(oTPSendType, authProv);
+          } else {
+            print(res['ErrorEndUserMessage']);
+            helpers.showErrorToast(res['ErrorEndUserMessage']);
+          }
+        }).catchError((err) {
+          print('$err');
+          widget.changeLoadingStata(false);
 
+          helpers.showErrorToast();
+        });
+      } catch (e) {}
     } else {
       // TODO route to this page with parameters to inicate we should present 2 option
       if (Platform.isAndroid && oTPSendType == 3) {
         helpers.showErrorToast('Your device not support this feature');
       } else {
-        Navigator.of(context).push(MaterialPageRoute(
-            builder: (BuildContext context) =>
-                VerificationMethodsScreen(password: widget.password,)));
+        // Navigator.of(context).push(MaterialPageRoute(
+        //     builder: (BuildContext context) =>
+        //         VerificationMethodsScreen(password: widget.password,)));
 
         // Navigator.of(context).pushNamed(VERIFICATION_METHODS,
         //     arguments: {'verificationMethod': oTPSendType});
       }
     }
   }
+
+  Widget getButton(flag, authProv) {
+    switch (flag) {
+      case 2:
+        return InkWell(
+            onTap: () => {authenticateUser(2, true, authProv)},
+            child: RoundedContainer(
+                borderColor: Colors.grey,
+                showBorder: true,
+                child: Padding(
+                  padding: EdgeInsets.fromLTRB(30, 15, 30, 15),
+                  child: Column(
+                    children: <Widget>[
+                      Image.asset(
+                        'assets/images/login/104.png',
+                        height: SizeConfig.imageSizeMultiplier * 13,
+                        width: SizeConfig.imageSizeMultiplier * 16,
+                      ),
+                      SizedBox(
+                        height: 20,
+                      ),
+                      AppText(
+                        TranslationBase.of(context).verifyWhatsApp,
+                        fontSize: SizeConfig.textMultiplier * 2,
+                        textAlign: TextAlign.center,
+                      )
+                    ],
+                  ),
+                )));
+        break;
+      case 1:
+        return InkWell(
+            onTap: () => {authenticateUser(1, true, authProv)},
+            child: RoundedContainer(
+                borderColor: Colors.grey,
+                showBorder: true,
+                child: Padding(
+                  padding: EdgeInsets.fromLTRB(5, 15, 5, 15),
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: <Widget>[
+                      Image.asset(
+                        'assets/images/login/103.png',
+                        height: SizeConfig.imageSizeMultiplier * 13,
+                        width: SizeConfig.imageSizeMultiplier * 16,
+                      ),
+                      projectsProvider.isArabic
+                          ? SizedBox(
+                              height: 20,
+                            )
+                          : SizedBox(
+                              height: 20,
+                            ),
+                      AppText(
+                        TranslationBase.of(context).verifySMS,
+                        fontSize: projectsProvider.isArabic
+                            ? SizeConfig.textMultiplier * 1.8
+                            : SizeConfig.textMultiplier * 2,
+                        textAlign: TextAlign.center,
+                      )
+                    ],
+                  ),
+                )));
+        break;
+      case 3:
+        return InkWell(
+            onTap: () => {
+                  authenticateUser(3, BiometricType.fingerprint.index, authProv)
+                },
+            child: RoundedContainer(
+                backgroundColor: BiometricType.fingerprint.index == 1
+                    ? Colors.white
+                    : Colors.white.withOpacity(.7),
+                borderColor: Colors.grey,
+                showBorder: true,
+                child: Padding(
+                  padding: EdgeInsets.fromLTRB(5, 15, 5, 15),
+                  child: Column(
+                    children: <Widget>[
+                      Image.asset(
+                        'assets/images/login/102.png',
+                        height: SizeConfig.imageSizeMultiplier * 13,
+                        width: SizeConfig.imageSizeMultiplier * 16,
+                      ),
+                      SizedBox(
+                        height: 20,
+                      ),
+                      AppText(
+                        TranslationBase.of(context).verifyFingerprint,
+                        fontSize: SizeConfig.textMultiplier * 2,
+                        textAlign: TextAlign.center,
+                      )
+                    ],
+                  ),
+                )));
+        break;
+      case 4:
+        return InkWell(
+            onTap: () =>
+                {authenticateUser(4, BiometricType.face.index, authProv)},
+            child: RoundedContainer(
+                backgroundColor: checkIfBiometricAvailable(BiometricType.face)
+                    ? Colors.white
+                    : Colors.white.withOpacity(.7),
+                borderColor: Colors.grey,
+                showBorder: true,
+                child: Padding(
+                  padding: EdgeInsets.fromLTRB(5, 15, 5, 15),
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: <Widget>[
+                      Image.asset(
+                        'assets/images/login/101.png',
+                        height: SizeConfig.imageSizeMultiplier * 13,
+                        width: SizeConfig.imageSizeMultiplier * 16,
+                      ),
+                      SizedBox(
+                        height: 20,
+                      ),
+                      AppText(
+                        TranslationBase.of(context).verifyFaceID,
+                        fontSize: SizeConfig.textMultiplier * 2,
+                        textAlign: TextAlign.center,
+                      )
+                    ],
+                  ),
+                )));
+        break;
+
+      default:
+        return InkWell(
+            onTap: () => {
+                  setState(() {
+                    isMoreOption = true;
+                  })
+                },
+            child: RoundedContainer(
+                backgroundColor: BiometricType.fingerprint.index == 1
+                    ? Colors.white
+                    : Colors.white.withOpacity(.7),
+                borderColor: Colors.grey,
+                showBorder: true,
+                child: Padding(
+                  padding: EdgeInsets.fromLTRB(5, 0, 5, 5),
+                  child: Column(
+                    children: <Widget>[
+                      Image.asset(
+                        'assets/images/login/more_icon.png',
+                        height: SizeConfig.imageSizeMultiplier * 13,
+                        width: SizeConfig.imageSizeMultiplier * 16,
+                      ),
+                      projectsProvider.isArabic
+                          ? SizedBox(
+                              height: 15,
+                            )
+                          : SizedBox(
+                              height: 10,
+                            ),
+                      AppText(
+                        TranslationBase.of(context).moreVerification,
+                        fontSize: SizeConfig.textMultiplier * 2,
+                        textAlign: TextAlign.center,
+                      )
+                    ],
+                  ),
+                )));
+    }
+  }
+
+  getType(type, context) {
+    switch (type) {
+      case 1:
+        return TranslationBase.of(context).verifySMS;
+        break;
+      case 3:
+        return TranslationBase.of(context).verifyFingerprint;
+        break;
+      case 4:
+        return TranslationBase.of(context).verifyFaceID;
+        break;
+      case 2:
+        return TranslationBase.of(context).verifyWhatsApp;
+        break;
+      default:
+        return TranslationBase.of(context).verifySMS;
+        break;
+    }
+  }
+
+  bool checkIfBiometricAvailable(BiometricType biometricType) {
+    bool isAvailable = false;
+    if (_availableBiometrics != null) {
+      for (var i = 0; i < _availableBiometrics.length; i++) {
+        if (biometricType == _availableBiometrics[i]) isAvailable = true;
+      }
+    }
+    return isAvailable;
+  }
+
+  formatDate(date) {
+    return DateFormat('MMM dd, yyy, kk:mm').format(date);
+  }
+
+  authenticateUser(type, isActive, authProv) {
+    //GifLoaderDialogUtils.showMyDialog(context);
+    // if (type == 2 || type == 3) {
+    //   fingrePrintBefore = type;
+    // }
+    //this.selectedOption = fingrePrintBefore != null ? fingrePrintBefore : type;
+
+    switch (type) {
+      case 1:
+        this.loginWithSMS(1, isActive, authProv);
+        break;
+      case 2:
+        this.loginWithSMS(2, isActive, authProv);
+
+        break;
+      case 3:
+        this.loginWithFingurePrintFace(3, isActive, authProv);
+        break;
+      case 4:
+        this.loginWithFingurePrintFace(4, isActive, authProv);
+        break;
+      default:
+        break;
+    }
+    // sharedPref.setInt(LAST_LOGIN,
+    //     this.selectedOption); //this.cs.sharedService.setStorage(this.selectedOption, AuthenticationService.LAST_LOGIN);
+  }
+
+  loginWithSMS(type, isActive, authProv) {
+    this.sendActivationCode(type, authProv);
+    // //if (!el.disabled) {
+    // if (this.user != null) {
+    //   this.checkUserAuthentication(type);
+    // } else {
+    //   // if (this.loginTokenID != null) {
+    //   this.sendActivationCode(type, authProv);
+    //   // } else {
+    //   //this.checkUserAuthentication(type);
+    //   // }
+    // }
+  }
+
+  // checkUserAuthentication(type) {
+  //   // showLoader(true);
+  //   // var req = getCommonRequest(type: type);
+  //   // req.logInTokenID = "";
+
+  //   // var request = CheckPatientAuthenticationReq.fromJson(req.toJson());
+
+  //   // sharedPref.setObject(REGISTER_DATA_FOR_REGISTER, request);
+  //   // authService
+  //   //     .checkPatientAuthentication(request)
+  //   //     .then((value) => {
+  //   //           GifLoaderDialogUtils.hideDialog(context),
+  //   //           if (value['isSMSSent'])
+  //   //             {
+  //   //               sharedPref.setString(LOGIN_TOKEN_ID, value['LogInTokenID']),
+  //   //               this.loginTokenID = value['LogInTokenID'],
+  //   //               sharedPref.setObject(REGISTER_DATA_FOR_LOGIIN, request),
+  //   //               // Future.delayed(Duration(seconds: 1), () {
+  //   //               this.sendActivationCode(type)
+  //   //               //  })
+  //   //             }
+  //   //           else
+  //   //             {
+  //   //               if (value['IsAuthenticated']) {this.checkActivationCode()}
+  //   //             }
+  //   //         })
+  //   //     .catchError((err) {
+  //   //   print(err);
+  //   //   GifLoaderDialogUtils.hideDialog(context);
+  //   // });
+  // }
+  Future<void> _getAvailableBiometrics() async {
+    var availableBiometrics;
+    try {
+      availableBiometrics = await auth.getAvailableBiometrics();
+    } on PlatformException catch (e) {
+      print(e);
+    }
+    if (!mounted) return;
+
+    setState(() {
+      _availableBiometrics = availableBiometrics;
+    });
+  }
+
+  sendActivationCode(type, authProv) async {
+    if (user != null) {
+      sendActivationCodeVerificationScreen(type, authProv);
+    } else {
+      sendActivationCodeByOtpNotificationType(type, authProv);
+    }
+  }
+
+  startSMSService(type, authProv) {
+    sharedPref.setInt(OTP_TYPE, type);
+    new SMSOTP(
+      context,
+      type,
+      _loggedUser['MobileNumber'],
+      (value) {
+        showDialog(
+            context: context,
+            builder: (BuildContext context) {
+              return Center(
+                child: CircularProgressIndicator(),
+              );
+            });
+
+        this.checkActivationCode(authProv, value: value);
+      },
+      () => {
+        Navigator.pop(context),
+        print('Faild..'),
+      },
+    ).displayDialog(context);
+  }
+
+  loginWithFingurePrintFace(type, isActive, authProv) async {
+    if (isActive == 1) {
+      // this.startBiometricLoginIfAvailable();
+      authenticated = await auth.authenticateWithBiometrics(
+          localizedReason: 'Scan your fingerprint to authenticate',
+          useErrorDialogs: true,
+          stickyAuth: true);
+      if (user.logInTypeID == 1 || user.logInTypeID == 2) {
+        this.onlySMSBox = true;
+      } else {
+        this.checkActivationCode(authProv);
+      }
+
+      // if (authenticated == true) {
+      //   if (user != null && (user.logInTypeID == 4 || user.logInTypeID == 3)) {
+      //     //this.checkActivationCode();
+      //   } else {
+      //     // var request = this.getCommonRequest(type: type);
+      //     // this.getMobileInfo(request);
+      //   }
+      // }
+    }
+  }
+
+  checkActivationCode(AuthViewModel authProv, {value}) async {
+    CheckActivationCodeRequestModel checkActivationCodeForDoctorApp =
+        new CheckActivationCodeRequestModel(
+            zipCode: _loggedUser['ZipCode'],
+            mobileNumber: _loggedUser['MobileNumber'],
+            projectID: await sharedPref.getInt(PROJECT_ID),
+            logInTokenID: await sharedPref.getString(LOGIN_TOKEN_ID),
+            activationCode: value,
+            oTPSendType: await sharedPref.getInt(OTP_TYPE),
+            generalid: "Cs2020@2016\$2958");
+
+    authProv
+        .checkActivationCodeForDoctorApp(checkActivationCodeForDoctorApp)
+        .then((res) async {
+      widget.changeLoadingStata(false);
+      if (res['MessageStatus'] == 1) {
+        sharedPref.setString(TOKEN, res['AuthenticationTokenID']);
+        if (res['List_DoctorProfile'] != null) {
+          loginProcessCompleted(res['List_DoctorProfile'][0], authProv);
+        } else {
+          ClinicModel clinic =
+              ClinicModel.fromJson(res['List_DoctorsClinic'][0]);
+          getDocProfiles(clinic, authProv);
+        }
+      } else {
+        //changeLoadingStata(false);
+        helpers.showErrorToast(res['ErrorEndUserMessage']);
+      }
+    }).catchError((err) {
+      //changeLoadingStata(false);
+      helpers.showErrorToast(err);
+    });
+  }
+
+  loginProcessCompleted(Map<String, dynamic> profile, authProv) {
+    var doctor = DoctorProfileModel.fromJson(profile);
+    authProv.setDoctorProfile(doctor);
+    sharedPref.setObj(DOCTOR_PROFILE, profile);
+    projectsProvider.isLogin = true;
+    Navigator.of(context).pushReplacementNamed(HOME);
+  }
+
+  getDocProfiles(ClinicModel clinicInfo, authProv) {
+    ProfileReqModel docInfo = new ProfileReqModel(
+        doctorID: clinicInfo.doctorID,
+        clinicID: clinicInfo.clinicID,
+        license: true,
+        projectID: clinicInfo.projectID,
+        tokenID: '',
+        languageID: 2);
+    authProv.getDocProfiles(docInfo.toJson()).then((res) {
+      if (res['MessageStatus'] == 1) {
+        loginProcessCompleted(res['DoctorProfileList'][0], authProv);
+      } else {
+        // changeLoadingStata(false);
+        helpers.showErrorToast(res['ErrorEndUserMessage']);
+      }
+    }).catchError((err) {
+      // changeLoadingStata(false);
+      helpers.showErrorToast(err);
+    });
+  }
 }

lib/widgets/otp/sms-popup.dart

@@ -0,0 +1,346 @@
+import 'dart:async';
+
+import 'package:doctor_app_flutter/config/size_config.dart';
+import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
+import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
+import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
+import 'package:flutter/material.dart';
+import 'dart:math';
+
+import 'package:provider/provider.dart';
+
+class SMSOTP {
+  final type;
+  final mobileNo;
+  final Function onSuccess;
+  final Function onFailure;
+  final context;
+
+  int remainingTime = 600;
+
+  Future<Null> timer;
+
+  static BuildContext _context;
+
+  static bool _loading;
+
+  SMSOTP(
+    this.context,
+    this.type,
+    this.mobileNo,
+    this.onSuccess,
+    this.onFailure,
+  );
+
+  final verifyAccountForm = GlobalKey<FormState>();
+
+  TextEditingController digit1 = TextEditingController(text: "");
+  TextEditingController digit2 = TextEditingController(text: "");
+  TextEditingController digit3 = TextEditingController(text: "");
+  TextEditingController digit4 = TextEditingController(text: "");
+
+  Map verifyAccountFormValue = {
+    'digit1': '',
+    'digit2': '',
+    'digit3': '',
+    'digit4': '',
+  };
+  final focusD1 = FocusNode();
+  final focusD2 = FocusNode();
+  final focusD3 = FocusNode();
+  final focusD4 = FocusNode();
+  String errorMsg;
+  ProjectViewModel projectProvider;
+  String displayTime = '';
+
+  displayDialog(BuildContext context) async {
+    return showDialog(
+        context: context,
+        builder: (context) {
+          projectProvider = Provider.of(context);
+          return AlertDialog(
+            title: Row(
+              mainAxisAlignment: MainAxisAlignment.end,
+              children: <Widget>[
+                IconButton(
+                  icon: Icon(Icons.close),
+                  onPressed: () {
+                    Navigator.pop(context);
+                    this.onFailure();
+                  },
+                )
+              ],
+            ),
+            shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.all(Radius.circular(10.0))),
+            content: StatefulBuilder(builder: (context, setState) {
+              if (displayTime == '') {
+                startTimer(setState);
+              }
+              return Container(
+                color: Colors.white,
+                height: SizeConfig.realScreenHeight * 0.5,
+                width: SizeConfig.realScreenWidth * 0.8,
+                child: Center(
+                    child: SingleChildScrollView(
+                        child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: <Widget>[
+                    type == 1
+                        ? Image.asset('assets/images/login/103.png')
+                        : Image.asset('assets/images/login/104.png'),
+                    Padding(
+                        padding: EdgeInsets.only(top: 5),
+                        child: AppText(
+                          TranslationBase.of(context).verificationMessage +
+                              ' XXXXXX' +
+                              mobileNo
+                                  .toString()
+                                  .substring(mobileNo.toString().length - 3),
+                          textAlign: TextAlign.center,
+                        )),
+                    Form(
+                      key: verifyAccountForm,
+                      child: Padding(
+                        padding: EdgeInsets.only(top: 20),
+                        child: Directionality(
+                            textDirection: TextDirection.ltr,
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceAround,
+                              children: <Widget>[
+                                Container(
+                                  width: SizeConfig.realScreenWidth * 0.15,
+                                  child: TextFormField(
+                                    textInputAction: TextInputAction.next,
+                                    style: buildTextStyle(),
+                                    autofocus: true,
+                                    maxLength: 1,
+                                    controller: digit1,
+                                    textAlign: TextAlign.center,
+                                    keyboardType: TextInputType.number,
+                                    decoration: buildInputDecoration(context),
+                                    onSaved: (val) {},
+                                    validator: validateCodeDigit,
+                                    onFieldSubmitted: (_) {
+                                      FocusScope.of(context)
+                                          .requestFocus(focusD2);
+                                    },
+                                    onChanged: (val) {
+                                      if (val.length == 1) {
+                                        FocusScope.of(context)
+                                            .requestFocus(focusD2);
+                                        verifyAccountFormValue['digit1'] =
+                                            val.trim();
+                                        checkValue();
+                                      }
+                                    },
+                                  ),
+                                ),
+                                Container(
+                                  width: SizeConfig.realScreenWidth * 0.15,
+                                  child: TextFormField(
+                                      focusNode: focusD2,
+                                      textInputAction: TextInputAction.next,
+                                      maxLength: 1,
+                                      controller: digit2,
+                                      textAlign: TextAlign.center,
+                                      style: buildTextStyle(),
+                                      keyboardType: TextInputType.number,
+                                      decoration: buildInputDecoration(context),
+                                      onSaved: (val) {},
+                                      onFieldSubmitted: (_) {
+                                        FocusScope.of(context)
+                                            .requestFocus(focusD3);
+                                      },
+                                      onChanged: (val) {
+                                        if (val.length == 1) {
+                                          FocusScope.of(context)
+                                              .requestFocus(focusD3);
+                                          verifyAccountFormValue['digit2'] =
+                                              val.trim();
+                                          checkValue();
+                                        }
+                                      },
+                                      validator: validateCodeDigit),
+                                ),
+                                Container(
+                                    width: SizeConfig.realScreenWidth * 0.15,
+                                    child: TextFormField(
+                                        focusNode: focusD3,
+                                        textInputAction: TextInputAction.next,
+                                        maxLength: 1,
+                                        controller: digit3,
+                                        textAlign: TextAlign.center,
+                                        style: buildTextStyle(),
+                                        keyboardType: TextInputType.number,
+                                        decoration:
+                                            buildInputDecoration(context),
+                                        onSaved: (val) {},
+                                        onFieldSubmitted: (_) {
+                                          FocusScope.of(context)
+                                              .requestFocus(focusD4);
+                                        },
+                                        onChanged: (val) {
+                                          if (val.length == 1) {
+                                            FocusScope.of(context)
+                                                .requestFocus(focusD4);
+                                            verifyAccountFormValue['digit3'] =
+                                                val.trim();
+                                            checkValue();
+                                          }
+                                        },
+                                        validator: validateCodeDigit)),
+                                Container(
+                                    width: SizeConfig.realScreenWidth * 0.15,
+                                    child: TextFormField(
+                                        focusNode: focusD4,
+                                        maxLength: 1,
+                                        textAlign: TextAlign.center,
+                                        style: buildTextStyle(),
+                                        controller: digit4,
+                                        keyboardType: TextInputType.number,
+                                        decoration:
+                                            buildInputDecoration(context),
+                                        onFieldSubmitted: (_) {
+                                          FocusScope.of(context)
+                                              .requestFocus(focusD4);
+                                        },
+                                        onChanged: (val) {
+                                          if (val.length == 1) {
+                                            verifyAccountFormValue['digit4'] =
+                                                val.trim();
+                                            checkValue();
+                                          }
+                                        },
+                                        validator: validateCodeDigit)),
+                              ],
+                            )),
+                      ),
+                    ),
+                    Padding(
+                        padding: EdgeInsets.only(top: 10),
+                        child: AppText(
+                          TranslationBase.of(context).validationMessage +
+                              ' ' +
+                              displayTime,
+                          color: Colors.red,
+                          textAlign: TextAlign.center,
+                        ))
+                  ],
+                ))),
+              );
+            }),
+          );
+        });
+  }
+
+  TextStyle buildTextStyle() {
+    return TextStyle(
+      fontSize: SizeConfig.textMultiplier * 3,
+    );
+  }
+
+  InputDecoration buildInputDecoration(BuildContext context) {
+    return InputDecoration(
+      counterText: " ",
+      // ts/images/password_icon.png
+      // contentPadding: EdgeInsets.only(top: 20, bottom: 20),
+      enabledBorder: OutlineInputBorder(
+        borderRadius: BorderRadius.all(Radius.circular(10)),
+        borderSide: BorderSide(color: Colors.black),
+      ),
+      focusedBorder: OutlineInputBorder(
+        borderRadius: BorderRadius.all(Radius.circular(10.0)),
+        borderSide: BorderSide(color: Theme.of(context).primaryColor),
+      ),
+      errorBorder: OutlineInputBorder(
+        borderRadius: BorderRadius.all(Radius.circular(10.0)),
+        borderSide: BorderSide(color: Theme.of(context).errorColor),
+      ),
+      focusedErrorBorder: OutlineInputBorder(
+        borderRadius: BorderRadius.all(Radius.circular(10.0)),
+        borderSide: BorderSide(color: Theme.of(context).errorColor),
+      ),
+    );
+  }
+
+  String validateCodeDigit(value) {
+    if (value.isEmpty) {
+      return ' ';
+    } else if (value.length == 3) {
+      print(value);
+    } else {
+      return null;
+    }
+  }
+
+  checkValue() {
+    //print(verifyAccountFormValue);
+    if (verifyAccountForm.currentState.validate()) {
+      onSuccess(digit1.text.toString() +
+          digit2.text.toString() +
+          digit3.text.toString() +
+          digit4.text.toString());
+    }
+  }
+
+  getSecondsAsDigitalClock(int inputSeconds) {
+    var sec_num =
+        int.parse(inputSeconds.toString()); // don't forget the second param
+    var hours = (sec_num / 3600).floor();
+    var minutes = ((sec_num - hours * 3600) / 60).floor();
+    var seconds = sec_num - hours * 3600 - minutes * 60;
+    var minutesString = "";
+    var secondsString = "";
+    minutesString =
+        minutes < 10 ? "0" + minutes.toString() : minutes.toString();
+    secondsString =
+        seconds < 10 ? "0" + seconds.toString() : seconds.toString();
+    return minutesString + ":" + secondsString;
+  }
+
+  startTimer(setState) {
+    this.remainingTime--;
+    setState(() {
+      displayTime = this.getSecondsAsDigitalClock(this.remainingTime);
+    });
+
+    timer = Future.delayed(Duration(seconds: 1), () {
+      if (this.remainingTime > 0) {
+        startTimer(setState);
+      } else {
+        Navigator.pop(context);
+      }
+    });
+  }
+
+  static void showLoadingDialog(BuildContext context, bool _loading) async {
+    _context = context;
+
+    if (_loading == false) {
+      Navigator.of(context).pop();
+      return;
+    }
+    _loading = true;
+    await showDialog(
+        context: _context,
+        barrierDismissible: false,
+        builder: (BuildContext context) {
+          return SimpleDialog(
+            elevation: 0.0,
+            backgroundColor: Colors.transparent,
+            children: <Widget>[
+              Center(
+                child: CircularProgressIndicator(
+                  valueColor: AlwaysStoppedAnimation<Color>(Colors.black),
+                ),
+              )
+            ],
+          );
+        });
+  }
+
+  static void hideSMSBox(context) {
+    Navigator.pop(context);
+  }
+}

lib/widgets/patients/dynamic_elements.dart

@@ -59,22 +59,49 @@ class _DynamicElementsState extends State<DynamicElements> {
 
   @override
   Widget build(BuildContext context) {
+    final screenSize = MediaQuery
+        .of(context)
+        .size;
+    InputDecoration textFieldSelectorDecoration({String hintText,
+        String selectedText, bool isDropDown,IconData icon}) {
+      return InputDecoration(
+        focusedBorder: OutlineInputBorder(
+          borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0),
+          borderRadius: BorderRadius.circular(8),
+        ),
+        enabledBorder: OutlineInputBorder(
+          borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0),
+          borderRadius: BorderRadius.circular(8),
+        ),
+        disabledBorder: OutlineInputBorder(
+          borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0),
+          borderRadius: BorderRadius.circular(8),
+        ),
+        hintText: selectedText != null ? selectedText : hintText,
+        suffixIcon: isDropDown ? Icon(icon ?? Icons.arrow_drop_down) : null,
+        hintStyle: TextStyle(
+          fontSize: 14,
+          color: Colors.grey.shade600,
+        ),
+      )
+      ;
+    }
     return LayoutBuilder(
       builder: (ctx, constraints) {
         return Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
+            SizedBox(
+              height: 10,
+            ),
             SizedBox(
               height: 10,
             ),
             AppTextFormField(
-              textInputType: TextInputType.number,
+              onTap: ()=> _presentDatePicker('_selectedFromDate'),
               hintText: TranslationBase.of(context).fromDate,
               controller: _fromDateController,
               inputFormatter: ONLY_DATE,
-              onTap: () {
-                _presentDatePicker('_selectedFromDate');
-              },
               onSaved: (value) {
                 if (_fromDateController.text.toString().trim().isEmpty) {
                   widget._patientSearchFormValues.From = "0";
@@ -82,12 +109,14 @@ class _DynamicElementsState extends State<DynamicElements> {
                   widget._patientSearchFormValues.From = _fromDateController.text.replaceAll("/", "-");
                 }
               },
+              readOnly: true,
+
             ),
             SizedBox(
               height: 10,
             ),
             AppTextFormField(
-              textInputType: TextInputType.number,
+              readOnly: true,
               hintText: TranslationBase
                   .of(context)
                   .toDate,

lib/widgets/patients/patient-referral-item-widget.dart

@@ -37,7 +37,7 @@ class PatientReferralItemWidget extends StatelessWidget {
                   children: <Widget>[
                     Center(
                       child: AppText(
-                        patientName,
+                        "${patientName}",
                         color: Colors.black,
                         fontWeight: FontWeight.bold,
                         fontSize: 16,
@@ -48,9 +48,10 @@ class PatientReferralItemWidget extends StatelessWidget {
                         color: Color(0xFF4BA821),
                         padding: EdgeInsets.all(4),
                         child: AppText(
-                          referralStatus == "46"
+                          referralStatus
+                          /*referralStatus == "46"
                               ? TranslationBase.of(context).approved
-                              : TranslationBase.of(context).rejected,
+                              : TranslationBase.of(context).rejected*/,
                           color: Colors.white,
                           fontWeight: FontWeight.bold,
                           fontSize: 12,

lib/widgets/patients/profile/patient-page-header-widget.dart

@@ -1,92 +1,109 @@
+import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
 import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
+import 'package:doctor_app_flutter/models/SOAP/GeneralGetReqForSOAP.dart';
 import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
+import 'package:doctor_app_flutter/screens/base/base_view.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
+import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
 import 'package:flutter/material.dart';
 
 class PatientPageHeaderWidget extends StatelessWidget {
 
   final PatiantInformtion patient;
-
   PatientPageHeaderWidget(this.patient);
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.start,
-        children: [
-          Padding(
-            padding: const EdgeInsets.all(8.0),
-            child: Row(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              mainAxisSize: MainAxisSize.min,
-              children:   <Widget>[
-                AvatarWidget(
-                  Icon(
-                    patient.genderDescription == "Male"
-                        ? DoctorApp.male
-                        : DoctorApp.female_icon,
-                    size: 70,
-                    color: Colors.white,
-                  ),
-                ),
-                SizedBox(
-                  width: 20,
-                ),
-                Expanded(
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    children: [
-                      SizedBox(
-                        height: 5,
-                      ),
-                      AppText(
-                        patient.firstName + '  ' + patient.lastName,
-                        color: Colors.black,
-                        fontWeight: FontWeight.bold,
-                      ),
-                      Row(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          AppText(
-                            TranslationBase.of(context).age,
-                            color: Colors.black,
-                            fontWeight: FontWeight.bold,
-                          ),
-                          SizedBox(
-                            width: 20,
+    return BaseView<SOAPViewModel>(
+        onModelReady: (model) async {
+          GeneralGetReqForSOAP generalGetReqForSOAP = GeneralGetReqForSOAP(
+              patientMRN: patient.patientMRN,
+              episodeId: patient.episodeNo,
+              appointmentNo: patient.appointmentNo,
+              doctorID: '',
+              editedBy: '');
+          await model.getPatientAllergy(generalGetReqForSOAP);
+
+        },
+        builder: (_, model, w) => Container(
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.start,
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.all(8.0),
+                    child: Row(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      mainAxisSize: MainAxisSize.min,
+                      children: <Widget>[
+                        AvatarWidget(
+                          Icon(
+                            patient.genderDescription == "Male"
+                                ? DoctorApp.male
+                                : DoctorApp.female_icon,
+                            size: 70,
+                            color: Colors.white,
                           ),
-                          AppText(
-                            patient.age.toString(),
-                            color: Colors.black,
-                            fontWeight: FontWeight.normal,
+                        ),
+                        SizedBox(
+                          width: 20,
+                        ),
+                        Expanded(
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            mainAxisAlignment: MainAxisAlignment.start,
+                            children: [
+                              SizedBox(
+                                height: 5,
+                              ),
+                              AppText(
+                                patient.firstName + '  ' + patient.lastName,
+                                color: Colors.black,
+                                fontWeight: FontWeight.bold,
+                              ),
+                              Row(
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  AppText(
+                                    TranslationBase.of(context).age,
+                                    color: Colors.black,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                  SizedBox(
+                                    width: 20,
+                                  ),
+                                  AppText(
+                                    patient.age.toString(),
+                                    color: Colors.black,
+                                    fontWeight: FontWeight.normal,
+                                  ),
+                                ],
+                              ),
+                              NetworkBaseView(
+                                baseViewModel: model,
+                                child: model.patientAllergiesList.isNotEmpty ?AppText(
+                                    "ALLERGIC TO: "+model.getAllergicNames(),
+                                  color: Color(0xFFB9382C),
+                                  fontWeight: FontWeight.bold,
+                                ) : AppText(''),
+                              ),
+                            ],
                           ),
-                        ],
-                      ),
-                      AppText(
-                        "ALLERGIC TO: FOOD, ASPIRIN, EGG WHITE",
-                        color: Color(0xFFB9382C),
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ],
+                        )
+                      ],
+                    ),
+                  ),
+                  Container(
+                    width: double.infinity,
+                    height: 1,
+                    color: Color(0xffCCCCCC),
+                  ),
+                  SizedBox(
+                    width: 20,
                   ),
-                )
-              ],
-            ),
-          ),
-          Container(
-            width: double.infinity,
-            height: 1,
-            color: Color(0xffCCCCCC),
-          ),
-          SizedBox(
-            width: 20,
-          ),
-        ],
-      ),
-    );
+                ],
+              ),
+            ));
   }
 }

lib/widgets/patients/profile/profile_medical_info_widget.dart

@@ -1,7 +1,13 @@
 import 'package:doctor_app_flutter/config/config.dart';
+import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
+import 'package:doctor_app_flutter/models/SOAP/PostEpisodeReqModel.dart';
 import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/routes.dart';
+import 'package:doctor_app_flutter/screens/base/base_view.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
+import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart';
+import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:hexcolor/hexcolor.dart';
@@ -22,26 +28,46 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
    String patientType;
   @override
   Widget build(BuildContext context) {
-    return SliverGrid.count(
+    return BaseView<SOAPViewModel>(
+      onModelReady: (model) async {},
+      builder: (_, model, w) => SliverGrid.count(
         crossAxisSpacing: 10,
         mainAxisSpacing: 20,
         crossAxisCount: 2,
         childAspectRatio: 1.5,
         children: [
+          if (int.parse(patientType) == 7)
+            PatientProfileButton(
+                key: key,
+                patient: patient,
+                isDisable: patient.episodeNo != 0 ? true : false,
+                nameLine1: TranslationBase.of(context).createNew,
+                nameLine2: TranslationBase.of(context).episode,
+                route: CREATE_EPISODE,
+                onTap: () async {
+                  PostEpisodeReqModel postEpisodeReqModel = PostEpisodeReqModel(
+                      appointmentNo: patient.appointmentNo,
+                      patientMRN: patient.patientMRN);
+                  await model.postEpisode(postEpisodeReqModel);
+                  patient.episodeNo = model.episodeID;
+                  Navigator.of(context).pushNamed(CREATE_EPISODE, arguments: {'patient': patient});
+
+
+                },
+                 isLoading: model.state == ViewState.BusyLocal,
+              icon: 'create-episod.png'
+                ),
           if(int.parse(patientType) ==7)
           PatientProfileButton(
               key: key,
               patient: patient,
-              nameLine1: TranslationBase.of(context).createNew,
-              nameLine2: TranslationBase.of(context).episode,
-              route: CREATE_EPISODE,
-              icon: 'create-episod.png'),
-          if(int.parse(patientType) ==7)
-          PatientProfileButton(
-              key: key,
-              patient: patient,
-              nameLine1: TranslationBase.of(context).update,
-              nameLine2: TranslationBase.of(context).episode,
+              isDisable: patient.episodeNo == 0 ? true : false,
+              nameLine1: TranslationBase
+                  .of(context)
+                  .update,
+              nameLine2: TranslationBase
+                  .of(context)
+                  .episode,
               route: UPDATE_EPISODE,
               icon: 'modilfy-episode.png'),
           PatientProfileButton(
@@ -67,7 +93,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
               nameLine1: TranslationBase.of(context).previewHealth,
               nameLine2: TranslationBase.of(context).summaryReport,
               icon: 'radiology-1.png'),
-          if (selectedPatientType != 0 && selectedPatientType != 5)
+          if (selectedPatientType != 0 && selectedPatientType != 5 && selectedPatientType != 7)
             PatientProfileButton(
                 key: key,
                 patient: patient,
@@ -145,7 +171,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
                     .of(context)
                     .ucaf,
                 icon: 'lab.png'),
-        ]);
+            ],),);
   }
 }
 
@@ -205,20 +231,25 @@ class PatientProfileButton extends StatelessWidget {
   final dynamic route;
   final PatiantInformtion patient;
   final String url = "assets/images/";
-  PatientProfileButton(
-      {Key key,
-      this.patient,
-      this.nameLine1,
-      this.nameLine2,
-      this.icon,
-      this.route})
+  final bool isDisable;
+  final bool isLoading;
+  final Function onTap;
+
+
+  PatientProfileButton({Key key,
+    this.patient,
+    this.nameLine1,
+    this.nameLine2,
+    this.icon,
+    this.route, this.isDisable = false, this.onTap, this.isLoading = false})
       : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return new Container(
       margin: new EdgeInsets.symmetric(horizontal: 4.0),
       child: InkWell(
-        onTap: () {
+        onTap: isDisable?null:onTap != null ? onTap : () {
           navigator(context, this.route);
         },
         child: Column(children: <Widget>[
@@ -242,6 +273,8 @@ class PatientProfileButton extends StatelessWidget {
                   textAlign: TextAlign.left,
                   fontSize: SizeConfig.textMultiplier * 2,
                 ),
+                if(isLoading)
+                  DrAppCircularProgressIndeicator()
               ],
             ),
           ),
@@ -260,7 +293,7 @@ class PatientProfileButton extends StatelessWidget {
       ),
       decoration: BoxDecoration(
         // border: Border.all(),
-        color: Colors.white,
+        color: isDisable ? Colors.grey.withOpacity(0.4) : Colors.white,
         borderRadius: BorderRadius.all(Radius.circular(10)),
         border: Border.fromBorderSide(BorderSide(
           color: Color(0xffBBBBBB),

lib/widgets/patients/profile/soap_update/custom_validation_error.dart

@@ -0,0 +1,33 @@
+
+import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
+import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
+import 'package:flutter/material.dart';
+
+// ignore: must_be_immutable
+class CustomValidationError extends StatelessWidget {
+  String  error;
+  CustomValidationError({
+    Key key, this.error,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    if(error == null )
+      error = TranslationBase
+          .of(context)
+          .emptyMessage;
+    return Column(
+      children: [
+        SizedBox(
+          height: 2,
+        ),
+        Container(
+          margin: EdgeInsets.symmetric(horizontal: 3),
+          child: AppText(error, color: Theme
+              .of(context)
+              .errorColor, fontSize: 14,),
+        ),
+      ],
+    );
+  }
+}

lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart

@@ -19,6 +19,8 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 
+import '../custom_validation_error.dart';
+
 class UpdateAllergiesWidget extends StatefulWidget {
   final List<MySelectedAllergy> myAllergiesList;
 
@@ -226,10 +228,11 @@ class _AddAllergiesState extends State<AddAllergies> {
   MasterKeyModel _selectedAllergy;
   TextEditingController remarkController = TextEditingController();
   GlobalKey key = new GlobalKey<AutoCompleteTextFieldState<MasterKeyModel>>();
+  bool isFormSubmitted = false;
 
-
-  InputDecoration textFieldSelectorDecoration(String hintText,
-      String selectedText, bool isDropDown,{IconData icon}) {
+  InputDecoration textFieldSelectorDecoration(
+      String hintText, String selectedText, bool isDropDown,
+      {IconData icon}) {
     return InputDecoration(
       focusedBorder: OutlineInputBorder(
         borderSide: BorderSide(color: Color(0xFFCCCCCC), width: 2.0),
@@ -328,18 +331,24 @@ class _AddAllergiesState extends State<AddAllergies> {
                                       input.toLowerCase()) ||
                                       suggestion.nameEn.toLowerCase()
                                           .startsWith(input.toLowerCase()),
-                                ):TextField(
+                                ) : TextField(
                                   decoration: textFieldSelectorDecoration(
                                       TranslationBase
                                           .of(context)
                                           .selectAllergy,
                                       _selectedAllergy != null
-                                          ? projectViewModel.isArabic?_selectedAllergy.nameAr: _selectedAllergy.nameEn
-                                          : null, true, icon: EvaIcons.search),
+                                          ? projectViewModel.isArabic
+                                          ? _selectedAllergy.nameAr
+                                          : _selectedAllergy.nameEn
+                                          : null,
+                                      true,
+                                      icon: EvaIcons.search),
                                   enabled: false,
                                 ),
                               ),
                             ),
+                            if(isFormSubmitted && _selectedAllergy == null)
+                              CustomValidationError(),
                             SizedBox(
                               height: 10,
                             ),
@@ -382,6 +391,8 @@ class _AddAllergiesState extends State<AddAllergies> {
                                 ),
                               ),
                             ),
+                            if(isFormSubmitted && _selectedAllergySeverity == null)
+                              CustomValidationError(),
                             SizedBox(
                               height: 10,
                             ),
@@ -410,12 +421,18 @@ class _AddAllergiesState extends State<AddAllergies> {
                             AppButton(
                               title: TranslationBase.of(context).add.toUpperCase(),
                               onPressed: () {
-                                MySelectedAllergy mySelectedAllergy = new MySelectedAllergy(
-                                  remark: remarkController.text,
-                                  selectedAllergy: _selectedAllergy,
-                                  isChecked: true,
-                                  selectedAllergySeverity: _selectedAllergySeverity,);
-                                widget.addAllergiesFun(mySelectedAllergy);
+                                setState(() {
+                                  isFormSubmitted = true;
+                                });
+                                if(_selectedAllergy !=null && _selectedAllergySeverity !=null) {
+                                  MySelectedAllergy mySelectedAllergy = new MySelectedAllergy(
+                                    remark: remarkController.text,
+                                    selectedAllergy: _selectedAllergy,
+                                    isChecked: true,
+                                    selectedAllergySeverity: _selectedAllergySeverity,);
+                                  widget.addAllergiesFun(mySelectedAllergy);
+                                }
+
                               },
                             ),
                           ]
@@ -433,3 +450,4 @@ class _AddAllergiesState extends State<AddAllergies> {
 
 
 
+

lib/widgets/patients/profile/soap_update/subjective/update_history_widget.dart

@@ -10,6 +10,7 @@ import 'package:doctor_app_flutter/widgets/shared/Text.dart';
 import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/master_key_checkbox_search_widget.dart';
+import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
 import 'package:eva_icons_flutter/eva_icons_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -271,6 +272,9 @@ class _AddHistoryDialogState extends State<AddHistoryDialog> {
           onModelReady: (model) async {
             if (model.historyFamilyList.length == 0) {
               await model.getMasterLookup(MasterKeysService.HistoryFamily);
+              setState(() {
+
+              });
             }
           },
           builder: (_, model, w) => AppScaffold(
@@ -313,62 +317,71 @@ class _AddHistoryDialogState extends State<AddHistoryDialog> {
                         },
                         scrollDirection: Axis.horizontal,
                         children: <Widget>[
-                          MasterKeyCheckboxSearchWidget(
-                            model: model,
-                            masterList: model.historyFamilyList,
-                            removeHistory: (history){
-                              setState(() {
-                                widget.removeHistory(history);
-                              });
-                            },
-                            addHistory: (history){
-                              setState(() {
-                                createAndAddHistory(
-                                    history);
-                              });
-                            },
-                            addSelectedHistories: (){
-                              widget.addSelectedHistories();
-                            },
-                            isServiceSelected: (master) =>isServiceSelected(master),
+                          NetworkBaseView(
+                            baseViewModel: model,
+                            child: MasterKeyCheckboxSearchWidget(
+                              model: model,
+                              masterList: model.historyFamilyList,
+                              removeHistory: (history){
+                                setState(() {
+                                  widget.removeHistory(history);
+                                });
+                              },
+                              addHistory: (history){
+                                setState(() {
+                                  createAndAddHistory(
+                                      history);
+                                });
+                              },
+                              addSelectedHistories: (){
+                                widget.addSelectedHistories();
+                              },
+                              isServiceSelected: (master) =>isServiceSelected(master),
+                            ),
                           ),
-                          MasterKeyCheckboxSearchWidget(
-                            model: model,
-                            masterList: model.mergeHistorySurgicalWithHistorySportList,
-                            removeHistory: (history){
-                              setState(() {
-                                widget.removeHistory(history);
-                              });
-                            },
-                            addHistory: (history){
-                              setState(() {
-                                createAndAddHistory(
-                                    history);
-                              });
-                            },
-                            addSelectedHistories: (){
-                              widget.addSelectedHistories();
-                            },
-                            isServiceSelected: (master) =>isServiceSelected(master),
+                          NetworkBaseView(
+                            baseViewModel: model,
+                            child: MasterKeyCheckboxSearchWidget(
+                              model: model,
+                              masterList: model.mergeHistorySurgicalWithHistorySportList,
+                              removeHistory: (history){
+                                setState(() {
+                                  widget.removeHistory(history);
+                                });
+                              },
+                              addHistory: (history){
+                                setState(() {
+                                  createAndAddHistory(
+                                      history);
+                                });
+                              },
+                              addSelectedHistories: (){
+                                widget.addSelectedHistories();
+                              },
+                              isServiceSelected: (master) =>isServiceSelected(master),
+                            ),
                           ),
-                          MasterKeyCheckboxSearchWidget(
-                            model: model,
-                            masterList: model.historyMedicalList,
-                            removeHistory: (history){
-                              setState(() {
-                                widget.removeHistory(history);
-                              });
-                            },
-                            addHistory: (history){
-                              setState(() {
-                                createAndAddHistory(
-                                    history);
-                              });
-                            },
-                            addSelectedHistories: (){
-                              widget.addSelectedHistories();
-                            },
-                            isServiceSelected: (master) =>isServiceSelected(master),
+                          NetworkBaseView(
+                            baseViewModel: model,
+                            child: MasterKeyCheckboxSearchWidget(
+                              model: model,
+                              masterList: model.historyMedicalList,
+                              removeHistory: (history){
+                                setState(() {
+                                  widget.removeHistory(history);
+                                });
+                              },
+                              addHistory: (history){
+                                setState(() {
+                                  createAndAddHistory(
+                                      history);
+                                });
+                              },
+                              addSelectedHistories: (){
+                                widget.addSelectedHistories();
+                              },
+                              isServiceSelected: (master) =>isServiceSelected(master),
+                            ),
                           ),
                         ],
                       ),

lib/widgets/patients/profile/soap_update/update_assessment_page.dart

@@ -23,6 +23,8 @@ import 'package:eva_icons_flutter/eva_icons_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
+import 'custom_validation_error.dart';
+
 class UpdateAssessmentPage extends StatefulWidget {
   final Function changePageViewIndex;
   List<MySelectedAssessment> mySelectedAssessmentList;
@@ -41,7 +43,6 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
   bool isAssessmentExpand = false;
   @override
   Widget build(BuildContext context) {
-    final screenSize = MediaQuery.of(context).size;
 
     return BaseView<SOAPViewModel>(
         onModelReady: (model) async{
@@ -152,12 +153,10 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
                                               model: model);
                                         },
                                         readOnly: true,
-                                        // hintColor: Colors.black,
                                         suffixIcon: EvaIcons.plusCircleOutline,
                                         suffixIconColor: AppGlobal
                                             .appPrimaryColor,
                                         fontWeight: FontWeight.w600,
-                                        // controller: messageController,
                                         validator: (value) {
                                           if (value == null)
                                             return TranslationBase
@@ -217,7 +216,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
                                                   MainAxisAlignment.start,
                                                   children: [
                                                     AppText(
-                                                      "Appointment #: ",
+                                                      TranslationBase.of(context).appointmentNo,
                                                       fontWeight: FontWeight
                                                           .bold,
                                                       fontSize: 16,
@@ -250,7 +249,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
                                                   MainAxisAlignment.start,
                                                   children: [
                                                     AppText(
-                                                      "Type : ",
+                                                     TranslationBase.of(context).type +':',
                                                       fontWeight: FontWeight
                                                           .bold,
                                                       fontSize: 16,
@@ -270,7 +269,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
                                                   MainAxisAlignment.start,
                                                   children: [
                                                     AppText(
-                                                      "Doc : ",
+                                                      TranslationBase.of(context).doc,
                                                       fontWeight: FontWeight
                                                           .bold,
                                                       fontSize: 16,
@@ -402,6 +401,7 @@ class _UpdateAssessmentPageState extends State<UpdateAssessmentPage> {
               addSelectedAssessment: (MySelectedAssessment mySelectedAssessment,
                   bool isUpdate) async {
                 setState(() {
+                  widget.mySelectedAssessmentList.add(mySelectedAssessment);
 
                 });
               });
@@ -416,7 +416,6 @@ class AddAssessmentDetails extends StatefulWidget {
   final Function(MySelectedAssessment mySelectedAssessment, bool isUpdate) addSelectedAssessment;
   final PatiantInformtion patientInfo;
   final bool isUpdate;
-
   AddAssessmentDetails(
       {Key key, this.mySelectedAssessment, this.addSelectedAssessment, this.patientInfo, this.isUpdate = false, this.mySelectedAssessmentList});
 
@@ -429,6 +428,7 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
   TextEditingController remarkController = TextEditingController();
   TextEditingController appointmentIdController = TextEditingController();
   GlobalKey key = new GlobalKey<AutoCompleteTextFieldState<MasterKeyModel>>();
+  bool isFormSubmitted = false;
 
   @override
   Widget build(BuildContext context) {
@@ -552,6 +552,9 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
                               ),
                             ),
                                   ),
+                                  if(isFormSubmitted && widget.mySelectedAssessment
+                                      .selectedICD == null)
+                                    CustomValidationError(),
                                   SizedBox(
                                     height: 10,
                                   ),
@@ -598,6 +601,9 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
                                       ),
                                     ),
                                   ),
+                                  if(isFormSubmitted && widget.mySelectedAssessment
+                                      .selectedDiagnosisCondition == null)
+                                    CustomValidationError(),
                                   SizedBox(
                                     height: 10,
                                   ),
@@ -644,6 +650,9 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
                                       ),
                                     ),
                                   ),
+                                  if(isFormSubmitted && widget.mySelectedAssessment
+                                      .selectedDiagnosisType == null)
+                                    CustomValidationError(),
                                   SizedBox(
                                     height: 10,
                                   ),
@@ -671,9 +680,12 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
                                     height: 10,
                                   ),
                                   AppButton(
-                                    title: "Add".toUpperCase(),
+                                    title: (widget.isUpdate?TranslationBase.of(context).update:TranslationBase.of(context).add).toUpperCase(),
                                     loading: model.state == ViewState.BusyLocal,
                                     onPressed: () async {
+                                      setState(() {
+                                        isFormSubmitted = true;
+                                      });
                                         widget.mySelectedAssessment.remark =
                                             remarkController.text;
                                         widget.mySelectedAssessment
@@ -695,10 +707,6 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
                                               model: model,
                                               mySelectedAssessment: widget
                                                   .mySelectedAssessment);
-                                        } else {
-                                          helpers.showErrorToast(TranslationBase
-                                              .of(context)
-                                              .requiredMsg);
                                         }
                                     },
                                   ),
@@ -755,7 +763,8 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
       mySelectedAssessment.icdCode10ID = mySelectedAssessment.selectedICD.code;
 
       if (!isUpdate) {
-        widget.mySelectedAssessmentList.add(mySelectedAssessment);
+        // widget.mySelectedAssessmentList.add(mySelectedAssessment);
+        widget.addSelectedAssessment(mySelectedAssessment,isUpdate);
       }
       Navigator.of(context).pop();
     }

lib/widgets/patients/profile/soap_update/update_objective_page.dart

@@ -315,7 +315,7 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
                                           fontWeight: FontWeight.w600,
                                           maxLines: 25,
                                           minLines: 4,
-                                          controller: remarksController,
+                                          // controller: remarksController,
                                           validator: (value) {
                                             if (value == null)
                                               return TranslationBase.of(context)
@@ -397,10 +397,10 @@ class _UpdateObjectivePageState extends State<UpdateObjectivePage> {
         widget.changePageViewIndex(2);
       }
     } else {
-      helpers.showErrorToast(TranslationBase.of(context).requiredMsg);
-    }
+      widget.changePageViewIndex(2);
 
-    widget.changePageViewIndex(2);
+      // helpers.showErrorToast(TranslationBase.of(context).requiredMsg);
+    }
   }
 
   removeExamination(MasterKeyModel masterKey) {

lib/widgets/patients/profile/soap_update/update_plan_page.dart

@@ -51,8 +51,6 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
 
   @override
   Widget build(BuildContext context) {
-    final screenSize = MediaQuery.of(context).size;
-
     return BaseView<SOAPViewModel>(
       onModelReady: (model) async {
         GetGetProgressNoteReqModel getGetProgressNoteReqModel =
@@ -115,7 +113,7 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
                       ),
                       Column(
                         children: [
-                          if(model.patientProgressNoteList.isEmpty)
+                          if(model.patientProgressNoteList.isEmpty ||  progressNoteController.text !='')
                           Container(
                             margin:
                                 EdgeInsets.only(left: 10, right: 10, top: 15),
@@ -142,7 +140,7 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
                           SizedBox(
                             height: 20,
                           ),
-                          if (progressNoteController.text.isNotEmpty)
+                          if (progressNoteController.text !='')
                             Container(
                               margin:
                                   EdgeInsets.only(left: 5, right: 5, top: 15),
@@ -287,13 +285,13 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
           appointmentNo: widget.patientInfo.appointmentNo,
           planNote: progressNoteController.text, doctorID: '', editedBy: '');
 
-      // if(model.patientProgressNoteList.isEmpty){
+      if(model.patientProgressNoteList.isEmpty){
         await model.postProgressNote(postProgressNoteRequestModel);
 
-      // }else {
-      //   await model.patchProgressNote(postProgressNoteRequestModel);
-      //
-      // }
+      }else {
+        await model.patchProgressNote(postProgressNoteRequestModel);
+
+      }
 
       if (model.state == ViewState.ErrorLocal) {
         helpers.showErrorToast(model.error);
@@ -352,6 +350,9 @@ class _UpdatePlanPageState extends State<UpdatePlanPage> {
                         AppButton(
                           title: "Add".toUpperCase(),
                           onPressed: () {
+                            setState(() {
+                              print(progressNoteController.text);
+                            });
                             Navigator.of(context).pop();
                           },
                         ),

lib/widgets/shared/app_loader_widget.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:progress_hud_v2/progress_hud.dart';
 
+import 'loader/gif_loader_container.dart';
+
 /* 
  *@author: Elham Rababah 
  *@Date:19/4/2020  
@@ -41,6 +43,18 @@ class _AppLoaderWidgetState extends State<AppLoaderWidget> {
 
   @override
   Widget build(BuildContext context) {
-    return Positioned(child: _progressHUD);
+    return Container(
+      height: MediaQuery.of(context).size.height,
+
+      child: Stack(
+        children: [
+          Container(
+            color: Colors.grey.withOpacity(0.6),
+          ),
+          Container(child: GifLoaderContainer(), margin: EdgeInsets.only(
+              bottom: MediaQuery.of(context).size.height * 0.09))
+        ],
+      ),
+    );
   }
 }

lib/widgets/shared/app_text_form_field.dart

@@ -4,10 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hexcolor/hexcolor.dart';
 
-// OWNER : Ibrahim albitar
-// DATE : 19-04-2020
-// DESCRIPTION : Custom Text Form Field for app.
-
 class AppTextFormField extends FormField<String> {
   AppTextFormField(
       {FormFieldSetter<String> onSaved,
@@ -41,6 +37,7 @@ class AppTextFormField extends FormField<String> {
                       obscureText: obscureText,
                       focusNode: focusNode,
                       keyboardType: textInputType,
+                      readOnly: readOnly,
                       inputFormatters: [
                         FilteringTextInputFormatter.allow(
                             RegExp(inputFormatter)),

lib/widgets/shared/loader/gif_loader_container.dart

@@ -0,0 +1,43 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter_gifimage/flutter_gifimage.dart';
+
+class GifLoaderContainer extends StatefulWidget {
+  @override
+  _GifLoaderContainerState createState() => _GifLoaderContainerState();
+}
+
+class _GifLoaderContainerState extends State<GifLoaderContainer>
+    with TickerProviderStateMixin {
+  GifController controller1;
+
+  @override
+  void initState() {
+    controller1 = GifController(vsync: this);
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      controller1.repeat(
+          min: 0, max: 11, period: Duration(milliseconds: 750), reverse: true);
+    });
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    controller1.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      //progress-loading.gif
+        child: Container(
+          // margin: EdgeInsets.only(bottom: 40),
+          child: GifImage(
+            controller: controller1,
+            image: AssetImage(
+                "assets/images/progress-loading-red.gif"), //NetworkImage("http://img.mp.itc.cn/upload/20161107/5cad975eee9e4b45ae9d3c1238ccf91e.jpg"),
+          ),
+        ));
+  }
+}

lib/widgets/shared/loader/gif_loader_dialog_utils.dart

@@ -0,0 +1,14 @@
+import 'package:flutter/material.dart';
+
+import 'gif_loader_container.dart';
+
+
+class GifLoaderDialogUtils {
+  static showMyDialog(BuildContext context) {
+    showDialog(context: context, child: GifLoaderContainer());
+  }
+
+  static hideDialog(BuildContext context) {
+    Navigator.of(context).pop();
+  }
+}

lib/widgets/shared/master_key_checkbox_search_widget.dart

@@ -53,71 +53,68 @@ class _MasterKeyCheckboxSearchWidgetState extends State<MasterKeyCheckboxSearchW
     return Container(
       child: Column(
         children: [
-          NetworkBaseView(
-            baseViewModel: widget.model,
-            child: Container(
-              height: MediaQuery.of(context).size.height * 0.5,
-              child: Center(
-                  child: Container(
-                margin: EdgeInsets.only(top: 15),
-                    decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(12),
-                        color: Colors.white),
-                    child: ListView(
-                      children: [
-                        TextFields(
-                          hintText: widget.hintSearchText ?? TranslationBase
-                              .of(context)
-                              .searchHistory,
-                          suffixIcon: EvaIcons.search,
-                          onChanged: (value) {
-                            filterSearchResults(value);
-                          },
-                        ),
-                        SizedBox(height: 15,),
-                        Column(
-                          children: items.map((historyInfo) {
-                            return Column(
-                              children: [
-                                Row(
-                                  children: [
-                                    Checkbox(
-                                        value:
-                                        widget.isServiceSelected(historyInfo),
-                                        activeColor: Colors.red[800],
-                                        onChanged: (bool newValue) {
-                                          setState(() {
-                                            if (widget
-                                                .isServiceSelected(historyInfo)) {
-                                              widget.removeHistory(historyInfo);
-                                            } else {
-                                              widget.addHistory(historyInfo);
-                                            }
-                                          });
-                                        }),
-                                    Expanded(
-                                      child: Padding(
-                                        padding: const EdgeInsets.symmetric(
-                                            horizontal: 10, vertical: 0),
-                                        child: Texts(projectViewModel.isArabic
-                                            ? historyInfo.nameAr!=""?historyInfo.nameAr:historyInfo.nameEn
-                                            : historyInfo.nameEn,
-                                            variant: "bodyText",
-                                            bold: true,
-                                            color: Colors.black),
-                                      ),
+          Container(
+            height: MediaQuery.of(context).size.height * 0.5,
+            child: Center(
+                child: Container(
+              margin: EdgeInsets.only(top: 15),
+                  decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(12),
+                      color: Colors.white),
+                  child: ListView(
+                    children: [
+                      TextFields(
+                        hintText: widget.hintSearchText ?? TranslationBase
+                            .of(context)
+                            .searchHistory,
+                        suffixIcon: EvaIcons.search,
+                        onChanged: (value) {
+                          filterSearchResults(value);
+                        },
+                      ),
+                      SizedBox(height: 15,),
+                      Column(
+                        children: items.map((historyInfo) {
+                          return Column(
+                            children: [
+                              Row(
+                                children: [
+                                  Checkbox(
+                                      value:
+                                      widget.isServiceSelected(historyInfo),
+                                      activeColor: Colors.red[800],
+                                      onChanged: (bool newValue) {
+                                        setState(() {
+                                          if (widget
+                                              .isServiceSelected(historyInfo)) {
+                                            widget.removeHistory(historyInfo);
+                                          } else {
+                                            widget.addHistory(historyInfo);
+                                          }
+                                        });
+                                      }),
+                                  Expanded(
+                                    child: Padding(
+                                      padding: const EdgeInsets.symmetric(
+                                          horizontal: 10, vertical: 0),
+                                      child: Texts(projectViewModel.isArabic
+                                          ? historyInfo.nameAr!=""?historyInfo.nameAr:historyInfo.nameEn
+                                          : historyInfo.nameEn,
+                                          variant: "bodyText",
+                                          bold: true,
+                                          color: Colors.black),
                                     ),
-                                  ],
-                                ),
-                                DividerWithSpacesAround(),
-                              ],
-                            );
-                          }).toList(),
-                        ),
-                      ],
-                    ),
-                  )),
-            ),
+                                  ),
+                                ],
+                              ),
+                              DividerWithSpacesAround(),
+                            ],
+                          );
+                        }).toList(),
+                      ),
+                    ],
+                  ),
+                )),
           ),
           SizedBox(
             height: 10,

pubspec.lock

@@ -316,6 +316,34 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "5.2.1"
+  firebase_core:
+    dependency: transitive
+    description:
+      name: firebase_core
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.5.3"
+  firebase_core_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_core_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.0"
+  firebase_core_web:
+    dependency: transitive
+    description:
+      name: firebase_core_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.1+1"
+  firebase_messaging:
+    dependency: "direct main"
+    description:
+      name: firebase_messaging
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "7.0.3"
   fixnum:
     dependency: transitive
     description:
@@ -342,6 +370,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.4"
+  flutter_gifimage:
+    dependency: "direct main"
+    description:
+      name: flutter_gifimage
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
   flutter_localizations:
     dependency: "direct main"
     description: flutter

pubspec.yaml

@@ -59,6 +59,10 @@ dependencies:
   #Dependency Injection
   get_it: ^4.0.2
 
+  #firebase
+  firebase_messaging: ^7.0.0
+  #GIF image
+  flutter_gifimage: ^1.0.1
 
   #Autocomplete TextField
   autocomplete_textfield: ^1.7.3
@@ -93,7 +97,7 @@ flutter:
   assets:
     - assets/images/
     - assets/images/dashboard/
-   
+    - assets/images/login/
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware.