Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient

merge-requests/590/head
Mohammad Aljammal 5 years ago
commit 57d22aca13

Binary file not shown.

@ -129,7 +129,7 @@ const GET_SICKLEAVE_STATISTIC =
const ARRIVED_PATIENT_URL = const ARRIVED_PATIENT_URL =
'Services/DoctorApplication.svc/REST/PatientArrivalList'; 'Services/DoctorApplication.svc/REST/PatientArrivalList';
const ADD_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/PostSickLeave'; const ADD_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/PostSickLeave';
const GET_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/GetAllSickLeaves'; const GET_SICK_LEAVE = 'Services/Patients.svc/REST/GetPatientSickLeave';
const EXTEND_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/ExtendSickLeave'; const EXTEND_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/ExtendSickLeave';
const GET_OFFTIME = 'Services/DoctorApplication.svc/REST/GetMasterLookUpList'; const GET_OFFTIME = 'Services/DoctorApplication.svc/REST/GetMasterLookUpList';
@ -238,10 +238,13 @@ const GET_BOX_QUANTITY =
///GET ECG ///GET ECG
const GET_ECG = "Services/Patients.svc/REST/HIS_GetPatientMuseResults"; const GET_ECG = "Services/Patients.svc/REST/HIS_GetPatientMuseResults";
const GET_MY_REFERRAL_INPATIENT = "Services/DoctorApplication.svc/REST/GtMyReferralPatient"; const GET_MY_REFERRAL_INPATIENT =
"Services/DoctorApplication.svc/REST/GtMyReferralPatient";
const GET_MY_DISCHARGE_PATIENT = "Services/DoctorApplication.svc/REST/GtMyDischargeReferralPatient"; const GET_MY_DISCHARGE_PATIENT =
const GET_DISCHARGE_PATIENT = "Services/DoctorApplication.svc/REST/GtMyDischargePatient"; "Services/DoctorApplication.svc/REST/GtMyDischargeReferralPatient";
const GET_DISCHARGE_PATIENT =
"Services/DoctorApplication.svc/REST/GtMyDischargePatient";
const GET_PAtIENTS_INSURANCE_APPROVALS = const GET_PAtIENTS_INSURANCE_APPROVALS =
"Services/Patients.svc/REST/GetApprovalStatus"; "Services/Patients.svc/REST/GetApprovalStatus";

@ -32,7 +32,7 @@ const Map<String, Map<String, String>> localizedValues = {
'outPatients': {'en': 'Out Patient', 'ar': 'المريض الخارجي'}, 'outPatients': {'en': 'Out Patient', 'ar': 'المريض الخارجي'},
'myOutPatient': {'en': 'My OutPatients', 'ar': 'المريض الخارجي'}, 'myOutPatient': {'en': 'My OutPatients', 'ar': 'المريض الخارجي'},
'searchPatient': {'en': 'Search Patient', 'ar': 'البحث عن مريض'}, 'searchPatient': {'en': 'Search Patients', 'ar': 'البحث عن مريض'},
'searchAbout': {'en': 'Search', 'ar': 'البحث عن'}, 'searchAbout': {'en': 'Search', 'ar': 'البحث عن'},
'patient': {'en': 'Patient', 'ar': ' مريض'}, 'patient': {'en': 'Patient', 'ar': ' مريض'},
'patients': {'en': "Patient's", 'ar': ' مريض'}, 'patients': {'en': "Patient's", 'ar': ' مريض'},
@ -50,7 +50,7 @@ const Map<String, Map<String, String>> localizedValues = {
'inPatient': {'en': 'My InPatients', 'ar': 'المريض الداخلي'}, 'inPatient': {'en': 'My InPatients', 'ar': 'المريض الداخلي'},
'operations': {'en': 'Operations', 'ar': 'عمليات'}, 'operations': {'en': 'Operations', 'ar': 'عمليات'},
'patientServices': {'en': 'Patient Services', 'ar': 'خدمات المرضى'}, 'patientServices': {'en': 'Patient Services', 'ar': 'خدمات المرضى'},
'searchMedicine': {'en': 'Search Medicine', 'ar': 'بحث عن الدواء'}, 'searchMedicine': {'en': 'Search Medicines', 'ar': 'بحث عن الدواء'},
'myReferralPatient': {'en': 'My Referral Patient', 'ar': 'مرضى الاحالة'}, 'myReferralPatient': {'en': 'My Referral Patient', 'ar': 'مرضى الاحالة'},
'referPatient': {'en': 'Referral Patient', 'ar': 'إحالة مريض'}, 'referPatient': {'en': 'Referral Patient', 'ar': 'إحالة مريض'},
'myReferral': {'en': 'My Referral', 'ar': 'إحالة'}, 'myReferral': {'en': 'My Referral', 'ar': 'إحالة'},
@ -383,8 +383,8 @@ const Map<String, Map<String, String>> localizedValues = {
'leanBodyWeight': {'en': "Lean Body Weight", 'ar': 'وزن الجسم الهزيل'}, 'leanBodyWeight': {'en': "Lean Body Weight", 'ar': 'وزن الجسم الهزيل'},
'bodyMassIndex': {'en': "Body Mass Index", 'ar': 'مؤشر كتلة الجسم'}, 'bodyMassIndex': {'en': "Body Mass Index", 'ar': 'مؤشر كتلة الجسم'},
'yourBodyMassIndex': { 'yourBodyMassIndex': {
'en': "Your Body Mass Index is", 'en': "Body Mass Index is",
'ar': 'مؤشر كتلة جسمك هو' 'ar': 'مؤشر كتلة الجسم هو'
}, },
'bmiUnderWeight': {'en': "UnderWeight", 'ar': 'تحت الوزن'}, 'bmiUnderWeight': {'en': "UnderWeight", 'ar': 'تحت الوزن'},
'bmiHealthy': {'en': "Healthy", 'ar': 'صحي'}, 'bmiHealthy': {'en': "Healthy", 'ar': 'صحي'},
@ -867,4 +867,5 @@ const Map<String, Map<String, String>> localizedValues = {
"ar": "لم يتم التقاط ذلك. حاول التحدث مرة أخرى" "ar": "لم يتم التقاط ذلك. حاول التحدث مرة أخرى"
}, },
"showDetail": {"en": "Show Detail", "ar": "أظهر المعلومات"}, "showDetail": {"en": "Show Detail", "ar": "أظهر المعلومات"},
"viewProfile": {"en": "View Profile", "ar": "إعرض الملف"},
}; };

