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

small fixes

Browse Source
merge-requests/924/head
Elham Rababh 4 years ago
parent af10c60a7e
commit c2fbd99ced
7 changed files with 113 additions and 105 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": "خدمة"}, "service": {"en": "Service", "ar": "خدمة"},
"referral": {"en": "Referral", "ar": "الإحالة"}, "referral": {"en": "Referral", "ar": "الإحالة"},
"inPatient": {"en": "In Patients", "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": "مرضاي المنومين"}, "myInPatientTitle": {"en": "My Patients", "ar": "مرضاي المنومين"},
"inPatientLabel": {"en": "InPatients", "ar": "المريض المنوم"}, "inPatientLabel": {"en": "InPatients", "ar": "المريض المنوم"},
"inPatientAll": {"en": "All Patients", "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: [ children: [
Container( Container(
margin: EdgeInsets.only(top: 70), margin: EdgeInsets.only(top: 70),
child: PatientTypeRadioWidget( child: Container(
(patientType) async { child: PatientTypeRadioWidget(
setState(() { (patientType) async {
this.patientType = patientType; setState(() {
}); this.patientType = patientType;
GifLoaderDialogUtils.showMyDialog(context); });
if (patientType == PatientType.IN_PATIENT) { GifLoaderDialogUtils.showMyDialog(context);
await model.getMyReferralPatientService(localBusy: true); if (patientType == PatientType.IN_PATIENT) {
} else { await model.getMyReferralPatientService(localBusy: true);
await model.getMyReferralOutPatientService(localBusy: true); } else {
} await model.getMyReferralOutPatientService(localBusy: true);
GifLoaderDialogUtils.hideDialog(context); }
}, GifLoaderDialogUtils.hideDialog(context);
},
),
), ),
), ),
model.myReferralPatients.isEmpty model.myReferralPatients.isEmpty
@ -74,91 +76,93 @@ class _MyReferralInPatientScreenState extends State<MyReferralInPatientScreen> {
: Expanded( : Expanded(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Container( child: Container(
child: Column( child: Container(
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
ListView.builder( children: [
itemCount: model.myReferralPatients.length, ListView.builder(
scrollDirection: Axis.vertical, itemCount: model.myReferralPatients.length,
physics: ScrollPhysics(), scrollDirection: Axis.vertical,
shrinkWrap: true, physics: ScrollPhysics(),
itemBuilder: (context, index) { shrinkWrap: true,
return InkWell( itemBuilder: (context, index) {
onTap: () { return InkWell(
if (patientType == onTap: () {
PatientType.OUT_PATIENT) { if (patientType ==
Navigator.push( PatientType.OUT_PATIENT) {
context, Navigator.push(
FadePage( context,
page: MyReferralDetailScreen( FadePage(
referralPatient: model page: MyReferralDetailScreen(
.myReferralPatients[index]), referralPatient: model
), .myReferralPatients[index]),
); ),
} else { );
Navigator.push( } else {
context, Navigator.push(
FadePage( context,
page: ReferralPatientDetailScreen( FadePage(
model.myReferralPatients[index], page: ReferralPatientDetailScreen(
model), model.myReferralPatients[index],
), model),
); ),
} );
}, }
child: PatientReferralItemWidget( },
referralStatus: child: PatientReferralItemWidget(
model.getReferralStatusNameByCode( referralStatus:
model.myReferralPatients[index] model.getReferralStatusNameByCode(
.referralStatus, model.myReferralPatients[index]
context), .referralStatus,
referralStatusCode: model context),
.myReferralPatients[index] referralStatusCode: model
.referralStatus, .myReferralPatients[index]
patientName: model .referralStatus,
.myReferralPatients[index] patientName: model
.patientName, .myReferralPatients[index]
patientGender: model .patientName,
.myReferralPatients[index].gender, patientGender: model
referredDate: AppDateUtils .myReferralPatients[index].gender,
.getDayMonthYearDateFormatted(model referredDate: AppDateUtils
.myReferralPatients[index] .getDayMonthYearDateFormatted(model
.referralDate), .myReferralPatients[index]
referredTime: AppDateUtils.getTimeHHMMA( .referralDate),
model.myReferralPatients[index] referredTime: AppDateUtils.getTimeHHMMA(
.referralDate), model.myReferralPatients[index]
patientID: .referralDate),
"${model.myReferralPatients[index].patientID}", patientID:
isSameBranch: false, "${model.myReferralPatients[index].patientID}",
isReferral: true, isSameBranch: false,
isReferralClinic: true, isReferral: true,
referralClinic: isReferralClinic: true,
"${model.myReferralPatients[index].referringClinicDescription}", referralClinic:
remark: model.myReferralPatients[index] "${model.myReferralPatients[index].referringClinicDescription}",
.referringDoctorRemarks, remark: model.myReferralPatients[index]
nationality: model .referringDoctorRemarks,
.myReferralPatients[index] nationality: model
.nationalityName, .myReferralPatients[index]
nationalityFlag: model .nationalityName,
.myReferralPatients[index] nationalityFlag: model
.nationalityFlagURL, .myReferralPatients[index]
doctorAvatar: model .nationalityFlagURL,
.myReferralPatients[index] doctorAvatar: model
.doctorImageURL, .myReferralPatients[index]
referralDoctorName: model .doctorImageURL,
.myReferralPatients[index] referralDoctorName: model
.referringDoctorName, .myReferralPatients[index]
clinicDescription: model .referringDoctorName,
.myReferralPatients[index] clinicDescription: model
.referringClinicDescription, .myReferralPatients[index]
infoIcon: Icon( .referringClinicDescription,
FontAwesomeIcons.arrowRight, infoIcon: Icon(
size: 25, FontAwesomeIcons.arrowRight,
color: Colors.black), size: 25,
), color: Colors.black),
); ),
}) );
], })
],
),
), ),
), ),
), ),

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/config/size_config.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -118,8 +119,9 @@ class MethodTypeCard extends StatelessWidget {
AppText( AppText(
label, label,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth()* (SizeConfig.isHeightVeryShort?3:3.7), fontSize: SizeConfig.getTextMultiplierBasedOnWidth()* (SizeConfig.isHeightVeryShort?3:3.7),
color: Color(0xFF2B353E), color: AppGlobal.appTextColor,
fontWeight: FontWeight.w700, 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( AppText(
value.kPIParameter, value.kPIParameter,
textOverflow: TextOverflow.clip, 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, color: AppGlobal.appTextColor,
textAlign: TextAlign.start, textAlign: TextAlign.start,
fontWeight: FontWeight.w600, 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, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.5,
textAlign: TextAlign.center, textAlign: TextAlign.center,
color: Color(0xFF2B353E), color: Color(0xFF2B353E),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w500,
letterSpacing: -0.3, letterSpacing: -0.3,
), ),
AppText( 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); ProjectViewModel projectViewModel = Provider.of(context);
return Container( 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( child: Column(
children: [ children: [
Container( Container(

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

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

Write Preview
Loading…
Cancel
Save