fixed issues

merge-update-with-lab-changes
Fatimah Alshammari 5 years ago
parent 428791c725
commit c242910aa2

@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/core/viewModels/offers_Categorise_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/offers_Categorise_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.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';
import 'package:diplomaticquarterapp/widgets/others/StarRating.dart'; import 'package:diplomaticquarterapp/widgets/others/StarRating.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_pharmacy_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_pharmacy_widget.dart';
@ -698,9 +699,31 @@ class _OffersCategorisePageState extends State<OffersCategorisePage> {
), ),
) )
: Center( : Center(
child: Texts( child: Column(
"SORRY , there's no listed offers now :(", mainAxisAlignment: MainAxisAlignment.center,
color: Colors.green, children: [
)))); Padding(
padding: const EdgeInsets.all(8.0),
child: Image.asset(
'assets/images/new-design/empty_box.png',
width: 100,
height: 100,
fit: BoxFit.cover,
),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Text(TranslationBase.of(context).noData,
// 'There is no data',
style: TextStyle(fontSize: 30),
),
)
],
),
// child: Texts(
// "SORRY , there's no listed offers now :(",
// color: Colors.green,
// )
)));
} }
} }

@ -421,7 +421,7 @@ class _OrderBottomWidgetState extends State<OrderBottomWidget> {
fontSize: 14), fontSize: 14),
), ),
color: Color(0xFF4CAF50), color: Color(0xFF4CAF50),
disabledColor:Color(0xFF4CAF50), disabledColor:Colors.grey[700],
// disabledColor: Color(0xff005aff), // disabledColor: Color(0xff005aff),
) )
// RaisedButton( // RaisedButton(

@ -55,9 +55,10 @@ class _PharmacyPageState extends State<PharmacyPage> {
BannerPager(model), BannerPager(model),
GridViewButtons(model), GridViewButtons(model),
PrescriptionsWidget(), PrescriptionsWidget(),
ShopByBrandWidget(), // ShopByBrandWidget(),
RecentlyViewedWidget(), RecentlyViewedWidget(),
BestSellerWidget(), BestSellerWidget(),
ShopByBrandWidget(),
], ],
), ),
), ),

@ -1,5 +1,7 @@
import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/PrescriptionViewModel.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/PrescriptionViewModel.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/locator.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart';
import 'package:diplomaticquarterapp/pages/pharmacies/widgets/home/ViewAllHomeWidget.dart'; import 'package:diplomaticquarterapp/pages/pharmacies/widgets/home/ViewAllHomeWidget.dart';
@ -11,6 +13,10 @@ import 'package:provider/provider.dart';
import 'package:rating_bar/rating_bar.dart'; import 'package:rating_bar/rating_bar.dart';
class PrescriptionsWidget extends StatelessWidget { class PrescriptionsWidget extends StatelessWidget {
AuthenticatedUserObject authenticatedUserObject =
locator<AuthenticatedUserObject>();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<PrescriptionViewModel>( return BaseView<PrescriptionViewModel>(
@ -20,7 +26,7 @@ class PrescriptionsWidget extends StatelessWidget {
} }
}, },
allowAny: true, allowAny: true,
builder: (_, model, wi) => model.prescriptionsList.length > 0 builder: (_, model, wi) => model.prescriptionsList.length > 0 && authenticatedUserObject.isLogin
? NetworkBaseView( ? NetworkBaseView(
isLocalLoader: true, isLocalLoader: true,
baseViewModel: model, baseViewModel: model,
@ -179,7 +185,8 @@ class PrescriptionsWidget extends StatelessWidget {
), ),
), ),
) )
: Container(), : Container(
),
); );
} }
} }

Loading…
Cancel
Save