@ -132,7 +132,7 @@ class LabsService extends BaseService {
body['OrderNo'] = patientLabOrder.orderNo; body['OrderNo'] = patientLabOrder.orderNo;
body['SetupID'] = patientLabOrder.setupID; body['SetupID'] = patientLabOrder.setupID;
body['ProjectID'] = patientLabOrder.projectID; body['ProjectID'] = patientLabOrder.projectID;
body['ClinicID'] = patientLabOrder.clinicID; body['ClinicID'] = patientLabOrder.clinicID ?? 0;
} }
body['isDentalAllowedBackend'] = false; body['isDentalAllowedBackend'] = false;
body['Procedure'] = procedure; body['Procedure'] = procedure;

@ -36,6 +36,35 @@ class UcafService extends LookupService {
}, body: body); }, body: body);
} }
Future getInPatientVitalSignHistory(PatiantInformtion patient, bool isInPatient) async {
hasError = false;
Map<String, dynamic> body = Map();
body['PatientID'] = patient.patientId;
body['PatientTypeID'] = 1;
if(isInPatient){
body['InOutPatientType'] = 1;
}else {
body['InOutPatientType'] = 2;
}
await baseAppClient.post(
GET_PATIENT_VITAL_SIGN,
onSuccess: (dynamic response, int statusCode) {
patientVitalSignsHistory.clear();
if (response['List_DoctorPatientVitalSign'] != null) {
response['List_DoctorPatientVitalSign'].forEach((v) {
patientVitalSignsHistory.add(new VitalSignHistory.fromJson(v));
});
}
},
onFailure: (String error, int statusCode) {
hasError = true;
super.error = error.toString();
},
body: body,
);
}
Future getPatientVitalSignsHistory( Future getPatientVitalSignsHistory(
PatiantInformtion patient, String fromDate, String toDate) async { PatiantInformtion patient, String fromDate, String toDate) async {
hasError = false; hasError = false;

@ -67,12 +67,16 @@ class VitalSignsService extends BaseService {
); );
} }
Future getInPatientVitalSignHistory(PatiantInformtion patient) async { Future getInPatientVitalSignHistory(PatiantInformtion patient, bool isInPatient) async {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['PatientID'] = patient.patientId; body['PatientID'] = patient.patientId;
body['InOutPatientType'] = 1;
body['PatientTypeID'] = 1; body['PatientTypeID'] = 1;
if(isInPatient){
body['InOutPatientType'] = 1;
}else {
body['InOutPatientType'] = 2;
}
await baseAppClient.post( await baseAppClient.post(
GET_PATIENT_VITAL_SIGN, GET_PATIENT_VITAL_SIGN,

@ -67,7 +67,8 @@ class UcafViewModel extends BaseViewModel {
to = DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd'); to = DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd');
} }
await _ucafService.getPatientVitalSignsHistory(patient, from, to); // await _ucafService.getPatientVitalSignsHistory(patient, from, to);
await _ucafService.getInPatientVitalSignHistory(patient, false);
await _ucafService.getPatientChiefComplaint(patient); await _ucafService.getPatientChiefComplaint(patient);
if (_ucafService.hasError) { if (_ucafService.hasError) {

@ -52,11 +52,12 @@ class VitalSignsViewModel extends BaseViewModel {
to = DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd'); to = DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd');
} }
if (isInPatient) { await _vitalSignService.getInPatientVitalSignHistory(patient, isInPatient);
await _vitalSignService.getInPatientVitalSignHistory(patient); // if (isInPatient) {
} else { // await _vitalSignService.getInPatientVitalSignHistory(patient, isInPatient);
await _vitalSignService.getPatientVitalSignsHistory(patient, from, to); // } else {
} // await _vitalSignService.getPatientVitalSignsHistory(patient, from, to);
// }
if (_vitalSignService.hasError) { if (_vitalSignService.hasError) {
error = _vitalSignService.error; error = _vitalSignService.error;

File diff suppressed because one or more lines are too long

@ -131,7 +131,8 @@ class DoctorApp {
IconData(0xe833, fontFamily: _kFontFam, fontPackage: _kFontPkg); IconData(0xe833, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData edit = static const IconData edit =
IconData(0xe834, fontFamily: _kFontFam, fontPackage: _kFontPkg); IconData(0xe834, fontFamily: _kFontFam, fontPackage: _kFontPkg);
// static const IconData lab_results = IconData(0xe835, fontFamily: _kFontFam, fontPackage: _kFontPkg); static const IconData lab_results2 =
IconData(0xe835, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData leaves = static const IconData leaves =
IconData(0xe836, fontFamily: _kFontFam, fontPackage: _kFontPkg); IconData(0xe836, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData logout = static const IconData logout =
@ -260,8 +261,6 @@ class DoctorApp {
IconData(0xe874, fontFamily: _kFontFam, fontPackage: _kFontPkg); IconData(0xe874, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData ovrweight_bmi_1 = static const IconData ovrweight_bmi_1 =
IconData(0xe875, fontFamily: _kFontFam, fontPackage: _kFontPkg); IconData(0xe875, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData powered_by_cs_1 =
IconData(0xe876, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData qr_code_3 = static const IconData qr_code_3 =
IconData(0xe877, fontFamily: _kFontFam, fontPackage: _kFontPkg); IconData(0xe877, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData reschedule__1 = static const IconData reschedule__1 =
@ -360,8 +359,6 @@ class DoctorApp {
IconData(0xe8a6, fontFamily: _kFontFam, fontPackage: _kFontPkg); IconData(0xe8a6, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData obese_bmi_r_1 = static const IconData obese_bmi_r_1 =
IconData(0xe8a9, fontFamily: _kFontFam, fontPackage: _kFontPkg); IconData(0xe8a9, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData menu =
IconData(0xe8ad, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData inpatient = static const IconData inpatient =
IconData(0xe959, fontFamily: _kFontFam, fontPackage: _kFontPkg); IconData(0xe959, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData discharge = static const IconData discharge =
@ -378,4 +375,10 @@ class DoctorApp {
IconData(0xe95f, fontFamily: _kFontFam, fontPackage: _kFontPkg); IconData(0xe95f, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData speechtotext = static const IconData speechtotext =
IconData(0xe960, fontFamily: _kFontFam, fontPackage: _kFontPkg); IconData(0xe960, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData search_medicines =
IconData(0xe964, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData discharge_patients =
IconData(0xe965, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData referral_discharge =
IconData(0xe966, fontFamily: _kFontFam, fontPackage: _kFontPkg);
} }

@ -60,6 +60,4 @@ class HomePageCard extends StatelessWidget {
), ),
); );
} }
getDashboardWidget() {}
} }

@ -12,9 +12,11 @@ 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/models/doctor/profile_req_Model.dart';
import 'package:doctor_app_flutter/models/patient/patient_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/base/base_view.dart';
import 'package:doctor_app_flutter/screens/medicine/medicine_search_screen.dart';
import 'package:doctor_app_flutter/screens/medicine/search_medicine_patient_screen.dart'; import 'package:doctor_app_flutter/screens/medicine/search_medicine_patient_screen.dart';
import 'package:doctor_app_flutter/screens/patients/DischargedPatientPage.dart'; import 'package:doctor_app_flutter/screens/patients/DischargedPatientPage.dart';
import 'package:doctor_app_flutter/screens/patients/ReferralDischargedPatientPage.dart'; import 'package:doctor_app_flutter/screens/patients/ReferralDischargedPatientPage.dart';
import 'package:doctor_app_flutter/screens/patients/patient_search_screen.dart';
import 'package:doctor_app_flutter/screens/patients/profile/referral/patient_referral_screen.dart'; import 'package:doctor_app_flutter/screens/patients/profile/referral/patient_referral_screen.dart';
import 'package:doctor_app_flutter/util/date-utils.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/dr_app_shared_pref.dart';
@ -457,7 +459,6 @@ class _HomeScreenState extends State<HomeScreen> {
SizedBox( SizedBox(
height: 10, height: 10,
), ),
new Container( new Container(
height: 130, height: 130,
child: new ListView( child: new ListView(
@ -546,7 +547,7 @@ class _HomeScreenState extends State<HomeScreen> {
}, },
), ),
HomePageCard( HomePageCard(
color: Colors.red[800], color: Colors.black,
margin: EdgeInsets.all(5), margin: EdgeInsets.all(5),
child: Column( child: Column(
mainAxisAlignment: mainAxisAlignment:
@ -586,7 +587,7 @@ class _HomeScreenState extends State<HomeScreen> {
}, },
), ),
HomePageCard( HomePageCard(
color: Colors.grey[300], color: Colors.red[800],
margin: EdgeInsets.all(5), margin: EdgeInsets.all(5),
child: Column( child: Column(
mainAxisAlignment: mainAxisAlignment:
@ -598,15 +599,15 @@ class _HomeScreenState extends State<HomeScreen> {
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 10, left: 10, right: 0), top: 10, left: 10, right: 0),
child: Icon( child: Icon(
DoctorApp.referral_1, DoctorApp.discharge_patients,
size: 35, size: 35,
color: Colors.black, color: Colors.white,
)), )),
Container( Container(
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: AppText( child: AppText(
'Discharged Patients', 'Discharged Patients',
color: Colors.black, color: Colors.white,
textAlign: TextAlign.start, textAlign: TextAlign.start,
fontSize: 15, fontSize: 15,
)) ))
@ -625,7 +626,7 @@ class _HomeScreenState extends State<HomeScreen> {
}, },
), ),
HomePageCard( HomePageCard(
color: Colors.red[800], color: Colors.grey[300],
margin: EdgeInsets.all(5), margin: EdgeInsets.all(5),
child: Column( child: Column(
mainAxisAlignment: mainAxisAlignment:
@ -637,15 +638,15 @@ class _HomeScreenState extends State<HomeScreen> {
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 10, left: 10, right: 0), top: 10, left: 10, right: 0),
child: Icon( child: Icon(
DoctorApp.referral_1, DoctorApp.referral_discharge,
size: 35, size: 35,
color: Colors.white, color: Colors.black,
)), )),
Container( Container(
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: AppText( child: AppText(
'Referral Discharged', 'Referral Discharged',
color: Colors.white, color: Colors.black,
textAlign: TextAlign.start, textAlign: TextAlign.start,
fontSize: 15, fontSize: 15,
)) ))
@ -684,7 +685,7 @@ class _HomeScreenState extends State<HomeScreen> {
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: AppText( child: AppText(
TranslationBase.of(context) TranslationBase.of(context)
.searchmedicinepatient, .searchPatient,
color: Colors.white, color: Colors.white,
textAlign: TextAlign.start, textAlign: TextAlign.start,
fontSize: 13, fontSize: 13,
@ -697,13 +698,49 @@ class _HomeScreenState extends State<HomeScreen> {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => builder: (context) =>
SearchMedicinePatientScreen(), PatientSearchScreen(),
)); ));
}, },
), ),
HomePageCard(
color: Colors.red[800],
margin: EdgeInsets.all(5),
child: Column(
mainAxisAlignment:
MainAxisAlignment.center,
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
Padding(
padding: EdgeInsets.only(
top: 10, left: 10, right: 0),
child: Icon(
DoctorApp.search_medicines,
size: 32,
color: Colors.white,
)),
Container(
padding: EdgeInsets.all(10),
child: AppText(
TranslationBase.of(context)
.searchMedicine,
color: Colors.white,
textAlign: TextAlign.start,
fontSize: 13,
))
],
),
hasBorder: false,
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
MedicineSearchScreen(),
));
},
)
])), ])),
Row( Row(
// mainAxisAlignment: MainAxisAlignment.spaceAround, // mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

@ -122,7 +122,7 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
myController.text = model.searchText; myController.text = model.searchText;
return AppScaffold( return AppScaffold(
// baseViewModel: model, // baseViewModel: model,
isShowAppBar: false, isShowAppBar: true,
appBarTitle: TranslationBase.of(context).searchMedicine, appBarTitle: TranslationBase.of(context).searchMedicine,
body: SingleChildScrollView( body: SingleChildScrollView(
child: FractionallySizedBox( child: FractionallySizedBox(
@ -134,7 +134,7 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
height: SizeConfig.screenHeight * .16, height: 20,
), ),
FractionallySizedBox( FractionallySizedBox(
widthFactor: 0.9, widthFactor: 0.9,
@ -157,6 +157,9 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
), ),
), ),
), ),
SizedBox(
height: 20,
),
FractionallySizedBox( FractionallySizedBox(
widthFactor: 0.9, widthFactor: 0.9,
child: Container( child: Container(
@ -197,7 +200,7 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
), ),
if (myController.text != '') if (myController.text != '')
Container( Container(
height: MediaQuery.of(context).size.height * 0.5, height: MediaQuery.of(context).size.height * 0.6,
child: ListView.builder( child: ListView.builder(
padding: const EdgeInsets.only(top: 20), padding: const EdgeInsets.only(top: 20),

@ -124,10 +124,12 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
}, },
child: AppScaffold( child: AppScaffold(
appBarTitle: TranslationBase.of(context).searchPatient, appBarTitle: TranslationBase.of(context).searchPatient,
isShowAppBar: false, isShowAppBar: true,
body: ListView( body: Column(
children: <Widget>[ mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
RoundedContainer( RoundedContainer(
showBorder: false,
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Column( Column(
@ -178,7 +180,8 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
borderRadius: borderRadius:
BorderRadius.all(Radius.circular(6.0)), BorderRadius.all(Radius.circular(6.0)),
border: Border.all( border: Border.all(
width: 1.0, color: HexColor("#CCCCCC"))), width: 1.0,
color: HexColor("#CCCCCC"))),
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: AppTextFormField( child: AppTextFormField(
labelText: TranslationBase.of(context) labelText: TranslationBase.of(context)
@ -191,16 +194,20 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
onSaved: (value) { onSaved: (value) {
if (value != null && value != '') { if (value != null && value != '') {
if (value.length == 10 && if (value.length == 10 &&
(value[0] == '2' || value[0] == '1')) { (value[0] == '2' ||
value[0] == '1')) {
_patientSearchFormValues _patientSearchFormValues
.IdentificationNo = value; .IdentificationNo = value;
_patientSearchFormValues.Searchtype = 2; _patientSearchFormValues.Searchtype = 2;
_patientSearchFormValues.setPatientID = 0; _patientSearchFormValues.setPatientID =
0;
} else if ((value.length == 10 || } else if ((value.length == 10 ||
value.length == 9) && value.length == 9) &&
((value[0] == '0' && value[1] == '5') || ((value[0] == '0' &&
value[1] == '5') ||
value[0] == '5')) { value[0] == '5')) {
_patientSearchFormValues.MobileNo = value; _patientSearchFormValues.MobileNo =
value;
_patientSearchFormValues.Searchtype = 0; _patientSearchFormValues.Searchtype = 0;
} else { } else {
_patientSearchFormValues.setPatientID = _patientSearchFormValues.setPatientID =
@ -273,17 +280,21 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
width: double.infinity, width: double.infinity,
child: Padding( child: Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: SizeConfig.widthMultiplier * 0.9, top: SizeConfig.widthMultiplier *
bottom: 0.9,
SizeConfig.widthMultiplier * 0.9, bottom: SizeConfig.widthMultiplier *
right: SizeConfig.widthMultiplier * 3, 0.9,
left: SizeConfig.widthMultiplier * 3), right:
SizeConfig.widthMultiplier * 3,
left:
SizeConfig.widthMultiplier * 3),
child: Row( child: Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
// add Expanded to have your dropdown button fill remaining space // add Expanded to have your dropdown button fill remaining space
child: DropdownButtonHideUnderline( child:
DropdownButtonHideUnderline(
child: DropdownButton( child: DropdownButton(
isExpanded: true, isExpanded: true,
value: _selectedType, value: _selectedType,
@ -297,7 +308,8 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
mainAxisSize: mainAxisSize:
MainAxisSize.max, MainAxisSize.max,
children: <Widget>[ children: <Widget>[
!projectsProvider.isArabic !projectsProvider
.isArabic
? AppText( ? AppText(
item['text'], item['text'],
fontSize: SizeConfig fontSize: SizeConfig
@ -314,15 +326,17 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
); );
}).toList(); }).toList();
}, },
onChanged: (String newValue) => { onChanged: (String newValue) =>
{
setState(() { setState(() {
_selectedType = newValue; _selectedType = newValue;
selectedPatientType = selectedPatientType =
int.parse(_selectedType); int.parse(
_selectedType);
}) })
}, },
items: items: PATIENT_TYPE_Des.map(
PATIENT_TYPE_Des.map((item) { (item) {
!projectsProvider.isArabic !projectsProvider.isArabic
? itemText = item['text'] ? itemText = item['text']
: itemText = : itemText =
@ -364,7 +378,10 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
.setFirstName = value; .setFirstName = value;
if (value != null && if (value != null &&
value.toString().trim().isEmpty) { value
.toString()
.trim()
.isEmpty) {
_patientSearchFormValues _patientSearchFormValues
.setFirstName = "0"; .setFirstName = "0";
} }
@ -397,13 +414,17 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
onSaved: (value) { onSaved: (value) {
value == null || value == '' value == null || value == ''
? _patientSearchFormValues ? _patientSearchFormValues
.setPatientMobileNumber = "0" .setPatientMobileNumber =
"0"
: _patientSearchFormValues : _patientSearchFormValues
.setPatientMobileNumber = .setPatientMobileNumber =
value; value;
if (value != null && if (value != null &&
value.toString().trim().isEmpty) { value
.toString()
.trim()
.isEmpty) {
_patientSearchFormValues _patientSearchFormValues
.setPatientMobileNumber = "0"; .setPatientMobileNumber = "0";
} }
@ -432,7 +453,10 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
: _patientSearchFormValues : _patientSearchFormValues
.setMiddleName = value; .setMiddleName = value;
if (value != null && if (value != null &&
value.toString().trim().isEmpty) { value
.toString()
.trim()
.isEmpty) {
_patientSearchFormValues _patientSearchFormValues
.setMiddleName = "0"; .setMiddleName = "0";
} }
@ -464,7 +488,10 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
: _patientSearchFormValues : _patientSearchFormValues
.setLastName = value; .setLastName = value;
if (value != null && if (value != null &&
value.toString().trim().isEmpty) { value
.toString()
.trim()
.isEmpty) {
_patientSearchFormValues _patientSearchFormValues
.setLastName = "0"; .setLastName = "0";
} }
@ -497,7 +524,10 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
.setPatientID = .setPatientID =
int.parse(value); int.parse(value);
if (value != null && if (value != null &&
value.trim().toString().isEmpty) { value
.trim()
.toString()
.isEmpty) {
_patientSearchFormValues _patientSearchFormValues
.setPatientID = 0; .setPatientID = 0;
} }
@ -546,7 +576,8 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
Radius.circular(6.0)), Radius.circular(6.0)),
border: Border.all( border: Border.all(
width: 1.0, width: 1.0,
color: HexColor("#CCCCCC"))), color:
HexColor("#CCCCCC"))),
height: 25, height: 25,
width: 25, width: 25,
child: Checkbox( child: Checkbox(
@ -566,14 +597,15 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
TranslationBase.of(context) TranslationBase.of(context)
.onlyArrivedPatient, .onlyArrivedPatient,
fontSize: fontSize:
SizeConfig.textMultiplier * 2), SizeConfig.textMultiplier *
2),
])), ])),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
]) ])
: SizedBox( : SizedBox(
height: SizeConfig.screenHeight * .45, height: 0,
), ),
], ],
), ),
@ -602,8 +634,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
), ),
], ],
), ),
], ]),
),
), ),
); );
} }

