bug fixes

merge-requests/267/head
Sultan Khan 5 years ago
parent d55ce4c1ec
commit 735698ce90

@ -622,13 +622,32 @@ const Map<String, Map<String, String>> localizedValues = {
'orderProcedure': {'en': "order procedure", 'ar': "طلب العمليات"}, 'orderProcedure': {'en': "order procedure", 'ar': "طلب العمليات"},
'nameOrICD': {'en': "Name or ICD", 'ar': "الاسم او  ICD"}, 'nameOrICD': {'en': "Name or ICD", 'ar': "الاسم او  ICD"},
'dType': {'en': "Type", 'ar': "النوع"}, 'dType': {'en': "Type", 'ar': "النوع"},
'addAssessmentDetails': {'en': "Add Assessment Details", 'ar':"أضف تفاصيل التقييم" }, 'addAssessmentDetails': {
'en': "Add Assessment Details",
'ar': "أضف تفاصيل التقييم"
},
'progressNoteSOAP': {'en': "Progress Note", 'ar': "ملاحظة التقدم"}, 'progressNoteSOAP': {'en': "Progress Note", 'ar': "ملاحظة التقدم"},
'addProgressNote': {'en': "Add Progress Note", 'ar': "أضف ملاحظة التقدم"}, 'addProgressNote': {'en': "Add Progress Note", 'ar': "أضف ملاحظة التقدم"},
'createdBy': {'en': "Created By :", 'ar': "أضيفت : "}, 'createdBy': {'en': "Created By :", 'ar': "أضيفت : "},
'editedBy': {'en': "Edited By :", 'ar': "عدلت : "}, 'editedBy': {'en': "Edited By :", 'ar': "عدلت : "},
'currentMedications': {'en': "Current Medications", 'ar': "الأدوية الحالية"}, 'currentMedications': {'en': "Current Medications", 'ar': "الأدوية الحالية"},
'noItem': {'en': "No items exists in this list", 'ar':"لا توجد عناصر في هذه القائمة" }, 'noItem': {
'postUcafSuccessMsg': {'en': "UCAF request send successfully", 'ar':"تم ارسال طلب UCAF بنجاح" }, 'en': "No items exists in this list",
'vitalSignDetailEmpty': {'en': "There is no data for this vital sign", 'ar':"لا توجد بيانات لهذه العلامة الحيوية" }, 'ar': "لا توجد عناصر في هذه القائمة"
},
'postUcafSuccessMsg': {
'en': "UCAF request send successfully",
'ar': "تم ارسال طلب UCAF بنجاح"
},
'vitalSignDetailEmpty': {
'en': "There is no data for this vital sign",
'ar': "لا توجد بيانات لهذه العلامة الحيوية"
},
'onlyOfftimeHoliday': {
'en': "You can only apply holiday or offtime from mobile app",
'ar': "يمكنك فقط تطبيق عطلة أو إجازة من تطبيق الهاتف"
},
'active': {'en': "Active", 'ar': "نشيط"},
'hold': {'en': "Hold", 'ar': "معلق"},
'loading': {'en': "Loading...", 'ar': "جار التحميل..."}
}; };

@ -100,7 +100,7 @@ class SickLeaveService extends BaseService {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, },
body: {'PatientMRN': patientMRN}, body: {'PatientMRN': patientMRN, "Status": 0},
); );
} }

@ -114,18 +114,17 @@ class ProjectViewModel with ChangeNotifier {
} }
void getProfile() async { void getProfile() async {
// Map profile = await sharedPref.getObj(DOCTOR_PROFILE); Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
// DoctorProfileModel doctorProfile = new DoctorProfileModel.fromJson(profile); DoctorProfileModel doctorProfile = new DoctorProfileModel.fromJson(profile);
// ProfileReqModel docInfo = new ProfileReqModel( ProfileReqModel docInfo = new ProfileReqModel(
// doctorID: doctorProfile.doctorID, doctorID: doctorProfile.doctorID,
// clinicID: doctorProfile.clinicID, clinicID: doctorProfile.clinicID,
// license: true, license: true,
// projectID: doctorProfile.projectID, projectID: doctorProfile.projectID,
// tokenID: '', );
// languageID: 2);
Provider.of<AuthViewModel>(AppGlobal.CONTEX, listen: false) Provider.of<AuthViewModel>(AppGlobal.CONTEX, listen: false)
.getDocProfiles(ProfileReqModel().toJson()) .getDocProfiles(docInfo.toJson())
.then((res) async { .then((res) async {
sharedPref.setObj(DOCTOR_PROFILE, res['DoctorProfileList'][0]); sharedPref.setObj(DOCTOR_PROFILE, res['DoctorProfileList'][0]);
}).catchError((err) { }).catchError((err) {

@ -9,6 +9,7 @@ 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/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/screens/auth/verification_methods_screen.dart'; import 'package:doctor_app_flutter/screens/auth/verification_methods_screen.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/widgets/shared/app_loader_widget.dart';
import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -120,18 +121,9 @@ class _LoginsreenState extends State<Loginsreen> {
), ),
], ],
) )
// : Column(
// crossAxisAlignment:
// CrossAxisAlignment.start,
// children: <Widget>[
// AuthHeader(loginType.unknownUser),
// KnownUserLogin(),
// ],
// ),
])) ]))
]) ])
: Center(child: CircularProgressIndicator()), : Center(child: AppLoaderWidget()),
), ),
)); ));
} }

