offers products page

merge-update-with-lab-changes
hussam al-habibeh 6 years ago
parent 7815005e21
commit 6162833bba

@ -120,7 +120,6 @@ void setupLocator() {
locator.registerLazySingleton(() => HomeHealthCareService()); locator.registerLazySingleton(() => HomeHealthCareService());
locator.registerLazySingleton(() => CMCService()); locator.registerLazySingleton(() => CMCService());
locator.registerLazySingleton(() => PatientSickLeaveService()); locator.registerLazySingleton(() => PatientSickLeaveService());
locator.registerLazySingleton(() => MyBalanceService()); locator.registerLazySingleton(() => MyBalanceService());
locator.registerLazySingleton(() => BloodSugarService()); locator.registerLazySingleton(() => BloodSugarService());
@ -150,7 +149,6 @@ void setupLocator() {
locator.registerLazySingleton(() => PharmacyModuleService()); locator.registerLazySingleton(() => PharmacyModuleService());
locator.registerLazySingleton(() => OrderPreviewService()); locator.registerLazySingleton(() => OrderPreviewService());
/// View Model /// View Model
locator.registerFactory(() => HospitalViewModel()); locator.registerFactory(() => HospitalViewModel());
locator.registerFactory(() => PharmacyViewModel()); locator.registerFactory(() => PharmacyViewModel());
@ -181,8 +179,6 @@ void setupLocator() {
locator.registerFactory(() => UserInformationViewModel()); locator.registerFactory(() => UserInformationViewModel());
locator.registerFactory(() => VaccinationTableViewModel()); locator.registerFactory(() => VaccinationTableViewModel());
locator.registerFactory(() => AddNewChildViewModel()); locator.registerFactory(() => AddNewChildViewModel());
locator.registerFactory(() => H2OViewModel()); locator.registerFactory(() => H2OViewModel());
locator.registerFactory(() => BloodSugarViewMode()); locator.registerFactory(() => BloodSugarViewMode());
@ -196,9 +192,6 @@ void setupLocator() {
locator.registerFactory(() => HomeHealthCareViewModel()); locator.registerFactory(() => HomeHealthCareViewModel());
locator.registerFactory(() => CMCViewModel()); locator.registerFactory(() => CMCViewModel());
locator.registerFactory(() => PharmacyModuleViewModel()); locator.registerFactory(() => PharmacyModuleViewModel());
locator.registerFactory(() => OrderPreviewViewModel()); locator.registerFactory(() => OrderPreviewViewModel());

@ -11,7 +11,7 @@ import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart'; import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart';
import 'package:diplomaticquarterapp/pages/paymentService/payment_service.dart'; import 'package:diplomaticquarterapp/pages/paymentService/payment_service.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/screens/pharmacy_module_page.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/screens/pharmacy_module_page.dart';
import 'package:diplomaticquarterapp/pages/pharmacyModule/pharmacy_module_page.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
@ -484,8 +484,6 @@ class _HomePageState extends State<HomePage> {
opacity: 0.5, opacity: 0.5,
), ),
DashboardItem( DashboardItem(
onTap: () => Navigator.push(context, FadePage(page: PharmacyPage())),
child: Center( child: Center(
child: Padding( child: Padding(
padding: const EdgeInsets.all(15.0), padding: const EdgeInsets.all(15.0),
@ -518,7 +516,7 @@ class _HomePageState extends State<HomePage> {
), ),
), ),
DashboardItem( DashboardItem(
onTap: (){ onTap: () {
Navigator.push( Navigator.push(
context, context,
FadePage( FadePage(
@ -832,8 +830,10 @@ class DashboardItem extends StatelessWidget {
? DecorationImage( ? DecorationImage(
image: ExactAssetImage('assets/images/$imageName'), image: ExactAssetImage('assets/images/$imageName'),
fit: BoxFit.cover, fit: BoxFit.cover,
colorFilter: hasColorFilter ? new ColorFilter.mode( colorFilter: hasColorFilter
Colors.black.withOpacity(0.2), BlendMode.dstIn) : null, ? new ColorFilter.mode(
Colors.black.withOpacity(0.2), BlendMode.dstIn)
: null,
) )
: null, : null,
), ),

@ -52,14 +52,16 @@ class AppScaffold extends StatelessWidget {
this.title, this.title,
this.description, this.description,
this.isShowDecPage = true, this.isShowDecPage = true,
this.isBottomBar,this.backgroundColor}); this.isBottomBar,
this.backgroundColor});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
AppGlobal.context = context; AppGlobal.context = context;
return Scaffold( return Scaffold(
backgroundColor: backgroundColor ?? Theme.of(context).scaffoldBackgroundColor, backgroundColor:
backgroundColor ?? Theme.of(context).scaffoldBackgroundColor,
appBar: isShowAppBar appBar: isShowAppBar
? AppBar( ? AppBar(
elevation: 0, elevation: 0,
@ -116,6 +118,8 @@ class AppScaffold extends StatelessWidget {
buildBodyWidget() { buildBodyWidget() {
// return body; //Stack(children: <Widget>[body, buildAppLoaderWidget(isLoading)]); // return body; //Stack(children: <Widget>[body, buildAppLoaderWidget(isLoading)]);
return Stack(children: <Widget>[body, /*FloatingSearchButton()*/]); return Stack(children: <Widget>[
body, /*FloatingSearchButton()*/
]);
} }
} }

Loading…
Cancel
Save