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/viewstate.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/patients/profile/referral/referred_patient_detail_in-paint.dart';
@ -48,16 +49,15 @@ class _ReferredPatientScreenState extends State<ReferredPatientScreen> {
},
),
),
model.listMyReferredPatientModel == null ||
model.listMyReferredPatientModel.length == 0
? Center(
if (model.listMyReferredPatientModel == null ||
model.listMyReferredPatientModel.length == 0) Center(
child: ErrorMessage(
error: TranslationBase.of(context).referralEmptyMsg,
))
: Expanded(
)) else Expanded(
child: SingleChildScrollView(
// DoctorApplication.svc/REST/GtMyReferredPatient
child: Container(
child: Column(
children: [
ListView.builder(
@ -90,21 +90,25 @@ class _ReferredPatientScreenState extends State<ReferredPatientScreen> {
patientGender: model
.getReferredPatientItem(index)
.gender,
referredDate: AppDateUtils.getDayMonthYearDateFormatted(
AppDateUtils.convertStringToDate(
model
.getReferredPatientItem(index)
.referralDate,
referredDate: model.state == ViewState.BusyLocal ?"":
AppDateUtils.getDayMonthYearDateFormatted(
patientType == PatientType.IN_PATIENT?
AppDateUtils.getDateTimeFromServerFormat(
model.getReferredPatientItem(index).referralDate,
):AppDateUtils.getDateTimeFromString(
model.getReferredPatientItem(index).referralDate,
),
isMonthShort: true
),
referredTime:
AppDateUtils
.convertDateFromServerFormat(
model
.getReferredPatientItem(index)
.referralDate,
"hh:mm a"),
referredTime:AppDateUtils.getHour(
patientType == PatientType.IN_PATIENT?
AppDateUtils.getDateTimeFromServerFormat(
model.getReferredPatientItem(index).referralDate,
):AppDateUtils.getDateTimeFromString(
model.getReferredPatientItem(index).referralDate,
),
// isMonthShort: true
),
patientID:
"${model.getReferredPatientItem(index).patientID}",
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[900],
),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
AppText(
referredDate ?? "",
fontFamily: 'Poppins',
@ -99,6 +102,16 @@ class PatientReferralItemWidget extends StatelessWidget {
letterSpacing: -0.48,
fontSize: 12.0,
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,
color: Color(0xffF0448D)),
SizedBox(
width: 50,
),
AppText(
referredTime ?? "",
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 12.0,
color: Color(0XFF575757),
letterSpacing: -0.48,
),
],
),
Row(

Write Preview
Loading…
Cancel
Save