@ -16,8 +16,9 @@ class FlowChartPage extends StatelessWidget {
final PatientLabOrders patientLabOrder; final PatientLabOrders patientLabOrder;
final String filterName; final String filterName;
final PatiantInformtion patient; final PatiantInformtion patient;
final bool isInpatient;
FlowChartPage({this.patientLabOrder, this.filterName, this.patient}); FlowChartPage({this.patientLabOrder, this.filterName, this.patient, this.isInpatient});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

@ -36,7 +36,7 @@ class LabResultWidget extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
if (!isInpatient) // if (!isInpatient)
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
@ -50,6 +50,7 @@ class LabResultWidget extends StatelessWidget {
filterName: filterName, filterName: filterName,
patientLabOrder: patientLabOrder, patientLabOrder: patientLabOrder,
patient: patient, patient: patient,
isInpatient: isInpatient,
), ),
), ),
); );

@ -10,6 +10,7 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/add-order/addNewOrder.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/add-order/addNewOrder.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart'; import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
@ -105,34 +106,85 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
child: ListView.builder( child: ListView.builder(
itemCount: model.patientProgressNoteList.length, itemCount: model.patientProgressNoteList.length,
itemBuilder: (BuildContext ctxt, int index) { itemBuilder: (BuildContext ctxt, int index) {
return Column( return FractionallySizedBox(
widthFactor: 0.95,
child: CardWithBgWidget(
hasBorder: false,
bgColor: model.patientProgressNoteList[index]
.status ==
1 &&
authProvider.doctorProfile.doctorID !=
model
.patientProgressNoteList[
index]
.createdBy
? Color(0xFFCC9B14):model
.patientProgressNoteList[
index]
.status ==
4?Colors.red.shade700
: model
.patientProgressNoteList[
index]
.status ==
2?Colors.green[600]:Color(0xFFCC9B14),
widget: Column(
children: [ children: [
Container( Column(
margin: EdgeInsets.only(
left: 10,
right: 10,
),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(10),
),
padding: EdgeInsets.all(15),
child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: [ children: [
if (model
if(model.patientProgressNoteList[index].status == 1 && authProvider.doctorProfile.doctorID != model.patientProgressNoteList[index].createdBy) .patientProgressNoteList[
index]
.status ==
1 &&
authProvider
.doctorProfile.doctorID !=
model
.patientProgressNoteList[
index]
.createdBy)
AppText( AppText(
'In Progress',fontWeight: FontWeight.bold, color: Color(0xFFCC9B14),fontSize: 16,), 'Pending',
if(model.patientProgressNoteList[index].status == 4) fontWeight: FontWeight.bold,
color: Color(0xFFCC9B14),
fontSize: 12,
),
if (model
.patientProgressNoteList[
index]
.status ==
4)
AppText( AppText(
'Canceled',fontWeight: FontWeight.bold, color: Colors.red.shade700,fontSize: 16,), 'Canceled',
if(model.patientProgressNoteList[index].status == 2) fontWeight: FontWeight.bold,
color: Colors.red.shade700,
fontSize: 12,
),
if (model
.patientProgressNoteList[
index]
.status ==
2)
AppText( AppText(
'Verified',fontWeight: FontWeight.bold, color: Colors.grey.shade700,fontSize: 16,), 'Verified',
fontWeight: FontWeight.bold,
color: Colors.green[600],
fontSize: 12,
),
if (model.patientProgressNoteList[index].status != 2 && if (model.patientProgressNoteList[index].status != 2 &&
model.patientProgressNoteList[index].status != 4 && authProvider.doctorProfile.doctorID == model.patientProgressNoteList[index].createdBy) model
.patientProgressNoteList[
index]
.status !=
4 &&
authProvider
.doctorProfile.doctorID ==
model
.patientProgressNoteList[
index]
.createdBy)
Row( Row(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
@ -144,11 +196,13 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
MaterialPageRoute( MaterialPageRoute(
builder: (context) => builder: (context) =>
UpdateNoteOrder( UpdateNoteOrder(
note: model.patientProgressNoteList[ note: model
.patientProgressNoteList[
index], index],
patientModel: patientModel:
model, model,
patient: patient, patient:
patient,
visitType: widget visitType: widget
.visitType, .visitType,
isUpdate: true, isUpdate: true,
@ -157,7 +211,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
}, },
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.green[600], color: Colors.grey[600],
borderRadius: borderRadius:
BorderRadius.circular( BorderRadius.circular(
10), 10),
@ -191,30 +245,34 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
onTap: () async { onTap: () async {
showMyDialog( showMyDialog(
context: context, context: context,
actionName: "cancel", actionName: "verify",
confirmFun: () async { confirmFun: () async {
GifLoaderDialogUtils GifLoaderDialogUtils
.showMyDialog( .showMyDialog(
context, context);
);
UpdateNoteReqModel UpdateNoteReqModel
reqModel = reqModel =
UpdateNoteReqModel( UpdateNoteReqModel(
admissionNo: admissionNo: int
int.parse(patient .parse(patient
.admissionNo), .admissionNo),
cancelledNote: true, cancelledNote:
lineItemNo: false,
model.patientProgressNoteList[index] lineItemNo: model
.patientProgressNoteList[
index]
.lineItemNo, .lineItemNo,
createdBy: createdBy: model
model.patientProgressNoteList[index] .patientProgressNoteList[
index]
.createdBy, .createdBy,
notes: notes: model
model.patientProgressNoteList[index] .patientProgressNoteList[
index]
.notes, .notes,
verifiedNote: false, verifiedNote: true,
patientTypeID: patient patientTypeID:
patient
.patientType, .patientType,
patientOutSA: false, patientOutSA: false,
); );
@ -222,7 +280,9 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
.updatePatientProgressNote( .updatePatientProgressNote(
reqModel); reqModel);
await getProgressNoteList( await getProgressNoteList(
context, model, isLocalBusy: true); context, model,
isLocalBusy:
true);
GifLoaderDialogUtils GifLoaderDialogUtils
.hideDialog( .hideDialog(
context); context);
@ -230,7 +290,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
}, },
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.red[600], color: Colors.green[600],
borderRadius: borderRadius:
BorderRadius.circular( BorderRadius.circular(
10), 10),
@ -240,7 +300,8 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
child: Row( child: Row(
children: [ children: [
Icon( Icon(
FontAwesomeIcons.trash, FontAwesomeIcons
.check,
size: 12, size: 12,
color: Colors.white, color: Colors.white,
), ),
@ -248,7 +309,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
width: 2, width: 2,
), ),
AppText( AppText(
'Cancel', 'Verify',
fontSize: 10, fontSize: 10,
color: Colors.white, color: Colors.white,
), ),
@ -262,37 +323,54 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
), ),
InkWell( InkWell(
onTap: () async { onTap: () async {
showMyDialog(context: context, actionName: "verify",confirmFun: () async{ showMyDialog(
context: context,
actionName: "cancel",
confirmFun: () async {
GifLoaderDialogUtils GifLoaderDialogUtils
.showMyDialog(context); .showMyDialog(
UpdateNoteReqModel reqModel = context,
);
UpdateNoteReqModel
reqModel =
UpdateNoteReqModel( UpdateNoteReqModel(
admissionNo: int.parse( admissionNo: int
patient.admissionNo), .parse(patient
cancelledNote: false, .admissionNo),
lineItemNo: model.patientProgressNoteList[index] cancelledNote: true,
lineItemNo: model
.patientProgressNoteList[
index]
.lineItemNo, .lineItemNo,
createdBy: model.patientProgressNoteList[index] createdBy: model
.patientProgressNoteList[
index]
.createdBy, .createdBy,
notes: notes: model
model.patientProgressNoteList[index].notes, .patientProgressNoteList[
verifiedNote: true, index]
.notes,
verifiedNote: false,
patientTypeID: patientTypeID:
patient.patientType, patient
.patientType,
patientOutSA: false, patientOutSA: false,
); );
await model await model
.updatePatientProgressNote( .updatePatientProgressNote(
reqModel); reqModel);
await getProgressNoteList( await getProgressNoteList(
context, model, isLocalBusy: true); context, model,
isLocalBusy:
true);
GifLoaderDialogUtils GifLoaderDialogUtils
.hideDialog(context); .hideDialog(
context);
}); });
}, },
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.grey[600], color: Colors.red[600],
borderRadius: borderRadius:
BorderRadius.circular( BorderRadius.circular(
10), 10),
@ -302,7 +380,8 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
child: Row( child: Row(
children: [ children: [
Icon( Icon(
FontAwesomeIcons.check, FontAwesomeIcons
.trash,
size: 12, size: 12,
color: Colors.white, color: Colors.white,
), ),
@ -310,7 +389,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
width: 2, width: 2,
), ),
AppText( AppText(
'Verify', 'Cancel',
fontSize: 10, fontSize: 10,
color: Colors.white, color: Colors.white,
), ),
@ -319,6 +398,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
padding: EdgeInsets.all(6), padding: EdgeInsets.all(6),
), ),
), ),
SizedBox( SizedBox(
width: 10, width: 10,
) )
@ -337,7 +417,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
width: MediaQuery.of(context) width: MediaQuery.of(context)
.size .size
.width * .width *
0.65, 0.60,
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
@ -353,23 +433,35 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
), ),
Expanded( Expanded(
child: AppText( child: AppText(
model.patientProgressNoteList[index].doctorName??'',fontWeight: FontWeight.w600,fontSize: 12,), model
.patientProgressNoteList[
index]
.doctorName ??
'',
fontWeight:
FontWeight.w600,
fontSize: 12,
),
), ),
], ],
), ),
], ],
), ),
), ),
Column( Column(
children: [ children: [
AppText( AppText(
model.patientProgressNoteList[index] model
.patientProgressNoteList[
index]
.createdOn != .createdOn !=
null null
? DateUtils ? DateUtils.getDayMonthYearDateFormatted(
.getDayMonthYearDateFormatted( DateUtils.getDateTimeFromServerFormat(
DateUtils.getDateTimeFromServerFormat(model.patientProgressNoteList[index].createdOn)) model
.patientProgressNoteList[
index]
.createdOn))
: DateUtils : DateUtils
.getDayMonthYearDateFormatted( .getDayMonthYearDateFormatted(
DateTime.now()), DateTime.now()),
@ -377,14 +469,18 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
fontSize: 14, fontSize: 14,
), ),
AppText( AppText(
model.patientProgressNoteList[index] model
.patientProgressNoteList[
index]
.createdOn != .createdOn !=
null null
? DateUtils ? DateUtils.getHour(DateUtils
.getHour( .getDateTimeFromServerFormat(
DateUtils.getDateTimeFromServerFormat(model.patientProgressNoteList[index].createdOn )) model
: DateUtils .patientProgressNoteList[
.getHour( index]
.createdOn))
: DateUtils.getHour(
DateTime.now()), DateTime.now()),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 14, fontSize: 14,
@ -404,19 +500,22 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
children: [ children: [
Expanded( Expanded(
child: AppText( child: AppText(
model.patientProgressNoteList[index].notes, model
.patientProgressNoteList[
index]
.notes,
fontSize: 10, fontSize: 10,
), ),
), ),
]) ])
], ],
), ),
),
SizedBox( SizedBox(
height: 20, height: 20,
), ),
], ],
),
),
); );
}), }),
), ),

