home page design fix

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

@ -45,7 +45,7 @@ class DashboardViewModel extends BaseViewModel {
if (_dashboardService.hasError) {
error = _dashboardService.error;
setState(ViewState.Error);
setState(ViewState.ErrorLocal);
} else
setState(ViewState.Idle);
@ -72,31 +72,21 @@ class DashboardViewModel extends BaseViewModel {
Future getDashboard() async {
setState(ViewState.Busy);
await _dashboardService.getDashboard();
if (_dashboardService.hasError) {
error = _dashboardService.error;
setState(ViewState.Error);
} else
setState(ViewState.Idle);
}
Future checkDoctorHasLiveCare() async {
setState(ViewState.Busy);
await _dashboardService.checkDoctorHasLiveCare();
if (_dashboardService.hasError) {
error = _dashboardService.error;
setState(ViewState.Error);
} else
setState(ViewState.Idle);
}
Future getSpecialClinicalCareList() async {
setState(ViewState.Busy);
await _specialClinicsService.getSpecialClinicalCareList();
if (_specialClinicsService.hasError) {
error = _specialClinicsService.error;
setState(ViewState.Error);
} else
setState(ViewState.Idle);
// if (_specialClinicsService.hasError) {
// error = _specialClinicsService.error;
// setState(ViewState.Error);
// } else
// setState(ViewState.Idle);
}
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/shared/app_scaffold_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/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
@ -66,7 +67,8 @@ class _HomeScreenState extends State<HomeScreen> {
return BaseView<DashboardViewModel>(
onModelReady: (model) async {
model.startHomeScreenServices(projectsProvider, authenticationViewModel);
model.startHomeScreenServices(
projectsProvider, authenticationViewModel);
},
builder: (_, model, w) => AppScaffold(
baseViewModel: model,
@ -210,6 +212,10 @@ class _HomeScreenState extends State<HomeScreen> {
])
])),
content: Column(
children: [
if (model.state != ViewState.ErrorLocal)
Column(
mainAxisSize: MainAxisSize.min,
children: [
model.dashboardItemsList.length > 0
? DashboardSwipeWidget(
@ -227,7 +233,8 @@ class _HomeScreenState extends State<HomeScreen> {
widthFactor: 0.90,
child: Container(
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.start,
children: <Widget>[
SizedBox(
height: 10,
@ -242,6 +249,13 @@ class _HomeScreenState extends State<HomeScreen> {
model.dashboardItemsList[6]),
])))
: SizedBox(),
],
)
else
Container(
child: ErrorMessage(
error: model.error,
)),
FractionallySizedBox(
// widthFactor: 0.90,
child: Container(
@ -299,6 +313,7 @@ class _HomeScreenState extends State<HomeScreen> {
),
)
]),
]),
),
);
@ -400,8 +415,8 @@ class _HomeScreenState extends State<HomeScreen> {
patientSearchRequestModel: PatientSearchRequestModel(
from: date,
to: date,
doctorID:
authenticationViewModel.doctorProfile.doctorID),),
doctorID: authenticationViewModel.doctorProfile.doctorID),
),
settings: RouteSettings(name: 'OutPatientsScreen'),
));
},

Loading…
Cancel
Save