Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'Dec_fixes' into 'development'

Browse Source 
Dec fixes

See merge request Cloud_Solution/doctor_app_flutter!924
merge-requests/925/merge
Elham Ali 4 years ago
parent 6375d9fb2d c2fbd99ced
commit 10bbf51c52
8 changed files with 178 additions and 213 deletions
Show Stats Download Patch File Download Diff File

2
lib/config/localized_values.dart
Unescape Escape View File

@ -53,7 +53,7 @@ const Map<String, Map<String, String>> localizedValues = {
"service": {"en": "Service", "ar": "خدمة"},
"referral": {"en": "Referral", "ar": "الإحالة"},
"inPatient": {"en": "In Patients", "ar": "مرضاي"},
"myInPatient": {"en": "My\n Patients", "ar": "مرضاي\nالمنومين"},
"myInPatient": {"en": "My\n In Patients", "ar": "مرضاي\nالمنومين"},
"myInPatientTitle": {"en": "My Patients", "ar": "مرضاي المنومين"},
"inPatientLabel": {"en": "InPatients", "ar": "المريض المنوم"},
"inPatientAll": {"en": "All Patients", "ar": "جميع المرضى المنومين"},

200
lib/screens/patients/profile/referral/my-referral-inpatient-screen.dart
Unescape Escape View File

@ -37,19 +37,21 @@ class _MyReferralInPatientScreenState extends State<MyReferralInPatientScreen> {
children: [
Container(
margin: EdgeInsets.only(top: 70),
child: PatientTypeRadioWidget(
(patientType) async {
setState(() {
this.patientType = patientType;
});
GifLoaderDialogUtils.showMyDialog(context);
if (patientType == PatientType.IN_PATIENT) {
await model.getMyReferralPatientService(localBusy: true);
} else {
await model.getMyReferralOutPatientService(localBusy: true);
}
GifLoaderDialogUtils.hideDialog(context);
},
child: Container(
child: PatientTypeRadioWidget(
(patientType) async {
setState(() {
this.patientType = patientType;
});
GifLoaderDialogUtils.showMyDialog(context);
if (patientType == PatientType.IN_PATIENT) {
await model.getMyReferralPatientService(localBusy: true);
} else {
await model.getMyReferralOutPatientService(localBusy: true);
}
GifLoaderDialogUtils.hideDialog(context);
},
),
),
),
model.myReferralPatients.isEmpty
@ -74,91 +76,93 @@ class _MyReferralInPatientScreenState extends State<MyReferralInPatientScreen> {
: Expanded(
child: SingleChildScrollView(
child: Container(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
ListView.builder(
itemCount: model.myReferralPatients.length,
scrollDirection: Axis.vertical,
physics: ScrollPhysics(),
shrinkWrap: true,
itemBuilder: (context, index) {
return InkWell(
onTap: () {
if (patientType ==
PatientType.OUT_PATIENT) {
Navigator.push(
context,
FadePage(
page: MyReferralDetailScreen(
referralPatient: model
.myReferralPatients[index]),
),
);
} else {
Navigator.push(
context,
FadePage(
page: ReferralPatientDetailScreen(
model.myReferralPatients[index],
model),
),
);
}
},
child: PatientReferralItemWidget(
referralStatus:
model.getReferralStatusNameByCode(
model.myReferralPatients[index]
.referralStatus,
context),
referralStatusCode: model
.myReferralPatients[index]
.referralStatus,
patientName: model
.myReferralPatients[index]
.patientName,
patientGender: model
.myReferralPatients[index].gender,
referredDate: AppDateUtils
.getDayMonthYearDateFormatted(model
.myReferralPatients[index]
.referralDate),
referredTime: AppDateUtils.getTimeHHMMA(
model.myReferralPatients[index]
.referralDate),
patientID:
"${model.myReferralPatients[index].patientID}",
isSameBranch: false,
isReferral: true,
isReferralClinic: true,
referralClinic:
"${model.myReferralPatients[index].referringClinicDescription}",
remark: model.myReferralPatients[index]
.referringDoctorRemarks,
nationality: model
.myReferralPatients[index]
.nationalityName,
nationalityFlag: model
.myReferralPatients[index]
.nationalityFlagURL,
doctorAvatar: model
.myReferralPatients[index]
.doctorImageURL,
referralDoctorName: model
.myReferralPatients[index]
.referringDoctorName,
clinicDescription: model
.myReferralPatients[index]
.referringClinicDescription,
infoIcon: Icon(
FontAwesomeIcons.arrowRight,
size: 25,
color: Colors.black),
),
);
})
],
child: Container(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
ListView.builder(
itemCount: model.myReferralPatients.length,
scrollDirection: Axis.vertical,
physics: ScrollPhysics(),
shrinkWrap: true,
itemBuilder: (context, index) {
return InkWell(
onTap: () {
if (patientType ==
PatientType.OUT_PATIENT) {
Navigator.push(
context,
FadePage(
page: MyReferralDetailScreen(
referralPatient: model
.myReferralPatients[index]),
),
);
} else {
Navigator.push(
context,
FadePage(
page: ReferralPatientDetailScreen(
model.myReferralPatients[index],
model),
),
);
}
},
child: PatientReferralItemWidget(
referralStatus:
model.getReferralStatusNameByCode(
model.myReferralPatients[index]
.referralStatus,
context),
referralStatusCode: model
.myReferralPatients[index]
.referralStatus,
patientName: model
.myReferralPatients[index]
.patientName,
patientGender: model
.myReferralPatients[index].gender,
referredDate: AppDateUtils
.getDayMonthYearDateFormatted(model
.myReferralPatients[index]
.referralDate),
referredTime: AppDateUtils.getTimeHHMMA(
model.myReferralPatients[index]
.referralDate),
patientID:
"${model.myReferralPatients[index].patientID}",
isSameBranch: false,
isReferral: true,
isReferralClinic: true,
referralClinic:
"${model.myReferralPatients[index].referringClinicDescription}",
remark: model.myReferralPatients[index]
.referringDoctorRemarks,
nationality: model
.myReferralPatients[index]
.nationalityName,
nationalityFlag: model
.myReferralPatients[index]
.nationalityFlagURL,
doctorAvatar: model
.myReferralPatients[index]
.doctorImageURL,
referralDoctorName: model
.myReferralPatients[index]
.referringDoctorName,
clinicDescription: model
.myReferralPatients[index]
.referringClinicDescription,
infoIcon: Icon(
FontAwesomeIcons.arrowRight,
size: 25,
color: Colors.black),
),
);
})
],
),
),
),
),

173
lib/screens/patients/profile/referral/patient_referral_screen.dart
Unescape Escape View File

@ -3,6 +3,7 @@ import 'dart:ui';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart';
import 'package:doctor_app_flutter/screens/patients/profile/referral/referred-patient-screen.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
@ -45,123 +46,79 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
@override
Widget build(BuildContext context) {
return AppScaffold(
appBar: PatientSearchHeader(
title: TranslationBase.of(context).patientsreferral,
),
body: Column(
children: <Widget>[
Container(
//height: MediaQuery.of(context).size.height * 0.050,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: Theme.of(context).dividerColor,
width: 1), //width: 0.7
),
color: Colors.white),
child: TabBar(
isScrollable: false,
controller: _tabController,
indicatorColor: Colors.transparent,
indicatorWeight: 1.0,
indicatorSize: TabBarIndicatorSize.tab,
labelColor: Theme.of(context).primaryColor,
labelPadding:
EdgeInsets.only(top: 0, left: 0, right: 0, bottom: 0),
unselectedLabelColor: Colors.grey[800],
tabs: [
Container(
width: MediaQuery.of(context).size.width * 0.33,
height: MediaQuery.of(context).size.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
Color(0Xffffffff), Color(0xFFCCCCCC),
borderRadius: 4, borderWidth: 0),
child: Center(
child: Container(
height: MediaQuery.of(context).size.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
index == 0 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
index == 0 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
borderRadius: 4,
borderWidth: 0),
child: Center(
child: AppText(
TranslationBase.of(context).myReferredPatient,
fontSize: SizeConfig.textMultiplier * 1.8,
color: index == 0 ? Colors.white : Color(0xFF2B353E),
fontWeight: FontWeight.w700,
isShowAppBar: true,
appBar: PatientSearchHeader(
title: TranslationBase.of(context).patientsreferral,
),
appBarTitle: TranslationBase.of(context).patientsreferral,
body: Scaffold(
extendBodyBehindAppBar: true,
// backgroundColor: Colors.white,
appBar: PreferredSize(
preferredSize:
Size.fromHeight(MediaQuery.of(context).size.height * 0.070),
child: Center(
child: Container(
height: Helpers.getTabHeight(context),
child: Center(
child: TabBar(
isScrollable: false,
controller: _tabController,
indicatorColor: Colors.transparent,
indicatorWeight: 1.0,
indicatorSize: TabBarIndicatorSize.tab,
labelColor: Theme.of(context).primaryColor,
labelPadding:
EdgeInsets.only(top: 0, left: 0, right: 0, bottom: 0),
unselectedLabelColor: Colors.grey[800],
tabs: [
Container(
decoration: Helpers.getBoxTabsBoxDecoration(
isActive: index == 0, isFirst: true),
child: Center(
child: Helpers.getTabText(title:TranslationBase.of(context).myReferredPatient, isActive:index == 0 )
),
),
),
),
),
Container(
width: MediaQuery.of(context).size.width * 0.34,
height: MediaQuery.of(context).size.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
Color(0Xffffffff), Color(0xFFCCCCCC),
borderRadius: 4, borderWidth: 0),
child: Center(
child: Container(
height: MediaQuery.of(context).size.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
index == 1 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
index == 1 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
borderRadius: 4,
borderWidth: 0),
child: Center(
child: AppText(
TranslationBase.of(context).referral,
fontSize: SizeConfig.textMultiplier * 1.8,
color: index == 1 ? Colors.white : Color(0xFF2B353E),
fontWeight: FontWeight.w700,
Center(
child: Container(
decoration:Helpers.getBoxTabsBoxDecoration(
isActive: index == 1, isMiddle: true),
child: Center(
child:Helpers.getTabText(title:TranslationBase.of(context).referral, isActive:index == 1 )
),
),
),
),
),
),
Container(
width: MediaQuery.of(context).size.width * 0.33,
height: MediaQuery.of(context).size.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
Color(0Xffffffff), Color(0xFFCCCCCC),
borderRadius: 4, borderWidth: 0),
child: Center(
child: Container(
height: MediaQuery.of(context).size.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
index == 2 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
index == 2 ? Color(0xFFD02127) : Color(0xFFEAEAEA),
borderRadius: 4,
borderWidth: 0),
child: Center(
child: AppText(
TranslationBase.of(context).discharged,
fontSize: SizeConfig.textMultiplier * 1.8,
color: index == 2 ? Colors.white : Color(0xFF2B353E),
fontWeight: FontWeight.w700,
Center(
child: Container(
decoration:Helpers.getBoxTabsBoxDecoration(
isActive: index == 2, isLast: true),
child: Center(
child: Helpers.getTabText(title:TranslationBase.of(context).discharged, isActive:index == 2 ),
),
),
),
),
],
),
),
],
),
),
),
Expanded(
child: TabBarView(
physics: BouncingScrollPhysics(),
controller: _tabController,
children: <Widget>[
ReferredPatientScreen(),
MyReferralInPatientScreen(),
ReferralDischargedPatientPage()
// MyReferredPatient(),
],
),
)
],
),
);
body: Column(
children: <Widget>[
Expanded(
child: TabBarView(
physics: BouncingScrollPhysics(),
controller: _tabController,
children: <Widget>[
ReferredPatientScreen(),
MyReferralInPatientScreen(),
ReferralDischargedPatientPage()
// MyReferredPatient(),
],
),
)
],
),
));
}
}

6
lib/widgets/auth/method_type_card.dart
Unescape Escape View File

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart';
@ -118,8 +119,9 @@ class MethodTypeCard extends StatelessWidget {
AppText(
label,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth()* (SizeConfig.isHeightVeryShort?3:3.7),
color: Color(0xFF2B353E),
fontWeight: FontWeight.w700,
color: AppGlobal.appTextColor,
fontWeight: FontWeight.w600,
letterSpacing: -0.48,
)
],
),

4
lib/widgets/dashboard/activity_button.dart
Unescape Escape View File

@ -37,7 +37,9 @@ class GetActivityCard extends StatelessWidget {
AppText(
value.kPIParameter,
textOverflow: TextOverflow.clip,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width)* (SizeConfig.isHeightVeryShort?8: SizeConfig.isHeightShort?8: 9),
fontHeight: 1.4,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width)* (SizeConfig.isHeightVeryShort?8: SizeConfig.isHeightShort?8: 9.3),
color: AppGlobal.appTextColor,
textAlign: TextAlign.start,
fontWeight: FontWeight.w600,

2
lib/widgets/dashboard/out_patient_stack.dart
Unescape Escape View File

@ -126,7 +126,7 @@ class GetOutPatientStack extends StatelessWidget {
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.5,
textAlign: TextAlign.center,
color: Color(0xFF2B353E),
fontWeight: FontWeight.w700,
fontWeight: FontWeight.w500,
letterSpacing: -0.3,
),
AppText(

2
lib/widgets/patients/patient-referral-item-widget.dart
Unescape Escape View File

@ -55,7 +55,7 @@ class PatientReferralItemWidget extends StatelessWidget {
ProjectViewModel projectViewModel = Provider.of(context);
return Container(
margin: EdgeInsets.only(left: 16.0, right: 16.0, top: 8.0),
margin: EdgeInsets.only(left: 16.0, right: 16.0, top: 0.0),
child: Column(
children: [
Container(

2
lib/widgets/patients/profile/PatientProfileButton.dart
Unescape Escape View File

@ -104,7 +104,6 @@ class PatientProfileButton extends StatelessWidget {
color: color ?? AppGlobal.appTextColor,
letterSpacing: -0.33,
fontWeight: FontWeight.w600,
textAlign: TextAlign.left,
fontSize: SizeConfig.textMultiplier * 1.30,
),
@ -113,6 +112,7 @@ class PatientProfileButton extends StatelessWidget {
color: color ?? Color(0xFF2B353E),
fontWeight: FontWeight.w600,
textAlign: TextAlign.left,
fontHeight: 1.4,
fontSize: SizeConfig.textMultiplier * 1.30,
),
if (isLoading) DrAppCircularProgressIndeicator()

Write Preview
Loading…
Cancel
Save