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

Merge branch 'roaa_schedule_design' into 'development'

Browse Source 
fix referred-patient-screen

See merge request Cloud_Solution/doctor_app_flutter!962
merge-requests/963/merge
Elham Ali 3 years ago
parent df3ba10a54 83ea30303b
commit 17998cbbf3
2 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File

38
lib/screens/patients/profile/referral/referred-patient-screen.dart
Unescape Escape View File

@ -1,4 +1,5 @@
import 'package:doctor_app_flutter/core/enum/PatientType.dart'; import 'package:doctor_app_flutter/core/enum/PatientType.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.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/patients/profile/referral/referred_patient_detail_in-paint.dart'; import 'package:doctor_app_flutter/screens/patients/profile/referral/referred_patient_detail_in-paint.dart';
@ -48,16 +49,15 @@ class _ReferredPatientScreenState extends State<ReferredPatientScreen> {
}, },
), ),
), ),
model.listMyReferredPatientModel == null || if (model.listMyReferredPatientModel == null ||
model.listMyReferredPatientModel.length == 0 model.listMyReferredPatientModel.length == 0) Center(
? Center(
child: ErrorMessage( child: ErrorMessage(
error: TranslationBase.of(context).referralEmptyMsg, error: TranslationBase.of(context).referralEmptyMsg,
)) )) else Expanded(
: Expanded(
child: SingleChildScrollView( child: SingleChildScrollView(
// DoctorApplication.svc/REST/GtMyReferredPatient // DoctorApplication.svc/REST/GtMyReferredPatient
child: Container( child: Container(
child: Column( child: Column(
children: [ children: [
ListView.builder( ListView.builder(
@ -90,21 +90,25 @@ class _ReferredPatientScreenState extends State<ReferredPatientScreen> {
patientGender: model patientGender: model
.getReferredPatientItem(index) .getReferredPatientItem(index)
.gender, .gender,
referredDate: AppDateUtils.getDayMonthYearDateFormatted( referredDate: model.state == ViewState.BusyLocal ?"":
AppDateUtils.convertStringToDate( AppDateUtils.getDayMonthYearDateFormatted(
model patientType == PatientType.IN_PATIENT?
.getReferredPatientItem(index) AppDateUtils.getDateTimeFromServerFormat(
.referralDate, model.getReferredPatientItem(index).referralDate,
):AppDateUtils.getDateTimeFromString(
model.getReferredPatientItem(index).referralDate,
), ),
isMonthShort: true isMonthShort: true
), ),
referredTime: referredTime:AppDateUtils.getHour(
AppDateUtils patientType == PatientType.IN_PATIENT?
.convertDateFromServerFormat( AppDateUtils.getDateTimeFromServerFormat(
model model.getReferredPatientItem(index).referralDate,
.getReferredPatientItem(index) ):AppDateUtils.getDateTimeFromString(
.referralDate, model.getReferredPatientItem(index).referralDate,
"hh:mm a"), ),
// isMonthShort: true
),
patientID: patientID:
"${model.getReferredPatientItem(index).patientID}", "${model.getReferredPatientItem(index).patientID}",
isSameBranch: model isSameBranch: model

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

@ -92,6 +92,9 @@ class PatientReferralItemWidget extends StatelessWidget {
? Colors.red[700] ? Colors.red[700]
: Colors.red[900], : Colors.red[900],
), ),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
AppText( AppText(
referredDate ?? "", referredDate ?? "",
fontFamily: 'Poppins', fontFamily: 'Poppins',
@ -99,6 +102,16 @@ class PatientReferralItemWidget extends StatelessWidget {
letterSpacing: -0.48, letterSpacing: -0.48,
fontSize: 12.0, fontSize: 12.0,
color: Color(0XFF28353E), color: Color(0XFF28353E),
),
AppText(
referredTime ?? "",
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 12.0,
color: Color(0XFF575757),
letterSpacing: -0.48,
),
],
) )
], ],
), ),
@ -126,17 +139,6 @@ class PatientReferralItemWidget extends StatelessWidget {
) )
: Icon(DoctorApp.female_1, : Icon(DoctorApp.female_1,
color: Color(0xffF0448D)), color: Color(0xffF0448D)),
SizedBox(
width: 50,
),
AppText(
referredTime ?? "",
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 12.0,
color: Color(0XFF575757),
letterSpacing: -0.48,
),
], ],
), ),
Row( Row(

Write Preview
Loading…
Cancel
Save