@ -90,16 +90,47 @@ class ReferralPatientDetailScreen extends StatelessWidget {
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Padding( Column(
children: [
InkWell(
onTap: () {
PatiantInformtion patient =
model.getPatientFromReferralO(referredPatient);
Navigator.of(context)
.pushNamed(PATIENTS_PROFILE, arguments: {
"patient": patient,
"patientType": "1",
"isInpatient": true,
"arrivalType": "1",
"from": DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd'),
"to": DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd'),
});
},
child: Padding(
padding: EdgeInsets.only(left: 12.0), padding: EdgeInsets.only(left: 12.0),
child: Container( child: Container(
width: 60, width: 60,
height: 60, height: 60,
child: Image.network( child: Image.asset(
referredPatient.doctorImageURL referredPatient.gender == 1
? 'assets/images/male_avatar.png'
: 'assets/images/female_avatar.png',
fit: BoxFit.cover,
),
), ),
), ),
), ),
SizedBox(
height: 20,
),
AppText(
TranslationBase.of(context).viewProfile,
fontWeight: FontWeight.w700,
fontSize: 1.7 * SizeConfig.textMultiplier,
color: Colors.red[700],
)
],
),
SizedBox( SizedBox(
width: 10, width: 10,
), ),
@ -321,7 +352,7 @@ class ReferralPatientDetailScreen extends StatelessWidget {
margin: margin:
EdgeInsets.only(left: 10, right: 0), EdgeInsets.only(left: 10, right: 0),
child: Image.asset( child: Image.asset(
'assets/images/patient/ic_ref_arrow_left.png', 'assets/images/patient/ic_ref_arrow_up.png',
height: 50, height: 50,
width: 30, width: 30,
), ),

@ -127,10 +127,10 @@ class ReferredPatientDetailScreen extends StatelessWidget {
height: 20, height: 20,
), ),
AppText( AppText(
TranslationBase.of(context).showDetail, TranslationBase.of(context).viewProfile,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 1.7 * SizeConfig.textMultiplier, fontSize: 1.7 * SizeConfig.textMultiplier,
color: Colors.blue, color: Colors.red[700],
) )
], ],
), ),