@ -116,7 +116,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
IsLoginForDoctorApp: true, IsLoginForDoctorApp: true,
PatientOutSA: false); PatientOutSA: false);
return BaseView<DashboardViewModel>( return BaseView<DashboardViewModel>(
//onModelReady: (model) => model.getDashboard(), onModelReady: (model) => model.getDashboard(),
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
baseViewModel: model, baseViewModel: model,
isShowAppBar: false, isShowAppBar: false,

@ -4,6 +4,7 @@ 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/base/base_view.dart';
import 'package:doctor_app_flutter/screens/medical-file/medical_file_details.dart'; import 'package:doctor_app_flutter/screens/medical-file/medical_file_details.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/patient-page-header-widget.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_widget.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/patient_profile_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; 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/app_texts_widget.dart';
@ -34,57 +35,7 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
child: Container( child: Container(
child: Column( child: Column(
children: [ children: [
Padding( PatientPageHeaderWidget(patient),
padding: EdgeInsets.all(8.0),
child: Row(
children: <Widget>[
AvatarWidget(
Icon(
patient.genderDescription == "Male"
? DoctorApp.male
: DoctorApp.female_icon,
size: 70,
color: Colors.white,
),
),
SizedBox(
width: 20,
),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
patient.firstName + ' ' + patient.lastName,
color: Colors.black,
fontWeight: FontWeight.bold,
),
Row(
children: [
AppText(
TranslationBase.of(context).fileNo,
color: Colors.black,
fontWeight: FontWeight.bold,
),
SizedBox(
width: 5.0,
),
AppText(
patient.age.toString(),
color: Colors.black,
fontWeight: FontWeight.normal,
),
],
),
AppText(
"ALLERGIC TO: FOOD, ASPIRIN",
color: Color(0xFFB9382C),
fontWeight: FontWeight.bold,
),
],
)
],
),
),
Divider( Divider(
height: 1.0, height: 1.0,
thickness: 1.0, thickness: 1.0,

@ -210,7 +210,7 @@ class AddRescheduleLeavScreen extends StatelessWidget {
], ],
), ),
), ),
(item.status == 1) (item.status == 2)
? Expanded( ? Expanded(
flex: 1, flex: 1,
child: IconButton( child: IconButton(

@ -54,8 +54,8 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
var clinicID; var clinicID;
var fromTime; var fromTime;
var toTime; var toTime;
TextEditingController _controller4; TextEditingController _controller4 = new TextEditingController();
TextEditingController _controller5; TextEditingController _controller5 = new TextEditingController();
void _presentDatePicker(id) { void _presentDatePicker(id) {
var date = new DateTime.now(); var date = new DateTime.now();
var initialDate = id == 'fromDate' var initialDate = id == 'fromDate'
@ -718,11 +718,17 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
? TranslationBase.of(context).update ? TranslationBase.of(context).update
: TranslationBase.of(context).add, : TranslationBase.of(context).add,
onPressed: () { onPressed: () {
if (offTime == '1' || offTime == '2') {
if (widget.isUpdate == true) { if (widget.isUpdate == true) {
updateRecheduleLeave(model2); updateRecheduleLeave(model2);
} else { } else {
addRecheduleLeave(model2); addRecheduleLeave(model2);
} }
} else {
DrAppToastMsg.showErrorToast(
TranslationBase.of(context)
.onlyOfftimeHoliday);
}
}, },
), ),
], ],
@ -750,9 +756,21 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
this.profile = p; this.profile = p;
if (widget.updateData != null) { if (widget.updateData != null) {
this.clinicID = widget.updateData.clinicId; this.clinicID = widget.updateData.clinicId;
final df = new DateFormat('HH:mm:ss');
final dateFormat = new DateFormat('yyyy-MM-dd');
_toDateController.text = widget.updateData.dateTimeFrom; _toDateController.text =
_toDateController2.text = widget.updateData.dateTimeTo; dateFormat.format(DateTime.parse(widget.updateData.dateTimeFrom));
//df.format(DateTime.parse(widget.updateData.dateTimeFrom));
this.fromTime =
df.format(DateTime.parse(widget.updateData.dateTimeFrom));
this.toTime = df.format(DateTime.parse(widget.updateData.dateTimeTo));
_toDateController2.text =
dateFormat.format(DateTime.parse(widget.updateData.dateTimeTo));
_controller5.text = toTime;
_controller4.text = fromTime;
toDate = _toDateController2.text;
fromDate = _toDateController.text;
} }
}); });
} }
@ -827,20 +845,29 @@ class _RescheduleLeaveScreen extends State<RescheduleLeaveScreen> {
} }
updateRecheduleLeave(model) { updateRecheduleLeave(model) {
final df = new DateFormat('yyyy-MM-ddThh:mm:ss'); final df = new DateFormat('yyyy-MM-ddTHH:MM:ss');
final dateFormat = new DateFormat('yyyy-MM-dd'); final dateFormat = new DateFormat('yyyy-MM-dd');
var fromDates = fromDate;
var toDates = toDate;
if (offTime == '1') { if (offTime == '1') {
fromDate = dateFormat.format(fromDate) + 'T' + fromTime + '00'; fromDate = df.format(DateTime.parse(fromDates)) +
toDate = dateFormat.format(fromDate) + 'T' + toTime + '00'; 'T' +
fromTime +
':' +
DateTime.now().second.toString();
toDate = df.format(DateTime.parse(fromDates)) +
'T' +
toTime +
':' +
DateTime.now().second.toString();
} else { } else {
fromDate = df.format(fromDate); fromDate = df.format(fromDates);
toDate = df.format(toDate); toDate = df.format(toDates);
} }
Map<String, dynamic> request = { Map<String, dynamic> request = {
"Requisition": { "Requisition": {
"requisitionNo": 0, "requisitionNo": widget.updateData.requisitionNo,
"requisitionType": offTime, "requisitionType": offTime,
"clinicId": this.profile['ClinicID'], "clinicId": this.profile['ClinicID'],
"doctorId": this.profile['DoctorID'], "doctorId": this.profile['DoctorID'],

@ -56,20 +56,22 @@ class AddSickLeavScreen extends StatelessWidget {
item.status == 1 item.status == 1
? TranslationBase.of( ? TranslationBase.of(
context) context)
.approved .hold
: item.status == 2 : item.status == 2
? TranslationBase.of( ? TranslationBase.of(
context) context)
.extended .active
: TranslationBase.of( : TranslationBase.of(
context) context)
.pending, .all,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Colors.white, color: Colors.white,
), ),
color: item.status == 1 color: item.status == 1
? Colors.yellow[800]
: item.status == 2
? Colors.green ? Colors.green
: Colors.yellow[800], : Colors.black,
), ),
Row( Row(
children: [ children: [
@ -96,7 +98,7 @@ class AddSickLeavScreen extends StatelessWidget {
), ),
Row(children: [ Row(children: [
AppText( AppText(
item.remarks, item.remarks ?? "",
) )
]), ]),
], ],

@ -317,7 +317,7 @@ class Helpers {
listOfHours.forEach((element) { listOfHours.forEach((element) {
WorkingHours workingHours = WorkingHours(); WorkingHours workingHours = WorkingHours();
var from = element.substring( var from = element.substring(
element.indexOf('m ') + 2, element.indexOf('To') - 2); element.indexOf('m ') + 2, element.indexOf('To') - 1);
workingHours.from = from.trim(); workingHours.from = from.trim();
var to = element.substring(element.indexOf('To') + 2); var to = element.substring(element.indexOf('To') + 2);
workingHours.to = to.trim(); workingHours.to = to.trim();

@ -997,11 +997,9 @@ class TranslationBase {
String get orderProcedure => String get orderProcedure =>
localizedValues['orderProcedure'][locale.languageCode]; localizedValues['orderProcedure'][locale.languageCode];
String get nameOrICD => String get nameOrICD => localizedValues['nameOrICD'][locale.languageCode];
localizedValues['nameOrICD'][locale.languageCode];
String get dType => String get dType => localizedValues['dType'][locale.languageCode];
localizedValues['dType'][locale.languageCode];
String get addAssessmentDetails => String get addAssessmentDetails =>
localizedValues['addAssessmentDetails'][locale.languageCode]; localizedValues['addAssessmentDetails'][locale.languageCode];
@ -1012,19 +1010,21 @@ class TranslationBase {
String get addProgressNote => String get addProgressNote =>
localizedValues['addProgressNote'][locale.languageCode]; localizedValues['addProgressNote'][locale.languageCode];
String get createdBy => String get createdBy => localizedValues['createdBy'][locale.languageCode];
localizedValues['createdBy'][locale.languageCode];
String get editedBy => String get editedBy => localizedValues['editedBy'][locale.languageCode];
localizedValues['editedBy'][locale.languageCode];
String get currentMedications => String get currentMedications =>
localizedValues['currentMedications'][locale.languageCode]; localizedValues['currentMedications'][locale.languageCode];
String get noItem => String get noItem => localizedValues['noItem'][locale.languageCode];
localizedValues['noItem'][locale.languageCode];
String get postUcafSuccessMsg => String get postUcafSuccessMsg =>
localizedValues['postUcafSuccessMsg'][locale.languageCode]; localizedValues['postUcafSuccessMsg'][locale.languageCode];
String get vitalSignDetailEmpty => String get vitalSignDetailEmpty =>
localizedValues['vitalSignDetailEmpty'][locale.languageCode]; localizedValues['vitalSignDetailEmpty'][locale.languageCode];
String get onlyOfftimeHoliday =>
localizedValues['onlyOfftimeHoliday'][locale.languageCode];
String get active => localizedValues['active'][locale.languageCode];
String get hold => localizedValues['hold'][locale.languageCode];
String get loading => localizedValues['loading'][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -1,5 +1,6 @@
import 'package:doctor_app_flutter/lookups/hospital_lookup.dart'; import 'package:doctor_app_flutter/lookups/hospital_lookup.dart';
import 'package:doctor_app_flutter/screens/auth/verification_methods_screen.dart'; import 'package:doctor_app_flutter/screens/auth/verification_methods_screen.dart';
import 'package:doctor_app_flutter/widgets/shared/app_loader_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
@ -41,7 +42,7 @@ class _LoginFormState extends State<LoginForm> {
bool _isInit = true; bool _isInit = true;
FocusNode focusPass = FocusNode(); FocusNode focusPass = FocusNode();
FocusNode focusProject = FocusNode(); FocusNode focusProject = FocusNode();
HospitalViewModel projectsProv;
var userInfo = UserModel( var userInfo = UserModel(
userID: '', userID: '',
password: '', password: '',
@ -56,24 +57,13 @@ class _LoginFormState extends State<LoginForm> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
initPlatformState();
}
@override
void didChangeDependencies() {
super.didChangeDependencies();
authProv = Provider.of<AuthViewModel>(context);
if (_isInit) {
if (projectsList.length == 0) {
getProjectsList();
}
}
_isInit = false;
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
authProv = Provider.of<AuthViewModel>(context);
projectsProv = Provider.of<HospitalViewModel>(context);
getProjects();
return Form( return Form(
key: loginFormKey, key: loginFormKey,
child: Container( child: Container(
@ -128,7 +118,8 @@ class _LoginFormState extends State<LoginForm> {
}, },
), ),
buildSizedBox(), buildSizedBox(),
TextFormField( projectsList.length > 0
? TextFormField(
focusNode: focusProject, focusNode: focusProject,
controller: projectIdController, controller: projectIdController,
onTap: () { onTap: () {
@ -143,10 +134,17 @@ class _LoginFormState extends State<LoginForm> {
'assets/images/password_icon.png'), 'assets/images/password_icon.png'),
validator: (value) { validator: (value) {
if (value.isEmpty) { if (value.isEmpty) {
return TranslationBase.of(context).pleaseEnterYourProject; return TranslationBase.of(context)
.pleaseEnterYourProject;
} }
return null; return null;
}), })
: TextFormField(
readOnly: true,
decoration: buildInputDecoration(
context,
TranslationBase.of(context).loading,
'assets/images/password_icon.png')),
buildSizedBox(), buildSizedBox(),
Row( Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
@ -325,8 +323,9 @@ class _LoginFormState extends State<LoginForm> {
} }
getProjectsList() { getProjectsList() {
HospitalViewModel projectsProv = Provider.of<HospitalViewModel>(context); //showLoading();
projectsProv.getProjectsList().then((res) { projectsProv.getProjectsList().then((res) {
//hideLoading();
if (res['MessageStatus'] == 1) { if (res['MessageStatus'] == 1) {
setState(() { setState(() {
projectsList = res['ListProject']; projectsList = res['ListProject'];
@ -371,4 +370,13 @@ class _LoginFormState extends State<LoginForm> {
hideLoading() { hideLoading() {
Navigator.pop(context); Navigator.pop(context);
} }
getProjects() {
if (_isInit) {
if (projectsList.length == 0) {
getProjectsList();
}
}
_isInit = false;
}
} }

@ -118,7 +118,7 @@ class _VerificationMethodsState extends State<VerificationMethods> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Container( Container(
height: SizeConfig.realScreenHeight * 0.6, // height: SizeConfig.realScreenHeight * 0.6,
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
user != null && isMoreOption == false user != null && isMoreOption == false
@ -140,8 +140,7 @@ class _VerificationMethodsState extends State<VerificationMethods> {
height: 20, height: 20,
), ),
AppText( AppText(
TranslationBase.of(context) TranslationBase.of(context).accountInfo,
.accountInfo,
fontSize: fontSize:
SizeConfig.textMultiplier * 2.5, SizeConfig.textMultiplier * 2.5,
), ),
@ -165,10 +164,8 @@ class _VerificationMethodsState extends State<VerificationMethods> {
user.editedOn != null user.editedOn != null
? formatDate(Helpers ? formatDate(Helpers
.convertStringToDate( .convertStringToDate(
user user.editedOn))
.editedOn)) : user.createdOn != null
: user.createdOn !=
null
? formatDate(Helpers ? formatDate(Helpers
.convertStringToDate(user .convertStringToDate(user
.createdOn)) .createdOn))
@ -181,8 +178,7 @@ class _VerificationMethodsState extends State<VerificationMethods> {
Flexible( Flexible(
child: ListTile( child: ListTile(
title: Text( title: Text(
TranslationBase.of( TranslationBase.of(context)
context)
.lastLoginWith, .lastLoginWith,
overflow: overflow:
TextOverflow.ellipsis, TextOverflow.ellipsis,
@ -210,24 +206,23 @@ class _VerificationMethodsState extends State<VerificationMethods> {
? AppText( ? AppText(
TranslationBase.of(context) TranslationBase.of(context)
.verifyLoginWith, .verifyLoginWith,
fontSize: SizeConfig fontSize:
.textMultiplier * SizeConfig.textMultiplier *
3.5, 3.5,
textAlign: TextAlign.left, textAlign: TextAlign.left,
) )
: AppText( : AppText(
TranslationBase.of(context) TranslationBase.of(context)
.verifyFingerprint2, .verifyFingerprint2,
fontSize: SizeConfig fontSize:
.textMultiplier * SizeConfig.textMultiplier *
2.5, 2.5,
textAlign: TextAlign.start, textAlign: TextAlign.start,
), ),
]), ]),
user != null && isMoreOption == false user != null && isMoreOption == false
? Column( ? Column(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.start,
MainAxisAlignment.start,
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
@ -241,21 +236,18 @@ class _VerificationMethodsState extends State<VerificationMethods> {
authenticateUser( authenticateUser(
3, 3,
BiometricType BiometricType
.face .face.index,
.index,
authProv) authProv)
}, },
child: getButton( child: getButton(
user.logInTypeID, user.logInTypeID,
authProv))), authProv))),
Expanded( Expanded(
child: child: getButton(5, authProv))
getButton(5, authProv))
]) ])
]) ])
: Column( : Column(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.start,
MainAxisAlignment.start,
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
@ -278,16 +270,18 @@ class _VerificationMethodsState extends State<VerificationMethods> {
MainAxisAlignment.center, MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: child: getButton(1, authProv)),
getButton(1, authProv)),
Expanded( Expanded(
child: getButton(2, authProv)) child: getButton(2, authProv))
], ],
), ),
]), ]),
Expanded(
flex: 1, // )
child: Column( ],
),
),
Column(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[ children: <Widget>[
user != null user != null
@ -295,12 +289,10 @@ class _VerificationMethodsState extends State<VerificationMethods> {
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: Button( child: Button(
title: title: TranslationBase.of(context)
TranslationBase.of(context)
.useAnotherAccount, .useAnotherAccount,
onTap: () { onTap: () {
Navigator.of(context) Navigator.of(context).pushNamed(LOGIN);
.pushNamed(LOGIN);
}, },
)), )),
], ],
@ -308,9 +300,6 @@ class _VerificationMethodsState extends State<VerificationMethods> {
: SizedBox(), : SizedBox(),
], ],
), ),
)
],
))
], ],
), ),
)); ));

