prescriptions new ui updated.

merge-update-with-lab-changes
Sikander Saleem 4 years ago
parent cbb9151b62
commit 5410b826c3

@ -31,6 +31,11 @@ class PrescriptionsViewModel extends BaseViewModel {
List<PharmacyPrescriptions> get pharmacyPrescriptionsList => _prescriptionsService.pharmacyPrescriptionsList; List<PharmacyPrescriptions> get pharmacyPrescriptionsList => _prescriptionsService.pharmacyPrescriptionsList;
List<PrescriptionsList> get prescriptionsOrderList => filterType == FilterType.Clinic ? _prescriptionsOrderListClinic : _prescriptionsOrderListHospital; List<PrescriptionsList> get prescriptionsOrderList => filterType == FilterType.Clinic ? _prescriptionsOrderListClinic : _prescriptionsOrderListHospital;
List<PrescriptionsList> prescriptionsOrderListByValue(filterValue) {
return filterValue == FilterType.Clinic ? _prescriptionsOrderListClinic : _prescriptionsOrderListHospital;
}
get isMedDeliveryAllowed => _prescriptionsService.isMedDeliveryAllowed; get isMedDeliveryAllowed => _prescriptionsService.isMedDeliveryAllowed;
getPrescriptions() async { getPrescriptions() async {
setState(ViewState.Busy); setState(ViewState.Busy);

@ -1,5 +1,6 @@
import 'dart:ui'; import 'dart:ui';
import 'package:diplomaticquarterapp/core/enum/filter_type.dart';
import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart'; import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/prescriptions_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/medical/prescriptions_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
@ -26,7 +27,7 @@ class _HomePrescriptionsPageState extends State<HomePrescriptionsPage> with Sing
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_tabController = TabController(length: 2, vsync: this); _tabController = TabController(length: 3, vsync: this);
imagesInfo.add(ImagesInfo( imagesInfo.add(ImagesInfo(
imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-prescriptions/en/0.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-prescriptions/ar/0.png')); imageEn: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-prescriptions/en/0.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/imges-info/my-prescriptions/ar/0.png'));
imagesInfo.add(ImagesInfo( imagesInfo.add(ImagesInfo(
@ -74,7 +75,8 @@ class _HomePrescriptionsPageState extends State<HomePrescriptionsPage> with Sing
letterSpacing: -0.48, letterSpacing: -0.48,
), ),
tabs: [ tabs: [
Text(TranslationBase.of(context).prescriptions, style: TextStyle(fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins')), Text(TranslationBase.of(context).byClinic, style: TextStyle(fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins')),
Text(TranslationBase.of(context).byHospital, style: TextStyle(fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins')),
Text(TranslationBase.of(context).orderLog, style: TextStyle(fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins')), Text(TranslationBase.of(context).orderLog, style: TextStyle(fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins')),
], ],
), ),
@ -84,9 +86,19 @@ class _HomePrescriptionsPageState extends State<HomePrescriptionsPage> with Sing
controller: _tabController, controller: _tabController,
children: <Widget>[ children: <Widget>[
PrescriptionsPage( PrescriptionsPage(
FilterType.Clinic,
prescriptionsViewModel: model, prescriptionsViewModel: model,
showOrderLog: () async { showOrderLog: () async {
_tabController.animateTo(1); _tabController.animateTo(2);
await model.getPrescriptionsOrders(showLoading: true);
setState(() {});
},
),
PrescriptionsPage(
FilterType.Hospital,
prescriptionsViewModel: model,
showOrderLog: () async {
_tabController.animateTo(2);
await model.getPrescriptionsOrders(showLoading: true); await model.getPrescriptionsOrders(showLoading: true);
setState(() {}); setState(() {});
}, },

@ -16,86 +16,66 @@ import 'package:provider/provider.dart';
class PrescriptionsPage extends StatelessWidget { class PrescriptionsPage extends StatelessWidget {
final VoidCallback showOrderLog; final VoidCallback showOrderLog;
final FilterType filterType;
final PrescriptionsViewModel prescriptionsViewModel; final PrescriptionsViewModel prescriptionsViewModel;
const PrescriptionsPage({Key key, this.prescriptionsViewModel, this.showOrderLog}) : super(key: key); const PrescriptionsPage(this.filterType, {Key key, this.prescriptionsViewModel, this.showOrderLog}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
return AppScaffold( return AppScaffold(
baseViewModel: prescriptionsViewModel, baseViewModel: prescriptionsViewModel,
body: FractionallySizedBox( body: ListView.separated(
widthFactor: 1.0,
child: ListView(
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
children: <Widget>[ padding: EdgeInsets.only(top: 12),
Row( separatorBuilder: (context, index) {
children: [ return Container(
MyTabView(TranslationBase.of(context).byClinic, FilterType.Clinic, prescriptionsViewModel.filterType, () { height: 12,
prescriptionsViewModel.setFilterType(FilterType.Clinic); margin: EdgeInsets.only(left: 21, right: 21),
}), // color: Color(0xffD9D9D9),
MyTabView(TranslationBase.of(context).byHospital, FilterType.Hospital, prescriptionsViewModel.filterType, () { );
prescriptionsViewModel.setFilterType(FilterType.Hospital); },
}), itemBuilder: (context, index) {
], List<Prescriptions> prescriptionsList = prescriptionsViewModel.prescriptionsOrderListByValue(filterType)[index].prescriptionsList;
), return AppExpandableNotifier(
ListView.separated( title: prescriptionsViewModel.prescriptionsOrderListByValue(filterType)[index].filterName,
physics: NeverScrollableScrollPhysics(), bodyWidget: ListView.separated(
shrinkWrap: true, shrinkWrap: true,
padding: EdgeInsets.only(top: 12), physics: NeverScrollableScrollPhysics(),
separatorBuilder: (context, index) { padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21),
return Container( itemBuilder: (context, _index) {
height: 12, Prescriptions prescriptions = prescriptionsList[_index];
margin: EdgeInsets.only(left: 21, right: 21), return DoctorCard(
// color: Color(0xffD9D9D9), onTap: () async {
); final _shouldRecallApi = await Navigator.push(
}, context,
itemBuilder: (context, index) { FadePage(
List<Prescriptions> prescriptionsList = prescriptionsViewModel.prescriptionsOrderList[index].prescriptionsList; page: PrescriptionItemsPage(
return AppExpandableNotifier( prescriptions: prescriptions,
title: prescriptionsViewModel.prescriptionsOrderList[index].filterName, ),
bodyWidget: ListView.separated( ),
shrinkWrap: true, );
physics: NeverScrollableScrollPhysics(), if (_shouldRecallApi != null) {
padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21), showOrderLog();
itemBuilder: (context, _index) { }
Prescriptions prescriptions = prescriptionsList[_index]; },
return DoctorCard( name: prescriptions.doctorName,
onTap: () async { profileUrl: prescriptions.doctorImageURL,
final _shouldRecallApi = await Navigator.push( rating: prescriptions.actualDoctorRate.toDouble(),
context, subName: prescriptions.name,
FadePage( isInOutPatient: prescriptions.isInOutPatient,
page: PrescriptionItemsPage( isLiveCareAppointment: prescriptions.isLiveCareAppointment,
prescriptions: prescriptions, // appointmentTime: DateUtil.formatDateToTime(DateUtil.convertStringToDate(prescriptions
), // .appointmentDate)),
), date: DateUtil.convertStringToDate(prescriptions
); .appointmentDate) //projectViewModel.isArabic? DateUtil.getMonthDayYearDateFormattedAr( DateUtil.convertStringToDate(prescriptions.appointmentDate) ):DateUtil.getMonthDayYearDateFormatted(DateUtil.convertStringToDate(prescriptions.appointmentDate)),
if (_shouldRecallApi != null) { );
showOrderLog(); },
} separatorBuilder: (context, index) => SizedBox(height: 14),
}, itemCount: prescriptionsList.length),
name: prescriptions.doctorName, );
profileUrl: prescriptions.doctorImageURL, },
rating: prescriptions.actualDoctorRate.toDouble(), itemCount: prescriptionsViewModel.prescriptionsOrderListByValue(filterType).length,
subName: prescriptions.name, ));
isInOutPatient: prescriptions.isInOutPatient,
isLiveCareAppointment: prescriptions.isLiveCareAppointment,
// appointmentTime: DateUtil.formatDateToTime(DateUtil.convertStringToDate(prescriptions
// .appointmentDate)),
date: DateUtil.convertStringToDate(prescriptions
.appointmentDate) //projectViewModel.isArabic? DateUtil.getMonthDayYearDateFormattedAr( DateUtil.convertStringToDate(prescriptions.appointmentDate) ):DateUtil.getMonthDayYearDateFormatted(DateUtil.convertStringToDate(prescriptions.appointmentDate)),
);
},
separatorBuilder: (context, index) => SizedBox(height: 14),
itemCount: prescriptionsList.length),
);
},
itemCount: prescriptionsViewModel.prescriptionsOrderList.length,
)
],
),
),
);
} }
} }

@ -6,8 +6,7 @@ class GifLoaderContainer extends StatefulWidget {
_GifLoaderContainerState createState() => _GifLoaderContainerState(); _GifLoaderContainerState createState() => _GifLoaderContainerState();
} }
class _GifLoaderContainerState extends State<GifLoaderContainer> class _GifLoaderContainerState extends State<GifLoaderContainer> with TickerProviderStateMixin {
with TickerProviderStateMixin {
GifController controller1; GifController controller1;
@override @override
@ -15,8 +14,9 @@ class _GifLoaderContainerState extends State<GifLoaderContainer>
controller1 = GifController(vsync: this); controller1 = GifController(vsync: this);
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
controller1.repeat( try {
min: 0, max: 11, period: Duration(milliseconds: 750), reverse: true); controller1.repeat(min: 0, max: 11, period: Duration(milliseconds: 750), reverse: true);
} catch (ex) {}
}); });
super.initState(); super.initState();
} }
@ -30,14 +30,13 @@ class _GifLoaderContainerState extends State<GifLoaderContainer>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Center( return Center(
//progress-loading.gif //progress-loading.gif
child: Container( child: Container(
// margin: EdgeInsets.only(bottom: 40), // margin: EdgeInsets.only(bottom: 40),
child: GifImage( child: GifImage(
controller: controller1, controller: controller1,
image: AssetImage( image: AssetImage("assets/images/progress-loading-red.gif"), //NetworkImage("http://img.mp.itc.cn/upload/20161107/5cad975eee9e4b45ae9d3c1238ccf91e.jpg"),
"assets/images/progress-loading-red.gif"), //NetworkImage("http://img.mp.itc.cn/upload/20161107/5cad975eee9e4b45ae9d3c1238ccf91e.jpg"), ),
), ));
));
} }
} }

Loading…
Cancel
Save