home page design fix

merge-requests/859/head
mosazaid 4 years ago
parent 6003df7f63
commit efbe6ae76b

@ -37,7 +37,7 @@ class DashboardViewModel extends BaseViewModel {
await getDoctorProfile(isGetProfile: true); await getDoctorProfile(isGetProfile: true);
final results = await Future.wait([ final results = await Future.wait([
projectsProvider.getDoctorClinicsList(), projectsProvider.getDoctorClinicsList(),
_dashboardService.getDashboard(), _dashboardService.getDashboard(),
_dashboardService.checkDoctorHasLiveCare(), _dashboardService.checkDoctorHasLiveCare(),
_specialClinicsService.getSpecialClinicalCareList(), _specialClinicsService.getSpecialClinicalCareList(),
@ -45,7 +45,7 @@ class DashboardViewModel extends BaseViewModel {
if (_dashboardService.hasError) { if (_dashboardService.hasError) {
error = _dashboardService.error; error = _dashboardService.error;
setState(ViewState.Error); setState(ViewState.ErrorLocal);
} else } else
setState(ViewState.Idle); setState(ViewState.Idle);
@ -72,31 +72,21 @@ class DashboardViewModel extends BaseViewModel {
Future getDashboard() async { Future getDashboard() async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _dashboardService.getDashboard(); await _dashboardService.getDashboard();
if (_dashboardService.hasError) {
error = _dashboardService.error;
setState(ViewState.Error);
} else
setState(ViewState.Idle);
} }
Future checkDoctorHasLiveCare() async { Future checkDoctorHasLiveCare() async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _dashboardService.checkDoctorHasLiveCare(); await _dashboardService.checkDoctorHasLiveCare();
if (_dashboardService.hasError) {
error = _dashboardService.error;
setState(ViewState.Error);
} else
setState(ViewState.Idle);
} }
Future getSpecialClinicalCareList() async { Future getSpecialClinicalCareList() async {
setState(ViewState.Busy); setState(ViewState.Busy);
await _specialClinicsService.getSpecialClinicalCareList(); await _specialClinicsService.getSpecialClinicalCareList();
if (_specialClinicsService.hasError) { // if (_specialClinicsService.hasError) {
error = _specialClinicsService.error; // error = _specialClinicsService.error;
setState(ViewState.Error); // setState(ViewState.Error);
} else // } else
setState(ViewState.Idle); // setState(ViewState.Idle);
} }
Future changeClinic( Future changeClinic(

@ -22,6 +22,7 @@ import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/profile-welcome-widget.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/profile-welcome-widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.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:doctor_app_flutter/widgets/shared/errors/error_message.dart';
import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart';
import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -66,7 +67,8 @@ class _HomeScreenState extends State<HomeScreen> {
return BaseView<DashboardViewModel>( return BaseView<DashboardViewModel>(
onModelReady: (model) async { onModelReady: (model) async {
model.startHomeScreenServices(projectsProvider, authenticationViewModel); model.startHomeScreenServices(
projectsProvider, authenticationViewModel);
}, },
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
baseViewModel: model, baseViewModel: model,
@ -211,37 +213,49 @@ class _HomeScreenState extends State<HomeScreen> {
])), ])),
content: Column( content: Column(
children: [ children: [
model.dashboardItemsList.length > 0 if (model.state != ViewState.ErrorLocal)
? DashboardSwipeWidget( Column(
model.dashboardItemsList, mainAxisSize: MainAxisSize.min,
model, children: [
(sliderIndex) { model.dashboardItemsList.length > 0
setState(() { ? DashboardSwipeWidget(
sliderActiveIndex = sliderIndex; model.dashboardItemsList,
}); model,
}, (sliderIndex) {
) setState(() {
: SizedBox(), sliderActiveIndex = sliderIndex;
model.dashboardItemsList.length > 0 });
? FractionallySizedBox( },
widthFactor: 0.90, )
child: Container( : SizedBox(),
child: Column( model.dashboardItemsList.length > 0
mainAxisAlignment: MainAxisAlignment.start, ? FractionallySizedBox(
children: <Widget>[ widthFactor: 0.90,
SizedBox( child: Container(
height: 10, child: Column(
), mainAxisAlignment:
sliderActiveIndex == 1 MainAxisAlignment.start,
? DashboardSliderItemWidget( children: <Widget>[
model.dashboardItemsList[4]) SizedBox(
: sliderActiveIndex == 0 height: 10,
? DashboardSliderItemWidget( ),
model.dashboardItemsList[3]) sliderActiveIndex == 1
: DashboardSliderItemWidget( ? DashboardSliderItemWidget(
model.dashboardItemsList[6]), model.dashboardItemsList[4])
]))) : sliderActiveIndex == 0
: SizedBox(), ? DashboardSliderItemWidget(
model.dashboardItemsList[3])
: DashboardSliderItemWidget(
model.dashboardItemsList[6]),
])))
: SizedBox(),
],
)
else
Container(
child: ErrorMessage(
error: model.error,
)),
FractionallySizedBox( FractionallySizedBox(
// widthFactor: 0.90, // widthFactor: 0.90,
child: Container( child: Container(
@ -299,6 +313,7 @@ class _HomeScreenState extends State<HomeScreen> {
), ),
) )
]), ]),
]), ]),
), ),
); );
@ -397,11 +412,11 @@ class _HomeScreenState extends State<HomeScreen> {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => OutPatientsScreen( builder: (context) => OutPatientsScreen(
patientSearchRequestModel: PatientSearchRequestModel( patientSearchRequestModel: PatientSearchRequestModel(
from: date, from: date,
to: date, to: date,
doctorID: doctorID: authenticationViewModel.doctorProfile.doctorID),
authenticationViewModel.doctorProfile.doctorID),), ),
settings: RouteSettings(name: 'OutPatientsScreen'), settings: RouteSettings(name: 'OutPatientsScreen'),
)); ));
}, },

Loading…
Cancel
Save