Conflicts:
	lib/screens/profile_screen.dart
merge-requests/123/merge
hussam al-habibeh 6 years ago
commit b63d8906bc

@ -56,4 +56,61 @@ const Map<String, Map<String, String>> localizedValues = {
'en': 'Only Arrived Patient', 'en': 'Only Arrived Patient',
'ar': 'المريض الذي حضر للموعد' 'ar': 'المريض الذي حضر للموعد'
}, },
'searchMedicineNameHere': {
'en': 'Search Medicine Name Here',
'ar': 'ابحث عن الدواء هنا'
},
'youCanFind': {'en': 'You Can Find', 'ar': 'تستطيع ان تجد '},
'itemsInSearch': {'en': 'items in search', 'ar': 'عناصر في البحث'},
'qrReader': {'en': 'QR Reader', 'ar': 'قارىء رمز الQR'},
'startScanning': {'en': 'Start Scanning', 'ar': 'بدء المسح'},
'scanQrCode': {
'en': 'scan Qr code to retrieve patient profile',
'ar': 'مسح رمزاال QR لاسترداد ملف تعريف المريض '
},
'scanQr': {'en': 'Scan Qr', 'ar': 'اقراء ال QR'},
'profile': {'en': 'Profile', 'ar': 'ملفي الشخصي'},
'gender': {'en': 'Gender', 'ar': 'الجنس'},
'clinic': {'en': 'Clinic', 'ar': 'العيادة'},
'hospital': {'en': 'Hospital', 'ar': 'المستشفى'},
'speciality': {'en': 'Speciality', 'ar': 'التخصص'},
'errorMessage': {'en': 'Something went wrong', 'ar': 'حدث خطأ ما'},
'patientProfile': {'en': 'Patient Profile', 'ar': 'ملف المريض'},
'vitalSign': {'en': 'Vital Sign', 'ar': 'المؤشرات الحيوية'},
'labOrder': {'en': 'Lab Order', 'ar': 'نتائج التحاليل'},
'prescription': {'en': 'Prescription', 'ar': 'الوصفات'},
'insuranceApprovals': {'en': 'Insurance Approvals', 'ar': 'موافقات التأمين'},
'bodyMeasurements': {'en': 'Body Measurements', 'ar': 'قياسات الجسم'},
'temperature': {'en': 'Temperature', 'ar': 'درجة الحرارة'},
'pulse': {'en': 'Pulse', 'ar': 'النبض'},
'respiration': {'en': 'Respiration', 'ar': 'التنفس'},
'bloodPressure': {'en': 'Blood Pressure', 'ar': 'ضغط الدم'},
'oxygenation': {'en': 'Oxygenation', 'ar': 'الأوكسجين'},
'painScale': {'en': 'Pain Scale', 'ar': 'مقياس الألم'},
'errorNoVitalSign': {
'en': 'You don\'t have any Vital Sign',
'ar': 'ليس لديك اي اعراض حيوية'
},
'labOrders': {'en': 'Lab Orders', 'ar': 'الفحوصات الطبية'},
'errorNoLabOrders': {
'en': 'You don\'t have any lab orders',
'ar': 'ليس لديك اي فحوصات طبية'
},
'answerThePatient': {'en': 'answer the patient', 'ar': 'اجب المريض '},
'pleaseEnterAnswer': {
'en': 'please enter answer',
'ar': 'الرجاء ادخال اجابة '
},
'replay': {'en': 'Replay', 'ar': 'تاكيد'},
'progressNote': {'en': 'Progress Note', 'ar': 'ملاحظة التقدم'},
'searchNote': {'en': 'Search Note', 'ar': 'بحث عن ملاحظة'},
'errorNoProgressNote': {
'en': 'You don\'t have any Progress Note',
'ar': 'ليس لديك اي ملاحظة تقدم '
},
'invoiceNo:': {'en': 'Invoice No :', 'ar': 'رقم الفاتورة'},
'generalResult': {'en': 'General Result :', 'ar': 'النتيجة العامة'},
'description': {'en': 'Description', 'ar': 'الوصف'},
'value': {'en': 'Value', 'ar': 'القيمة'},
'range': {'en': 'range', 'ar': 'النطاق'},
}; };

