Merge branch 'pharmacy-Fatima' into 'development'

fixed an issue in recommended page

See merge request Cloud_Solution/diplomatic-quarter!304
merge-update-with-lab-changes
Mohammad Aljammal 5 years ago
commit 1607aecb4a

@ -34,7 +34,7 @@ class PharmacyModuleViewModel extends BaseViewModel {
_pharmacyService.lastVisitedProducts; _pharmacyService.lastVisitedProducts;
List<Products> get recommendedProductList => List<PharmacyProduct> get recommendedProductList =>
_recommendedProductService.recommendedList; _recommendedProductService.recommendedList;
List<Prescriptions> get prescriptionsList => List<Prescriptions> get prescriptionsList =>

@ -30,6 +30,7 @@ PharmacyProduct specificationData;
class ProductDetailPage extends StatefulWidget { class ProductDetailPage extends StatefulWidget {
final PharmacyProduct product; final PharmacyProduct product;
ProductDetailPage(this.product); ProductDetailPage(this.product);
@override @override
@ -661,7 +662,15 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
.length, .length,
itemBuilder: itemBuilder:
(context, index) { (context, index) {
return Card( return InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: ProductDetailPage(model.recommendedProductList[index]),
));
},
child: Card(
elevation: 2, elevation: 2,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
side: BorderSide( side: BorderSide(
@ -878,6 +887,7 @@ class __ProductDetailPageState extends State<ProductDetailPage> {
], ],
), ),
), ),
),
); );
}), }),
) )

@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/PharmacyProduct.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/recommendedProduct_model.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/recommendedProduct_model.dart';
import 'package:diplomaticquarterapp/core/service/base_service.dart'; import 'package:diplomaticquarterapp/core/service/base_service.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
@ -15,8 +16,8 @@ class RecommendedProductService extends BaseService{
AuthenticatedUser authUser = new AuthenticatedUser(); AuthenticatedUser authUser = new AuthenticatedUser();
AuthProvider authProvider = new AuthProvider(); AuthProvider authProvider = new AuthProvider();
List<Products> _recommendedProductList = List(); List<PharmacyProduct> _recommendedProductList = List();
List<Products> get recommendedList => _recommendedProductList; List<PharmacyProduct> get recommendedList => _recommendedProductList;
String url =""; String url ="";
Future getRecommendedProducts(productId) async { Future getRecommendedProducts(productId) async {
@ -26,7 +27,7 @@ class RecommendedProductService extends BaseService{
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
_recommendedProductList.clear(); _recommendedProductList.clear();
response['products'].forEach((item) { response['products'].forEach((item) {
_recommendedProductList.add(Products.fromJson(item)); _recommendedProductList.add(PharmacyProduct.fromJson(item));
print("----------------------------------"); print("----------------------------------");
print("Test data"); print("Test data");
print(_recommendedProductList[0]); print(_recommendedProductList[0]);

Loading…
Cancel
Save