@ -24,13 +24,15 @@ class MyScheduleWidget extends StatelessWidget {
Column( Column(
children: [ children: [
Divider( Divider(
height: 10, height: 1,
color: Colors.grey, color: Colors.grey,
thickness: 1.0, thickness: 1.0,
), ),
Text('${workingHoursTable.date.day}')
], ],
), ),
SizedBox(
height: 10,
),
Row( Row(
children: <Widget>[ children: <Widget>[
AppText( AppText(
@ -49,45 +51,20 @@ class MyScheduleWidget extends StatelessWidget {
children: workingHours.map((work) { children: workingHours.map((work) {
return Container( return Container(
child: Column( child: Column(
children: <Widget>[
Row(
children: <Widget>[
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
height: 5, height: 5,
), ),
AppText( AppText(
work.from + ' - ', work.from + ' - ' + work.to,
fontSize: 2.0 * SizeConfig.textMultiplier, fontSize: 2.0 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
) )
], ],
), ),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
SizedBox(
height: 5,
),
AppText(
work.to,
fontSize: 2.0 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300,
),
],
),
],
)
],
),
); );
}).toList(), }).toList(),
), ),
SizedBox(
width: 8,
)
], ],
), ),
), ),

@ -98,7 +98,9 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
nameLine1: TranslationBase.of(context).previewHealth, nameLine1: TranslationBase.of(context).previewHealth,
nameLine2: TranslationBase.of(context).summaryReport, nameLine2: TranslationBase.of(context).summaryReport,
icon: 'radiology-1.png'), icon: 'radiology-1.png'),
if (selectedPatientType != 0 && selectedPatientType != 5 && selectedPatientType != 7) if (selectedPatientType != 0 &&
selectedPatientType != 5 &&
selectedPatientType != 7)
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
@ -144,7 +146,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
nameLine1: TranslationBase.of(context).orders, nameLine1: TranslationBase.of(context).orders,
nameLine2: TranslationBase.of(context).list, nameLine2: TranslationBase.of(context).list,
icon: 'radiology-1.png'), icon: 'radiology-1.png'),
if (selectedPatientType != 0 && selectedPatientType != 5) if (int.parse(patientType) == 7 || int.parse(patientType) == 6)
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
@ -26,6 +27,7 @@ class AppDrawer extends StatefulWidget {
class _AppDrawerState extends State<AppDrawer> { class _AppDrawerState extends State<AppDrawer> {
bool _isInit = true; bool _isInit = true;
Helpers helpers = new Helpers(); Helpers helpers = new Helpers();
ProjectViewModel projectsProvider;
// @override // @override
// void didChangeDependencies() { // void didChangeDependencies() {
// super.didChangeDependencies(); // super.didChangeDependencies();
@ -38,6 +40,7 @@ class _AppDrawerState extends State<AppDrawer> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
AuthViewModel authProvider = Provider.of(context); AuthViewModel authProvider = Provider.of(context);
projectsProvider = Provider.of(context);
return RoundedContainer( return RoundedContainer(
child: Container( child: Container(
color: Colors.white, color: Colors.white,
@ -84,7 +87,13 @@ class _AppDrawerState extends State<AppDrawer> {
)) ))
: SizedBox(), : SizedBox(),
AppText( AppText(
"Director of medical records", //TODO: Make The Dr Title Dynamic and check overflow issue. projectsProvider.isArabic
? authProvider
.doctorProfile.titleDescriptionN ??
""
: authProvider
.doctorProfile?.titleDescription ??
"",
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
color: Colors.black87), color: Colors.black87),
RaisedButton( RaisedButton(

Loading…
Cancel
Save