@ -1,11 +1,15 @@
const PATIENT_TYPE = const [ const PATIENT_TYPE = const [
{"text": "outPatiant", "val": "0"}, {"text": "outPatiant", "text_ar": "المريض الخارجي", "val": "0"},
{"text": "InPatiant", "val": "1"}, {"text": "InPatiant", "text_ar": "المريض المنوم", "val": "1"},
{"text": "Discharge", "val": "2"}, {"text": "Discharge", "text_ar": "المريض المعافى", "val": "2"},
{"text": "Referrd", "val": "3"}, {"text": "Referrd", "text_ar": "المريض المحول الي", "val": "3"},
{"text": "Referral Discharge", "val": "4"}, {
{"text": "Tomorrow Patient", "val": "5"}, "text": "Referral Discharge",
{"text": "Referral", "val": "6"}, "text_ar": "المريض المحال المعافى",
"val": "4"
},
{"text": "Tomorrow Patient", "text_ar": "مريض الغد", "val": "5"},
{"text": "Referral", "text_ar": "المريض المحول مني", "val": "6"},
]; ];
const LOCATIONS = const [ const LOCATIONS = const [

@ -15,6 +15,7 @@ import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import '../routes.dart'; import '../routes.dart';
@ -55,7 +56,7 @@ class _QrReaderScreenState extends State<QrReaderScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
appBarTitle: "QR Reader", appBarTitle: TranslationBase.of(context).qrReader,
body: Center( body: Center(
child: Container( child: Container(
margin: EdgeInsets.only(top: SizeConfig.realScreenHeight / 7), margin: EdgeInsets.only(top: SizeConfig.realScreenHeight / 7),
@ -64,7 +65,7 @@ class _QrReaderScreenState extends State<QrReaderScreen> {
child: ListView( child: ListView(
children: [ children: [
AppText( AppText(
'Start Scanning', TranslationBase.of(context).startScanning,
fontSize: 18, fontSize: 18,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
textAlign: TextAlign.center, textAlign: TextAlign.center,
@ -72,12 +73,10 @@ class _QrReaderScreenState extends State<QrReaderScreen> {
SizedBox( SizedBox(
height: 7, height: 7,
), ),
AppText( AppText(TranslationBase.of(context).scanQrCode,
'scan Qr code to retrieve patient profile',
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
textAlign: TextAlign.center textAlign: TextAlign.center),
),
SizedBox( SizedBox(
height: 15, height: 15,
), ),
@ -92,24 +91,31 @@ class _QrReaderScreenState extends State<QrReaderScreen> {
onTap: () { onTap: () {
_scanQrAndGetPatient(context); _scanQrAndGetPatient(context);
}, },
title: 'Scan Qr', title: TranslationBase.of(context).scanQr,
loading: isLoading, loading: isLoading,
icon: Image.asset('assets/images/qr_code_white.png'), icon: Image.asset('assets/images/qr_code_white.png'),
), ),
isError ? Container( isError
? Container(
margin: EdgeInsets.only(top: 8), margin: EdgeInsets.only(top: 8),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(6.0), borderRadius: BorderRadius.circular(6.0),
color: Theme.of(context).errorColor.withOpacity(0.06), color: Theme.of(context).errorColor.withOpacity(0.06),
), ),
padding: EdgeInsets.symmetric(vertical: 8.0, horizontal: 12.0), padding: EdgeInsets.symmetric(
vertical: 8.0, horizontal: 12.0),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Expanded(child: AppText(error ?? "Something went wrong.", color: Theme.of(context).errorColor)), Expanded(
child: AppText(
error ??
TranslationBase.of(context)
.errorMessage,
color: Theme.of(context).errorColor)),
], ],
), ),
):Container(), )
: Container(),
], ],
), ),
), ),
@ -118,7 +124,6 @@ class _QrReaderScreenState extends State<QrReaderScreen> {
); );
} }
_scanQrAndGetPatient(BuildContext context) async { _scanQrAndGetPatient(BuildContext context) async {
/// When give qr we will change this method to get data /// When give qr we will change this method to get data
/// var result = await BarcodeScanner.scan(); /// var result = await BarcodeScanner.scan();
@ -151,7 +156,8 @@ class _QrReaderScreenState extends State<QrReaderScreen> {
case "0": case "0":
if (response['List_MyOutPatient'] != null) { if (response['List_MyOutPatient'] != null) {
setState(() { setState(() {
patientList = ModelResponse.fromJson(response['List_MyOutPatient']).list; patientList =
ModelResponse.fromJson(response['List_MyOutPatient']).list;
isLoading = false; isLoading = false;
}); });
Navigator.of(context).pushNamed(PATIENTS_PROFILE, arguments: { Navigator.of(context).pushNamed(PATIENTS_PROFILE, arguments: {
@ -168,7 +174,8 @@ class _QrReaderScreenState extends State<QrReaderScreen> {
case "1": case "1":
if (response['List_MyInPatient'] != null) { if (response['List_MyInPatient'] != null) {
setState(() { setState(() {
patientList = ModelResponse.fromJson(response['List_MyInPatient']).list; patientList =
ModelResponse.fromJson(response['List_MyInPatient']).list;
isLoading = false; isLoading = false;
error = ""; error = "";
}); });
@ -189,8 +196,8 @@ class _QrReaderScreenState extends State<QrReaderScreen> {
isLoading = false; isLoading = false;
isError = true; isError = true;
}); });
DrAppToastMsg.showErrorToast(response['ErrorEndUserMessage'] ?? response['ErrorMessage']); DrAppToastMsg.showErrorToast(
response['ErrorEndUserMessage'] ?? response['ErrorMessage']);
} }
}).catchError((error) { }).catchError((error) {
setState(() { setState(() {

@ -419,7 +419,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: DashboardItemIconText( child: DashboardItemIconText(
widget.iconURL + 'qr-code.svg', widget.iconURL + 'qr-code.svg',
"", "",
"QR Reader", TranslationBase.of(context).qrReader,
showBorder: true, showBorder: true,
backgroundColor: Colors.white, backgroundColor: Colors.white,
valueFontColor: Colors.black, valueFontColor: Colors.black,

@ -17,7 +17,7 @@ class MyReferralPatient extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
referralPatientProvider = Provider.of(context); referralPatientProvider = Provider.of(context);
return AppScaffold( return AppScaffold(
appBarTitle: 'My Referral Patient', appBarTitle: TranslationBase.of(context).myReferralPatient,
body: referralPatientProvider.isLoading body: referralPatientProvider.isLoading
? DrAppCircularProgressIndeicator() ? DrAppCircularProgressIndeicator()
: referralPatientProvider.isError : referralPatientProvider.isError
@ -43,11 +43,12 @@ class MyReferralPatient extends StatelessWidget {
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Container( Container(
child: Column( child: Column(
children: referralPatientProvider.listMyReferralPatientModel.map((item) { children: referralPatientProvider
.listMyReferralPatientModel
.map((item) {
return MyReferralPatientWidget( return MyReferralPatientWidget(
myReferralPatientModel: item, myReferralPatientModel: item,
); );

@ -9,16 +9,16 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../widgets/shared/app_scaffold_widget.dart'; import '../../widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
class MyReferredPatient extends StatelessWidget { class MyReferredPatient extends StatelessWidget {
MyReferredPatientProvider referredPatientProvider; MyReferredPatientProvider referredPatientProvider;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
referredPatientProvider = Provider.of(context); referredPatientProvider = Provider.of(context);
return AppScaffold( return AppScaffold(
appBarTitle: 'My Referred Patient', appBarTitle: TranslationBase.of(context).myReferredPatient,
body: referredPatientProvider.isLoading body: referredPatientProvider.isLoading
? DrAppCircularProgressIndeicator() ? DrAppCircularProgressIndeicator()
: referredPatientProvider.isError : referredPatientProvider.isError
@ -28,7 +28,6 @@ class MyReferredPatient extends StatelessWidget {
color: Theme.of(context).errorColor, color: Theme.of(context).errorColor,
), ),
) )
: referredPatientProvider.listMyReferredPatientModel.length == 0 : referredPatientProvider.listMyReferredPatientModel.length == 0
? Center( ? Center(
child: AppText( child: AppText(
@ -49,7 +48,9 @@ class MyReferredPatient extends StatelessWidget {
Container( Container(
child: Column( child: Column(
//children: referredPatientProvider.listMyReferralPatientModel.map((item) { //children: referredPatientProvider.listMyReferralPatientModel.map((item) {
children: referredPatientProvider.listMyReferredPatientModel.map((item) { children: referredPatientProvider
.listMyReferredPatientModel
.map((item) {
return MyReferredPatientWidget( return MyReferredPatientWidget(
myReferredPatientModel: item, myReferredPatientModel: item,
); );

@ -14,6 +14,7 @@ import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indei
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../util/extenstions.dart'; import '../../util/extenstions.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
DrAppSharedPreferances sharedPref = DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = DrAppSharedPreferances();
@ -46,7 +47,7 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
appBarTitle: "Search Medicine", appBarTitle: TranslationBase.of(context).searchMedicine,
body: Column( body: Column(
children: <Widget>[ children: <Widget>[
Padding( Padding(
@ -56,12 +57,11 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
left: SizeConfig.heightMultiplier * 2, left: SizeConfig.heightMultiplier * 2,
top: SizeConfig.heightMultiplier * 3), top: SizeConfig.heightMultiplier * 3),
child: AppTextFormField( child: AppTextFormField(
hintText: 'Search Medicine Name Here..', hintText: TranslationBase.of(context).searchMedicineNameHere,
controller: myController, controller: myController,
onSaved: (value) {}, onSaved: (value) {},
inputFormatter: ONLY_LETTERS), inputFormatter: ONLY_LETTERS),
), ),
Container( Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
bottom: SizeConfig.heightMultiplier * 1, bottom: SizeConfig.heightMultiplier * 1,
@ -72,7 +72,7 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
alignment: WrapAlignment.center, alignment: WrapAlignment.center,
children: <Widget>[ children: <Widget>[
AppButton( AppButton(
title: "Search", title: TranslationBase.of(context).search,
color: Color(PRIMARY_COLOR), color: Color(PRIMARY_COLOR),
onPressed: () { onPressed: () {
searchMedicine(context); searchMedicine(context);
@ -87,9 +87,9 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
"You find " + TranslationBase.of(context).youCanFind +
(data == null ? "0" : data.length.toString()) + (data == null ? "0" : data.length.toString()) +
" items in search", TranslationBase.of(context).itemsInSearch,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
margin: 5, margin: 5,
), ),
@ -127,7 +127,9 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
ChangeNotifierProvider( ChangeNotifierProvider(
create: (_) => MedicineProvider(), create: (_) => MedicineProvider(),
child: PharmaciesListScreen( child: PharmaciesListScreen(
itemID: data[index]["ItemID"], url: data[index]["ProductImageBase64"]), itemID: data[index]["ItemID"],
url: data[index]
["ProductImageBase64"]),
), ),
), ),
); );

@ -1,5 +1,6 @@
import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.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/providers/project_provider.dart';
import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/routes.dart';
import 'package:doctor_app_flutter/util/dr_app_shared_pref.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/helpers.dart';
@ -19,6 +20,7 @@ import '../../widgets/patients/dynamic_elements.dart';
import '../../config/config.dart'; import '../../config/config.dart';
import '../../models/doctor_profile_model.dart'; import '../../models/doctor_profile_model.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:provider/provider.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
Helpers helpers = Helpers(); Helpers helpers = Helpers();
@ -36,6 +38,8 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
String _selectedType = '1'; String _selectedType = '1';
String _selectedLocation = '1'; String _selectedLocation = '1';
String error = ''; String error = '';
ProjectProvider projectsProvider;
String itemText = '';
final GlobalKey<FormState> _formKey = GlobalKey<FormState>(); final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
bool _autoValidate = false; bool _autoValidate = false;
@ -113,6 +117,7 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
projectsProvider = Provider.of(context);
return AppScaffold( return AppScaffold(
appBarTitle: TranslationBase.of(context).searchPatient, appBarTitle: TranslationBase.of(context).searchPatient,
body: ListView( body: ListView(
@ -175,10 +180,17 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
return Row( return Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: <Widget>[ children: <Widget>[
AppText( !projectsProvider.isArabic
? AppText(
item['text'], item['text'],
fontSize: fontSize: SizeConfig
SizeConfig.textMultiplier * .textMultiplier *
2.1,
)
: AppText(
item['text_ar'],
fontSize: SizeConfig
.textMultiplier *
2.1, 2.1,
), ),
], ],
@ -193,9 +205,12 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
}) })
}, },
items: PATIENT_TYPE.map((item) { items: PATIENT_TYPE.map((item) {
!projectsProvider.isArabic
? itemText = item['text']
: itemText = item['text_ar'];
return DropdownMenuItem( return DropdownMenuItem(
child: Text( child: Text(
'${item['text']}', itemText,
textAlign: TextAlign.end, textAlign: TextAlign.end,
), ),
value: item['val'], value: item['val'],

@ -15,6 +15,7 @@ import '../../../util/dr_app_shared_pref.dart';
import '../../../widgets/shared/app_scaffold_widget.dart'; import '../../../widgets/shared/app_scaffold_widget.dart';
import '../../../widgets/shared/app_texts_widget.dart'; import '../../../widgets/shared/app_texts_widget.dart';
import '../../../widgets/shared/dr_app_circular_progress_Indeicator.dart'; import '../../../widgets/shared/dr_app_circular_progress_Indeicator.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
@ -77,7 +78,7 @@ class _InsuranceApprovalsState extends State<InsuranceApprovalsScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
appBarTitle: "Insurance Approvals", appBarTitle: TranslationBase.of(context).insuranceApprovals,
body: patientsProv.isLoading body: patientsProv.isLoading
? DrAppCircularProgressIndeicator() ? DrAppCircularProgressIndeicator()
: patientsProv.isError : patientsProv.isError
@ -128,9 +129,12 @@ class _InsuranceApprovalsState extends State<InsuranceApprovalsScreen> {
: approvalsList[index][ : approvalsList[index][
"ApprovalStatusDescption"] "ApprovalStatusDescption"]
.toString() .toString()
.contains("Cancelled") .contains(
? DoctorApp.reject_icon "Cancelled")
: DoctorApp.pending_icon, ? DoctorApp
.reject_icon
: DoctorApp
.pending_icon,
color: approvalsList[index][ color: approvalsList[index][
"ApprovalStatusDescption"] "ApprovalStatusDescption"]
.toString() .toString()
@ -139,12 +143,17 @@ class _InsuranceApprovalsState extends State<InsuranceApprovalsScreen> {
: approvalsList[index][ : approvalsList[index][
"ApprovalStatusDescption"] "ApprovalStatusDescption"]
.toString() .toString()
.contains("Cancelled") .contains(
"Cancelled")
? Colors.red ? Colors.red
: Colors.yellow, : Colors.yellow,
), ),
AppText(approvalsList[index]["ApprovalStatusDescption"], AppText(
fontSize: SizeConfig.textMultiplier * 1.5, approvalsList[index][
"ApprovalStatusDescption"],
fontSize: SizeConfig
.textMultiplier *
1.5,
color: approvalsList[index][ color: approvalsList[index][
"ApprovalStatusDescption"] "ApprovalStatusDescption"]
.toString() .toString()
@ -153,9 +162,11 @@ class _InsuranceApprovalsState extends State<InsuranceApprovalsScreen> {
: approvalsList[index][ : approvalsList[index][
"ApprovalStatusDescption"] "ApprovalStatusDescption"]
.toString() .toString()
.contains("Cancelled") .contains(
"Cancelled")
? Colors.red ? Colors.red
: Colors.yellow,) : Colors.yellow,
)
], ],
), ),
Expanded( Expanded(
@ -204,7 +215,8 @@ class _InsuranceApprovalsState extends State<InsuranceApprovalsScreen> {
backgroundColor: backgroundColor:
Color(PRIMARY_COLOR), Color(PRIMARY_COLOR),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
approvalsList[index] approvalsList[index]
@ -212,14 +224,12 @@ class _InsuranceApprovalsState extends State<InsuranceApprovalsScreen> {
.toString(), .toString(),
color: Colors.white, color: Colors.white,
fontSize: 19, fontSize: 19,
fontWeight: fontWeight: FontWeight.bold,
FontWeight.bold,
marginTop: 10, marginTop: 10,
marginLeft: 10, marginLeft: 10,
marginRight: 10, marginRight: 10,
marginBottom: 2, marginBottom: 2,
), ),
AppText( AppText(
"Approval No:", "Approval No:",
color: Colors.white, color: Colors.white,
@ -241,24 +251,34 @@ class _InsuranceApprovalsState extends State<InsuranceApprovalsScreen> {
AppText( AppText(
"PRODUCER NAME", "PRODUCER NAME",
fontSize: 10, fontSize: 10,
color: Colors.white, color:
Colors.white,
marginLeft: SizeConfig marginLeft: SizeConfig
.widthMultiplier * .widthMultiplier *
3, 3,
), ),
AppText(checkList(approvalsList[index]["ApporvalDetails"])? AppText(
approvalsList[index] checkList(approvalsList[
index]
[
"ApporvalDetails"])
? approvalsList[
index]
[ [
"ApporvalDetails"][0] "ApporvalDetails"][0]
[ [
"ProcedureName"] : "", "ProcedureName"]
: "",
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.bold, fontWeight:
FontWeight
.bold,
marginLeft: SizeConfig marginLeft: SizeConfig
.widthMultiplier * .widthMultiplier *
3, 3,
marginTop: 3, marginTop: 3,
color: Colors.white, color:
Colors.white,
), ),
], ],
), ),
@ -273,22 +293,26 @@ class _InsuranceApprovalsState extends State<InsuranceApprovalsScreen> {
AppText( AppText(
"STATUS", "STATUS",
fontSize: 10, fontSize: 10,
color: Colors.white, color:
Colors.white,
marginLeft: SizeConfig marginLeft: SizeConfig
.widthMultiplier * .widthMultiplier *
9, 9,
), ),
AppText( AppText(
approvalsList[index] approvalsList[
[ index][
"ApprovalStatusDescption"], "ApprovalStatusDescption"],
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.bold, fontWeight:
FontWeight
.bold,
marginLeft: SizeConfig marginLeft: SizeConfig
.widthMultiplier * .widthMultiplier *
9, 9,
marginTop: 3, marginTop: 3,
color: Colors.white, color:
Colors.white,
), ),
], ],
), ),
@ -307,7 +331,8 @@ class _InsuranceApprovalsState extends State<InsuranceApprovalsScreen> {
AppText( AppText(
"RECEIPT ON", "RECEIPT ON",
fontSize: 10, fontSize: 10,
color: Colors.white, color:
Colors.white,
marginLeft: SizeConfig marginLeft: SizeConfig
.widthMultiplier * .widthMultiplier *
3, 3,
@ -316,16 +341,25 @@ class _InsuranceApprovalsState extends State<InsuranceApprovalsScreen> {
1.5, 1.5,
), ),
AppText( AppText(
convertDateFormat( approvalsList[index] convertDateFormat(
["ReceiptOn"]), approvalsList[
index]
[
"ReceiptOn"]),
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.bold, fontWeight:
FontWeight
.bold,
marginLeft: SizeConfig marginLeft: SizeConfig
.widthMultiplier * .widthMultiplier *
3, 3,
marginTop: 3, marginTop: 3,
marginBottom: SizeConfig.heightMultiplier*2, marginBottom:
color: Colors.white, SizeConfig
.heightMultiplier *
2,
color:
Colors.white,
), ),
], ],
), ),
@ -340,7 +374,8 @@ class _InsuranceApprovalsState extends State<InsuranceApprovalsScreen> {
AppText( AppText(
"EXPIRY DATE", "EXPIRY DATE",
fontSize: 10, fontSize: 10,
color: Colors.white, color:
Colors.white,
marginTop: SizeConfig marginTop: SizeConfig
.heightMultiplier * .heightMultiplier *
1.5, 1.5,
@ -351,16 +386,23 @@ class _InsuranceApprovalsState extends State<InsuranceApprovalsScreen> {
AppText( AppText(
convertDateFormat( convertDateFormat(
approvalsList[ approvalsList[
index][ index]
[
"ExpiryDate"]), "ExpiryDate"]),
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.bold, fontWeight:
FontWeight
.bold,
marginLeft: SizeConfig marginLeft: SizeConfig
.widthMultiplier * .widthMultiplier *
9, 9,
marginTop: 3, marginTop: 3,
marginBottom: SizeConfig.heightMultiplier*2, marginBottom:
color: Colors.white, SizeConfig
.heightMultiplier *
2,
color:
Colors.white,
), ),
], ],
), ),
@ -434,6 +476,7 @@ class _InsuranceApprovalsState extends State<InsuranceApprovalsScreen> {
return newDate.toString(); return newDate.toString();
} }
bool checkList(List list) { bool checkList(List list) {
return list.length > 0 ? true : false; return list.length > 0 ? true : false;
} }

@ -18,6 +18,7 @@ import '../../../../widgets/shared/card_with_bg_widget.dart';
import '../../../../widgets/shared/dr_app_circular_progress_Indeicator.dart'; import '../../../../widgets/shared/dr_app_circular_progress_Indeicator.dart';
import '../../../../widgets/shared/profile_image_widget.dart'; import '../../../../widgets/shared/profile_image_widget.dart';
import 'lab_result_secreen.dart'; import 'lab_result_secreen.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
@ -72,13 +73,14 @@ class _LabOrdersScreenState extends State<LabOrdersScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
appBarTitle: "Lab Orders", appBarTitle: TranslationBase.of(context).labOrders,
body: patientsProv.isLoading body: patientsProv.isLoading
? DrAppCircularProgressIndeicator() ? DrAppCircularProgressIndeicator()
: patientsProv.isError : patientsProv.isError
? DrAppEmbeddedError(error: patientsProv.error) ? DrAppEmbeddedError(error: patientsProv.error)
: patientsProv.patientLabResultOrdersList.length == 0 : patientsProv.patientLabResultOrdersList.length == 0
? DrAppEmbeddedError(error: 'You don\'t have any Orders') ? DrAppEmbeddedError(
error: TranslationBase.of(context).errorNoLabOrders)
: Container( : Container(
margin: EdgeInsets.fromLTRB( margin: EdgeInsets.fromLTRB(
SizeConfig.realScreenWidth * 0.05, SizeConfig.realScreenWidth * 0.05,

@ -12,6 +12,7 @@ import 'package:eva_icons_flutter/eva_icons_flutter.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
class LabResult extends StatefulWidget { class LabResult extends StatefulWidget {
final LabOrdersResModel labOrders; final LabOrdersResModel labOrders;
@ -40,13 +41,14 @@ class _LabResultState extends State<LabResult> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
appBarTitle: "Lab Orders", appBarTitle: TranslationBase.of(context).labOrders,
body: patientsProv.isLoading body: patientsProv.isLoading
? DrAppCircularProgressIndeicator() ? DrAppCircularProgressIndeicator()
: patientsProv.isError : patientsProv.isError
? DrAppEmbeddedError(error: patientsProv.error) ? DrAppEmbeddedError(error: patientsProv.error)
: patientsProv.labResultList.length == 0 : patientsProv.labResultList.length == 0
? DrAppEmbeddedError(error: 'You don\'t have any Orders') ? DrAppEmbeddedError(
error: TranslationBase.of(context).errorNoLabOrders)
: Container( : Container(
margin: EdgeInsets.fromLTRB( margin: EdgeInsets.fromLTRB(
SizeConfig.realScreenWidth * 0.05, SizeConfig.realScreenWidth * 0.05,
@ -57,25 +59,25 @@ class _LabResultState extends State<LabResult> {
children: <Widget>[ children: <Widget>[
CardWithBgWidgetNew( CardWithBgWidgetNew(
widget: Row( widget: Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.start,
MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
' Invoice No :', TranslationBase.of(context).invoiceNo,
fontSize: fontSize: 2 * SizeConfig.textMultiplier,
2 * SizeConfig.textMultiplier,
color: Colors.grey[800], color: Colors.grey[800],
), ),
AppText( AppText(
' ${widget.labOrders.invoiceNo}', ' ${widget.labOrders.invoiceNo}',
fontSize: fontSize: 2 * SizeConfig.textMultiplier,
2 * SizeConfig.textMultiplier,
color: Colors.grey[800], color: Colors.grey[800],
), ),
], ],
), ),
), ),
CardWithBgWidgetNew(widget: LabResultWidget(labResult: patientsProv.labResultList,)) CardWithBgWidgetNew(
widget: LabResultWidget(
labResult: patientsProv.labResultList,
))
], ],
), ),
), ),

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import '../../../widgets/patients/profile/patient_profile_widget.dart'; import '../../../widgets/patients/profile/patient_profile_widget.dart';
import '../../../widgets/shared/app_scaffold_widget.dart'; import '../../../widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
class PatientProfileScreen extends StatelessWidget { class PatientProfileScreen extends StatelessWidget {
const PatientProfileScreen({Key key}) : super(key: key); const PatientProfileScreen({Key key}) : super(key: key);
@ -9,7 +10,7 @@ class PatientProfileScreen extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
appBarTitle: 'Patient Profile', appBarTitle: TranslationBase.of(context).patientProfile,
body: PatientProfileWidget(), body: PatientProfileWidget(),
); );
} }

@ -17,6 +17,7 @@ import '../../../../widgets/shared/app_scaffold_widget.dart';
import '../../../../widgets/shared/app_texts_widget.dart'; import '../../../../widgets/shared/app_texts_widget.dart';
import '../../../../widgets/shared/dr_app_circular_progress_Indeicator.dart'; import '../../../../widgets/shared/dr_app_circular_progress_Indeicator.dart';
import '../../../../widgets/shared/errors/dr_app_embedded_error.dart'; import '../../../../widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
@ -83,7 +84,7 @@ class _PrescriptionScreenState extends State<PrescriptionScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
appBarTitle: "Prescriptions", appBarTitle: TranslationBase.of(context).prescription,
body: patientsProv.isLoading body: patientsProv.isLoading
? DrAppCircularProgressIndeicator() ? DrAppCircularProgressIndeicator()
: patientsProv.isError : patientsProv.isError

@ -14,6 +14,7 @@ import '../../../util/dr_app_shared_pref.dart';
import '../../../widgets/shared/app_scaffold_widget.dart'; import '../../../widgets/shared/app_scaffold_widget.dart';
import '../../../widgets/shared/app_texts_widget.dart'; import '../../../widgets/shared/app_texts_widget.dart';
import '../../../widgets/shared/dr_app_circular_progress_Indeicator.dart'; import '../../../widgets/shared/dr_app_circular_progress_Indeicator.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
@ -75,14 +76,14 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
appBarTitle: "Progress Note", appBarTitle: TranslationBase.of(context).progressNote,
body: patientsProv.isLoading body: patientsProv.isLoading
? DrAppCircularProgressIndeicator() ? DrAppCircularProgressIndeicator()
: patientsProv.isError : patientsProv.isError
? DrAppEmbeddedError(error: patientsProv.error) ? DrAppEmbeddedError(error: patientsProv.error)
: notesList == null : notesList == null
? DrAppEmbeddedError( ? DrAppEmbeddedError(
error: 'You don\'t have any Progress Note') error: TranslationBase.of(context).errorNoProgressNote)
: Column( : Column(
children: <Widget>[ children: <Widget>[
Container( Container(
@ -93,8 +94,8 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
onChanged: (String str) { onChanged: (String str) {
this.searchData(str); this.searchData(str);
}, },
decoration: decoration: buildInputDecoration(context,
buildInputDecoration(context, 'Search Note'), TranslationBase.of(context).searchNote),
), ),
), ),
Expanded( Expanded(
@ -116,7 +117,8 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
ExpansionTile( ExpansionTile(
title: Container( title: Container(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
notesList[index] notesList[index]

@ -15,6 +15,7 @@ import '../../../../widgets/shared/app_texts_widget.dart';
import '../../../../widgets/shared/card_with_bg_widget.dart'; import '../../../../widgets/shared/card_with_bg_widget.dart';
import '../../../../widgets/shared/dr_app_circular_progress_Indeicator.dart'; import '../../../../widgets/shared/dr_app_circular_progress_Indeicator.dart';
import '../../../../widgets/shared/profile_image_widget.dart'; import '../../../../widgets/shared/profile_image_widget.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
@ -75,13 +76,14 @@ class _RadiologyScreenState extends State<RadiologyScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
appBarTitle: "Radiology", appBarTitle: TranslationBase.of(context).radiology,
body: patientsProv.isLoading body: patientsProv.isLoading
? DrAppCircularProgressIndeicator() ? DrAppCircularProgressIndeicator()
: patientsProv.isError : patientsProv.isError
? DrAppEmbeddedError(error: patientsProv.error) ? DrAppEmbeddedError(error: patientsProv.error)
: patientsProv.patientRadiologyList.length == 0 : patientsProv.patientRadiologyList.length == 0
? DrAppEmbeddedError(error: 'You don\'t have any Vital Sign') ? DrAppEmbeddedError(
error: TranslationBase.of(context).errorNoVitalSign)
: Container( : Container(
margin: EdgeInsets.fromLTRB( margin: EdgeInsets.fromLTRB(
SizeConfig.realScreenWidth * 0.05, SizeConfig.realScreenWidth * 0.05,
@ -103,7 +105,14 @@ class _RadiologyScreenState extends State<RadiologyScreen> {
onTap: () { onTap: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => RadiologyReportScreen(reportData: patientsProv.patientRadiologyList[index].reportData,)),); MaterialPageRoute(
builder: (context) =>
RadiologyReportScreen(
reportData: patientsProv
.patientRadiologyList[index]
.reportData,
)),
);
}, },
child: Container( child: Container(
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),

@ -14,6 +14,7 @@ import '../../../../routes.dart';
import '../../../../screens/patients/profile/vital_sign/vital_sign_item.dart'; import '../../../../screens/patients/profile/vital_sign/vital_sign_item.dart';
import '../../../../util/dr_app_shared_pref.dart'; import '../../../../util/dr_app_shared_pref.dart';
import '../../../../widgets/shared/app_scaffold_widget.dart'; import '../../../../widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
@ -76,7 +77,7 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
final routeArgs = ModalRoute.of(context).settings.arguments as Map; final routeArgs = ModalRoute.of(context).settings.arguments as Map;
vitalSing = routeArgs['vitalSing']; vitalSing = routeArgs['vitalSing'];
return AppScaffold( return AppScaffold(
appBarTitle: "vital Sing", appBarTitle: TranslationBase.of(context).vitalSign,
body: patientsProv.isLoading body: patientsProv.isLoading
? DrAppCircularProgressIndeicator() ? DrAppCircularProgressIndeicator()
: patientsProv.isError : patientsProv.isError
@ -101,9 +102,13 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
}, },
child: Container( child: Container(
child: VitalSignItem( child: VitalSignItem(
des: 'Body Measurements', des: TranslationBase.of(context)
.bodyMeasurements,
url: url + 'heartbeat.png', url: url + 'heartbeat.png',
lastVal: patientsProv.patientVitalSignOrderdSubList[0].heightCm.toString(), lastVal: patientsProv
.patientVitalSignOrderdSubList[0]
.heightCm
.toString(),
unit: 'Cm', unit: 'Cm',
), ),
), ),
@ -115,16 +120,18 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
arguments: { arguments: {
'title': 'Temperature', 'title': 'Temperature',
'key': vitalSignDetails.temperature, 'key': vitalSignDetails.temperature,
}); });
}, },
child: Container( child: Container(
child: VitalSignItem( child: VitalSignItem(
des: 'Temperature', des: TranslationBase.of(context)
.temperature,
url: url + 'heartbeat.png', url: url + 'heartbeat.png',
lastVal: patientsProv.patientVitalSignOrderdSubList[0].temperatureCelcius.toString(), lastVal: patientsProv
.patientVitalSignOrderdSubList[0]
.temperatureCelcius
.toString(),
unit: 'C', unit: 'C',
), ),
), ),
), ),
@ -142,9 +149,12 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
}); });
}, },
child: VitalSignItem( child: VitalSignItem(
des: 'Pulse', des: TranslationBase.of(context).pulse,
url: url + 'heartbeat.png', url: url + 'heartbeat.png',
lastVal: patientsProv.patientVitalSignOrderdSubList[0].pulseBeatPerMinute.toString(), lastVal: patientsProv
.patientVitalSignOrderdSubList[0]
.pulseBeatPerMinute
.toString(),
unit: 'M', unit: 'M',
), ),
), ),
@ -158,10 +168,13 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
}); });
}, },
child: VitalSignItem( child: VitalSignItem(
des: 'Respiration', des:
TranslationBase.of(context).respiration,
url: url + 'heartbeat.png', url: url + 'heartbeat.png',
lastVal: patientsProv
lastVal: patientsProv.patientVitalSignOrderdSubList[0].respirationBeatPerMinute.toString(), .patientVitalSignOrderdSubList[0]
.respirationBeatPerMinute
.toString(),
unit: 'M', unit: 'M',
), ),
), ),
@ -179,9 +192,13 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
}); });
}, },
child: VitalSignItem( child: VitalSignItem(
des: 'Blood Pressure', des: TranslationBase.of(context)
.bloodPressure,
url: url + 'heartbeat.png', url: url + 'heartbeat.png',
lastVal: patientsProv.patientVitalSignOrderdSubList[0].bloodPressure.toString(), lastVal: patientsProv
.patientVitalSignOrderdSubList[0]
.bloodPressure
.toString(),
unit: '', unit: '',
), ),
), ),
@ -195,9 +212,12 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
}); });
}, },
child: VitalSignItem( child: VitalSignItem(
des: 'Oxygenation', des:
TranslationBase.of(context).oxygenation,
url: url + 'heartbeat.png', url: url + 'heartbeat.png',
lastVal: patientsProv.patientVitalSignOrderdSubList[0].fIO2.toString(), lastVal: patientsProv
.patientVitalSignOrderdSubList[0].fIO2
.toString(),
unit: '', unit: '',
), ),
), ),
@ -216,7 +236,7 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
}); });
}, },
child: VitalSignItem( child: VitalSignItem(
des: 'Pain Scale', des: TranslationBase.of(context).painScale,
url: url + 'heartbeat.png', url: url + 'heartbeat.png',
), ),
), ),

@ -1,7 +1,4 @@
import 'package:doctor_app_flutter/models/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/doctor_profile_model.dart';
import 'package:doctor_app_flutter/widgets/shared/app_drawer_widget.dart';
//////////////
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../config/size_config.dart'; import '../config/size_config.dart';
@ -9,6 +6,7 @@ import '../widgets/shared/app_scaffold_widget.dart';
import '../widgets/shared/drawer_item_widget.dart'; import '../widgets/shared/drawer_item_widget.dart';
import '../widgets/shared/profile_image_widget.dart'; import '../widgets/shared/profile_image_widget.dart';
import '../widgets/shared/rounded_container_widget.dart'; import '../widgets/shared/rounded_container_widget.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
class ProfileScreen extends StatefulWidget { class ProfileScreen extends StatefulWidget {
ProfileScreen({Key key, this.title, this.doctorProfileall}) : super(key: key); ProfileScreen({Key key, this.title, this.doctorProfileall}) : super(key: key);
@ -27,14 +25,14 @@ class _ProfileScreenState extends State<ProfileScreen> {
//****************** //******************
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
Map arg = ModalRoute.of(context).settings.arguments
Map arg=ModalRoute.of(context).settings.arguments as Map;//ModalRoute.of(context).settings.arguments; as Map; //ModalRoute.of(context).settings.arguments;
doctorProfile = arg['doctorProfileall']; doctorProfile = arg['doctorProfileall'];
print("******************"); print("******************");
//print(doctorProfile.doctorName); //print(doctorProfile.doctorName);
print("******************"); print("******************");
return AppScaffold( return AppScaffold(
appBarTitle: 'Profile', appBarTitle: TranslationBase.of(context).profile,
body: ListView(padding: EdgeInsets.zero, children: <Widget>[ body: ListView(padding: EdgeInsets.zero, children: <Widget>[
Container( Container(
height:MediaQuery.of(context).size.height * 0.35, //SizeConfig.heightMultiplier * 35, height:MediaQuery.of(context).size.height * 0.35, //SizeConfig.heightMultiplier * 35,
@ -54,37 +52,35 @@ class _ProfileScreenState extends State<ProfileScreen> {
), ),
), ),
), ),
), ),
RoundedContainer( RoundedContainer(
child: ListView( child: ListView(
children: <Widget>[ children: <Widget>[
DrawerItem( DrawerItem(
"Gender" TranslationBase.of(context).gender,
,
Icons.person_pin, Icons.person_pin,
color: Colors.black, color: Colors.black,
subTitle: doctorProfile.genderDescription //"Male" subTitle: doctorProfile.genderDescription //"Male"
, ,
), ),
DrawerItem( DrawerItem(TranslationBase.of(context).clinic, Icons.build,
"Clinic",
Icons.build,
color: Colors.black, color: Colors.black,
subTitle: doctorProfile.clinicDescription//"Neurology Clinic", subTitle:
doctorProfile.clinicDescription //"Neurology Clinic",
), ),
DrawerItem( DrawerItem(
"Hospital", TranslationBase.of(context).hospital,
Icons.local_hospital, Icons.local_hospital,
color: Colors.black, color: Colors.black,
subTitle: doctorProfile.projectName, //"Al-Takkassussi", subTitle: doctorProfile.projectName, //"Al-Takkassussi",
), ),
DrawerItem( DrawerItem(
"Speciality", TranslationBase.of(context).speciality,
Icons.crop_square, Icons.crop_square,
color: Colors.black, color: Colors.black,
subTitle: doctorProfile.doctorRate==0 ?"being bad":"being great", subTitle: doctorProfile.doctorRate == 0
? "being bad"
: "being great",
), ),
], ],
), ),

@ -86,6 +86,61 @@ class TranslationBase {
String get search => localizedValues['search'][locale.languageCode]; String get search => localizedValues['search'][locale.languageCode];
String get onlyArrivedPatient => String get onlyArrivedPatient =>
localizedValues['onlyArrivedPatient'][locale.languageCode]; localizedValues['onlyArrivedPatient'][locale.languageCode];
String get searchMedicineNameHere =>
localizedValues['searchMedicineNameHere'][locale.languageCode];
String get youCanFind => localizedValues['youCanFind'][locale.languageCode];
String get itemsInSearch =>
localizedValues['itemsInSearch'][locale.languageCode];
String get qrReader => localizedValues['qrReader'][locale.languageCode];
String get startScanning =>
localizedValues['startScanning'][locale.languageCode];
String get scanQrCode => localizedValues['scanQrCode'][locale.languageCode];
String get scanQr => localizedValues['scanQr'][locale.languageCode];
String get profile => localizedValues['profile'][locale.languageCode];
String get gender => localizedValues['gender'][locale.languageCode];
String get clinic => localizedValues['clinic'][locale.languageCode];
String get hospital => localizedValues['hospital'][locale.languageCode];
String get speciality => localizedValues['speciality'][locale.languageCode];
String get errorMessage =>
localizedValues['errorMessage'][locale.languageCode];
String get patientProfile =>
localizedValues['patientProfile'][locale.languageCode];
String get vitalSign => localizedValues['vitalSign'][locale.languageCode];
String get labOrder => localizedValues['labOrder'][locale.languageCode];
String get prescription =>
localizedValues['prescription'][locale.languageCode];
String get insuranceApprovals =>
localizedValues['insuranceApprovals'][locale.languageCode];
String get bodyMeasurements =>
localizedValues['bodyMeasurements'][locale.languageCode];
String get temperature => localizedValues['temperature'][locale.languageCode];
String get pulse => localizedValues['pulse'][locale.languageCode];
String get respiration => localizedValues['respiration'][locale.languageCode];
String get bloodPressure =>
localizedValues['bloodPressure'][locale.languageCode];
String get oxygenation => localizedValues['oxygenation'][locale.languageCode];
String get painScale => localizedValues['painScale'][locale.languageCode];
String get errorNoVitalSign =>
localizedValues['errorNoVitalSign'][locale.languageCode];
String get labOrders => localizedValues['labOrders'][locale.languageCode];
String get errorNoLabOrders =>
localizedValues['errorNoLabOrders'][locale.languageCode];
String get answerThePatient =>
localizedValues['answerThePatient'][locale.languageCode];
String get pleaseEnterAnswer =>
localizedValues['pleaseEnterAnswer'][locale.languageCode];
String get replay => localizedValues['replay'][locale.languageCode];
String get progressNote =>
localizedValues['progressNote'][locale.languageCode];
String get searchNote => localizedValues['searchNote'][locale.languageCode];
String get errorNoProgressNote =>
localizedValues['errorNoProgressNote'][locale.languageCode];
String get invoiceNo => localizedValues['invoiceNo:'][locale.languageCode];
String get generalResult =>
localizedValues['generalResult'][locale.languageCode];
String get description => localizedValues['description'][locale.languageCode];
String get value => localizedValues['value'][locale.languageCode];
String get range => localizedValues['range'][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -6,6 +6,7 @@ import 'package:doctor_app_flutter/widgets/shared/card_with_bgNew_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
class LabResultWidget extends StatefulWidget { class LabResultWidget extends StatefulWidget {
final List<LabResult> labResult; final List<LabResult> labResult;
@ -30,7 +31,7 @@ class _LabResultWidgetState extends State<LabResultWidget> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
'General Result', TranslationBase.of(context).generalResult,
fontSize: 2.5 * SizeConfig.textMultiplier, fontSize: 2.5 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@ -57,23 +58,18 @@ class _LabResultWidgetState extends State<LabResultWidget> {
margin: EdgeInsets.only(top: 10), margin: EdgeInsets.only(top: 10),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(10)), borderRadius: BorderRadius.all(Radius.circular(10)),
), ),
child: Column( child: Column(
children: widget.labResult.map((result) { children: widget.labResult.map((result) {
return Container( return Container(
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: borderRadius: BorderRadius.all(Radius.circular(10)),
BorderRadius.all(Radius.circular(10)),
border: Border( border: Border(
bottom: BorderSide( bottom:
color: Colors.grey, width: 0.5), BorderSide(color: Colors.grey, width: 0.5),
top: BorderSide( top: BorderSide(color: Colors.grey, width: 0.5),
color: Colors.grey, width: 0.5), left: BorderSide(color: Colors.grey, width: 0.5),
left: BorderSide( right: BorderSide(color: Colors.grey, width: 0.5),
color: Colors.grey, width: 0.5),
right: BorderSide(
color: Colors.grey, width: 0.5),
), ),
), ),
margin: EdgeInsets.only(top: 10), margin: EdgeInsets.only(top: 10),
@ -92,7 +88,8 @@ class _LabResultWidgetState extends State<LabResultWidget> {
), ),
child: Center( child: Center(
child: Texts( child: Texts(
'Description', TranslationBase.of(context)
.description,
color: Colors.white, color: Colors.white,
), ),
), ),
@ -103,7 +100,9 @@ class _LabResultWidgetState extends State<LabResultWidget> {
child: Container( child: Container(
color: Hexcolor('#515B5D'), color: Hexcolor('#515B5D'),
child: Center( child: Center(
child: Texts('Value', color: Colors.white), child: Texts(
TranslationBase.of(context).value,
color: Colors.white),
), ),
height: 60), height: 60),
), ),
@ -116,7 +115,9 @@ class _LabResultWidgetState extends State<LabResultWidget> {
), ),
), ),
child: Center( child: Center(
child: Texts('Range', color: Colors.white), child: Texts(
TranslationBase.of(context).range,
color: Colors.white),
), ),
height: 60), height: 60),
), ),
@ -143,8 +144,7 @@ class _LabResultWidgetState extends State<LabResultWidget> {
Expanded( Expanded(
child: Container( child: Container(
child: Center( child: Center(
child: Texts( child: Texts('${result.resultValue}',
'${result.resultValue}',
color: Colors.grey[800]), color: Colors.grey[800]),
), ),
height: 60), height: 60),

@ -11,6 +11,7 @@ import 'package:doctor_app_flutter/widgets/shared/card_with_bgNew_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
class MyReferralPatientWidget extends StatefulWidget { class MyReferralPatientWidget extends StatefulWidget {
final MyReferralPatientModel myReferralPatientModel; final MyReferralPatientModel myReferralPatientModel;
@ -31,7 +32,8 @@ class _MyReferralPatientWidgetState extends State<MyReferralPatientWidget> {
@override @override
void initState() { void initState() {
answerController = new TextEditingController(text: widget.myReferralPatientModel.referredDoctorRemarks ?? ''); answerController = new TextEditingController(
text: widget.myReferralPatientModel.referredDoctorRemarks ?? '');
super.initState(); super.initState();
} }
@ -59,7 +61,6 @@ class _MyReferralPatientWidgetState extends State<MyReferralPatientWidget> {
Icon(_showDetails Icon(_showDetails
? Icons.keyboard_arrow_up ? Icons.keyboard_arrow_up
: Icons.keyboard_arrow_down), : Icons.keyboard_arrow_down),
], ],
), ),
), ),
@ -70,13 +71,19 @@ class _MyReferralPatientWidgetState extends State<MyReferralPatientWidget> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
SizedBox(height: 5,), SizedBox(
Divider(color: Color(0xFF000000),height: 0.5,), height: 5,
),
Divider(
color: Color(0xFF000000),
height: 0.5,
),
Table( Table(
border: TableBorder.symmetric(inside: BorderSide(width: 0.5),), border: TableBorder.symmetric(
children: [ inside: BorderSide(width: 0.5),
TableRow( ),
children: [ children: [
TableRow(children: [
Container( Container(
margin: EdgeInsets.all(2.5), margin: EdgeInsets.all(2.5),
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
@ -84,97 +91,96 @@ class _MyReferralPatientWidgetState extends State<MyReferralPatientWidget> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
'File No', TranslationBase.of(context).fileNo,
fontSize: fontSize: 1.7 * SizeConfig.textMultiplier,
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
SizedBox(height: 5,), SizedBox(
height: 5,
),
AppText( AppText(
'${widget.myReferralPatientModel.referringDoctor}', '${widget.myReferralPatientModel.referringDoctor}',
fontSize: fontSize: 1.7 * SizeConfig.textMultiplier,
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
) )
], ],
), ),
), ),
Container( Container(
margin: EdgeInsets.only(left: 4,top: 2.5,right: 2.5,bottom: 2.5), margin: EdgeInsets.only(
left: 4, top: 2.5, right: 2.5, bottom: 2.5),
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
'Referring Doctor', TranslationBase.of(context)
fontSize: .referralDoctor,
1.7 * SizeConfig.textMultiplier, fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
SizedBox(height: 5,), SizedBox(
height: 5,
),
AppText( AppText(
widget.myReferralPatientModel widget.myReferralPatientModel
.referringClinicDescription, .referringClinicDescription,
fontSize: fontSize: 1.7 * SizeConfig.textMultiplier,
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
) )
], ],
), ),
), ),
] ]),
), TableRow(children: [
TableRow(
children: [
Container( Container(
margin: EdgeInsets.all(2.5), margin: EdgeInsets.all(2.5),
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
'Referring Clinic', TranslationBase.of(context)
fontSize: .referringClinic,
1.7 * SizeConfig.textMultiplier, fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
SizedBox(height: 5,), SizedBox(
height: 5,
),
AppText( AppText(
'${widget.myReferralPatientModel.referringClinicDescription}', '${widget.myReferralPatientModel.referringClinicDescription}',
fontSize: fontSize: 1.7 * SizeConfig.textMultiplier,
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
) )
], ],
), ),
), ),
Container( Container(
margin: EdgeInsets.only(left: 4,top: 2.5,right: 2.5,bottom: 2.5), margin: EdgeInsets.only(
left: 4, top: 2.5, right: 2.5, bottom: 2.5),
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
'Frequency', TranslationBase.of(context).frequency,
fontSize: fontSize: 1.7 * SizeConfig.textMultiplier,
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
SizedBox(height: 5,), SizedBox(
height: 5,
),
AppText( AppText(
widget.myReferralPatientModel widget.myReferralPatientModel
.frequencyDescription, .frequencyDescription,
fontSize: fontSize: 1.7 * SizeConfig.textMultiplier,
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
) )
], ],
), ),
) )
] ]),
),
TableRow( TableRow(
children: [ children: [
Container( Container(
@ -185,12 +191,14 @@ class _MyReferralPatientWidgetState extends State<MyReferralPatientWidget> {
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
'Priority', TranslationBase.of(context).priority,
fontSize: fontSize:
1.7 * SizeConfig.textMultiplier, 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
SizedBox(height: 5,), SizedBox(
height: 5,
),
AppText( AppText(
'${widget.myReferralPatientModel.priorityDescription}', '${widget.myReferralPatientModel.priorityDescription}',
fontSize: fontSize:
@ -201,19 +209,26 @@ class _MyReferralPatientWidgetState extends State<MyReferralPatientWidget> {
), ),
), ),
Container( Container(
margin: EdgeInsets.only(left: 4,top: 2.5,right: 2.5,bottom: 2.5), margin: EdgeInsets.only(
left: 4,
top: 2.5,
right: 2.5,
bottom: 2.5),
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
'Max Response Time', TranslationBase.of(context)
.maxResponseTime,
fontSize: fontSize:
1.7 * SizeConfig.textMultiplier, 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
SizedBox(height: 5,), SizedBox(
height: 5,
),
AppText( AppText(
Helpers.getDateFormatted(widget Helpers.getDateFormatted(widget
.myReferralPatientModel .myReferralPatientModel
@ -227,10 +242,12 @@ class _MyReferralPatientWidgetState extends State<MyReferralPatientWidget> {
) )
], ],
), ),
], ],
), ),
Divider(color: Color(0xFF000000),height: 0.5,), Divider(
color: Color(0xFF000000),
height: 0.5,
),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
@ -238,10 +255,12 @@ class _MyReferralPatientWidgetState extends State<MyReferralPatientWidget> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
'Clinic Details and Remarks', TranslationBase.of(context)
.clinicDetailsandRemarks,
fontSize: 1.7 * SizeConfig.textMultiplier, fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
textAlign: TextAlign.start,), textAlign: TextAlign.start,
),
Texts( Texts(
'${widget.myReferralPatientModel.referringDoctorRemarks}', '${widget.myReferralPatientModel.referringDoctorRemarks}',
style: "bodyText1", style: "bodyText1",
@ -254,7 +273,7 @@ class _MyReferralPatientWidgetState extends State<MyReferralPatientWidget> {
height: 5, height: 5,
), ),
AppText( AppText(
'Answer/Suggestions', TranslationBase.of(context).answerSuggestions,
fontSize: 1.7 * SizeConfig.textMultiplier, fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
textAlign: TextAlign.start, textAlign: TextAlign.start,
@ -267,13 +286,17 @@ class _MyReferralPatientWidgetState extends State<MyReferralPatientWidget> {
child: TextFields( child: TextFields(
maxLines: 2, maxLines: 2,
minLines: 2, minLines: 2,
hintText: 'Answer the patient', hintText:
TranslationBase.of(context).answerThePatient,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
initialValue: widget.myReferralPatientModel.referredDoctorRemarks ?? '', initialValue: widget.myReferralPatientModel
.referredDoctorRemarks ??
'',
readOnly: _isLoading, readOnly: _isLoading,
validator: (value) { validator: (value) {
if (value.isEmpty) if (value.isEmpty)
return "please enter answer"; return TranslationBase.of(context)
.pleaseEnterAnswer;
else else
return null; return null;
}, },
@ -292,12 +315,16 @@ class _MyReferralPatientWidgetState extends State<MyReferralPatientWidget> {
_isLoading = true; _isLoading = true;
}); });
try { try {
await Provider.of<MyReferralPatientProvider>(context, listen: false).replay(answerController.text.toString(), widget.myReferralPatientModel); await Provider.of<MyReferralPatientProvider>(
context,
listen: false)
.replay(answerController.text.toString(),
widget.myReferralPatientModel);
setState(() { setState(() {
_isLoading = false; _isLoading = false;
}); });
DrAppToastMsg.showSuccesToast('Reply Successfully'); DrAppToastMsg.showSuccesToast(
'Reply Successfully');
} catch (e) { } catch (e) {
setState(() { setState(() {
_isLoading = false; _isLoading = false;
@ -306,7 +333,7 @@ class _MyReferralPatientWidgetState extends State<MyReferralPatientWidget> {
} }
} }
}, },
title: 'Reply', title: TranslationBase.of(context).replay,
loading: _isLoading, loading: _isLoading,
), ),
) )

@ -8,6 +8,7 @@ import 'package:hexcolor/hexcolor.dart';
import '../../../config/size_config.dart'; import '../../../config/size_config.dart';
import '../../shared/app_texts_widget.dart'; import '../../shared/app_texts_widget.dart';
import '../../shared/rounded_container_widget.dart'; import '../../shared/rounded_container_widget.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
/* /*
*@author: Elham Rababah *@author: Elham Rababah
@ -32,26 +33,26 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
name: 'Vital Sign', name: TranslationBase.of(context).vitalSign,
route: VITAL_SIGN_DETAILS, route: VITAL_SIGN_DETAILS,
icon: 'heartbeat.png'), icon: 'heartbeat.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
route: LAB_ORDERS, route: LAB_ORDERS,
name: 'Lab Order', name: TranslationBase.of(context).labOrder,
icon: 'lab.png'), icon: 'lab.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
route: PRESCRIPTIONS, route: PRESCRIPTIONS,
name: 'Prescription', name: TranslationBase.of(context).prescription,
icon: 'note.png'), icon: 'note.png'),
PatientProfileButton( PatientProfileButton(
key: key, key: key,
patient: patient, patient: patient,
route: RADIOLOGY, route: RADIOLOGY,
name: 'Radiology', name: TranslationBase.of(context).radiology,
icon: 'radiology-1.png'), icon: 'radiology-1.png'),
Visibility( Visibility(
visible: selectedPatientType != 0 && selectedPatientType != 5, visible: selectedPatientType != 0 && selectedPatientType != 5,
@ -65,7 +66,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
key: key, key: key,
patient: patient, patient: patient,
route: PATIENT_INSURANCE_APPROVALS, route: PATIENT_INSURANCE_APPROVALS,
name: 'Insurance Aprovals', name: TranslationBase.of(context).insuranceApprovals,
icon: 'lab.png'), icon: 'lab.png'),
Visibility( Visibility(
visible: selectedPatientType != 0 && visible: selectedPatientType != 0 &&

Loading…
Cancel
Save