@ -21,7 +21,8 @@ class AddSickLeavScreen extends StatelessWidget {
final routeArgs = ModalRoute.of(context).settings.arguments as Map; final routeArgs = ModalRoute.of(context).settings.arguments as Map;
patient = routeArgs['patient']; patient = routeArgs['patient'];
return BaseView<SickLeaveViewModel>( return BaseView<SickLeaveViewModel>(
onModelReady: (model) => model.getSickLeave(patient.patientMRN??patient.patientId), onModelReady: (model) =>
model.getSickLeave(patient.patientMRN ?? patient.patientId),
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
baseViewModel: model, baseViewModel: model,
isShowAppBar: true, isShowAppBar: true,

@ -1175,6 +1175,7 @@ class TranslationBase {
localizedValues['noDataAvailable'][locale.languageCode]; localizedValues['noDataAvailable'][locale.languageCode];
String get showMoreBtn => localizedValues['show-more-btn'][locale.languageCode]; String get showMoreBtn => localizedValues['show-more-btn'][locale.languageCode];
String get showDetail => localizedValues['showDetail'][locale.languageCode]; String get showDetail => localizedValues['showDetail'][locale.languageCode];
String get viewProfile => localizedValues['viewProfile'][locale.languageCode];
String get fileNumber => localizedValues['fileNumber'][locale.languageCode]; String get fileNumber => localizedValues['fileNumber'][locale.languageCode];
String get reschedule => localizedValues['reschedule'][locale.languageCode]; String get reschedule => localizedValues['reschedule'][locale.languageCode];

@ -55,6 +55,7 @@ class SMSOTP {
displayDialog(BuildContext context) async { displayDialog(BuildContext context) async {
return showDialog( return showDialog(
context: context, context: context,
barrierColor: Colors.black.withOpacity(0.7),
builder: (context) { builder: (context) {
projectProvider = Provider.of(context); projectProvider = Provider.of(context);
return AlertDialog( return AlertDialog(
@ -84,14 +85,14 @@ class SMSOTP {
? Padding( ? Padding(
child: Icon( child: Icon(
DoctorApp.verify_sms_1, DoctorApp.verify_sms_1,
size: 40, size: 50,
), ),
padding: EdgeInsets.only(bottom: 20), padding: EdgeInsets.only(bottom: 20),
) )
: Padding( : Padding(
child: Icon( child: Icon(
DoctorApp.verify_whtsapp, DoctorApp.verify_whtsapp,
size: 40, size: 50,
), ),
padding: EdgeInsets.only(bottom: 20), padding: EdgeInsets.only(bottom: 20),
), ),
@ -114,7 +115,7 @@ class SMSOTP {
) )
])), ])),
Padding( Padding(
padding: EdgeInsets.only(top: 5), padding: EdgeInsets.only(top: 5, right: 5),
child: AppText( child: AppText(
TranslationBase.of(context).verificationMessage + TranslationBase.of(context).verificationMessage +
' XXXXXX' + ' XXXXXX' +
@ -122,7 +123,9 @@ class SMSOTP {
.toString() .toString()
.substring(mobileNo.toString().length - 3), .substring(mobileNo.toString().length - 3),
textAlign: TextAlign.start, textAlign: TextAlign.start,
fontWeight: FontWeight.w600, fontWeight: FontWeight.bold,
fontSize: 14,
maxLines: 2,
)), )),
Form( Form(
key: verifyAccountForm, key: verifyAccountForm,
@ -131,10 +134,11 @@ class SMSOTP {
child: Directionality( child: Directionality(
textDirection: TextDirection.ltr, textDirection: TextDirection.ltr,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Container( Container(
width: SizeConfig.realScreenWidth * 0.15, width: SizeConfig.realScreenWidth * 0.16,
margin: EdgeInsets.all(5),
child: TextFormField( child: TextFormField(
textInputAction: TextInputAction.next, textInputAction: TextInputAction.next,
style: buildTextStyle(), style: buildTextStyle(),
@ -162,7 +166,8 @@ class SMSOTP {
), ),
), ),
Container( Container(
width: SizeConfig.realScreenWidth * 0.15, width: SizeConfig.realScreenWidth * 0.16,
margin: EdgeInsets.all(5),
child: TextFormField( child: TextFormField(
focusNode: focusD2, focusNode: focusD2,
textInputAction: TextInputAction.next, textInputAction: TextInputAction.next,
@ -189,7 +194,8 @@ class SMSOTP {
validator: validateCodeDigit), validator: validateCodeDigit),
), ),
Container( Container(
width: SizeConfig.realScreenWidth * 0.15, margin: EdgeInsets.all(5),
width: SizeConfig.realScreenWidth * 0.16,
child: TextFormField( child: TextFormField(
focusNode: focusD3, focusNode: focusD3,
textInputAction: TextInputAction.next, textInputAction: TextInputAction.next,
@ -216,7 +222,8 @@ class SMSOTP {
}, },
validator: validateCodeDigit)), validator: validateCodeDigit)),
Container( Container(
width: SizeConfig.realScreenWidth * 0.15, margin: EdgeInsets.all(5),
width: SizeConfig.realScreenWidth * 0.16,
child: TextFormField( child: TextFormField(
focusNode: focusD4, focusNode: focusD4,
maxLength: 1, maxLength: 1,
@ -280,15 +287,15 @@ class SMSOTP {
// contentPadding: EdgeInsets.only(top: 20, bottom: 20), // contentPadding: EdgeInsets.only(top: 20, bottom: 20),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(10)), borderRadius: BorderRadius.all(Radius.circular(10)),
borderSide: BorderSide(color: Colors.grey[100]), borderSide: BorderSide(color: Colors.grey[300]),
), ),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(10.0)), borderRadius: BorderRadius.all(Radius.circular(10.0)),
borderSide: BorderSide(color: Colors.grey[100]), borderSide: BorderSide(color: Colors.grey[300]),
), ),
errorBorder: OutlineInputBorder( errorBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(10.0)), borderRadius: BorderRadius.all(Radius.circular(10.0)),
borderSide: BorderSide(color: Colors.grey[100]), borderSide: BorderSide(color: Colors.grey[300]),
), ),
focusedErrorBorder: OutlineInputBorder( focusedErrorBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(10.0)), borderRadius: BorderRadius.all(Radius.circular(10.0)),

@ -328,7 +328,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
margin: EdgeInsets.only(top: 10), margin: EdgeInsets.only(top: 10),
), ),
Expanded( Expanded(
flex: 4, flex: 5,
child: Container( child: Container(
margin: EdgeInsets.all(10), margin: EdgeInsets.all(10),
child: Column( child: Column(
@ -467,5 +467,5 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget
} }
@override @override
Size get preferredSize => Size(double.maxFinite, 290); Size get preferredSize => Size(double.maxFinite, 310);
} }

Loading…
Cancel
Save